Merge branch 'develop' of http://101.37.147.115:3000/mz666/bocai_supplyChain into develop

pages/billDetail/index.js

@@ -88,11 +88,19 @@ Page({
     var that = this;
 
     var text = "姓名：" + that.data.recordDetail.userName + "/" + (that.data.recordDetail.sex == 1 ? "男" : "女") + "/" + that.data.recordDetail.age + "岁" + (that.data.recordDetail.nation == "族" ? "" : "/" + that.data.recordDetail.nation) + "\n电话：" + (that.data.recordDetail.tel == "" || that.data.recordDetail.tel == undefined || that.data.recordDetail.tel == null ? "-" : that.data.recordDetail.tel) + "\n身份证号：" + (that.data.recordDetail.idCard == "" ? "-" : that.data.recordDetail.idCard) + "\n家庭地址：" + (that.data.recordDetail.address == "" || that.data.recordDetail.address == undefined || that.data.recordDetail.address == null ? "-" : that.data.recordDetail.address) + "\n报名岗位：" + that.data.recordDetail.storeJobName + "\n员工薪资：" + (that.data.recordDetail.employeeSalary || '-') + "\n代理政策：" + that.data.recordDetail.policy;
+    // #if MP
     app.copyFun(text,()=>{
       console.log(123123);
       that.close2();
-
     })
+     // #elif ANDROID || IOS
+     app.copyFun(text)
+     that.close2();
+     // #endif
+
+
+
+
     // wx.setClipboardData({
     //   data: text,
     //   success (res) {
@@ -243,22 +251,31 @@ Page({
     }else{
       text = that.data.userinfo.totalZC;
     }
-    wx.setClipboardData({
+
-      data: text,
+     // #if MP
-      success (res) {
+     app.copyFun(text,()=>{
-        wx.getClipboardData({
+      console.log(123123);
-          success (res) {
+    })
-            console.log(res.data); // data
+     // #elif ANDROID || IOS
-            wx.showToast({
+     app.copyFun(text)
-              title: "内容已复制",
+     // #endif
-              icon: "none",
+
-              duration: 1500,
+    // wx.setClipboardData({
-            });
+    //   data: text,
-            that.close1();
+    //   success (res) {
-          },
+    //     wx.getClipboardData({
-        });
+    //       success (res) {
-      },
+    //         console.log(res.data); // data
-    });
+    //         wx.showToast({
+    //           title: "内容已复制",
+    //           icon: "none",
+    //           duration: 1500,
+    //         });
+    //         that.close1();
+    //       },
+    //     });
+    //   },
+    // });
   },
 
   copyClose () {
@@ -267,8 +284,21 @@ Page({
     app.copyFun(text,()=>{
       console.log(123123);
       that.close1();
+    })
 
+     // #if MP
+     app.copyFun(text,()=>{
+      console.log(123123);
+      that.close1();
     })
+     // #elif ANDROID || IOS
+     app.copyFun(text)
+     that.close1();
+     // #endif
+
+
+
+
     // wx.setClipboardData({
     //   data: text,
     //   success (res) {

pages/detail/index.js

@@ -1869,13 +1869,16 @@ Page({
     wx.showModal({
       content: '抱歉，您需先成为伯才代理以获得使用权限。',
       // content: that.data.bclr,
-      contentColor: "#ccc",
+      confirmColor: '#1890ff',
-      confirmColor: "#1890ff",
+        confirmText: '成为代理',
-      confirmText: "确定",
+        cancelText: '知道了',
-      showCancel: false,
         success (res) {
-
+          if (res.confirm) {
-      },
+            wx.navigateTo({
+              url: '/pages/tobeAgency/index'
+            })
+          }
+        }
     });
   },
   showFee () {

pages/tobeAgency/index.js

@@ -50,7 +50,7 @@ Page({
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow () { },
+  onShow () {},
 
   /**
    * 地址选择
@@ -184,9 +184,7 @@ Page({
                 duration: 1000,
                 success () {
                   setTimeout(() => {
-                    wx.switchTab({
+                   wx.navigateBack()
-                      url: '../mine/index',
-                    })
                   }, 1200);
                 },
               });

subPage/todayBill/index.js

@@ -190,11 +190,13 @@ Page({
   copyInfo (e) {
     let val = e.currentTarget.dataset.info;
     app.vibrateShort()
+    // #if MP
     app.copyFun(val.text, () => {
       console.log(123123);
     })
-
+    // #elif ANDROID || IOS
-
+    app.copyFun(val.text)
+    // #endif
   },
   /**
    * 用户点击右上角分享