洪海涛 8 gadi atpakaļ
vecāks
revīzija
9253a567a5

+ 1 - 1
www/webapp/o2o/dist/js/page/appendPay.js

@@ -1 +1 @@
-define(["$","template","api","native","config","user"],function(e,t,n,r,i,s){function o(t){e(document).trigger("spa:navigate",{hash:"myOrder/1",pushData:{dontNeedReload:!0,animate:"slideOutDown"}})}return{title:"壹管家上门服务",body:"",init:function(t,u){var a=this,f=e(document);e.newTouch(".pay-option",function(t){t.preventDefault();var n=e(this).data("value");e(".btn-pay",a).attr("data-pay-channel",n),e(this).addClass("checked").parent().siblings().find("a").removeClass("checked")},a),e.newTouch(".btn-pay",function(t){t.preventDefault();var o=a.data("orderID"),u=a.data("appendID"),l=e(this).attr("data-pay-channel");i.isWX&&(l="wx_pub");if(!l)return;f.trigger("spa:openloader"),n.getAppendPayCharge({user_id:s.id,order_id:o,pay_channel:l,append_id:u},function(e){f.trigger("spa:closeloader");if(e.success){var t=s.getOrderInfo(o),n={orderInfo:t,charge:e.data};r.pay(n,function(e){if(e.success)return console.log(e),!1;f.trigger("spa:openpanel",["simpleAlert",{message:e.message}])})}else f.trigger("spa:openpanel",["simpleAlert",{message:e.message}])})},a),e.newTouch(".cancel-button",function(e){e.preventDefault(),o(a.data("backHash"))},a),a.on("tapBackButton",function(e){e.preventDefault(),o(a.data("backHash"))}),u.resolve()},beforeopen:function(n,o){var u=this,a=n.pushData,f=a.orderID,l=a.appendID;u.data("appendID",l),u.data("orderID",f);var c=s.appendOrder;if(!i.isWX&&!i.isChubao)r.isWxAppInstalled(function(n){var r=!0;n.success&&!n.isInstalled&&(r=!1),i.appVersion<"2.2"&&(r=!1);var s=t("pay/index",{showWX:r,showNavBar:!i.isWX&&!i.isChubao,orderType:c.products_str,orderprice:c.price});e(".spa-page-body",u).html(s),o.resolve()});else{var h=t("pay/index",{showNavBar:!i.isWX&&!i.isChubao,wxPub:!0,orderType:c.products_str,orderprice:c.price});e(".spa-page-body",u).html(h),o.resolve()}}}});
+define(["$","template","api","native","config","user"],function(e,t,n,r,i,s){function o(t){e(document).trigger("spa:navigate",{hash:"myOrder/1",pushData:{dontNeedReload:!0,animate:"slideOutDown"}})}return{title:"壹管家上门服务",body:"",init:function(t,u){var a=this,f=e(document);e.newTouch(".pay-option",function(t){t.preventDefault();var n=e(this).data("value");e(".btn-pay",a).attr("data-pay-channel",n),e(this).addClass("checked").parent().siblings().find("a").removeClass("checked")},a),e.newTouch(".btn-pay",function(t){t.preventDefault();var o=a.data("orderID"),u=a.data("appendID"),l=e(this).attr("data-pay-channel");i.isWX&&(l="wx_pub");if(!l)return;f.trigger("spa:openloader"),n.getAppendPayCharge({user_id:s.id,order_id:o,pay_channel:l,append_id:u},function(e){f.trigger("spa:closeloader");if(e.success){var t=s.getOrderInfo(o),n={orderInfo:t,charge:e.data};r.pay(n,function(e){e.success?f.trigger("spa:navigate",{hash:"paySuccess"}):f.trigger("spa:openpanel",["simpleAlert",{message:e.message}])})}else f.trigger("spa:openpanel",["simpleAlert",{message:e.message}])})},a),e.newTouch(".cancel-button",function(e){e.preventDefault(),o(a.data("backHash"))},a),a.on("tapBackButton",function(e){e.preventDefault(),o(a.data("backHash"))}),u.resolve()},beforeopen:function(n,o){var u=this,a=n.pushData,f=a.orderID,l=a.appendID;u.data("appendID",l),u.data("orderID",f);var c=s.appendOrder;if(!i.isWX&&!i.isChubao)r.isWxAppInstalled(function(n){var r=!0;n.success&&!n.isInstalled&&(r=!1),i.appVersion<"2.2"&&(r=!1);var s=t("pay/index",{showWX:r,showNavBar:!i.isWX&&!i.isChubao,orderType:c.products_str,orderprice:c.price});e(".spa-page-body",u).html(s),o.resolve()});else{var h=t("pay/index",{showNavBar:!i.isWX&&!i.isChubao,wxPub:!0,orderType:c.products_str,orderprice:c.price});e(".spa-page-body",u).html(h),o.resolve()}}}});

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

@@ -30,14 +30,12 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
                 $doc.trigger('spa:closeloader');
                 if (res.success) {
                     var orderInfo = user.getOrderInfo(orderID);
-                    console.log(orderInfo); return false;
                     var params = {
                         orderInfo: orderInfo,
                         charge: res.data
                     };
                     native.pay(params, function (resA) {
                         if (resA.success) {
-                          
                             $doc.trigger('spa:navigate', {
                                 hash: 'paySuccess'
                             });

+ 0 - 2
www/webapp/o2o/js/page/placeOrder.js

@@ -825,9 +825,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 						var orderID = order.id;
 						order.reset();
 						$('.booking-time', $view).html('请选择');
-
 						if (res.data.status == 1) {
-							
 							if(res.data.products_str=='活动产品'){
 								$doc.trigger('spa:navigate', {
 									hash: ''