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 }}
-
+
diff --git a/src/component/Account/frontPage/mylnformation.vue b/src/component/Account/frontPage/mylnformation.vue index 25eac482..72da23b4 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/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: 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/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 diff --git a/src/component/LoginPage/login/enterprise.vue b/src/component/LoginPage/login/enterprise.vue index b6c4945d..8be7338e 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 f5fb5be1..e94401f1 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 c177983b..5f531e44 100644 --- a/src/component/LoginPage/login/school.vue +++ b/src/component/LoginPage/login/school.vue @@ -109,7 +109,7 @@ I agree to the Terms, - Privacy Policy, + Privacy Policy, and Fees. diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue index 1695b452..2be32aa8 100644 --- a/src/component/WorksPage/newScaleImage.vue +++ b/src/component/WorksPage/newScaleImage.vue @@ -441,6 +441,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/component/home/design/editDesignType/index.vue b/src/component/home/design/editDesignType/index.vue index d03464f3..51d34141 100644 --- a/src/component/home/design/editDesignType/index.vue +++ b/src/component/home/design/editDesignType/index.vue @@ -812,31 +812,32 @@ methods: { }, setImageIndex(index:any){ if(this.isNext)return - 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 - } + // 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 diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 2bc0d03f..f44973b6 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -752,7 +752,8 @@ export default { editUser: "修改个人信息", notModifiable: "没有修改次数", remainingModifications: "本月剩余次数：", - Country: "国家", + plaseSelect:"请选择", + Country: "国家或地区", CompanyName: "职业", Status: "状态", Valid: "有效", @@ -1375,5 +1376,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 75d4ce4e..8a045deb 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -752,7 +752,8 @@ export default { editUser: "Change Information", notModifiable: "Not modifiable", remainingModifications: "Remaining this month:", - Country: "Country", + plaseSelect:"Please select", + Country: "Country or Region", CompanyName: "Occupation", Status: "Status", Valid: "Valid", @@ -1375,5 +1376,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 010a8057..8042e123 100644 --- a/src/store/userHabit/userHabit.ts +++ b/src/store/userHabit/userHabit.ts @@ -266,7 +266,7 @@ const userHabit : Module = { // data.systemUser = 0 state.userDetail.affiliate = data.affiliate state.userDetail.systemUser = data.systemUser - // state.userDetail.systemUser = 1 + // state.userDetail.systemUser = 7 // 身份列表1：可以使用aida系统，2:可以使用affiliate页面，3：系统管理员用户 state.userDetail.systemList = [] if(data.systemUser != 0)state.userDetail.systemList.push(1) 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)){