diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 11cb5a57..5bedaf96 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -593,27 +593,29 @@ export default defineComponent({
}
},
deleteFile(item: any) {
- if (item.type_ == "generate" || item.type_ == "material") {
- let maxImg = 8
- if(this.type_.type2 == 'Sketchboard'){
- maxImg = 20
- }
- item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:maxImg})
- this.store.commit("addGenerateMaterialFils", item);
- } else {
- this.sketchboardList =
- this.store.state.UploadFilesModule.moodboardFiles;
- let moodboard;
- this.store.state.UploadFilesModule.moodboardFiles.forEach(
- (items: any, index: Number) => {
- if (items.id_ == item.id_) {
- moodboard = index;
- }
- }
- );
- this.sketchboardList.splice(moodboard, 1);
- this.store.commit("setSketchboardFile", this.sketchboardList);
- }
+ // this.sketchboardList
+ this.sketchboardList.splice(item, 1);
+ // if (item.type_ == "generate" || item.type_ == "material") {
+ // let maxImg = 8
+ // if(this.type_.type2 == 'Sketchboard'){
+ // maxImg = 20
+ // }
+ // item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:maxImg})
+ // this.store.commit("addGenerateMaterialFils", item);
+ // } else {
+ // this.sketchboardList =
+ // this.store.state.UploadFilesModule.moodboardFiles;
+ // let moodboard;
+ // this.store.state.UploadFilesModule.moodboardFiles.forEach(
+ // (items: any, index: Number) => {
+ // if (items.id_ == item.id_) {
+ // moodboard = index;
+ // }
+ // }
+ // );
+ // this.sketchboardList.splice(moodboard, 1);
+ // this.store.commit("setSketchboardFile", this.sketchboardList);
+ // }
},
likeFile(item:any,str:string){
if(str == 'like'){
diff --git a/src/component/HomePage/RobotAssist.vue b/src/component/HomePage/RobotAssist.vue
index 397cc00e..2f1f94c0 100644
--- a/src/component/HomePage/RobotAssist.vue
+++ b/src/component/HomePage/RobotAssist.vue
@@ -121,14 +121,14 @@ export default defineComponent({
driverObj__.refresh();
this.record.push({
state:1,
- str:"Welcome to the AiDA system, your friendly fashion design assistant at your service! If you have any questions or need assistance, please don't hesitate to ask. ",
+ str:"Welcome to AiDA. I am your friendly fashion design assistant. If you have any questions or need assistance, please don't hesitate to ask. ",
driver:false,
})
this.textScroll()
setTimeout(() => {
this.record.push({
state:1,
- str:"I see you might be new here, and I'd love to guide you through a tutorial to help you get acquainted with our new and improved AiDA system. How does that sound? Would you like to start the tutorial now?",
+ str:"I see you might be new here, and I'd love to guide you through a tutorial to help you get acquainted with our new and improved AiDA system. Would you like to start the tutorial now?",
driver:true,
})
this.textScroll()
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index 0ebf4ec3..cef713d6 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -411,7 +411,7 @@ export default defineComponent({
return this.store?.state?.Workspace?.workspace
})
if(this.driver__.driver){
- this.captionGeneration = 'Exit sign, door, sunset, ocean, surreal'
+ this.captionGeneration = 'A detailed sketch of an elegant blouse with a high neck, flowing sleeves, and lace trim, highlighting texture and style.'
}else{
this.captionGeneration = ''
}
diff --git a/src/component/HomePage/collectionModal.vue b/src/component/HomePage/collectionModal.vue
index 2b170d09..bca43149 100644
--- a/src/component/HomePage/collectionModal.vue
+++ b/src/component/HomePage/collectionModal.vue
@@ -180,16 +180,31 @@ export default defineComponent({
}
});
},
- isPin(list:any){
+ isPin(str:any){
+ let _this = this
+ Modal.confirm({
+ title: this.t('collectionModal.jsContent5',{str:str}),
+ icon: createVNode(ExclamationCircleOutlined),
+ okText: 'Yes',
+ cancelText: 'No',
+ mask:false,
+ centered:true,
+ onOk() {
+ return true
+ },
+ onCancel(){
+ _this.isShowMark = false
+ return false
+ }
+ });
+ // message.warning(this.t('SketchboardUpload.jsContent1',str:str));
+ },
+ isPinOpen(list:any){
this.workspace
let numTop = 0
let numBottom = 0
let top:any
let bottom:any
- console.log(this.position);
- this.position.forEach((item:any) => {
- // let str =
- });
if(this.workspace.sexEnum.name == "Female"){
top = ['Outwear','Dress','Blouse']
bottom = ['Trousers','Skirt']
@@ -197,11 +212,21 @@ export default defineComponent({
top = ['Outwear','Tops']
bottom = ['Bottoms']
}
- console.log(this.workspace);
-
-
+ let topStr:any = []
+ let bottomStr:any = []
+ this.position.forEach((item:any) => {
+ let topBor
+ let botBor
+ topBor = top.includes(item.name)
+ botBor = bottom.includes(item.name)
+ if(topBor){
+ topStr.push(item.value)
+ }
+ if(botBor){
+ bottomStr.push(item.value)
+ }
+ });
list.forEach((item:any,index:number) => {
- console.log(item);
top.forEach((positionItem:any) => {
if(item.category == positionItem && item.pin){
numTop++
@@ -210,15 +235,21 @@ export default defineComponent({
}
});
});
+ let str
if(numTop >= 8){
- // let str =
- // return
+ console.log(1);
+ str = `top ${topStr.join(' and ')}`
+ return this.isPin(str)
}else if(numBottom >= 8){
- return
+ console.log(2);
+ str = `bottom ${bottomStr.join(' and ')}`
+ return this.isPin(str)
}else{
-
+ console.log(3);
+
+ return true
}
- // message.warning(this.t('SketchboardUpload.jsContent1',str:str));
+
},
//完成
finishCollection(){
@@ -236,7 +267,10 @@ export default defineComponent({
});
let data = {sketchBoards:arr}
// console.log(this.position);
- this.isPin(sketchList)
+ if(!this.isPinOpen(sketchList)){
+ this.isShowMark = false
+ return
+ }
let elList = document.querySelectorAll('.img_block_item_sketch img')
Https.axiosPost(Https.httpUrls.sketchBoardsBoundingBox, data)
.then((rv: any) => {
diff --git a/src/lang/en.ts b/src/lang/en.ts
index ed1cfe11..ed8c9324 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -272,7 +272,7 @@ export default {
jsContent1:"Since you have selected multiple images, please click 'Layout' to proceed.",
jsContent2:'The uploaded files will not be saved, being sure to continue? ',
jsContent3:'You must choose one or more colors for further process.',
- jsContent5:"We've detected that the number of pins on your top (blouse and dress) exceeds eight, which may result in some pinned items not being used. Would you like to continue anyway?",
+ jsContent5:"We've detected that the number of pins on your ({str}) exceeds eight, which may result in some pinned items not being used. Would you like to continue anyway?",
},
DesignDetail:{
Details:'Details',
diff --git a/src/tool/guide.js b/src/tool/guide.js
index 6e51cbbc..bee0dfce 100644
--- a/src/tool/guide.js
+++ b/src/tool/guide.js
@@ -15,18 +15,18 @@ const driverObj__ = driver({
steps: [
{ element: '.Guide_1_1_1', popover: { title: 'Title', description: 'Description' } },
{ element: '.Guide_1_27', popover: { title: '', description: "You can personalize your design settings right here in the Workspace, including choosing to design for men's or women's wear, as well as selecting the mannequin to use for your creations." } },
- { element: '.Guide_1_28', popover: { title: '', description: "Select the apparel type you'd like to work on.", side: "right",align: 'center' } },
+ { element: '.Guide_1_28', popover: { title: '', description: "Select the apparel type you'd like to work on.", side: "right", } },
{ element: '.Guide_1_28', popover: { title: '', description: 'Change the mannequin here.', side: "right",align: 'end' } },
{ element: '.Guide_1_29', popover: { title: '', description: 'You can currently select a mannequin from our system library. Later, you can also choose from the user library after registering your own mannequin.' } },
{ element: '.Guide_1_1', popover: { title: '', description: 'Begin your creative journey here. ' } },
- { element: '.Guide_1_1_2', popover: { title: '', description: 'For the Moodboard, Printboard, or Sketchboard, we provide three different sourcing methods to add images. The first option, as displayed on this page, is to upload directly from your local device. ' } },
- { element: '.Guide_1_1_2', popover: { title: '', description: "The second method is to select from your library.
You might notice that your library page is currently empty; there's no need to worry. All the images you upload will be automatically added to your library. In the future, you won't have to upload each time—you can simply choose from your library instead." } },
+ { element: '.Guide_1_1_2', popover: { title: '', description: 'For the Moodboard, Printboard, or Sketchboard, we provide three different sourcing methods to add images. The first option is Upload, allowing you to upload directly from your local device.', side: "left",align: 'start' } },
+ { element: '.Guide_1_1_2', popover: { title: '', description: "The second method is to select from your Library.
You might notice that your library page is currently empty; there's no need to worry. All the images you upload will be automatically added to your library. In the future, you won't have to upload each time—you can simply choose from your library instead." } },
// { element: '.Guide_1_1_2', popover: { title: '', description: 'Begin your creative journey here. ' } },
// { element: '.Guide_1_3', popover: { title: '', description: 'Description' } },
// { element: '.Guide_1_2', popover: { title: '', description: 'Description' } },
- { element: '.Guide_1_4', popover: { title: '', description: 'The third method is to generate images using the latest Image Generation technology.' } },
+ { element: '.Guide_1_4', popover: { title: '', description: 'The third method is to Generate images using the latest Image Generation technology.' } },
{ element: '.Guide_1_5', popover: { title: '', description: "Enter keywords that capture the mood you wish to express and then click the 'Generate' button." } },
{ element: '.Guide_1_6', popover: { title: '', description: 'Select two images for your moodboard.' } },
{ element: '.Guide_1_7', popover: { title: '', description: 'Click here to layout your moodboard.' } },
@@ -60,9 +60,9 @@ const driverObj__ = driver({
//开始design
{ element: '.Guide_1_15', popover: { title: '', description: 'Click here to let AI generate design illustrations.' } },
{ element: '.Guide_1_16', popover: { title: '', description: 'Please wait a few seconds.' } },
- { element: '.Guide_1_17', popover: { title: '', description: 'Click on any design image you are interested in to modify the details.' } },
+ { element: '.Guide_1_17', popover: { title: '', description: 'Click the little red heart to save your favorite design.' } },
// { element: '.Guide_1_18', popover: { title: '', description: 'Description' } },
- { element: '.Guide_1_30', popover: { title: '', description: "Click the 'Redesign' button to generate new results using the selected mannequin." } },
+ { element: '.Guide_1_30', popover: { title: '', description: "Click 'Redesign' to generate eight new outfits for your collection to choose from." } },
{ element: '.Guide_1_16', popover: { title: '', description: 'Click here to let AI generate design illustrations.' } },
{ element: '.Guide_1_17', popover: { title: '', description: 'Click on any design image you are interested in to modify the details.' } },
{ element: '.Guide_1_19', popover: { title: '', description: 'Click on the clothes to modify its details.' } },
@@ -72,7 +72,6 @@ const driverObj__ = driver({
{ element: '.Guide_1_23', popover: { title: '', description: 'Click here to layout the selected print' } },
// { element: '.Guide_1_24', popover: { title: '', description: 'Description' } },
{ element: '.Guide_1_25', popover: { title: '', description: 'Preview printed design here.' ,side: "right",align: 'end' } },
- { element: '.Guide_1_26', popover: { title: '', description: 'Click here to finalize your modification.' } },
{ element: '.Guide_1_99', popover: { title: 'Begin Your Design', description: 'Your guide is complete, and now the canvas is yours to create freely. For more insights and details, check out our demo video on the homepage at https://code-create.com.hk/aida/' } },
],
// showProgress: true,//控制总页数和当前页数是否显示
@@ -88,7 +87,7 @@ const driverObj__ = driver({
// prevBtnText: '‹—',
doneBtnText: '✕',
onPopoverRender: (popover, options) => {//每个步骤的元素和所有信息
- // console.log(popover,options,element);
+ console.log(popover,options,element);
popover.previousButton.style.display = 'none'
// let driver = document.querySelector('body')
driverIndex__ = driverObj__.getState().activeIndex
@@ -102,7 +101,15 @@ const driverObj__ = driver({
}else{
popover.wrapper.style.display = 'block'
}
-
+ console.log(options.state.activeIndex);
+ if(options.state.activeIndex == 2){
+ popover.wrapper.style.transform = 'translateY(11rem)'
+ // options.config.stagePadding = 10
+ }else if(options.state.activeIndex == 6 || options.state.activeIndex == 7){
+ popover.wrapper.style.transform = 'translateY(4rem)'
+ }else{
+ popover.wrapper.style.transform = 'initial'
+ }
//判断是不是generate 如果是就吧边距设为0
// if(options.state.activeIndex >= 2 && options.state.activeIndex < 3){
// options.config.stagePadding = 0