Merge remote-tracking branch 'origin/StableVersion' into dev_vite
This commit is contained in:
@@ -240,11 +240,13 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="userSystem" v-if="!pastDuePage">
|
||||
{{$t('Header.pastDue')}}
|
||||
</div>
|
||||
<div class="router" v-else-if="!getLangIsShowMark">
|
||||
<home ref="home" @setNewProject="()=>leftShow=true" @setTask="setTask"></home>
|
||||
<div class="routerView">
|
||||
<div class="userSystem" v-show="pastDuePage">
|
||||
{{$t('Header.pastDue')}}
|
||||
</div>
|
||||
<div class="router" v-if="!getLangIsShowMark">
|
||||
<home ref="home" @setNewProject="()=>leftShow=true" @setTask="setTask"></home>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -348,7 +350,7 @@ export default defineComponent({
|
||||
const pastDuePage = computed(()=>{
|
||||
const isAllowedRoute = route.path === '/home/events' || route.path === '/home/works';
|
||||
const hasNoSystemAccess = userDetail.value.systemList.indexOf(1) === -1;
|
||||
return hasNoSystemAccess && !isAllowedRoute;
|
||||
return !hasNoSystemAccess && !isAllowedRoute;
|
||||
})
|
||||
watch(()=>homeMainData.userDetailLanguage,(newVal)=>{
|
||||
if(locale.value == newVal || !newVal)return
|
||||
@@ -422,7 +424,6 @@ export default defineComponent({
|
||||
// homeMainData.historyData.page = 1
|
||||
// })
|
||||
|
||||
|
||||
let isMurmur = ref()
|
||||
let credits = computed(()=>{
|
||||
return store.state.UserHabit.credits.value
|
||||
@@ -961,9 +962,9 @@ export default defineComponent({
|
||||
let url = 'https://aida-user-manual-chinese.super.site/'
|
||||
if(this.locale == 'ENGLISH'){
|
||||
url = 'https://code-create.com.hk/wp-content/uploads/2025/02/aida_3.0-Manual-2_5-EN.pdf'
|
||||
showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0.mp4'})
|
||||
showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0.mov'})
|
||||
}else{
|
||||
showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0.mp4'})
|
||||
showViewVideo({url:'https://aida.com.hk/video/user_manual_3_1_0_cn.mov'})
|
||||
}
|
||||
this.toUserManual()
|
||||
// //打开视频
|
||||
@@ -1786,26 +1787,32 @@ export default defineComponent({
|
||||
|
||||
}
|
||||
}
|
||||
> .router{
|
||||
flex: 1;
|
||||
> .routerView{
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
padding: 0 6rem;
|
||||
padding-bottom: 2rem;
|
||||
}
|
||||
> .userSystem{
|
||||
top: 0;
|
||||
left: 0;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: rgba(0, 0, 0, 0.4);
|
||||
z-index:2;
|
||||
flex: 1;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
color: #fff;
|
||||
font-weight: 600;
|
||||
font-size: 4rem;
|
||||
> .router{
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
padding: 0 6rem;
|
||||
padding-bottom: 2rem;
|
||||
}
|
||||
> .userSystem{
|
||||
top: 0;
|
||||
left: 0;
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: rgba(0, 0, 0, 0.4);
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
color: #fff;
|
||||
font-weight: 600;
|
||||
font-size: 4rem;
|
||||
z-index: 100;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user