diff --git a/src/layout/components/Avatar/index.vue b/src/layout/components/Avatar/index.vue index 9749325..bf831e3 100644 --- a/src/layout/components/Avatar/index.vue +++ b/src/layout/components/Avatar/index.vue @@ -2,10 +2,10 @@
- avatar + avatar
@@ -50,9 +50,9 @@ const handleLogout = () => { onOk:async() => { const store = useUserStore(); await store.userLogut(); - window.localStorage.removeItem('token'); - clearLocalStorage(); - proxy.$router.push('/login'); + // window.localStorage.removeItem('token'); + // clearLocalStorage(); + //proxy.$router.push('/login'); }, }); }; diff --git a/src/router/index.js b/src/router/index.js index 824bd6c..7f3b374 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -83,7 +83,6 @@ router.beforeEach(async(to, from, next) => { permissionStore.addRouters.forEach((route) => { router.addRoute('/', route); }); - // next(to.fullPath); // 如果 addRoute 并未完成,路由守卫会一层一层的执行执行,直到 addRoute 完成,找到对应的路由 next({ ...to, replace: true }); diff --git a/src/store/userInfo.js b/src/store/userInfo.js index c346b33..07e31da 100644 --- a/src/store/userInfo.js +++ b/src/store/userInfo.js @@ -47,6 +47,7 @@ export const useUserStore = defineStore('user', { if(code==200){ this.clearInfo(); + window.location.href="/login" } } diff --git a/src/views/doctor/doctor-examine/index.vue b/src/views/doctor/doctor-examine/index.vue index 77c3153..7662a6b 100644 --- a/src/views/doctor/doctor-examine/index.vue +++ b/src/views/doctor/doctor-examine/index.vue @@ -8,15 +8,12 @@ - + - 审核中 认证失败 - + --> 搜索 diff --git a/src/views/doctor/doctor-list/index.vue b/src/views/doctor/doctor-list/index.vue index dae2b8e..b23d4a5 100644 --- a/src/views/doctor/doctor-list/index.vue +++ b/src/views/doctor/doctor-list/index.vue @@ -182,14 +182,13 @@ - + - @@ -585,8 +584,13 @@ avatar: 'https://img.applets.igandanyiyuan.com/basic/file/doctor_avatar.png', bank_card_code:'', }); - const hospital_name=computed(()=>{ - return modalForm.hospital.hospital_name+'('+modalForm.hospital.province+modalForm.hospital.city+modalForm.hospital.county+')' + const hospital_name=ref(''); + watch(()=>modalForm.hospital.hospital_name,()=>{ + if(modalForm.hospital.hospital_name){ + hospital_name.value= modalForm.hospital.hospital_name+'('+modalForm.hospital.province+modalForm.hospital.city+modalForm.hospital.county+')' + }else{ + hospital_name.value='' + } }) //const doctor_expertise=ref([]); //证书计算 @@ -748,7 +752,7 @@ } }], 'hospital.address': [{ required: true, message: '请输入医院地址' }], - 'hospital.hospital_name': [{ required: true, message: '请选择医院名称' }], + 'hospital_id': [{ required: true, message: '请选择医院名称' }], 'department_custom_mobile':[{ required: true, message: '请输入科室电话' }], @@ -1175,6 +1179,7 @@ }; const hospitalData = ref([]); const changeHospital=(value)=>{ + console.log(value); modalForm.hospital_id=value; } //获取医院列表 diff --git a/src/views/doctor/doctor-multipoint/index.vue b/src/views/doctor/doctor-multipoint/index.vue index 590dc58..a042fb9 100644 --- a/src/views/doctor/doctor-multipoint/index.vue +++ b/src/views/doctor/doctor-multipoint/index.vue @@ -8,15 +8,12 @@ - + - 审核中 认证失败 - + --> 搜索