fix:系统已到期,退出登录解决问题解决完成

src/utils/request.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import { Notification, MessageBox, Message, Loading } from 'element-ui'
 import store from '@/store'
-import { getToken } from '@/utils/auth'
+import { getToken ,removeToken } from '@/utils/auth'
 import errorCode from '@/utils/errorCode'
 import { tansParams, blobValidate } from "@/utils/ruoyi";
 import cache from '@/plugins/cache'
@@ -16,8 +16,9 @@ export let isRelogin = { show: false };
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
 const service = axios.create({
-  baseURL: process.env.VUE_APP_BASE_API,
-  // baseURL: "http://39.105.121.97:8080/api",
+  // baseURL: process.env.VUE_APP_BASE_API,
+  baseURL: "http://39.105.121.97:8080/api",
+  // baseURL: "http://106.74.15.131:81/api",
   
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   // baseURL: "http://192.168.3.142:8081/api",
@@ -105,6 +106,7 @@ service.interceptors.response.use(res => {
       if (!isRelogin.show) {
         isRelogin.show = true;
         MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
+          console.log(getToken,"getToken");
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
             location.href = '/index';
@@ -125,7 +127,11 @@ service.interceptors.response.use(res => {
       Notification.error({ title: msg })
       return Promise.reject('error')
     } else {
-      return  JSON.parse(cyptoTool.methods.decrypt(res.data)) 
+      if(res.data.msg && res.data.msg ==="退出成功"){
+        return res.data
+      } else {
+        return  JSON.parse(cyptoTool.methods.decrypt(res.data)) 
+      }
     }
   },
   error => {

src/views/settingsPage/clinicOverview/edit.vue

@@ -133,12 +133,12 @@
         <el-col :span="8">
           <ul>
             <li class="li_box">
-              <el-form-item label="营业执照编码" style="width: 95%">
+              <el-form-item label="营业执照编码" label-width="120px" style="width: 95%">
                 <el-input v-model="ruleForm.businessLicenseCode"></el-input>
               </el-form-item>
             </li>
             <li class="li_box">
-              <el-form-item label="营业时间" style="width: 95%">
+              <el-form-item label="营业时间" label-width="120px" style="width: 95%">
                 <el-time-select
                   placeholder="开始时间"
                   v-model="ruleForm.businessStartTime"
@@ -189,7 +189,7 @@
           </ul>
         </el-col>
         <el-col :span="8"> 
-          <el-form-item label="诊所编号标识" style="width: 95%">
+          <el-form-item label="诊所编号标识" style="width: 95%" label-width="120px" prop="clinicCode">
             <el-input v-model="ruleForm.clinicCode"></el-input>
           </el-form-item>
         </el-col>
@@ -338,7 +338,6 @@ import { regionData } from 'element-china-area-data'
 import { upload } from '@/api/system/user.js'
 import { clinicInfo } from '@/api/allApi.js'
 import banner from "./banner.vue";
-import store from "@/store";
 
 export default {
   name: 'EitcErmPcEdit',
@@ -370,6 +369,9 @@ export default {
         detailedAddress: [
           { required: true, message: '请输入详细地址', trigger: 'blur' }
         ],
+        clinicCode: [
+          { required: true, message: '请输入诊所编号标识', trigger: 'blur' }
+        ],
         region: [
           { required: true, message: '请选择诊所所在地区', trigger: 'change' }
         ]
@@ -498,18 +500,22 @@ export default {
       this.banner3 = ''
       this.bannerList3 = []
     },
-    async preserve() {
-      if(this.ruleForm.city.length && Array.isArray(this.ruleForm.city)) {
-        this.ruleForm.city = this.ruleForm.city.join()
-      }
-
-      this.ruleForm.bannerPic1 = this.banner1
-      this.ruleForm.bannerPic2 = this.banner2
-      this.ruleForm.bannerPic3 = this.banner3
-      const res = await clinicInfo(this.ruleForm)
-      if (res.code !== 200) return this.$message.$error(res.msg)
-      this.$message.success('保存成功')
-      this.$emit('cancel')
+    preserve() {
+      this.$refs.ruleForm.validate(async(valid) => {
+        if (valid) {
+          if(this.ruleForm.city.length && Array.isArray(this.ruleForm.city)) {
+            this.ruleForm.city = this.ruleForm.city.join()
+          }
+    
+          this.ruleForm.bannerPic1 = this.banner1
+          this.ruleForm.bannerPic2 = this.banner2
+          this.ruleForm.bannerPic3 = this.banner3
+          const res = await clinicInfo(this.ruleForm)
+          if (res.code !== 200) return this.$message.$error(res.msg)
+          this.$message.success('保存成功')
+          this.$emit('cancel')
+        }
+      })
     },
     handleStartTimeChange(value) {
       // 当开始时间变化时，更新结束时间的最小选择时间