Merge branch 'master' of http://git.shengws.com/csx/Pad_New

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.1.616"
+  "version": "1.1.634"
 }

config/dev.env.js

@@ -4,8 +4,8 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"https://api.xt.kuyicloud.com"'
-  // BASE_API: '"http://localhost:9531"'
+  // BASE_API: '"https://api.xt.kuyicloud.com"'
+  BASE_API: '"http://localhost:9531"'
   //BASE_API: '"http://localhost:9529"'
   //http://api.xt.test.sgjyun.com http://localhost:9529
   // BASE_API: '"http://api.xt.test.sgjyun.com"'

config/prod.env.js

@@ -1,8 +1,8 @@
 "use strict";
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
-  // BASE_API: '"https://api.xt.kuyicloud.com"'
+  // BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
+  BASE_API: '"https://api.xt.kuyicloud.com"'
   // BASE_API:'"http://localhost:9529"',
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com

src/main.js

@@ -114,7 +114,7 @@ Vue.use(ElementUI);
 Vue.config.productionTip = false;
 
 /* eslint-disable no-new */
-new Vue({
+var vue = new Vue({
   el: "#app",
   router,
   store,
@@ -123,5 +123,6 @@ new Vue({
   },
   template: "<App/>"
 });
+export default vue
 
 // eslint-disable-next-line no-undef

src/pages/home/index.vue

@@ -82,12 +82,12 @@
             <div>首页</div>
           </van-tabbar-item>
         </router-link>
-        <router-link to="/active">
-          <van-tabbar-item>
-            <i class="iconfont icon-jishiben iconOne"></i>
-            <div>致敬医护</div>
-          </van-tabbar-item>
-        </router-link>
+        <!--<router-link to="/active">-->
+          <!--<van-tabbar-item>-->
+            <!--<i class="iconfont icon-jishiben iconOne"></i>-->
+            <!--<div>致敬医护</div>-->
+          <!--</van-tabbar-item>-->
+        <!--</router-link>-->
         <!--<router-link to="/service">-->
           <!--<van-tabbar-item>-->
             <!--<i class="iconfont icon-fuwu2 iconOne"></i>-->
@@ -141,7 +141,7 @@ export default {
     const id = this.$route.query.id;
     // this.getAllOrgName(id);
     setRem();
-    
+
   },
   mounted(){
     let currenttabbar = window.location.hash.split("/")[1]

src/pages/homeIndex/index.vue

@@ -264,6 +264,7 @@ export default {
           // });
         } else {
           Toast(response.data.msg);
+
         }
       });
     },

src/pages/main/template/DialysisPrintOrderTen.vue

@@ -879,9 +879,10 @@
                 </div>
                 <div class="inline_block" style="flex:1;">
                   治疗医生：
-                  <div class="under_line" style="width: 80px;text-align: center">
-                    <span v-if="setAdminUserES(prescription.prescription_doctor) == ''">{{getAdminUser(prescription.creater)}}</span>
-                    <img style="height:20px;" :src="setAdminUserES(prescription.creater)" alt="" srcset="" v-else>
+                  <div class="under_line" style="width: 150px;text-align: center">
+                    <img style="height:20px;" src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm" alt="" srcset="">
+                    <span v-if="setAdminUserES(prescription.prescription_doctor) == ''">{{getAdminUser(prescription.prescription_doctor)}}</span>
+                    <img style="height:20px;" :src="setAdminUserES(prescription.prescription_doctor)" alt="" srcset="" v-else>
                   </div>
                 </div>
 

src/pages/my/index.vue

@@ -192,7 +192,7 @@ export default {
             this.isRouterAlive = true;
           });
           localStorage.removeItem("searchWord");
-          this.$router.replace("/");
+          this.$router.push("/");
         }
       });
     },

src/utils/request.js

@@ -2,6 +2,9 @@ import axios from "axios";
 // import { Toast } from 'mint-ui'
 import { Toast } from "vant";
 
+import context from '../../src/main.js'
+
+
 // create an axios instance
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url
@@ -9,6 +12,7 @@ const service = axios.create({
   withCredentials: true
 });
 
+var self = this;
 // respone interceptor
 service.interceptors.response.use(
   // response => response,
@@ -16,22 +20,28 @@ service.interceptors.response.use(
     const res = response.data;
     if (res.state !== 1) {
       if (res.code === 20049) {
-        location.reload();
-        return Promise.reject("error");
-      } else if (res.code == 20035){
+        // this.$router.replace("/")
+        // this.$router.replace({ path: "/" });
+        // window.location.href=window.location.href+
+        // window.location.href = location.href+'?time='+((new Date()).getTime());
+        // this.$router.go(0)
+        // this.refresh()
+        context.$router.replace({ path: "/" })
+
+        // return
+      } else if (res.code === 20035){
         Toast("你已经被管理员禁用,无法使用该系统");
-        location.reload();
-        return Promise.reject("error");
-      }else if(res.code == 6001){
+        context.$router.replace({ path: "/" })
+        return
+      }else if(res.code === 6001){
         Toast("登录超时");
-        location.reload();
-        window.androidinfo.showInfoFromJs("1233");
-        return Promise.reject("error");
-      }else if(res.code == 6002){
-        Toast("登录信息丢失");
-        location.reload();
-        window.androidinfo.showInfoFromJs("1233");
-        return Promise.reject("error");
+        context.$router.replace({ path: "/" })
+        return
+      }else if(res.code === 6002){
+        Toast("登录信息丢失,正在刷新页面");
+        context.$router.replace({ path: "/" })
+        return
+
       }else {
         return response;
       }