From f93b763b02abee5e3d5b0fec71767d0277e5cca7 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 18 Sep 2025 14:17:16 +0800 Subject: [PATCH 01/10] fix --- src/component/home/newProject/workspace.vue | 4 ++-- src/tool/listData.js | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/component/home/newProject/workspace.vue b/src/component/home/newProject/workspace.vue index d20eccf9..2e19c50b 100644 --- a/src/component/home/newProject/workspace.vue +++ b/src/component/home/newProject/workspace.vue @@ -41,7 +41,7 @@
{{ selectObject?.styleName?selectObject?.styleName:'All' }}
{{ $t('Habit.Select') }}
- +
{{$t('Habit.Category')}}: diff --git a/src/tool/listData.js b/src/tool/listData.js index 56477289..31c0bcde 100644 --- a/src/tool/listData.js +++ b/src/tool/listData.js @@ -340,12 +340,12 @@ const openTypeList = (t)=>{ value:'Models', router:'library=Models' }, - // { - // icon:'fi-ss-gem', - // label:t('LibraryPage.brandDNA'), - // value:'MyBrand', - // router:'library=MyBrand' - // }, + { + icon:'fi-ss-gem', + label:t('LibraryPage.brandDNA'), + value:'MyBrand', + router:'library=MyBrand' + }, ] }, history:{ From 95f7f52089759f63d6db56d7cfa0890191680913 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 19 Sep 2025 16:46:43 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=8D=B0=E8=8A=B1?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E4=B8=8B=E4=B8=80=E4=B8=AA=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/scaleImage.vue | 49 ++++++++++++++------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue index fcaf89a2..e001e990 100644 --- a/src/component/HomePage/scaleImage.vue +++ b/src/component/HomePage/scaleImage.vue @@ -608,30 +608,31 @@ export default defineComponent({ setImageIndex(index:any){ if(this.isNext)return let this_ = this - if(this.imgType == 'Printboard' || this.imgType == 'Sketchboard'){ - this.isNext = true - new Promise((resolve,reject)=>{ - Modal.confirm({ - title: this.t('scaleImage.submitCanvas'), - icon: createVNode(ExclamationCircleOutlined), - okText: 'Yes', - cancelText: 'No', - mask:false, - centered:true, - onOk() { - this_.scaleImageIndex = index - this_.isNext = false - resolve('') - }, - onCancel(){ - this_.isNext = false - resolve('') - } - }); - }) - }else{ - this.scaleImageIndex = index - } + // if(this.imgType == 'Printboard' || this.imgType == 'Sketchboard'){ + // this.isNext = true + // new Promise((resolve,reject)=>{ + // Modal.confirm({ + // title: this.t('scaleImage.submitCanvas'), + // icon: createVNode(ExclamationCircleOutlined), + // okText: 'Yes', + // cancelText: 'No', + // mask:false, + // centered:true, + // onOk() { + // this_.scaleImageIndex = index + // this_.isNext = false + // resolve('') + // }, + // onCancel(){ + // this_.isNext = false + // resolve('') + // } + // }); + // }) + // }else{ + // this.scaleImageIndex = index + // } + this.scaleImageIndex = index }, LikeFile(item:any,str:string){ let parent:any = this.$parent From 3cbb448520cd0ba082757cd254b0fa4982d6e000 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 19 Sep 2025 17:19:28 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=B2=E5=8C=96?= =?UTF-8?q?=E9=BC=A0=E6=A0=87=E6=8A=AC=E8=B5=B7=E5=90=8E=E5=B0=B1=E4=BC=9A?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Canvas/CanvasEditor/components/LiquifyPanel.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/Canvas/CanvasEditor/components/LiquifyPanel.vue b/src/component/Canvas/CanvasEditor/components/LiquifyPanel.vue index b58f52fb..c8946485 100644 --- a/src/component/Canvas/CanvasEditor/components/LiquifyPanel.vue +++ b/src/component/Canvas/CanvasEditor/components/LiquifyPanel.vue @@ -519,7 +519,7 @@ function showPanel(event) { } visible.value = true; - closePanel.value = true +// closePanel.value = true isEditing.value = true; // 初始化液化管理器并准备液化环境 From acb77671021d451105f561860b2d9d86858d5e57 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 19 Sep 2025 18:45:53 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Administrator/SE/allUser/index.vue | 2 +- .../Transaction/TransactionTable.vue | 2 +- src/component/Administrator/allUser.vue | 2 +- .../Administrator/allUserPoerations.vue | 2 +- src/component/Administrator/trialAllUser.vue | 2 +- .../home/design/editDesignType/index.vue | 51 ++++++++++--------- 6 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/component/Administrator/SE/allUser/index.vue b/src/component/Administrator/SE/allUser/index.vue index 28309f70..521e80df 100644 --- a/src/component/Administrator/SE/allUser/index.vue +++ b/src/component/Administrator/SE/allUser/index.vue @@ -22,7 +22,7 @@
- Country: + Country or Region:
- Country: + Country or Region:
- Country: + Country or Region: { - Modal.confirm({ - title: this.t('scaleImage.submitCanvas'), - icon: createVNode(ExclamationCircleOutlined), - okText: 'Yes', - cancelText: 'No', - mask:false, - centered:true, - onOk() { - this_.scaleImageIndex = index - this_.isNext = false - resolve('') - }, - onCancel(){ - this_.isNext = false - resolve('') - } - }); - }) - }else{ - this.scaleImageIndex = index - } + // let this_ = this + // if(this.isCanvas){ + // this.isNext = true + // new Promise((resolve,reject)=>{ + // Modal.confirm({ + // title: this.t('scaleImage.submitCanvas'), + // icon: createVNode(ExclamationCircleOutlined), + // okText: 'Yes', + // cancelText: 'No', + // mask:false, + // centered:true, + // onOk() { + // this_.scaleImageIndex = index + // this_.isNext = false + // resolve('') + // }, + // onCancel(){ + // this_.isNext = false + // resolve('') + // } + // }); + // }) + // }else{ + // this.scaleImageIndex = index + // } + this.scaleImageIndex = index }, LikeFile(item:any,str:string){ let parent:any = this.$parent From 15cb0c86e7763c4d6afd106c25fd3bc4163eeabc Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Sat, 20 Sep 2025 10:52:10 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=BA=8C=E5=88=9B=20ge?= =?UTF-8?q?nerate=E7=94=9F=E6=88=90=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/HomePage/Generate.vue | 2 +- src/component/WorksPage/newScaleImage.vue | 2 ++ src/views/HomeView/library.vue | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 0455d50c..2683c440 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -742,7 +742,7 @@ export default defineComponent({ data = data.filter((item:any) => item !== element.taskId); console.log(data) this.fileList = this.fileList.filter((item:any) => item.taskId !== element.taskId); - message.info(this.t('Generate.everyTimeEffectPoor')); + // message.info(this.t('Generate.everyTimeEffectPoor')); } }); if((data.length == 0)){ diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index 9bec3fcc..87573f2d 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -440,6 +440,8 @@ export default defineComponent({ if(userDetail.value.systemList.indexOf(1) == -1){ return message.info(t('newScaleImage.jsContent1')) } + return message.info(t('newScaleImage.jsContent2')) + if(imgData.scaleImageData.openSource == 0){ return message.info(t('newScaleImage.jsContent2')) } diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 86a1260d..f858ef3a 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -1823,7 +1823,7 @@ export default defineComponent({ }else if(element.status == 'Fail' || element.status == 'Invalid'){ data = data.filter((item:any) => item !== element.taskId); this.generateList[str] = this.generateList[str].filter((item:any) => item.taskId !== element.taskId); - message.info(this.t('Generate.everyTimeEffectPoor')); + // message.info(this.t('Generate.everyTimeEffectPoor')); } }); if((data.length == 0)){ From 575875ec661f18034108f393b136227c13ac4f68 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 22 Sep 2025 12:34:58 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=90=E7=A7=81?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/LoginPage/login/enterprise.vue | 2 +- src/component/LoginPage/login/personal.vue | 2 +- src/component/LoginPage/login/school.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/component/LoginPage/login/enterprise.vue b/src/component/LoginPage/login/enterprise.vue index f5fd7522..8c582cc9 100644 --- a/src/component/LoginPage/login/enterprise.vue +++ b/src/component/LoginPage/login/enterprise.vue @@ -105,7 +105,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. diff --git a/src/component/LoginPage/login/personal.vue b/src/component/LoginPage/login/personal.vue index 20a1f7ae..0278d701 100644 --- a/src/component/LoginPage/login/personal.vue +++ b/src/component/LoginPage/login/personal.vue @@ -88,7 +88,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. diff --git a/src/component/LoginPage/login/school.vue b/src/component/LoginPage/login/school.vue index 7435cc00..fb62faec 100644 --- a/src/component/LoginPage/login/school.vue +++ b/src/component/LoginPage/login/school.vue @@ -105,7 +105,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. From 80e1d4638f0b6d87097dc0ab399dd1d0107b4918 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 22 Sep 2025 12:35:57 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9A=90=E7=A7=81?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/LoginPage/login/enterprise.vue | 2 +- src/component/LoginPage/login/personal.vue | 2 +- src/component/LoginPage/login/school.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/component/LoginPage/login/enterprise.vue b/src/component/LoginPage/login/enterprise.vue index 8c582cc9..a5391b45 100644 --- a/src/component/LoginPage/login/enterprise.vue +++ b/src/component/LoginPage/login/enterprise.vue @@ -105,7 +105,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. diff --git a/src/component/LoginPage/login/personal.vue b/src/component/LoginPage/login/personal.vue index 0278d701..8afe7b59 100644 --- a/src/component/LoginPage/login/personal.vue +++ b/src/component/LoginPage/login/personal.vue @@ -88,7 +88,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. diff --git a/src/component/LoginPage/login/school.vue b/src/component/LoginPage/login/school.vue index fb62faec..60ca77d5 100644 --- a/src/component/LoginPage/login/school.vue +++ b/src/component/LoginPage/login/school.vue @@ -105,7 +105,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. From cd28861f0ca986ac5d422a8ad2106a5aa867afe6 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 22 Sep 2025 13:36:10 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E5=92=8C=E5=9C=B0=E5=8C=BA=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/cn.ts | 2 +- src/lang/en.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lang/cn.ts b/src/lang/cn.ts index ded270bc..7e05ad57 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -751,7 +751,7 @@ export default { editUser: "修改个人信息", notModifiable: "没有修改次数", remainingModifications: "本月剩余次数：", - Country: "国家", + Country: "国家或地区", CompanyName: "职业", Status: "状态", Valid: "有效", diff --git a/src/lang/en.ts b/src/lang/en.ts index 0928c6d4..7e59d3b8 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -753,7 +753,7 @@ export default { editUser: "Change Information", notModifiable: "Not modifiable", remainingModifications: "Remaining this month:", - Country: "Country", + Country: "Country or Region", CompanyName: "Occupation", Status: "Status", Valid: "Valid", From 6402ab4b64b350b0d5a277211379b38b3cf26352 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 22 Sep 2025 13:37:49 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=82=AE=E7=AE=B1icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Account/account.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/component/Account/account.vue b/src/component/Account/account.vue index 57f7a42e..6a9280e5 100644 --- a/src/component/Account/account.vue +++ b/src/component/Account/account.vue @@ -50,10 +50,10 @@
{{ userDetail.email }}
-
+
From 4f5a02bcf3e002514a56ef372a8578ea3dd2b2d0 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 22 Sep 2025 14:01:44 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Account/frontPage/mylnformation.vue | 2 +- src/component/Administrator/SE/recentActiveChart.vue | 4 +++- .../Administrator/Transaction/TransactionTable.vue | 4 ++-- src/component/Administrator/allUser.vue | 4 ++-- src/component/Administrator/recentActiveUser.vue | 4 ++-- src/component/Administrator/recentNewUser.vue | 4 ++-- src/lang/cn.ts | 12 ++++++++++++ src/lang/en.ts | 12 ++++++++++++ src/store/userHabit/userHabit.ts | 2 +- 9 files changed, 37 insertions(+), 11 deletions(-) diff --git a/src/component/Account/frontPage/mylnformation.vue b/src/component/Account/frontPage/mylnformation.vue index e5df3e55..80175852 100644 --- a/src/component/Account/frontPage/mylnformation.vue +++ b/src/component/Account/frontPage/mylnformation.vue @@ -28,7 +28,7 @@ optionFilterProp="label" :options="countryList" :field-names="{ label: locale == 'CHINESE_SIMPLIFIED'?'labelCn':'label' }" - placeholder="Please select" + :placeholder="`${$t('account.plaseSelect')} ${$t('account.Country')}`" allowClear show-search > diff --git a/src/component/Administrator/SE/recentActiveChart.vue b/src/component/Administrator/SE/recentActiveChart.vue index d9251b36..fe27f030 100644 --- a/src/component/Administrator/SE/recentActiveChart.vue +++ b/src/component/Administrator/SE/recentActiveChart.vue @@ -77,10 +77,12 @@ import { PieChart } from 'echarts/charts'; import { LabelLayout } from 'echarts/features'; import { useStore } from "vuex"; import { CanvasRenderer } from 'echarts/renderers'; +import { useI18n } from 'vue-i18n' export default defineComponent({ components: { }, setup() { + const {t} = useI18n() const store:any = useStore() let filter:any = reactive({ dataList:computed(()=>{ @@ -115,7 +117,7 @@ export default defineComponent({ let data:any = [] rv.names.forEach((item:any,index:number) => { let obj = { - name : item, + name : t(`admin.${item}`), value:rv.values[index], } data.push(obj) diff --git a/src/component/Administrator/Transaction/TransactionTable.vue b/src/component/Administrator/Transaction/TransactionTable.vue index 8e153108..48c4d595 100644 --- a/src/component/Administrator/Transaction/TransactionTable.vue +++ b/src/component/Administrator/Transaction/TransactionTable.vue @@ -365,11 +365,11 @@ export default defineComponent({ ellipsis:true }, { - title: "Country", + title: "Country or Region", align: "center", dataIndex: "country", key: "country", - width:150, + width:200, ellipsis:true }, { diff --git a/src/component/Administrator/allUser.vue b/src/component/Administrator/allUser.vue index e162e58d..2bff6e11 100644 --- a/src/component/Administrator/allUser.vue +++ b/src/component/Administrator/allUser.vue @@ -292,11 +292,11 @@ export default defineComponent({ }, }, { - title: "Country", + title: "Country or Region", align: "center", dataIndex: "country", key: "country", - width:100, + width:200, }, { title: "Create Date", diff --git a/src/component/Administrator/recentActiveUser.vue b/src/component/Administrator/recentActiveUser.vue index 421ef4af..9a8cd832 100644 --- a/src/component/Administrator/recentActiveUser.vue +++ b/src/component/Administrator/recentActiveUser.vue @@ -150,11 +150,11 @@ export default defineComponent({ }, }, { - title: "Country", + title: "Country or Region", align: "center", dataIndex: "country", key: "country", - width:100, + width:200, }, { title: "Create Date", diff --git a/src/component/Administrator/recentNewUser.vue b/src/component/Administrator/recentNewUser.vue index da8a628a..33bed9d4 100644 --- a/src/component/Administrator/recentNewUser.vue +++ b/src/component/Administrator/recentNewUser.vue @@ -177,11 +177,11 @@ export default defineComponent({ }, }, { - title: "Country", + title: "Country or Region", align: "center", dataIndex: "country", key: "country", - width:100, + width:200, }, { title: "Create Date", diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 7e05ad57..868f504b 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -751,6 +751,7 @@ export default { editUser: "修改个人信息", notModifiable: "没有修改次数", remainingModifications: "本月剩余次数：", + plaseSelect:"请选择", Country: "国家或地区", CompanyName: "职业", Status: "状态", @@ -1348,5 +1349,16 @@ export default { jsContent1:'邮箱格式有误', jsContent2:'请检查所有带 * 号的内容', jsDelete:'确定删除这一项吗', + Design:'设计', + SingleDesign:'单品设计', + MoodBoard:'情绪版', + PrintBoard:'印花板', + SketchBoard:'线稿板', + Pattern:'设计', + Logo:'标志', + Slogan:'标语', + ToProductImage:'产品图', + Relight:'打光', + ChatRobot:'对话生成', }, }; diff --git a/src/lang/en.ts b/src/lang/en.ts index 7e59d3b8..ba768f27 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -753,6 +753,7 @@ export default { editUser: "Change Information", notModifiable: "Not modifiable", remainingModifications: "Remaining this month:", + plaseSelect:"Please select", Country: "Country or Region", CompanyName: "Occupation", Status: "Status", @@ -1350,5 +1351,16 @@ export default { jsContent1:'The email format is incorrect', jsContent2:'Please check the input box marked with *', jsDelete:'Are you sure you want to delete this item?', + Design:'Design', + SingleDesign:'SingleDesign', + MoodBoard:'MoodBoard', + PrintBoard:'PrintBoard', + SketchBoard:'SketchBoard', + Pattern:'Pattern', + Logo:'Logo', + Slogan:'Slogan', + ToProductImage:'ToProductImage', + Relight:'Relight', + ChatRobot:'ChatRobot', }, }; diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts index d76ad75a..19c70970 100644 --- a/src/store/userHabit/userHabit.ts +++ b/src/store/userHabit/userHabit.ts @@ -265,7 +265,7 @@ const userHabit : Module = { */ state.userDetail.affiliate = data.affiliate state.userDetail.systemUser = data.systemUser - // state.userDetail.systemUser = 3 + state.userDetail.systemUser = 7 // 身份列表1：可以使用aida系统，2:可以使用affiliate页面，3：系统管理员用户 state.userDetail.systemList = [] if(data.systemUser != 0)state.userDetail.systemList.push(1)