-
+
+
![]()
@@ -541,7 +541,7 @@ export default defineComponent({
if(this.driver__.driver){
nextTick().then(()=>{
// driverObj__.moveNext();
- driverObj__.moveTo(41);
+ driverObj__.moveTo(36);
})
}
}
diff --git a/src/component/Detail/DesignDetailAlter.vue b/src/component/Detail/DesignDetailAlter.vue
index 340b2224..80a432d7 100644
--- a/src/component/Detail/DesignDetailAlter.vue
+++ b/src/component/Detail/DesignDetailAlter.vue
@@ -752,14 +752,14 @@ export default defineComponent({
// path:imgData?.url,
// designType: imgData?.designType
// }]
- // if(this.driver__.driver){
- // nextTick().then(()=>{
- // driverObj__.moveNext();
- // })
- // }
+
imgData.path = imgData.url
DesignDetailEnd.printsList.push(imgData)
-
+ if(this.driver__.driver){
+ nextTick().then(()=>{
+ driverObj__.moveNext();
+ })
+ }
// console.log(this.current.printObject,imgData);
}else if(this.selectCode == 'DesignElements'){
imgData.path = imgData.url
diff --git a/src/component/Detail/habit.vue b/src/component/Detail/habit.vue
index 63d1eac1..f06f8e3f 100644
--- a/src/component/Detail/habit.vue
+++ b/src/component/Detail/habit.vue
@@ -726,7 +726,9 @@ export default defineComponent({
// this.openType.habit = false
nextTick().then(()=>{
// driverObj__.moveTo(2);
- driverObj__.moveNext();
+ setTimeout(() => {
+ driverObj__.moveNext();
+ }, 300);
this.openType.model = false
// driverObj__.moveNext();
diff --git a/src/component/HomePage/ColorboardUpload.vue b/src/component/HomePage/ColorboardUpload.vue
index f68d847a..976d7c98 100644
--- a/src/component/HomePage/ColorboardUpload.vue
+++ b/src/component/HomePage/ColorboardUpload.vue
@@ -90,7 +90,7 @@
{{ $t('ColorboardUpload.UploadImage') }}
-
+
-
@@ -102,7 +102,7 @@
Delete
+
-
@@ -123,8 +124,8 @@
-
+
+
@@ -454,6 +455,11 @@ export default defineComponent({
file.status = 'done'
this.fileList[0] = file
this.getImgColor()
+ // nextTick().then(()=>{
+ // if(this.driver__.driver){
+ // driverObj__.moveNext()
+ // }
+ // })
};
// 转化为base64S
reader.readAsDataURL(fileData)
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 74494d22..3a992e82 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -1,7 +1,7 @@
-
-
+
-
+
-
+
-
+
{{ $t('Generate.Generate') }}
@@ -100,7 +100,7 @@
-
+
-->
- {{item}}
{{item}}
@@ -139,7 +139,7 @@
+
![]()
-
= 2 && this.driver__.driver){
+ let sketch = this.store.state.UploadFilesModule.sketchGenerateFiles
+ if((moodboard.length >= 2 || sketch.length >= 2) && this.driver__.driver){
driverObj__.moveNext()
}
},
@@ -542,12 +543,14 @@ export default defineComponent({
if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length ==data.length)){
if(rv.filter((item:any)=>item.status == 'Invalid').length ==dataNum){
message.info(this.t('Generate.effectPoor'));
+ }else{
+ nextTick().then(()=>{
+ if(this.driver__.driver){
+ driverObj__.moveNext()
+ }
+ })
}
- nextTick().then(()=>{
- if(this.driver__.driver){
- driverObj__.moveNext()
- }
- })
+
this.store.dispatch('getCredits')
clearInterval(this.generateTime)
clearInterval(this.remGenerateTime)
diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue
index f1c13542..243b8c73 100644
--- a/src/component/HomePage/PrintboardUpload.vue
+++ b/src/component/HomePage/PrintboardUpload.vue
@@ -266,7 +266,6 @@ export default defineComponent({
cropperFileData:{name:'',uid:''}, //裁剪的原始文件数据
currentFileNum:0, //当前上传的文件数
isUpload:false,
- captionGeneration:'',
printboardList:computed(()=>{
return useStore().state.UploadFilesModule.printboard
}),
@@ -284,10 +283,12 @@ export default defineComponent({
this.workspace = computed(()=>{
return this.store?.state?.Workspace?.workspace
})
+ let Generate:any = this.$refs.Generate
+
if(this.driver__.driver){
- this.captionGeneration = 'Elegant floral print for high-fashion attire'
+ Generate.searchPictureName = 'Elegant floral print for high-fashion attire'
}else{
- this.captionGeneration = ''
+ Generate.searchPictureName = ''
}
},
methods:{
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index 737f0d4d..3afc81a2 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -136,7 +136,7 @@
-
+
![]()
{
@@ -115,6 +115,7 @@ export default defineComponent({
setSketchLibrary(props.item)
}
if(props.driver__){
+
driverObj__.moveNext()
}
// this.store.commit("sketchGenerateFiles", this.fileList);
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index 25d2de2c..6f290060 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -566,12 +566,12 @@ export default {
guide11:"点击此处布局您的情绪版。",
guide12:"点击此处生成印花图片。",
guide13:"点击此处生成印花图片。",
- guide14:"我们为生成图片提供三个输入选项：仅图片、仅文本和图片文本。",
- guide15:"选择此选项，我们将使用您上传的图片和输入的文本生成四张印花图片。",
- guide16:"在此处选择生成模型；不同的模型将以不同的风格生成图片。",
+ // guide14:"我们为生成图片提供三个输入选项：仅图片、仅文本和图片文本。",
+ // guide15:"选择此选项，我们将使用您上传的图片和输入的文本生成四张印花图片。",
+ // guide16:"在此处选择生成模型；不同的模型将以不同的风格生成图片。",
guide17:"在此处选择生成模型；不同的模型将以不同的风格生成图片。",
guide18:"在此处上传输入图片。",
- guide19:"点击此图片进行选择。",
+ // guide19:"点击此图片进行选择。",
guide20:"输入关于您希望创建的印花的关键词，然后点击生成按钮。",
guide21:"选择您最喜欢的生成印花。",
guide22:"点击此处进行下一步。",
@@ -581,7 +581,7 @@ export default {
guide26:"从这些颜色块中选择您想要的颜色。",
guide27:"点击此处进行下一步。",
guide28:"点击此处生成服装草图。",
- guide29:"使用仅文本选项进行生成。",
+ // guide29:"使用仅文本选项进行生成。",
guide30:"输入关于您希望创建的草图的关键词，然后点击生成按钮。",
guide31:"点击此处为生成的草图选择一个类别。",
guide32:"为草图选择正确的类别。",
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 0b7799ed..2a3fba8f 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -567,8 +567,8 @@ export default {
guide11:"Click here to layout your moodboard.",
guide12:"Click here for next step.",
guide13:"Click here to generate print images.",
- guide14:"We provide three input options for generating images: Image Only, Text Only, and Text-Image.",
- guide15:"Select this option and we will generate four print images using both the picture you upload and the text you enter.",
+ // guide14:"We provide three input options for generating images: Image Only, Text Only, and Text-Image.",
+ // guide15:"Select this option and we will generate four print images using both the picture you upload and the text you enter.",
guide16:"Choose a generation model here; different models will generate images in various styles.",
guide17:"Choose a generation model here; different models will generate images in various styles.",
guide18:"Upload the input picture here.",
diff --git a/src/tool/guide.js b/src/tool/guide.js
index c81fb3ee..08d7f6ef 100644
--- a/src/tool/guide.js
+++ b/src/tool/guide.js
@@ -74,12 +74,12 @@ function createDriver(){
{ element: '.Guide_1_8', popover: { title: '', description: i18n.guide12 } },
//以上moodboard
{ element: '.Guide_1_2_1', popover: { title: '', description: i18n.guide13 } },
- { element: '.Guide_1_2_2', popover: { title: '', description: i18n.guide14 } },
- { element: '.Guide_1_2_3', popover: { title: '', description: i18n.guide15 } },
+ // { element: '.Guide_1_2_2', popover: { title: '', description: i18n.guide14 } },
+ // { element: '.Guide_1_2_3', popover: { title: '', description: i18n.guide15 } },
{ element: '.Guide_1_2_4', popover: { title: '', description: i18n.guide16 } },
- { element: '.Guide_1_2_5', popover: { title: '', description: i18n.guide17 } },
+ // { element: '.Guide_1_2_5', popover: { title: '', description: i18n.guide17 } },
{ element: '.Guide_1_2_6', popover: { title: '', description: i18n.guide18 } },
- { element: '.Guide_1_2_7', popover: { title: '', description: i18n.guide19 } },
+ // { element: '.Guide_1_2_7', popover: { title: '', description: i18n.guide19 } },
{ element: '.Guide_1_2_8', popover: { title: '', description: i18n.guide20 } },
{ element: '.Guide_1_2_9', popover: { title: '', description: i18n.guide21 } },
{ element: '.Guide_1_8', popover: { title: '', description: i18n.guide22 } },
@@ -89,7 +89,7 @@ function createDriver(){
{ element: '.Guide_1_11_2', popover: { title: '', description: i18n.guide26 } },
{ element: '.Guide_1_8', popover: { title: '', description: i18n.guide27 } },
{ element: '.Guide_1_9', popover: { title: '', description: i18n.guide28 } },
- { element: '.Guide_1_9_1', popover: { title: '', description: i18n.guide29 } },
+ // { element: '.Guide_1_9_1', popover: { title: '', description: i18n.guide29 } },
{ element: '.Guide_1_9_2', popover: { title: '', description: i18n.guide30 } },
{ element: '.Guide_1_13', popover: { title: '', description: i18n.guide31 } },
{ element: '.Guide_1_13_1', popover: { title: '', description: i18n.guide32 } },
@@ -119,7 +119,7 @@ function createDriver(){
showButtons:false,
stagePadding:10,//切口到元素的距离
stageRadius:5,//切口圆弧度
- allowKeyboardControl:false,//控制是否可以键盘控制下一步
+ allowKeyboardControl:true,//控制是否可以键盘控制下一步
disableActiveInteraction:false,//是否禁用显示元素的交互
overlayOpacity:.4,
overlay: true,
@@ -137,9 +137,10 @@ function createDriver(){
driver : true,
stepsLenth:stepsLenth,
}
+ console.log(options.state.activeIndex);
store?.commit("setGuide", data);
if(options.state.activeIndex == 0 ||
- options.state.activeIndex == 39
+ options.state.activeIndex == 34
){
popover.wrapper.style.display = 'none'
}else{
@@ -150,7 +151,7 @@ function createDriver(){
// options.config.stagePadding = 10
}else if(options.state.activeIndex == 6 || options.state.activeIndex == 7){
popover.wrapper.style.transform = 'translateY(4rem)'
- }else if(options.state.activeIndex == 46){
+ }else if(options.state.activeIndex == 41){
popover.wrapper.style.transform = 'translateY(-6rem)'
}else{
popover.wrapper.style.transform = 'initial'
@@ -228,7 +229,7 @@ function removeDiv(element){
}
const openGuide = () =>{
- return//暂时关闭
+ return
let isTest = JSON.parse(getCookie('isTest'))
let isBeginner = JSON.parse(getCookie('isBeginner'))
// console.log(isBeginner);
diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue
index 47e6cfc8..4af44dfe 100644
--- a/src/views/HomeView/HomeView.vue
+++ b/src/views/HomeView/HomeView.vue
@@ -85,7 +85,7 @@
design, index
) in designCollectionList" :key="design?.designItemId">
![]()
-
{
message.success(this.t('HistoryPage.jsContent1'))
this.collectionList.splice(index,1)
+ // let userGroupId: any = computed(() => {
+ // return
+ // });
+ if(record.id == this.store.state.HomeStoreModule.userGroupId){
+ this.store.commit('deleteUserGroupId')
+ this.store.commit("setLikeDesignCollectionList", []);
+ this.store.commit("clearAllData");
+ this.store.commit("clearAllCollection");
+ this.store.commit("setAllBoardDataChoose",{});
+ this.store.commit("clearShowSketchboard",{});
+ }
+ console.log(this.store.state.HomeStoreModule.userGroupId,record);
+
}
);
}