支付页面，支付类型统一为orders[i].products[0].product.name

www/webapp/o2o/dist/js/page/pay.js

@@ -1 +1 @@
-define(["$","template","api","native","config","user"],function(e,t,n,r,i,s){function c(){e(document).trigger("spa:navigate",{hash:o,pushData:{dontNeedReload:!0,animate:"slideOutDown"}})}var o,u,a,f,l=!1;return{title:"壹管家上门服务",body:"",init:function(t,o){function h(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};l?n.payRecharge(o,function(e){h(e)}):n.getPayCharge(o,function(e){h(e)})},a),e.newTouch(".cancel-button",function(e){e.preventDefault(),c.call(this,e)},a),a.on("tapBackButton",function(e){e.preventDefault(),c.call(this,e)}),o.resolve()},beforeopen:function(n,r){var c=this,h=n.pushData;u=h.orderID,o=h.backHash?h.backHash:"",l=h.isRecharge;var p=s.orders[1].data;for(var d=0,v=p.length;d<v;d++)p[d].id==u&&(a=p[d].products[0].name,f=p[d].final_price);var m=t("pay/index",{showNavBar:!i.isWX&&!i.isChubao,wxPub:!0,orderType:a,orderPrice:f});e(".spa-page-body",c).html(m),r.resolve()}}});
+define(["$","template","api","native","config","user"],function(e,t,n,r,i,s){function c(){e(document).trigger("spa:navigate",{hash:o,pushData:{dontNeedReload:!0,animate:"slideOutDown"}})}var o,u,a,f,l=!1;return{title:"壹管家上门服务",body:"",init:function(t,o){function h(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};l?n.payRecharge(o,function(e){h(e)}):n.getPayCharge(o,function(e){h(e)})},a),e.newTouch(".cancel-button",function(e){e.preventDefault(),c.call(this,e)},a),a.on("tapBackButton",function(e){e.preventDefault(),c.call(this,e)}),o.resolve()},beforeopen:function(n,r){var c=this,h=n.pushData;u=h.orderID,o=h.backHash?h.backHash:"",l=h.isRecharge;var p=s.orders[1].data;for(var d=0,v=p.length;d<v;d++)p[d].id==u&&(a=p[d].products[0].product.name,f=p[d].final_price);var m=t("pay/index",{showNavBar:!i.isWX&&!i.isChubao,wxPub:!0,orderType:a,orderPrice:f});e(".spa-page-body",c).html(m),r.resolve()}}});

www/webapp/o2o/dist/js/page/rechargee.js

@@ -1 +1 @@
-define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"mine",pushData:{dontNeedReload:!0}})}return{title:"充值卡",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},i),i.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),s.trigger("spa:openloader");var n=e(this).attr("data-value");r.addRechargeorder({user_id:o.id,recharge_id:e(this).attr("data-id")},function(e){s.trigger("spa:closeloader"),e.success&&(o.orders[1].data.push({id:e.data._id.$id,products:[{name:"充值"+n+"元"}],final_price:e.data.price}),s.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:e.data._id.$id,backHash:"recharge"}}))})},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("recharge/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"mine",pushData:{dontNeedReload:!0}})}return{title:"充值卡",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},i),i.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".btn-add-recharge",function(t){t.preventDefault(),s.trigger("spa:openloader");var n=e(this).attr("data-value");r.addRechargeorder({user_id:o.id,recharge_id:e(this).attr("data-id")},function(e){s.trigger("spa:closeloader"),e.success&&(o.orders[1].data.push({id:e.data._id.$id,products:[{product:{name:"充值"+n+"元"}}],final_price:e.data.price}),s.trigger("spa:navigate",{hash:"pay",pushData:{isRecharge:!0,orderID:e.data._id.$id,backHash:"recharge"}}))})},i),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("recharge/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/js/page/pay.js

@@ -104,7 +104,7 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
             var orders = user.orders[1].data;
             for (var i = 0, len = orders.length; i < len; i++) {
                 if (orders[i].id == orderID) {
-                    orderType = orders[i].products[0].name;
+                    orderType = orders[i].products[0].product.name;
                     orderPrice = orders[i].final_price;
                 }
             }

www/webapp/o2o/js/page/rechargee.js

@@ -49,7 +49,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
                         // 更新user的订单
                         user.orders[1].data.push({
                             id: res.data._id.$id,
-                            products: [{ name: '充值' + value + '元' }],
+                            products: [{ product:{name: '充值' + value + '元'}}],
                             final_price: res.data.price
                         });
                         // 只能用现金支付，跳转到pay页面