diff --git a/src/component/HomePage/bindEmail.vue b/src/component/HomePage/bindEmail.vue index 0e9530e2..e3eef199 100644 --- a/src/component/HomePage/bindEmail.vue +++ b/src/component/HomePage/bindEmail.vue @@ -211,11 +211,13 @@ export default defineComponent({ CompanyName:'', countryList:country, email:'', - sexList:[ - {label:t('account.Mr'),value:'Mr'}, - {label:t('account.Ms'),value:'Ms'}, - {label:t('account.Miss'),value:'Miss'}, - ], + sexList:computed(()=> { + return [ + {label:t('account.Mr'),value:'Mr'}, + {label:t('account.Ms'),value:'Ms'}, + {label:t('account.Miss'),value:'Miss'}, + ] + }), selectSex:null, surname:'', givenName:'', @@ -478,6 +480,7 @@ export default defineComponent({ transform: translate(100%, 100%); .back_text{ text-decoration: underline; + white-space: nowrap; } span{ margin-right: .5rem; diff --git a/src/store/userHabit/userHabit.ts b/src/store/userHabit/userHabit.ts index 8907ed2b..5227dc3f 100644 --- a/src/store/userHabit/userHabit.ts +++ b/src/store/userHabit/userHabit.ts @@ -217,7 +217,7 @@ const userHabit : Module = { state.userDetail.occupation = data.occupation//头像 state.userDetail.usernameModify = data.usernameModify//当月剩余修改次数 state.userDetail.isBeginner = data.isBeginner == 1 ? true : false;//是否完成新手指引 - state.userDetail.title = data.title//当月剩余修改次数 + // state.userDetail.title = data.title//当月剩余修改次数 state.userDetail.surname = data.surname//当月剩余修改次数 state.userDetail.givenName = data.givenName//当月剩余修改次数 // state.bindEmail.isBindEmail = true @@ -291,7 +291,8 @@ const userHabit : Module = { setLang(data.language) state.userDetail.expireTime = data.expireTime//有效期 state.userDetail.subscriptionType = data.subscriptionType//当前订阅类型 - state.userDetail.status = data.status || 'active'//当前订阅类型 + state.userDetail.status = data.status//当前订阅类型 + // state.userDetail.status = data.status || 'active'//当前订阅类型 state.userDetail.subscriptionId = data.subscriptionId//最新订阅id } }, diff --git a/src/views/HomeView/HomeView.vue b/src/views/HomeView/HomeView.vue index c3555d96..294a7b82 100644 --- a/src/views/HomeView/HomeView.vue +++ b/src/views/HomeView/HomeView.vue @@ -695,6 +695,10 @@ export default defineComponent({ likeLoading: false, //喜欢防抖 dragIdx:0, designRandom:'', + designFailure:{ + num:0, + currentNum:0, + },//获取20次都为空的话就停止获取 }; }, @@ -1042,8 +1046,14 @@ export default defineComponent({ }) }else{ + data.objectSignList = rv.unfinishedList.join() this.getDesignTime = setTimeout(()=>{ - data.objectSignList = rv.unfinishedList.join() + if(this.designFailure.currentNum == rv.unfinishedList.length){ + this.designFailure.num++ + if(this.designFailure.num >= 10)data.objectSignList='' + }else{ + this.designFailure.num = 0 + } this.getDesignResult(data,str) },1000) } @@ -1123,7 +1133,10 @@ export default defineComponent({ }; // data.moodboardPosition = JSON.stringify(this.store.state.UploadFilesModule.moodboardPosition) this.setSystemDesigner(0) - + this.designFailure = { + num:0, + currentNum:0, + } let isLoad = false if(designCollectionId == -1){ isLoad = true