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

+ 11 - 1
www/webapp/common/js/native.js

@@ -232,7 +232,17 @@ define(function (require) {
                     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 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 - 1
www/webapp/o2o/dist/js/page/pay.js


+ 2 - 1
www/webapp/o2o/js/page/pay.js

@@ -29,7 +29,8 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
                     var orderInfo = user.getOrderInfo(orderID);
                     var params = {
                         orderInfo: orderInfo,
-                        charge: res.data
+                        charge: res.data,
+                        isSpecial: res.data.body == "双11虹口区日常保洁特价体验"
                     };
                     native.pay(params, function (resA) {
                         if (resA.success) {

+ 8 - 3
www/webapp/o2o/module/pay/index.html

@@ -124,6 +124,8 @@
         created = urlParam.created,
         bookingTime = urlParam.bookingTime,
         body = urlParam.body;
+        isSpecial = urlParam.isSpecial;
+        console.log('isSpecial2'+isSpecial);
 
       function formatDate(now) {
         var d = new Date(now * 1000);
@@ -164,9 +166,12 @@
           },function(res){
               console.log(res);
             if(res.err_msg == "get_brand_wcpay_request:ok" ) {
-              $('.j-pay-btn').hide();
-              $('.j-pay-result').show();
-              alert('活动订单支付成功了');
+                if (isSpecial){
+                    location.href = '/o2o/web/index#bargain';
+                }else {
+                    $('.j-pay-btn').hide();
+                    $('.j-pay-result').show();
+                }
             } else if (res.err_msg == "get_brand_wcpay_request:cancel"){
                 // alert('取消支付');
             } else {

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