Browse Source

活动产品

jmx 8 years ago
parent
commit
10c876bac9
3 changed files with 19 additions and 18 deletions
  1. 19 18
      www/webapp/common/js/native.js
  2. 0 0
      www/webapp/o2o/dist/js/main.js
  3. 0 0
      www/webapp/o2o/dist/js/native.js

+ 19 - 18
www/webapp/common/js/native.js

@@ -213,24 +213,25 @@ define(function (require) {
                 },
                 wx: function () {
                     console.log(config.test);
-                    // if (config.test) {
-                    //     console.log(params)
-                    //     pingpp.createPayment(params.charge, function (result, err) {
-                    //         if (result) {
-                    //             var res = {
-                    //                 success: true
-                    //             };
-                    //             callback(res);
-                    //         }
-                    //         if (err) {
-                    //             console.log(err);
-                    //         }
-                    //     });
-                    // }
-                    var option = params['charge'].credential.wx_pub;
-                    var prepay = option["package"].replace('prepay_id=', '');
-                    var bookingTime = params.orderInfo.booking_time_str;
-                    location.href = '/webapp/o2o/module/pay/index.html?appId=' + option.appId + '&nonceStr=' + option.nonceStr + '&package=' + prepay + '&signType=' + option.signType + '&timeStamp=' + option.timeStamp + '&paySign=' + option.paySign + '&amount=' + params['charge'].amount + '&created=' + params['charge'].created + '&body=' + params['charge'].body + '&bookingTime=' + bookingTime;
+                    if (config.test) {
+                        pingpp.createPayment(params.charge, function (result, err) {
+                            if (result) {
+                                console.log(err);
+                                var res = {
+                                    success: true
+                                };
+                                callback(res);
+                            }
+                            if (err) {
+                                console.log(err);
+                            }
+                        });
+                    }else {
+                        var option = params['charge'].credential.wx_pub;
+                        var prepay = option["package"].replace('prepay_id=', '');
+                        var bookingTime = params.orderInfo.booking_time_str;
+                        location.href = '/webapp/o2o/module/pay/index.html?appId=' + option.appId + '&nonceStr=' + option.nonceStr + '&package=' + prepay + '&signType=' + option.signType + '&timeStamp=' + option.timeStamp + '&paySign=' + option.paySign + '&amount=' + params['charge'].amount + '&created=' + params['charge'].created + '&body=' + params['charge'].body + '&bookingTime=' + bookingTime;
+                    }
                 }
             });
             var callback = typeof (arguments[1]) == 'function' ? arguments[1] : null;

File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/main.js


File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/native.js


Some files were not shown because too many files changed in this diff