This commit is contained in:
X1627315083
2025-02-03 16:30:11 +08:00
parent 508e532ef2
commit 7014ce2ee6
2 changed files with 9 additions and 20 deletions

View File

@@ -128,9 +128,12 @@
</keep-alive>
<component :key="$route.name" :is="Component" v-if="!$route.meta.keepAlive"/>
</router-view> -->
<router-view @setTask="setTask" :getLangIsShowMark="getLangIsShowMark">
<router-view v-if="!getLangIsShowMark" @setTask="setTask" :getLangIsShowMark="getLangIsShowMark">
</router-view>
</div>
<div class="mark_loading" v-show="getLangIsShowMark">
<a-spin size="large" />
</div>
<RobotAssist></RobotAssist>
<scaleVideo ref="scaleVideo"></scaleVideo>
<!-- 进行续订 -->

View File

@@ -215,7 +215,7 @@
<ExportNewCoolection id="exportNewCoolection"></ExportNewCoolection>
<!-- 导出缩略图的蒙层 start-->
<div class="mark_loading" v-show="isShowMark || getLangIsShowMark">
<div class="mark_loading" v-show="isShowMark">
<a-spin size="large" />
</div>
<!-- 导出缩略图的蒙层 end-->
@@ -276,11 +276,6 @@ export default defineComponent({
generalCanvas,
DesignDetailcopy
},
props:{
getLangIsShowMark:{
type:Boolean,
}
},
emits:['setTask'],
activated() {
},
@@ -300,6 +295,9 @@ export default defineComponent({
let userDetail= computed(()=>{
return store.state.UserHabit.userDetail
})
let bindEmail= computed(()=>{
return store.state.UserHabit.bindEmail
})
let userGroupId: any = computed(() => {
return store.state.HomeStoreModule.userGroupId;
}); //模特id //当likeDesignCollectionList长度为0时清空startdesign时清空
@@ -641,6 +639,7 @@ export default defineComponent({
designCollectionList,
userGroupId,
userDetail,
bindEmail,
setPortfolio,
designCollectionId,
designId,
@@ -731,11 +730,6 @@ export default defineComponent({
//判断账号剩余时间是否太短
let isModalOne = JSON.parse(sessionStorage.getItem("isTimeOne") as any)
let text = {
}
console.log(this.store.state.UserHabit.bindEmail);
if(this.store.state.UserHabit.bindEmail.isBindEmail)return
if(!isModalOne){//判断是否是试用用户
// if(!isTest && !isModalOne){//判断是否是试用用户
@@ -775,16 +769,8 @@ export default defineComponent({
})
}else if(!isModalOne && isTest){
// setTimeout(() => {
// text = {
// str:`${this.t('HomeView.jsContent7')}<br>${this.t('HomeView.jsContent5')}<a href="https://code-create.com.hk/aida/" target="_blank">https://code-create.com.hk/aida/</a>${this.t('HomeView.jsContent6')}`,
// }
// this.affiche(text)
// }, 500);
}else{
openGuide()
}
let noRefresh = this.$route.params.noRefresh; //判断是否主动刷新还是路由跳转过来的 true 路由跳转过来的
window.addEventListener('beforeunload', (event)=>{