From 1ec37cd0532d00b5f896ff89c7f3fab1cad49151 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 28 Jun 2024 11:50:11 +0800 Subject: [PATCH] fix --- src/component/HomePage/Generate.vue | 1 + src/component/HomePage/productImg.vue | 1 + src/component/HomePage/selectImgList.vue | 15 +-------------- src/component/Login/registerModel.vue | 10 ++++------ src/views/HomeView/library.vue | 10 ++++++---- src/views/feedbackSurvey.vue | 3 +++ src/views/feedbackSurveyCN.vue | 3 +++ 7 files changed, 19 insertions(+), 24 deletions(-) diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index f91408a6..6c13c2d7 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -537,6 +537,7 @@ export default defineComponent({ driverObj__.moveNext() } }) + this.store.dispatch('getCredits') clearInterval(this.generateTime) clearInterval(this.remGenerateTime) this.remGenerate = false diff --git a/src/component/HomePage/productImg.vue b/src/component/HomePage/productImg.vue index a6b02308..18758172 100644 --- a/src/component/HomePage/productImg.vue +++ b/src/component/HomePage/productImg.vue @@ -458,6 +458,7 @@ 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){ // } + store.state.store.dispatch('getCredits') clearInterval(prductimgTime) clearInterval(remPrductimgTime) productImgData.remProductimg = false diff --git a/src/component/HomePage/selectImgList.vue b/src/component/HomePage/selectImgList.vue index 67e4b2ce..eb4b0e12 100644 --- a/src/component/HomePage/selectImgList.vue +++ b/src/component/HomePage/selectImgList.vue @@ -28,7 +28,7 @@
-
+
{{ $t('selectImgList.Clear') }}
@@ -60,14 +60,8 @@ emits:['setImgGetColor'], setup(props,{emit}) { let selectImgList: any = ref(false);//弹窗 let selectImgListMask:any = ref(false)//弹窗遮罩 - let oldDataId = '' let selectImgListData:any = reactive({ imgList:[], - selectStyle:{ - name:'', - id:'', - }, - selectStyleName:'', isShowMark:false, }) const {t} = useI18n() @@ -80,7 +74,6 @@ setup(props,{emit}) { selectImgList.value = false selectImgListData.isShowMark = false // setParentData() - } let cancelDsign = ()=>{ cleardata() @@ -92,11 +85,6 @@ setup(props,{emit}) { } cleardata() } - let setClear = ()=>{ - selectImgListData.selectStyle.id = '' - selectImgListData.selectStyle.name = '' - selectImgListData.selectStyle.value = '' - } let setItemSelect = (item:any)=>{ selectImgListData.imgList.forEach((item:any) => { item.isChecked = false @@ -111,7 +99,6 @@ setup(props,{emit}) { cancelDsign, setItemSelect, setOk, - setClear, }; }, data() { diff --git a/src/component/Login/registerModel.vue b/src/component/Login/registerModel.vue index 204c5612..3e4623c1 100644 --- a/src/component/Login/registerModel.vue +++ b/src/component/Login/registerModel.vue @@ -313,6 +313,7 @@ export default defineComponent({ email: this.email, operationType: "LOGIN", }; + Https.axiosPost(Https.httpUrls.accountSendEmail, data).then( (rv: any) => { if (rv) { @@ -376,6 +377,8 @@ export default defineComponent({ //提交账号密码预先登录 submitPerLogin() { + + //输入账号密码 if(this.emailStap>=2){ return; @@ -473,16 +476,11 @@ export default defineComponent({ setCookie("isBeginnerNum", 0);//从第一步开始，机器人开始的话就是从第二部开始 setCookie("userInfo", JSON.stringify(rv)); this.store.commit("setSystemUser",rv.systemUser) - if(rv.systemUser == 0){ - this.turnToHomePage('/'); - }else{ - this.turnToHomePage('/home'); - } - sessionStorage.setItem('isTimeOne', JSON.stringify(false));//是否需要公告 提示 弹窗 let randomNum:any = Math.floor(Math.random() * 9000000000000000) + 1000000000000000; sessionStorage.setItem('sessionId', randomNum); sessionStorage.setItem('record', JSON.stringify([])) + this.$router.go(0); } } ).catch(res=>{ diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index de5c572f..5da15ce7 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -793,17 +793,18 @@ export default defineComponent({ searchLabel.init(data,type) return }, - upLoad(){ - - }, uploadGenerateOpen(str:any){ // if(str == 'Generate'){ // if(this.selectCode == 'Printboard'){ // this.scene = this.designTypeList[this.selectCode][0] // } // } - this.scene = this.designTypeList[this.selectCode][0] + if(this.designTypeList[this.selectCode][0]){ + this.scene = this.designTypeList[this.selectCode][0] + this.designType = this.designTypeList[this.selectCode][0].value + } + if(this.uploadGenerate == 'Generate'){ if(str != 'Generate'){ this.getLibraryList('') @@ -1336,6 +1337,7 @@ export default defineComponent({ if(rv.filter((item:any)=>item.status == 'Invalid').length == dataNum){ message.info(this.t('Generate.effectPoor')); } + this.store.dispatch('getCredits') clearInterval(this.generateTime[str]) clearInterval(this.remGenerateTime[str]) this.remGenerate[str] = false diff --git a/src/views/feedbackSurvey.vue b/src/views/feedbackSurvey.vue index cf450dfd..dbf16958 100644 --- a/src/views/feedbackSurvey.vue +++ b/src/views/feedbackSurvey.vue @@ -241,6 +241,7 @@ id="text-area" placeholder="Please enter..." v-model="othersHelpful" + @input="()=>helpfulOthers.checked = true" >
@@ -357,6 +358,7 @@ id="text-area" v-model="othersImprovel" placeholder="Please enter..." + @input="()=>improvelOthers.checked = true" >
@@ -404,6 +406,7 @@ id="text-area" v-model="othersIsSubscribeCause" placeholder="Please enter..." + @input="()=>isSubscribeCauseOthers.checked = true" >
diff --git a/src/views/feedbackSurveyCN.vue b/src/views/feedbackSurveyCN.vue index 306719ae..b239901e 100644 --- a/src/views/feedbackSurveyCN.vue +++ b/src/views/feedbackSurveyCN.vue @@ -240,6 +240,7 @@ id="text-area" placeholder="请输入..." v-model="othersHelpful" + @input="()=>helpfulOthers.checked = true" > @@ -354,6 +355,7 @@ id="text-area" v-model="othersImprovel" placeholder="请输入..." + @input="()=>improvelOthers.checked = true" > @@ -401,6 +403,7 @@ id="text-area" v-model="othersIsSubscribeCause" placeholder="请输入..." + @input="()=>isSubscribeCauseOthers.checked = true" >