Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test

WXD-SEASON\season
2 parents 41c4c5dd 8d0c5060
Showing 2 changed files with 23 additions and 4 deletions
utils/pay.js
utils/pay2.js
@@ -47,6 +47,7 @@ module.exports = {
                     if(t.data.data.is_fuioupay){
                         const plugin = requirePlugin('fuiou-pay')
+                        getApp().globalData.no_clear=1;
                         var paramsJson={
                             reqType:"11",//必填 01-商户模式，11-机构模式
@@ -61,7 +62,13 @@ module.exports = {
                         },function (error){
                           console.log("插件支付错误",error);
                             //支付失败的时候
-                            getApp().confirmBox(error.code+error.message);
+
+                            var msg='取消支付';
+                            if(error.code){
+                                msg=error.code+":"+error.message;
+                            }
+                            getApp().confirmBox(msg);
+
                             setTimeout(function(){
                                 wx.redirectTo({
                                     url: "/pages/user/order_list/order_list",
@@ -19,8 +19,10 @@ module.exports = {
                     if(t.data.data=="升级成功"){
                         "function" == typeof succ && succ(1);
                     }else{
+
                         if(t.data.data.is_fuioupay){
                             const plugin = requirePlugin('fuiou-pay')
+                            getApp().globalData.no_clear=1;
                             var paramsJson={
                                 reqType:"11",//必填 01-商户模式，11-机构模式
@@ -35,7 +37,11 @@ module.exports = {
                                 console.log("插件支付错误",error);
                                 //支付失败的时候
                                 //getApp().confirmBox(error.code+error.message);
-                                fail(error.code+":"+error.message)
+                                var msg='取消支付';
+                                if(error.code){
+                                    msg=error.code+":"+error.message;
+                                }
+                                fail(msg)
                                 wx_paying=0;
                             })
                         }else {
@@ -75,17 +81,23 @@ module.exports = {
                 reqType:"11",//必填 01-商户模式，11-机构模式
                 reqData:ob.reqData,//必填 富友加密参数
             }
+            getApp().globalData.no_clear=1;
             console.log(plugin, plugin.fuioupay)
             plugin.fuioupay(parseInt(ob.amt),paramsJson,function (res){
                 console.log(res);
                 wx_paying=0;
                 "function" == typeof succ && succ();
             },function (error){
+                wx_paying=0;
                 console.log("插件支付错误",error);
                 //支付失败的时候
                 //getApp().confirmBox(error.code+error.message);
-                fail(error.code+":"+error.message)
-                wx_paying=0;
+                var msg='取消支付';
+                if(error && error.code){
+                    msg=error.code+":"+error.message;
+                }
+                fail(msg)
+
             })
         }else {
             this.weixinPay(ob, succ, fail);