Merge branch '机器人dev' into 海峡new

# Conflicts:
#	app.js
#	pages/main/advancepayment/adPayHome.js
#	project.config.json

@@ -148,7 +148,6 @@ App({
     // baseUrl: "http://47.110.158.110:20000/",
     // baseUrl: "http://47.110.158.110:20000/",
     // baseUrl: "https://api.workai.com.cn/",
     // baseUrl: "https://api.workai.com.cn/",
     baseUrl: "https://api.fjhxrl.com/",
     baseUrl: "https://api.fjhxrl.com/",
-    // baseUrl: "https://api.workai.com.cn/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
     userInfo: null,
     userInfo: null,
     hostInfo: null,
     hostInfo: null,

@@ -339,7 +339,7 @@ Page({
     } else {
     } else {
       this.setData({
       this.setData({
         btn_show: true,
         btn_show: true,
-        additionInfo: newdata
+        additionInfo: newdata?newdata:[]
       })
       })
     }
     }
   },
   },

@@ -198,10 +198,16 @@ Page({
 
 
   handleDetailsData: function (data) {
   handleDetailsData: function (data) {
 
 
-    let titles = JSON.parse(data['slip_titles'])
+    // let titles = JSON.parse(data['slip_titles'])
+    let titles = JSON.parse(data['salary_columns'])
     let detail = JSON.parse(data['detail'])
     let detail = JSON.parse(data['detail'])
     let mapping_keys = data["mapping_keys"] ? data["mapping_keys"] : []
     let mapping_keys = data["mapping_keys"] ? data["mapping_keys"] : []
-     console.log(titles,detail,mapping_keys)
+    console.log(titles, detail, mapping_keys)
+    // var obj = {}
+    // let titles = titles01.concat(titles02).reduce(function (item, next) {
+    //           obj[next.key] ? '' : obj[next.key] = true && item.push(next);
+    //           return item;
+    //  }, []);
     var details = []
     var details = []
     for (var i = 0; i < titles.length; ++i) {
     for (var i = 0; i < titles.length; ++i) {
       var titleData = titles[i]
       var titleData = titles[i]
@@ -215,8 +221,8 @@ Page({
         if (value != undefined) {
         if (value != undefined) {
           value += 'tax_rate' == titleData['key'] ? '%' : ''
           value += 'tax_rate' == titleData['key'] ? '%' : ''
         }
         }
-      }  
-      if (!title ) continue;
+      }
+      if (!title) continue;
       // if (!title || (value!=0&&!value)) continue;
       // if (!title || (value!=0&&!value)) continue;
       // if (mapping_keys.indexOf(titleData['key']) == -1 && (value == '0' || value == 0)) continue;
       // if (mapping_keys.indexOf(titleData['key']) == -1 && (value == '0' || value == 0)) continue;
       details.push({
       details.push({

@@ -248,7 +248,7 @@ Page({
           if (res.statusCode && res.statusCode >= 300) {
           if (res.statusCode && res.statusCode >= 300) {
             that.showtoast(res.data.message);
             that.showtoast(res.data.message);
             wx.redirectTo({
             wx.redirectTo({
-              url: '../verify_result/verify_result?result=fail',
+              url: '../verify_result/verify_result?result=fail&msg=' + res.data.message,
             })
             })
           } else {
           } else {
             that.showtoast('提交成功');
             that.showtoast('提交成功');

@@ -138,7 +138,7 @@ Page({
           console.log("SUCC", res)
           console.log("SUCC", res)
           if (res.statusCode && res.statusCode >= 300) {
           if (res.statusCode && res.statusCode >= 300) {
             wx.navigateTo({
             wx.navigateTo({
-              url: 'verify_result/verify_result?result=fail',
+              url: 'verify_result/verify_result?result=fail&msg=' + res.data.message,
             })
             })
             that.showtoast(res.data.message);
             that.showtoast(res.data.message);
           } else {
           } else {

@@ -28,7 +28,7 @@ Page({
       this.setData({
       this.setData({
         verify_img: "/images/verify_fail.png",
         verify_img: "/images/verify_fail.png",
         verify_status: "fail",
         verify_status: "fail",
-        verify_tip: "对不起！认证失败",
+        verify_tip: options.msg ? "对不起！认证失败 \n "+options.msg:"对不起！认证失败",
         btn_text: "重新认证"
         btn_text: "重新认证"
       })
       })
     }
     }

@@ -13,8 +13,13 @@
 	},
 	},
 	"compileType": "miniprogram",
 	"compileType": "miniprogram",
 	"libVersion": "2.4.2",
 	"libVersion": "2.4.2",
+<<<<<<< HEAD
 	"appid": "wxb1af25a27d6d0cba",
 	"appid": "wxb1af25a27d6d0cba",
 	"projectname": "%E6%B5%B7%E5%B3%A1%E8%87%AA%E7%84%B6%E4%BA%BA",
 	"projectname": "%E6%B5%B7%E5%B3%A1%E8%87%AA%E7%84%B6%E4%BA%BA",
+=======
+	"appid": "wxe7d4efda23782b49",
+	"projectname": "%E7%A4%BE%E7%A8%8E%E6%9C%BA%E5%99%A8%E4%BA%BA",
+>>>>>>> 机器人dev
 	"debugOptions": {
 	"debugOptions": {
 		"hidedInDevtools": []
 		"hidedInDevtools": []
 	},
 	},