push Develop
This commit is contained in:
@@ -75,13 +75,13 @@
|
||||
<i class="fi fi-rs-notebook"></i>
|
||||
<span class="select_item_des">{{$t('Header.ViewOrders')}}</span>
|
||||
</div>
|
||||
<router-link class="select_item" v-if="AdministratorUserIdList.indexOf(userInfo.userId) >= 0" :to="`/administrator`">
|
||||
<router-link class="select_item" v-if="AdministratorUserIdList.indexOf(userInfo?.userId) >= 0" :to="`/administrator`">
|
||||
<span class="icon iconfont icon-yonghu"></span>
|
||||
<span class="select_item_des">Administrator</span>
|
||||
</router-link>
|
||||
<div class="select_item" @click="logout()">
|
||||
<span class="icon iconfont icon-tuichu"></span
|
||||
><span class="select_item_des">{{$t('Header.logOff')}}</span>
|
||||
<span class="icon iconfont icon-tuichu"></span>
|
||||
<span class="select_item_des">{{$t('Header.logOff')}}</span>
|
||||
</div>
|
||||
|
||||
</nav>
|
||||
@@ -197,7 +197,7 @@ export default defineComponent({
|
||||
this.isMurmur =JSON.parse(isMurmur)
|
||||
this.userInfo = JSON.parse(getCookie("userInfo"));
|
||||
if (!this.userInfo) {
|
||||
this.$router.replace("/login");
|
||||
this.$router.replace("/");
|
||||
} else {
|
||||
this.accountIsLogin(this.userInfo);
|
||||
}
|
||||
@@ -288,7 +288,7 @@ export default defineComponent({
|
||||
if(JSON.parse(isTest)){
|
||||
await Https.axiosGet(Https.httpUrls.trialUserLogout,).then((rv) => {
|
||||
Https.axiosPost(Https.httpUrls.accountLogout, data).then((rv) => {
|
||||
this.$router.replace("/login");
|
||||
this.$router.replace("/");
|
||||
// WriteCookie("token");
|
||||
});
|
||||
})
|
||||
@@ -296,7 +296,7 @@ export default defineComponent({
|
||||
await Https.axiosPost(Https.httpUrls.accountLogout, data).then((rv) => {
|
||||
// WriteCookie("token");
|
||||
});
|
||||
this.$router.replace("/login");
|
||||
this.$router.replace("/");
|
||||
}
|
||||
// WriteCookie("token");
|
||||
// window.location.reload()
|
||||
@@ -309,7 +309,7 @@ export default defineComponent({
|
||||
};
|
||||
Https.axiosPost(Https.httpUrls.accountIsLogin, data).then((rv) => {
|
||||
if (!rv) {
|
||||
this.$router.replace("/login");
|
||||
this.$router.replace("/");
|
||||
}
|
||||
});
|
||||
},
|
||||
@@ -587,6 +587,7 @@ export default defineComponent({
|
||||
box-shadow: 0px 0.4rem 0.4rem 0px rgba(0, 0, 0, 0.1);
|
||||
overflow: hidden;
|
||||
border: 1px solid #000000;
|
||||
height: auto;
|
||||
&.select_list{
|
||||
// display: none;
|
||||
transform: translateX(105%);
|
||||
|
||||
Reference in New Issue
Block a user