jmx 8 жил өмнө
parent
commit
e876828aee

+ 14 - 14
www/webapp/common/js/native.js

@@ -228,21 +228,21 @@ define(function (require) {
                                 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;
+                        var isSpecial = params['isSpecial']
+                        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
+                            + '&isSpecial=' + isSpecial;
                     }
-                    var option = params['charge'].credential.wx_pub;
-                    var prepay = option["package"].replace('prepay_id=', '');
-                    var bookingTime = params.orderInfo.booking_time_str;
-                    var isSpecial = params['isSpecial']
-                    console.log('isSpecial1'+isSpecial);
-                    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
-                    + '&isSpecial=' + isSpecial;
                 }
             });
             var callback = typeof (arguments[1]) == 'function' ? arguments[1] : null;

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/o2o/dist/js/main.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/o2o/dist/js/native.js


+ 0 - 2
www/webapp/o2o/module/pay/index.html

@@ -301,8 +301,6 @@
                 bookingTime = urlParam.bookingTime,
                 body = urlParam.body,
                 isSpecial = urlParam.isSpecial;
-        console.log('isSpecial2' + isSpecial);
-        console.log(urlParam);
 
         function formatDate(now) {
             var d = new Date(now * 1000);

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно