Merge branch '机器人dev' into 苏州英格玛

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

@@ -194,11 +194,19 @@ 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"]:[]
-     console.log(titles,detail,mapping_keys)
+    let mapping_keys = data["mapping_keys"] ? data["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]
@@ -214,7 +222,7 @@ Page({
         }
         }
       }
       }
       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({
         title: title,
         title: title,
@@ -224,7 +232,6 @@ Page({
     console.log('details', details)
     console.log('details', details)
     return details
     return details
   },
   },
-
   goItemDetails: function (e) {
   goItemDetails: function (e) {
     var item =  this.data.taxDatas[e.currentTarget.id]
     var item =  this.data.taxDatas[e.currentTarget.id]
     wx.navigateTo({
     wx.navigateTo({

@@ -8,7 +8,7 @@ Page({
   data: {
   data: {
     verify_img: "/images/verify_succ.png",
     verify_img: "/images/verify_succ.png",
     verify_status: "succ",
     verify_status: "succ",
-    verify_tip: "",
+    verify_tip: "恭喜您！认证成功",
     btn_text: "完成"
     btn_text: "完成"
   },
   },
 
 
@@ -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: options.msg?options.msg:"对不起！认证失败",
+        verify_tip: options.msg ? "对不起！认证失败 \n "+options.msg:"对不起！认证失败",
         btn_text: "重新认证"
         btn_text: "重新认证"
       })
       })
     }
     }