测试

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){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?(console.log(e.data.products_str),e.data.products_str=="活动产品"?f.trigger("spa:navigate",{hash:""}):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?(console.log(e.data),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()}}});

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

@@ -1,187 +1,180 @@
 define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, template, api, native, config, user) {
 
-	var backHash; // 回退页面
-	var orderID; // 订单ID
-	var orderType; // 订单类型
-	var orderCoupon = 0; // 使用代金券支付的金额
-	var orderBalance = 0; // 使用余额支付的金额
-	var orderPayValue = 0; // 使用微信支付的金额
-	var isRecharge = false; // 是否是充值
+    var backHash; // 回退页面
+    var orderID; // 订单ID
+    var orderType; // 订单类型
+    var orderCoupon = 0; // 使用代金券支付的金额
+    var orderBalance = 0; // 使用余额支付的金额
+    var orderPayValue = 0; // 使用微信支付的金额
+    var isRecharge = false; // 是否是充值
 
-	function back() {
-		$(document).trigger('spa:navigate', {
-			hash: backHash,
-			pushData: {
-				dontNeedReload: true,
-				animate: 'slideOutDown' //强制设置动画为落下
-			}
-		});
-	}
+    function back() {
+        $(document).trigger('spa:navigate', {
+            hash: backHash,
+            pushData: {
+                dontNeedReload: true,
+                animate: 'slideOutDown' //强制设置动画为落下
+            }
+        });
+    }
 
-	return {
-		title: '壹管家上门服务',
-		body: '',
-		init: function (pageData, dtd) {
-			var $view = this;
-			var $doc = $(document);
+    return {
+        title: '壹管家上门服务',
+        body: '',
+        init: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
 
-			// 充值的回调
-			function payResult(res) {
-				$doc.trigger('spa:closeloader');
-				if (res.success) {
-					var orderInfo = user.getOrderInfo(orderID);
-					var params = {
-						orderInfo: orderInfo,
-						charge: res.data
-					};
-					native.pay(params, function (resA) {
-						if (resA.success) {
-							console.log(resA.data.products_str);
-							if (resA.data.products_str == '活动产品') {
-								$doc.trigger('spa:navigate', {
-									hash: ''
-								});
-							}else {
-								$doc.trigger('spa:navigate', {
-									hash: 'paySuccess'
-								});
-							}
+            // 充值的回调
+            function payResult(res) {
+                $doc.trigger('spa:closeloader');
+                if (res.success) {
+                    var orderInfo = user.getOrderInfo(orderID);
+                    var params = {
+                        orderInfo: orderInfo,
+                        charge: res.data
+                    };
+                    native.pay(params, function (resA) {
+                        if (resA.success) {
+                            console.log(resA.data)
+                            $doc.trigger('spa:navigate', {
+                                hash: 'paySuccess'
+                            });
+                        } else {
+                            $doc.trigger('spa:openpanel', ['simpleAlert', {
+                                message: resA.message
+                            }]);
+                        }
+                    });
+                } else {
+                    $doc.trigger('spa:openpanel', ['simpleAlert', {
+                        message: res.message
+                    }]);
+                }
+            }
 
-						} else {
-							$doc.trigger('spa:openpanel', ['simpleAlert', {
-								message: resA.message
-							}]);
-						}
-					});
-				} else {
-					$doc.trigger('spa:openpanel', ['simpleAlert', {
-						message: res.message
-					}]);
-				}
-			}
+            $.newTouch('.pay-option', function (event) {
+                event.preventDefault();
+                var payChannel = $(this).data('value');
+                $('.btn-pay', $view).attr('data-pay-channel', payChannel);
+                $(this).addClass('checked').parent().siblings().find('a').removeClass('checked');
+            }, $view);
 
-			$.newTouch('.pay-option', function (event) {
-				event.preventDefault();
-				var payChannel = $(this).data('value');
-				$('.btn-pay', $view).attr('data-pay-channel', payChannel);
-				$(this).addClass('checked').parent().siblings().find('a').removeClass('checked');
-			}, $view);
+            $.newTouch('.btn-pay', function (event) {
+                event.preventDefault();
+                var payChannel = $(this).attr('data-pay-channel');
+                if (config.isWX) {
+                    payChannel = 'wx_pub';
+                }
+                if (!payChannel) return;
+                $doc.trigger('spa:openloader');
+                var params = {
+                    user_id: user.id,
+                    order_id: orderID,
+                    pay_channel: payChannel
+                };
+                if (isRecharge){
+                    api.payRecharge(params, function (res) {
+                        payResult(res)
+                    });
+                }else {
+                    api.getPayCharge(params, function (res) {
+                        payResult(res)
+                    });
+                }
+            }, $view);
 
-			$.newTouch('.btn-pay', function (event) {
-				event.preventDefault();
-				var payChannel = $(this).attr('data-pay-channel');
-				if (config.isWX) {
-					payChannel = 'wx_pub';
-				}
-				if (!payChannel) return;
-				$doc.trigger('spa:openloader');
-				var params = {
-					user_id: user.id,
-					order_id: orderID,
-					pay_channel: payChannel
-				};
-				if (isRecharge) {
-					api.payRecharge(params, function (res) {
-						payResult(res)
-					});
-				} else {
-					api.getPayCharge(params, function (res) {
-						payResult(res)
-					});
-				}
-			}, $view);
+            //返回
+            $.newTouch('.cancel-button', function (event) {
+                event.preventDefault();
+                back.call(this, event);
+            }, $view);
+            $view.on('tapBackButton', function (event) {
+                event.preventDefault();
+                back.call(this, event);
+            });
+            /*$view.on('swipeRight', function (event) {
+                event.preventDefault();
+                back.call(this, event);
+            });*/
 
-			//返回
-			$.newTouch('.cancel-button', function (event) {
-				event.preventDefault();
-				back.call(this, event);
-			}, $view);
-			$view.on('tapBackButton', function (event) {
-				event.preventDefault();
-				back.call(this, event);
-			});
-			/*$view.on('swipeRight', function (event) {
-			 event.preventDefault();
-			 back.call(this, event);
-			 });*/
+            dtd.resolve();
+        },
+        beforeopen: function (pageData, dtd) {
+            var $view = this;
+            var pushData = pageData.pushData;
+            orderID = pushData.orderID;
+            backHash = pushData.backHash ? pushData.backHash : '';
+            isRecharge = pushData.isRecharge;
 
-			dtd.resolve();
-		},
-		beforeopen: function (pageData, dtd) {
-			var $view = this;
-			var pushData = pageData.pushData;
-			orderID = pushData.orderID;
-			backHash = pushData.backHash ? pushData.backHash : '';
-			isRecharge = pushData.isRecharge;
+            // 在用户的所有订单中找出这个订单
+            var orders = user.orders[1].data;
+            for (var i = 0, len = orders.length; i < len; i++) {
+                if (orders[i].id == orderID) {
+                    var selectOrder = orders[i];
+                    orderType = selectOrder.products[0].product.name;
+                    if (selectOrder.coupons && selectOrder.coupons.length){
+                        for (i in selectOrder.coupons){
+                            orderCoupon += parseInt(selectOrder.coupons[i].coupon.value);
+                        }
+                    }
+                    if (selectOrder.pay_price && selectOrder.pay_price != 0){
+                        orderBalance = selectOrder.final_price - selectOrder.pay_price;
+                    }
+                    if (selectOrder.pay_price && selectOrder.pay_price != 0){
+                        orderPayValue = selectOrder.pay_price;
+                    }else {
+                        orderPayValue = selectOrder.final_price;
+                    }
+                }
+            }
 
-			// 在用户的所有订单中找出这个订单
-			var orders = user.orders[1].data;
-			for (var i = 0, len = orders.length; i < len; i++) {
-				if (orders[i].id == orderID) {
-					var selectOrder = orders[i];
-					orderType = selectOrder.products[0].product.name;
-					if (selectOrder.coupons && selectOrder.coupons.length) {
-						for (i in selectOrder.coupons) {
-							orderCoupon += parseInt(selectOrder.coupons[i].coupon.value);
-						}
-					}
-					if (selectOrder.pay_price && selectOrder.pay_price != 0) {
-						orderBalance = selectOrder.final_price - selectOrder.pay_price;
-					}
-					if (selectOrder.pay_price && selectOrder.pay_price != 0) {
-						orderPayValue = selectOrder.pay_price;
-					} else {
-						orderPayValue = selectOrder.final_price;
-					}
-				}
-			}
+            var tpl = template('pay/index', {
+                showNavBar: !config.isWX && !config.isChubao,
+                wxPub: true,
+                orderType: orderType,
+                isRecharge: isRecharge,
+                isShow: !isRecharge,
+                orderCoupon: orderCoupon,
+                orderBalance: orderBalance,
+                orderPayValue: orderPayValue
+            });
+            $('.spa-page-body', $view).html(tpl);
 
-			var tpl = template('pay/index', {
-				showNavBar: !config.isWX && !config.isChubao,
-				wxPub: true,
-				orderType: orderType,
-				isRecharge: isRecharge,
-				isShow: !isRecharge,
-				orderCoupon: orderCoupon,
-				orderBalance: orderBalance,
-				orderPayValue: orderPayValue
-			});
-			$('.spa-page-body', $view).html(tpl);
+            dtd.resolve();
 
-			dtd.resolve();
-
-			// if (config.isAndroid || config.isIOS) {
-			//   native.isWxAppInstalled(function(res){
-			//     var showWX = true;
-			//     if (res.success && !res.isInstalled) {
-			//       showWX = false;
-			//     }
-			//     if (config.appVersion < '2.2') {
-			//       //微信支付2.2版本以下有问题 隐藏按钮
-			//       showWX = false;
-			//     }
-			//     var tpl = template('pay/index', {
-			//       showWX: showWX,
-			//       showNavBar: !config.isWX && !config.isChubao,
-			//       orderType: orderType,
-			//       orderprice: orderprice
-			//     });
-			//     $('.spa-page-body', $view).html(tpl);
-			//
-			//     dtd.resolve();
-			//   })
-			// } else if (config.isChubao) {
-			//   var tpl = template('pay/index', {
-			//     showNavBar: !config.isWX && !config.isChubao,
-			//     orderType: orderType,
-			//     orderprice: orderprice,
-			//     chubao: true
-			//   });
-			//   $('.spa-page-body', $view).html(tpl);
-			//   dtd.resolve();
-			// } else {
-			//
-			// }
-		}
-	}
+            // if (config.isAndroid || config.isIOS) {
+            //   native.isWxAppInstalled(function(res){
+            //     var showWX = true;
+            //     if (res.success && !res.isInstalled) {
+            //       showWX = false;
+            //     }
+            //     if (config.appVersion < '2.2') {
+            //       //微信支付2.2版本以下有问题 隐藏按钮
+            //       showWX = false;
+            //     }
+            //     var tpl = template('pay/index', {
+            //       showWX: showWX,
+            //       showNavBar: !config.isWX && !config.isChubao,
+            //       orderType: orderType,
+            //       orderprice: orderprice
+            //     });
+            //     $('.spa-page-body', $view).html(tpl);
+            //
+            //     dtd.resolve();
+            //   })
+            // } else if (config.isChubao) {
+            //   var tpl = template('pay/index', {
+            //     showNavBar: !config.isWX && !config.isChubao,
+            //     orderType: orderType,
+            //     orderprice: orderprice,
+            //     chubao: true
+            //   });
+            //   $('.spa-page-body', $view).html(tpl);
+            //   dtd.resolve();
+            // } else {
+            //
+            // }
+        }
+    }
 })