Parcourir la source

双十一活动收尾测试

海涛 il y a 8 ans
Parent
commit
aae8baf19d

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
www/webapp/o2o/dist/js/main.js


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
www/webapp/o2o/dist/js/model/product.js


+ 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){f.trigger("spa:closeloader");if(e.success){var t=s.getOrderInfo(u),n={orderInfo:t,charge:e.data};r.pay(n,function(t){t.success?e.data.body=="双11虹口区日常保洁特价体验"?f.trigger("spa:navigate",{hash:"bargain"}):f.trigger("spa:navigate",{hash:"paySuccess"}):f.trigger("spa:openpanel",["simpleAlert",{message:t.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(t){t.success?e.data.body=="活动产品"?f.trigger("spa:navigate",{hash:"bargain"}):f.trigger("spa:navigate",{hash:"paySuccess"}):f.trigger("spa:openpanel",["simpleAlert",{message:t.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()}}});

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
www/webapp/o2o/dist/js/page/placeOrder.js


+ 2 - 2
www/webapp/o2o/js/model/product.js

@@ -1039,7 +1039,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 is_extra: 0,
                 order: 0,
                 type: "8",
-                type_str: "租房大扫除",
+                type_str: "租房清洁",
                 extra: [
                     {
                         type: "客厅清洁",
@@ -1143,7 +1143,7 @@ define(['base', '$', 'api'], function (base, $, api) {
                 is_extra: 0,
                 order: 0,
                 type: "9",
-                type_str: "双11虹口区日常保洁特价体验",
+                type_str: "活动产品",
                 extra: [
                     {
                         type: "一室一卫",

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

@@ -33,7 +33,7 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
                     };
                     native.pay(params, function (resA) {
                         if (resA.success) {
-                            if (res.data.body == "双11虹口区日常保洁特价体验"){
+                            if (res.data.body == "活动产品"){
                                 /*$doc.trigger('spa:openpanel', ['simpleAlert', {
                                     message: "活动产品支付成功了"
                                 }]);*/

+ 3 - 3
www/webapp/o2o/js/page/placeOrder.js

@@ -50,7 +50,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 	/* 重置页面时调用,重新生成IScroll */
 	function fixScroll(pageData) {
 		setInterval(function () {
-			if (product.name == "双11虹口区日常保洁特价体验") {
+			if (product.name == "活动产品") {
 				$('.show-time-picker').css('display', 'none');
 				$('.show-coupon-picker').css('display', 'none');
 				$('.table-link-label').css('display', 'none');
@@ -783,7 +783,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 					return;
 				}
 
-				if (!order.bookingTimeStr&& product.name !== "双11虹口区日常保洁特价体验") {
+				if (!order.bookingTimeStr&& product.name !== "活动产品") {
 					$doc.trigger('spa:openpanel', ['simpleAlert', {
 						message: '请选择上门时间'
 					}]);
@@ -826,7 +826,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 						order.reset();
 						$('.booking-time', $view).html('请选择');
 						if (res.data.status == 1) {
-							if(res.data.products_str=='双11虹口区日常保洁特价体验'){
+							if(res.data.products_str=='活动产品'){
 								$doc.trigger('spa:navigate', {
 									hash: 'bargain'
 								});

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff