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

# Conflicts:
#	app.js
#	pages/main/advancepayment/adPayHome.js

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

@@ -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 {

@@ -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: "对不起！认证失败",
+        verify_tip: options.msg?options.msg:"对不起！认证失败",
         btn_text: "重新认证"
         btn_text: "重新认证"
       })
       })
     }
     }