fix
This commit is contained in:
@@ -128,9 +128,12 @@
|
|||||||
</keep-alive>
|
</keep-alive>
|
||||||
<component :key="$route.name" :is="Component" v-if="!$route.meta.keepAlive"/>
|
<component :key="$route.name" :is="Component" v-if="!$route.meta.keepAlive"/>
|
||||||
</router-view> -->
|
</router-view> -->
|
||||||
<router-view @setTask="setTask" :getLangIsShowMark="getLangIsShowMark">
|
<router-view v-if="!getLangIsShowMark" @setTask="setTask" :getLangIsShowMark="getLangIsShowMark">
|
||||||
</router-view>
|
</router-view>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="mark_loading" v-show="getLangIsShowMark">
|
||||||
|
<a-spin size="large" />
|
||||||
|
</div>
|
||||||
<RobotAssist></RobotAssist>
|
<RobotAssist></RobotAssist>
|
||||||
<scaleVideo ref="scaleVideo"></scaleVideo>
|
<scaleVideo ref="scaleVideo"></scaleVideo>
|
||||||
<!-- 进行续订 -->
|
<!-- 进行续订 -->
|
||||||
|
|||||||
@@ -215,7 +215,7 @@
|
|||||||
<ExportNewCoolection id="exportNewCoolection"></ExportNewCoolection>
|
<ExportNewCoolection id="exportNewCoolection"></ExportNewCoolection>
|
||||||
|
|
||||||
<!-- 导出缩略图的蒙层 start-->
|
<!-- 导出缩略图的蒙层 start-->
|
||||||
<div class="mark_loading" v-show="isShowMark || getLangIsShowMark">
|
<div class="mark_loading" v-show="isShowMark">
|
||||||
<a-spin size="large" />
|
<a-spin size="large" />
|
||||||
</div>
|
</div>
|
||||||
<!-- 导出缩略图的蒙层 end-->
|
<!-- 导出缩略图的蒙层 end-->
|
||||||
@@ -276,11 +276,6 @@ export default defineComponent({
|
|||||||
generalCanvas,
|
generalCanvas,
|
||||||
DesignDetailcopy
|
DesignDetailcopy
|
||||||
},
|
},
|
||||||
props:{
|
|
||||||
getLangIsShowMark:{
|
|
||||||
type:Boolean,
|
|
||||||
}
|
|
||||||
},
|
|
||||||
emits:['setTask'],
|
emits:['setTask'],
|
||||||
activated() {
|
activated() {
|
||||||
},
|
},
|
||||||
@@ -300,6 +295,9 @@ export default defineComponent({
|
|||||||
let userDetail= computed(()=>{
|
let userDetail= computed(()=>{
|
||||||
return store.state.UserHabit.userDetail
|
return store.state.UserHabit.userDetail
|
||||||
})
|
})
|
||||||
|
let bindEmail= computed(()=>{
|
||||||
|
return store.state.UserHabit.bindEmail
|
||||||
|
})
|
||||||
let userGroupId: any = computed(() => {
|
let userGroupId: any = computed(() => {
|
||||||
return store.state.HomeStoreModule.userGroupId;
|
return store.state.HomeStoreModule.userGroupId;
|
||||||
}); //模特id //当likeDesignCollectionList长度为0时清空,startdesign时清空
|
}); //模特id //当likeDesignCollectionList长度为0时清空,startdesign时清空
|
||||||
@@ -641,6 +639,7 @@ export default defineComponent({
|
|||||||
designCollectionList,
|
designCollectionList,
|
||||||
userGroupId,
|
userGroupId,
|
||||||
userDetail,
|
userDetail,
|
||||||
|
bindEmail,
|
||||||
setPortfolio,
|
setPortfolio,
|
||||||
designCollectionId,
|
designCollectionId,
|
||||||
designId,
|
designId,
|
||||||
@@ -731,11 +730,6 @@ export default defineComponent({
|
|||||||
//判断账号剩余时间是否太短
|
//判断账号剩余时间是否太短
|
||||||
let isModalOne = JSON.parse(sessionStorage.getItem("isTimeOne") as any)
|
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(this.store.state.UserHabit.bindEmail.isBindEmail)return
|
||||||
if(!isModalOne){//判断是否是试用用户
|
if(!isModalOne){//判断是否是试用用户
|
||||||
// if(!isTest && !isModalOne){//判断是否是试用用户
|
// if(!isTest && !isModalOne){//判断是否是试用用户
|
||||||
@@ -775,16 +769,8 @@ export default defineComponent({
|
|||||||
|
|
||||||
})
|
})
|
||||||
}else if(!isModalOne && isTest){
|
}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{
|
}else{
|
||||||
openGuide()
|
openGuide()
|
||||||
|
|
||||||
}
|
}
|
||||||
let noRefresh = this.$route.params.noRefresh; //判断是否主动刷新还是路由跳转过来的 true 路由跳转过来的
|
let noRefresh = this.$route.params.noRefresh; //判断是否主动刷新还是路由跳转过来的 true 路由跳转过来的
|
||||||
window.addEventListener('beforeunload', (event)=>{
|
window.addEventListener('beforeunload', (event)=>{
|
||||||
|
|||||||
Reference in New Issue
Block a user