Merge branch 'sit' into live

dist/runtime.js

@@ -113,7 +113,7 @@
 /******/
 /******/ 	var hotApplyOnUpdate = true;
 /******/ 	// eslint-disable-next-line no-unused-vars
-/******/ 	var hotCurrentHash = "92a98c750e209e14d655";
+/******/ 	var hotCurrentHash = "735ba93914f61a78f702";
 /******/ 	var hotRequestTimeout = 10000;
 /******/ 	var hotCurrentModuleData = {};
 /******/ 	var hotCurrentChildModule;

src/.env.staging

@@ -1,4 +1,4 @@
-NODE_ENV = stage
+NODE_ENV = staging
 
 # just a flag
 ENV = 'staging'

src/assets/css/index.css

@@ -98,7 +98,7 @@
     .van-nav-bar{
       background: transparent;
     }
-    .liveD .video-js .vjs-big-play-button {
-      top: calc(50% - 20px);
-      left: calc(50% - 43px);
-      }
+      .liveD .video-js .vjs-big-play-button {
+        top: calc(50% - 20px);
+        left: calc(50% - 43px);
+        }

src/config/env.development.js

@@ -1,7 +1,8 @@
 // 本地
 module.exports = {
   title: '五常稻田',
-  baseApi: 'http://www.fivechang.com/',
+  // baseApi: 'http://www.fivechang.com/',
+  baseApi: 'http://fc.test241.wanyuhengtong.com/',
   fileURL: `https://api2.edusit.zretchome.com`,
   appId: 'wx5ac3a2c2d72b6f26',
   ding: {

src/config/env.staging.js

@@ -1,7 +1,7 @@
 // 测试环境
 module.exports = {
   title: '五常稻田',
-  baseApi: 'http://five.sit.wanyuhengtong.com/',
+  baseApi: 'http://fc.test241.wanyuhengtong.com/',
   fileURL: `https://api2.edusit.zretchome.com`,
   appId: 'wx5ac3a2c2d72b6f26',
   ding:{

src/views/login/index.vue

@@ -83,8 +83,8 @@ export default {
       // codeTitle: "发送密码",
       // num: 60,
       form: {
-        mobile: "1745222222",
-        code: "aa2222",
+        mobile: "",
+        code: "",
       },
     };
   },

src/views/order/detail.vue

@@ -114,12 +114,13 @@ export default {
           provice_name,
           area_name,
           addr,
+          unit_weight
         } = res.data;
         this.list1[0].value = order_sn;
         this.list1[1].value = status === "1" ? "待发货" : "待收货";
         this.status = status;
         this.list4[0].value = unit === "盒" ? "藏金1745礼盒" : "藏金1745普通装";
-        this.list4[1].value = order_num + "袋/2.5kg";
+        this.list4[1].value = order_num + unit+"/"+unit_weight+'kg';
         this.list1[2].value = order_time;
         if (this.status === "2") {
           this.list2[0].value = post_name;

src/views/order/orderRes.vue

@@ -38,7 +38,7 @@
           @click="goto('/oDetail')"
           >订单详情</van-button
         >
-        <van-button round class="fr" size="small" @click="goto('/home/product')"
+        <van-button round class="fr" size="small" @click="goto('/home/live')"
           >返回首页</van-button
         >
       </div>

src/views/product/index.vue

@@ -213,7 +213,7 @@ export default {
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
       } else {
-        this.show_title("连接超时，请重新登录");
+        this.show_title(res.msg);
       }
     },
     async set_user_goodsNum(num) {