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

WXD-SEASON\season
2 parents c3e19c62 1bbbf3d6
Showing 5 changed files with 98 additions and 27 deletions
packageC/pages/presell/cart/cart.js
packageE/pages/cart/cart2/cart2.js
pages/cart/cart_wk/cart_wk.js
pages/user/order_list/order_list.js
utils/pay.js
@@ -2397,22 +2397,40 @@ Page({
                 //---用微信支付---
                 if (dd.tail_pay_type == 0) {
-                    var n = t.data.data;
-                    th.weixinPay(n,
-                        function () {
-                            //---用余额支付---
-                            getApp().my_warnning("支付成功", 1, th);
-                            var send_time = th.data.pre_arr.delivery_date;
-                            if (th.data.pre_arr.delivery_type == 2) {
-                                send_time = th.data.pre_arr.delivery_daynum * 3600;
-                            }
-                            th.setData({ isclose: 0, 'order.order_status': 1, 'order.pay_status': 1, 'wait_wk': 0, 'presell.tail_pay_state': 1, 'wait_fh': 1, send_time: send_time });
-                            this.data.paying=0;
-
-                        }, function () {
-                            this.data.paying=0;
-                            getApp().my_warnning("支付失败", 0, th);
-                        })
+                    util_pay.pay_data(t,function (){
+                        //---用余额支付---
+                        getApp().my_warnning("支付成功", 1, th);
+                        var send_time = th.data.pre_arr.delivery_date;
+                        if (th.data.pre_arr.delivery_type == 2) {
+                            send_time = th.data.pre_arr.delivery_daynum * 3600;
+                        }
+                        th.setData({ isclose: 0, 'order.order_status': 1, 'order.pay_status': 1, 'wait_wk': 0, 'presell.tail_pay_state': 1, 'wait_fh': 1, send_time: send_time });
+                        th.data.paying=0;
+
+                    },function (e){
+                          th.data.paying=0;
+                          wx.showToast({
+                              title:e,
+                              icon: 'none',
+                              duration: 2500
+                          })
+                    })
+                    // var n = t.data.data;
+                    // th.weixinPay(n,
+                    //     function () {
+                    //         //---用余额支付---
+                    //         getApp().my_warnning("支付成功", 1, th);
+                    //         var send_time = th.data.pre_arr.delivery_date;
+                    //         if (th.data.pre_arr.delivery_type == 2) {
+                    //             send_time = th.data.pre_arr.delivery_daynum * 3600;
+                    //         }
+                    //         th.setData({ isclose: 0, 'order.order_status': 1, 'order.pay_status': 1, 'wait_wk': 0, 'presell.tail_pay_state': 1, 'wait_fh': 1, send_time: send_time });
+                    //         th.data.paying=0;
+                    //
+                    //     }, function () {
+                    //         this.data.paying=0;
+                    //         getApp().my_warnning("支付失败", 0, th);
+                    //     })
                 } else {
                     if (t.data.code == 0) {
                         var send_time = th.data.pre_arr.delivery_date;
@@ -2426,7 +2444,7 @@ Page({
                     } else {
                         getApp().my_warnning(t.data.msg, 1, th);
                     }
-                    this.data.paying=0;
+                    th.data.paying=0;
                 }
             }
         });
@@ -1291,7 +1291,7 @@ Page({
               wx.showToast({
                 title: "视频号仅支持物流",
                 icon: 'none',
-                duration: 2000
+                duration: 2500
               })
               setTimeout(function () {
@@ -3,6 +3,7 @@ var t = getApp(),
   oo = t.globalData.setting,
   os=oo;
 var ut=require("../../../utils/util.js");
+var util_pay=require("../../../utils/pay.js");
 var regeneratorRuntime = require('../../../utils/runtime.js');
 Page({
@@ -86,6 +87,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    util_pay.set_fir();
     getApp().check_can_share();
     var th = this;
     if (th.data.isclose == 0) {
@@ -606,15 +608,24 @@ Page({
         //---用微信支付---
         if (dd.tail_pay_type == 0) {
-          var n = t.data.data;
-          th.weixinPay(n,
-            function () {
-              var allmoney = th.data.allpice;
-              th.jumpPaymentPage(th.data.order.order_sn, allmoney);
-            }, function () {
-              th.data.paying=0;
-              getApp().my_warnning("支付失败", 0, th);
-            })
+
+          util_pay.pay_data(t,function (){
+                var allmoney = th.data.allpice;
+                th.jumpPaymentPage(th.data.order.order_sn, allmoney);
+          },function (){
+                th.data.paying=0;
+                getApp().my_warnning("支付失败", 0, th);
+          })
+
+          //var n = t.data.data;
+          // th.weixinPay(n,
+          //   function () {
+          //     var allmoney = th.data.allpice;
+          //     th.jumpPaymentPage(th.data.order.order_sn, allmoney);
+          //   }, function () {
+          //     th.data.paying=0;
+          //     getApp().my_warnning("支付失败", 0, th);
+          //   })
         } else {
           if (t.data.code == 0) {
             //---用余额支付---
@@ -110,6 +110,8 @@ Page({
   },
   onShow: function () {
     t_pay.set_fir();
+    t.set_fir();
+
     var th = this;
     //---查看会员的等级价---
     getApp().getConfig2(function (e) {
@@ -111,6 +111,46 @@ module.exports = {
             }
         });
     },
+
+    //-- 这里是专享礼包的调用 --
+    pay_data:function (t,succ,fail){
+        var th=this;
+        var ob=t.data.data;
+        if(!ob){
+            this.set_fir();
+            fail('支付参数错误');
+            return false;
+        }
+        if(ob.is_fuioupay){
+            const plugin = requirePlugin('fuiou-pay')
+
+            var paramsJson={
+                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);
+                th.wx_paying=0;
+                "function" == typeof succ && succ();
+            },function (error){
+                th.wx_paying=0;
+                console.log("插件支付错误",error);
+                //支付失败的时候
+                //getApp().confirmBox(error.code+error.message);
+                var msg='取消支付';
+                if(error && error.code){
+                    msg=error.code+":"+error.message;
+                }
+                fail(msg)
+
+            })
+        }else {
+            this.weixinPay(ob, succ, fail);
+        }
+    },
+
     weixinPay: function(n, e, a) {
        var th=this;
 	   if(!n) return false;