洪海涛 пре 8 година
родитељ
комит
d9ef7ed0cc

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
www/webapp/o2o/dist/js/main.js


+ 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){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()}}}});
+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?(console.log(e),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()}}}});

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

@@ -1 +1 @@
-define(["$","template","api","native","config","user"],function(e,t,n,r,i,s){function p(){e(document).trigger("spa:navigate",{hash:o,pushData:{dontNeedReload:!0,animate:"slideOutDown"}})}var o,u,a,f=0,l=0,c=0,h=!1;return{title:"壹管家上门服务",body:"",init:function(t,o){function l(e){console.log(e),f.trigger("spa:closeloader");if(e.success){var t=s.getOrderInfo(u),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}])}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 r=e(this).attr("data-pay-channel");i.isWX&&(r="wx_pub");if(!r)return;f.trigger("spa:openloader");var o={user_id:s.id,order_id:u,pay_channel:r};h?n.payRecharge(o,function(e){l(e)}):n.getPayCharge(o,function(e){l(e)})},a),e.newTouch(".cancel-button",function(e){e.preventDefault(),p.call(this,e)},a),a.on("tapBackButton",function(e){e.preventDefault(),p.call(this,e)}),o.resolve()},beforeopen:function(n,r){var p=this,d=n.pushData;u=d.orderID,o=d.backHash?d.backHash:"",h=d.isRecharge;var v=s.orders[1].data;for(var m=0,g=v.length;m<g;m++)if(v[m].id==u){var y=v[m];a=y.products[0].product.name;if(y.coupons&&y.coupons.length)for(m in y.coupons)f+=parseInt(y.coupons[m].coupon.value);y.pay_price&&y.pay_price!=0&&(l=y.final_price-y.pay_price),y.pay_price&&y.pay_price!=0?c=y.pay_price:c=y.final_price}var b=t("pay/index",{showNavBar:!i.isWX&&!i.isChubao,wxPub:!0,orderType:a,isRecharge:h,isShow:!h,orderCoupon:f,orderBalance:l,orderPayValue:c});e(".spa-page-body",p).html(b),r.resolve()}}});
+define(["$","template","api","native","config","user"],function(e,t,n,r,i,s){function p(){e(document).trigger("spa:navigate",{hash:o,pushData:{dontNeedReload:!0,animate:"slideOutDown"}})}var o,u,a,f=0,l=0,c=0,h=!1;return{title:"壹管家上门服务",body:"",init:function(t,o){function l(e){f.trigger("spa:closeloader");if(e.success){var t=s.getOrderInfo(u),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}])}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 r=e(this).attr("data-pay-channel");i.isWX&&(r="wx_pub");if(!r)return;f.trigger("spa:openloader");var o={user_id:s.id,order_id:u,pay_channel:r};h?n.payRecharge(o,function(e){l(e)}):n.getPayCharge(o,function(e){l(e)})},a),e.newTouch(".cancel-button",function(e){e.preventDefault(),p.call(this,e)},a),a.on("tapBackButton",function(e){e.preventDefault(),p.call(this,e)}),o.resolve()},beforeopen:function(n,r){var p=this,d=n.pushData;u=d.orderID,o=d.backHash?d.backHash:"",h=d.isRecharge;var v=s.orders[1].data;for(var m=0,g=v.length;m<g;m++)if(v[m].id==u){var y=v[m];a=y.products[0].product.name;if(y.coupons&&y.coupons.length)for(m in y.coupons)f+=parseInt(y.coupons[m].coupon.value);y.pay_price&&y.pay_price!=0&&(l=y.final_price-y.pay_price),y.pay_price&&y.pay_price!=0?c=y.pay_price:c=y.final_price}var b=t("pay/index",{showNavBar:!i.isWX&&!i.isChubao,wxPub:!0,orderType:a,isRecharge:h,isShow:!h,orderCoupon:f,orderBalance:l,orderPayValue:c});e(".spa-page-body",p).html(b),r.resolve()}}});

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

@@ -47,6 +47,7 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
             }
               native.pay(params, function (resA) {
                 if (resA.success) {
+                  console.log(resA);
                   $doc.trigger('spa:navigate', {
                     hash: 'paySuccess'
                   });

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

@@ -27,7 +27,6 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
 
             // 充值的回调
             function payResult(res) {
-                console.log(res);
                 $doc.trigger('spa:closeloader');
                 if (res.success) {
                     var orderInfo = user.getOrderInfo(orderID);

Неке датотеке нису приказане због велике количине промена