Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.1.402"
+  "version": "1.1.512"
 }

config/prod.env.js

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

src/api/login.js

@@ -10,4 +10,4 @@ export function loginByPwd(mobile, password) {
         method: "post",
         params: params,
     })
-}
+}

src/pages/main/dialog/subMenu/MsgTip.vue

@@ -63,7 +63,7 @@
         <div class="content" style="margin-top:5px;margin-left:0;">
           <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">透后称重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getAfterWeight(record)}}</span>kg=
           透后总重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{record.weight_after}}</span>kg-
-          衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{predialysis.additional_weight}}</span>kg
+          衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{record.additional_weight}}</span>kg
            </span>
         </div>
         <br>
@@ -85,7 +85,7 @@
         <div class="content" style="margin-top:5px;margin-left:0;">
           <span class="text" style="text-align:left;display:block;height:0.4rem;" id="txms">上次透后称重:<span style="color:#ec6618;display:inline-block;text-align:center;margin:0 2px;">{{getLastAfterWeight(last_record)}}</span>kg=
           上次透后总重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{last_record.weight_after}}</span>kg-
-          上次衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{last_predialysis.additional_weight}}</span>kg
+          上次衣服重:<span style="color:#ec6618;display:inline-block;text-align:center;center;margin:0 2px;">{{last_record.additional_weight}}</span>kg
            </span>
         </div>
         <br>
@@ -197,8 +197,8 @@ export default {
       if (last_record.id > 0) {
         if (last_record.weight_after > 0) {
           let additional_weight = 0
-          if (this.last_predialysis.additional_weight != undefined) {
-            additional_weight = this.last_predialysis.additional_weight
+          if (this.last_record.additional_weight != undefined) {
+            additional_weight = this.last_record.additional_weight
           }
           return parseFloat(last_record.weight_after - additional_weight).toFixed(1)
         } else {

src/pages/main/index.vue

@@ -82,7 +82,7 @@ export default {
           return [item.groupno]
         })
         this.unReadWaitNum = sorted.length
-      } 
+      }
       // else {
       //   var date = parseTime(Date.parse(new Date()), '{y}-{m}-{d}')
       //   getWaitingScheduals({ date: date }).then(rs => {
@@ -139,7 +139,7 @@ export default {
         })
 
         this.unReadDialysisNum = sorted.length
-      } 
+      }
       // else {
       //   var date = this.$store.getters.app.dialysis_area.schedule_date
       //   var type = 0

src/permission.js

@@ -8,13 +8,14 @@ router.beforeEach((to, from, next) => {
   //   next()
   //   return
 
-  if (store.getters.user.user.id == 0) {
-    if (loginWhiteList.indexOf(to.path) !== -1) {
-      next();
+
+    if (store.getters.user.user.id == 0) {
+      if (loginWhiteList.indexOf(to.path) !== -1) {
+        next();
+      } else {
+        next({ path: "/" });
+      }
     } else {
-      next({ path: "/" });
-    }
-  } else {
-    next();
+      next();
   }
 });