diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 245cb13b..cbbe631a 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -853,9 +853,7 @@ export default defineComponent({ level2Type = this.sketchboardList?.[0]?.categoryValue ? this.sketchboardList[0].categoryValue : '' - if (this.workspace.styleName) { - sloganText = `${this.workspace.styleName},${sloganText}` - } + sloganText = `${this.workspace.styleName || 'all'},${sloganText}` } else if (this.upload.level1Type == 'Printboard') { level2Type = this.scene?.value if (level2Type == 'Slogan' && this.searchPictureName == '') { diff --git a/src/component/home/index.vue b/src/component/home/index.vue index f1f1eadb..19804341 100644 --- a/src/component/home/index.vue +++ b/src/component/home/index.vue @@ -196,9 +196,9 @@ export default defineComponent({ type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign', httpType:rv.process,//项目类型 ageGroup:rv.workspaceVO?.ageGroup, - style:rv.workspaceVO?.style, - styleId:rv.workspaceVO?.styleId, - styleName:rv.workspaceVO?.styleName, + style:rv.workspaceVO?.style || '', + styleId:rv.workspaceVO?.styleId || null, + styleName:rv.workspaceVO?.styleName || '', sex:rv.workspaceVO?.sex, userBrandDnaImg:rv.workspaceVO?.userBrandDnaImg, userBrandDnaName:rv.workspaceVO?.userBrandDnaName, diff --git a/src/component/home/newProject/setting.vue b/src/component/home/newProject/setting.vue index 731444f3..f1d805f6 100644 --- a/src/component/home/newProject/setting.vue +++ b/src/component/home/newProject/setting.vue @@ -94,9 +94,9 @@ export default defineComponent({ type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign', httpType:rv.process,//项目类型 ageGroup:rv.workspaceVO.ageGroup, - style:rv.workspaceVO.style, - styleId:rv.workspaceVO.styleId, - styleName:rv.workspaceVO.styleName, + style:rv.workspaceVO.style || '', + styleId:rv.workspaceVO.styleId || null, + styleName:rv.workspaceVO.styleName || '', sex:rv.workspaceVO.sex, userBrandDnaImg:rv.workspaceVO.userBrandDnaImg, userBrandDnaName:rv.workspaceVO.userBrandDnaName, diff --git a/src/component/home/newProject/workspace.vue b/src/component/home/newProject/workspace.vue index 67dbca2d..93f7b851 100644 --- a/src/component/home/newProject/workspace.vue +++ b/src/component/home/newProject/workspace.vue @@ -179,9 +179,9 @@ export default defineComponent({ dataDom.brandDNA.init(data.selectObject); } const setWorkspaceStyle = (value:any)=>{ - data.selectObject.styleName = value.name - data.selectObject.style = value.value - data.selectObject.styleId = value.id + data.selectObject.styleName = value.name || '' + data.selectObject.style = value.value || '' + data.selectObject.styleId = value.id || null // store.commit('setProbject',data) } const setWorkspaceBrandDNA = (value:any)=>{ @@ -238,9 +238,9 @@ export default defineComponent({ // type:rv.process == 'SERIES_DESIGN'?'seriesDesign':'singleProductDesign', // httpType:rv.process,//项目类型 ageGroup:rv.workspaceVO?.ageGroup, - style:rv.workspaceVO?.style, - styleId:rv.workspaceVO?.styleId, - styleName:rv.workspaceVO?.styleName, + style:rv.workspaceVO?.style || '', + styleId:rv.workspaceVO?.styleId || null, + styleName:rv.workspaceVO?.styleName || '', sex:rv.workspaceVO?.sex, userBrandDnaImg:rv.workspaceVO?.userBrandDnaImg, userBrandDnaName:rv.workspaceVO?.userBrandDnaName, diff --git a/src/component/modules/habitSetStyle.vue b/src/component/modules/habitSetStyle.vue index e0650d72..ad3b0259 100644 --- a/src/component/modules/habitSetStyle.vue +++ b/src/component/modules/habitSetStyle.vue @@ -102,9 +102,9 @@ setup(props,{emit}) { // if(habitSetStyleData.styleList.length == 0){ // getStyleList() // } - oldDataId = data.styleId - habitSetStyleData.selectStyle.id = data.styleId - habitSetStyleData.selectStyle.name = data.styleName + oldDataId = data.styleId || null + habitSetStyleData.selectStyle.id = data.styleId || null + habitSetStyleData.selectStyle.name = data.styleName || '' // habitSetStyleData.selectStyleId = 'feng2' } let setCover = (item:any)=>{ diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts index d853c60f..d101312d 100644 --- a/src/store/userHabit/userHabit.ts +++ b/src/store/userHabit/userHabit.ts @@ -407,7 +407,7 @@ const userHabit : Module = { item.name = name }); // const {t} = useI18n() - rv.unshift({name:t('Model.all'),value:'',id:''}) + rv.unshift({name:t('Model.all'),value:'',id:null}) store.commit('setMannequinStyle',rv) resolve('') } diff --git a/src/store/workspace/workspace.ts b/src/store/workspace/workspace.ts index 08e975d2..628a4d67 100644 --- a/src/store/workspace/workspace.ts +++ b/src/store/workspace/workspace.ts @@ -74,7 +74,8 @@ const Workspace: Module = { }, setProbject(state, data) { for (const key in data) { - if (data[key] == undefined) continue + let list = ['styleName','styleId','style'] + if (data[key] == undefined && !list.includes(key)) continue state.probjects[key] = data[key] } }, diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 79c3191f..6cd1b19f 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -1721,9 +1721,8 @@ export default defineComponent({ sloganText = this.captionGeneration if(this.selectCode == "Sketchboard"){ level2Type = this.selectGenerateList?.[0]?.categoryValue?this.selectGenerateList[0].categoryValue:'' - if(this.workspace.styleName){ - sloganText = `${this.workspace.styleName},${sloganText}` - } + // sloganText = `${this.workspace.styleName || 'all'},${sloganText}` + sloganText = `'all',${sloganText}` }else if(this.selectCode == "Printboard"){ level2Type = this.scene?.value if(level2Type == 'Slogan' && this.captionGeneration == ''){