Merge branch 'master' of http://101.37.147.115:3000/mz666/bocai_supplyChain

app.js

@@ -13,29 +13,29 @@ App({
       "content-type": "multipart/form-data",
       Authorization: "",
       Cookie: "",
-      appId: 'wxbc6d9dbb9dff5b37',
+      appId: 'wxb0dea4d11428c6a5',
       "g-open-env": 'MP_MINI',
       // 请求来源标识 1.小程序 2.app 3.网页
       appClassify: 1,
-      appName: encodeURIComponent('伯才')
+      // appName: encodeURIComponent('伯才')
     },
     headers1: {
       "content-type": "application/json",
       Authorization: "",
       Cookie: "",
-      appId: 'wxbc6d9dbb9dff5b37',
+      appId: 'wxb0dea4d11428c6a5',
       "g-open-env": 'MP_MINI',
       appClassify: 1,
-      appName: encodeURIComponent('伯才')
+      // appName: encodeURIComponent('伯才')
     },
     headers: {
       "content-type": "application/x-www-form-urlencoded",
       Authorization: "",
       Cookie: "",
-      appId: 'wxbc6d9dbb9dff5b37',
+      appId: 'wxb0dea4d11428c6a5',
       "g-open-env": 'MP_MINI',
       appClassify: 1,
-      appName: encodeURIComponent('伯才')
+      // appName: encodeURIComponent('伯才')
     },
     userLoginTokenInfo: {
       tel: "", //用户电话

app.json

@@ -129,7 +129,7 @@
     "list": [
       {
         "iconPath": "./assets/images/ysd.png",
-        "selectedIconPath": "./assets/images/ysd1.png",
+        "selectedIconPath": "./assets/images/home1.png",
         "pagePath": "pages/firstBill/index",
         "text": "首页"
       },

pages/dataDetail/index.wxss

@@ -108,7 +108,7 @@ page {
   width: 40px;
   height: 40px;
   margin-right: 12px;
-  background-color: rgba(255, 106, 0, 0.1);
+  background-color: #f4faff;
   text-align: center;
   border-radius: 50%;
 }

pages/firstBill/index.js

@@ -4566,7 +4566,7 @@ Page({
     } else if (event.detail.scrollTop <= 200 && this.getTabBar().data.toTop) {
       // console.log(!this.getTabBar().data.toTop);
       this.getTabBar().data.list[0].selectedIconPath =
-        "../assets/images/ysd1.png";
+        "../assets/images/home1.png";
       this.getTabBar().data.list[0].text = "首页";
       this.getTabBar().setData({
         toTop: false,

pages/hotList/index.js

@@ -3416,7 +3416,7 @@ Page({
         index: 0,
         text: "首页",
         iconPath: "/assets/images/ysd.png",
-        selectedIconPath: "/assets/images/ysd1.png",
+        selectedIconPath: "/assets/images/home1.png",
         success: (e) => { },
         fail (e) {
           console.log(e);

pages/listSharePage/index.js

@@ -3784,7 +3784,7 @@ Page({
         index: 0,
         text: "首页",
         iconPath: "/assets/images/ysd.png",
-        selectedIconPath: "/assets/images/ysd1.png",
+        selectedIconPath: "/assets/images/home1.png",
         success: (e) => { },
         fail (e) {
           console.log(e);

pages/login/index.js

@@ -148,13 +148,14 @@ Page({
   sendMsg: function () {
     console.log(this.data.tel);
     var that = this;
-
+    if (that.data.disabled == 1) {
+      that.getCode();
+    }
     that.setData({
       btnColor: false,
       disabled: 0,
     });
     
-    that.getCode();
     var timer = 1;
     if (timer == 1) {
       timer = 0;
@@ -231,7 +232,7 @@ Page({
               code: that.data.wxCode,
               iv: iv,
               encryptedData: encryptedData,
-              type: "yishoudan",
+              appId: 'wxb0dea4d11428c6a5',
             }
           }).then((res) => {
             app.globalData.openId = res.data.data.openId;
@@ -997,9 +998,9 @@ Page({
       tel: "",
     });
   },
-  showPSW(){
+  showPSW () {
     this.setData({
-      showPSW:!this.data.showPSW,
+      showPSW: !this.data.showPSW,
     });
   }
 });

pages/mineJob/index.wxss

@@ -117,7 +117,7 @@ page {
   width: 40px;
   height: 40px;
   margin-right: 12px;
-  background-color: rgba(255, 106, 0, 0.1);
+  background-color: #f4faff;
   text-align: center;
   border-radius: 50%;
 }

pages/myBill/index.wxss

@@ -107,7 +107,7 @@ page {
   width: 40px;
   height: 40px;
   margin-right: 12px;
-  background-color: rgba(255, 106, 0, 0.1);
+  background-color: #f4faff;
   text-align: center;
   border-radius: 50%;
 }

pages/underReview/index.wxss

@@ -25,7 +25,7 @@
   width: 40px;
   height: 40px;
   margin-right: 12px;
-  background-color: rgba(255, 106, 0, 0.1);
+  background-color: #f4faff;
   text-align: center;
   border-radius: 50%;
 }