双十一活动收尾测试

www/protected/config/yiguanjia_const.php

@@ -57,7 +57,7 @@ $wz['o2o_service'] = array(
     8=>array("name"=>"母婴房清洁"),
     9=>array("name"=>"租房清洁"),
     10=>array("name"=>"擦玻璃"),
-    11=>array("name"=>"活动产品"),
+    11=>array("name"=>"双11虹口区日常保洁特价体验"),
 );
 
 //新手礼包

www/webapp/o2o/dist/js/page/activities/day.js

@@ -1 +1 @@
-define(["$","template","IScroll","recharge","native","config","user","product"],function(e,t,n,r,i,s,o,u){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"双十一活动",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".btn-appliances",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));i.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:u.allList[n-1],needReset:!0}})},r),e.newTouch(".btn-home-day",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"activity-day",pushData:{needReset:!0}})},r),e.newTouch(".btn-banner-coupon",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"myCoupon",pushData:{needReload:!0}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-banner-recharge",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),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("activities/day",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#activitiesScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","recharge","native","config","user","product"],function(e,t,n,r,i,s,o,u){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"双十一活动",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".btn-appliances",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));i.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:u.allList[n-1],needReset:!0}})},r),e.newTouch(".btn-home-day",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"activity-day",pushData:{needReset:!0}})},r),e.newTouch(".btn-banner-coupon",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"myCoupon",pushData:{needReload:!0}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-banner-recharge",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"recharge",pushData:{needReload:!0}})},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),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("activities/day",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#activitiesScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/dist/js/page/bargain.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:"",pushData:{dontNeedReload:!0}})}return{title:"企业服务",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},r),r.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/enterprise"},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),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("bargain/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#bargainScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","recharge","native","config","user","product"],function(e,t,n,r,i,s,o,u){function a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"mine",pushData:{dontNeedReload:!0}})}return{title:"支付成功",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/enterprise"},r),e.newTouch(".btn-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"myOrder/1",pushData:{needReload:!0}})},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),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("bargain/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#bargainScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/dist/js/page/homeenterprise.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:"",pushData:{dontNeedReload:!0}})}return{title:"企业服务",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},r),r.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/enterprise"},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),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("homeenterprise/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#homeenterpriseScroll")},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:"",pushData:{dontNeedReload:!0}})}return{title:"企业服务",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},r),r.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/enterprise"},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),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("homeenterprise/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#homeenterpriseScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/dist/js/page/homestay.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:"",pushData:{dontNeedReload:!0}})}return{title:"民宿保洁",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},r),r.on("tapBackButton",function(e){history.go(-1)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/SinglesDay"},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),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("homestay/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#homestayScroll")},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:"",pushData:{dontNeedReload:!0}})}return{title:"民宿保洁",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},r),r.on("tapBackButton",function(e){history.go(-1)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/SinglesDay"},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),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("homestay/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#homestayScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/dist/js/page/im.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:"",pushData:{dontNeedReload:!0}})}return{title:"联系我们",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},r),r.on("tapBackButton",function(e){history.go(-1)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/SinglesDay"},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),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("im/im",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#homeImScroll")},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:"",pushData:{dontNeedReload:!0}})}return{title:"联系我们",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},r),r.on("tapBackButton",function(e){history.go(-1)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/SinglesDay"},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),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("im/im",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#homeImScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

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?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(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()}}});

www/webapp/o2o/js/model/product.js

@@ -1136,14 +1136,14 @@ define(['base', '$', 'api'], function (base, $, api) {
             },
             {
                 id: "581fe5a6a84ea0e36c8b45bb",
-                name: "活动产品",
+                name: "双11虹口区日常保洁特价体验",
                 imgSrc: 'http://odulvej8l.bkt.clouddn.com/1%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
                 desc: [{content: "http://odqeoyzxd.bkt.clouddn.com/image/image_rc.jpg"}, {content: "日常清洁"}],
                 status: 1,
                 is_extra: 0,
                 order: 0,
                 type: "9",
-                type_str: "日常清洁",
+                type_str: "双11虹口区日常保洁特价体验",
                 extra: [
                     {
                         type: "一室一卫",

www/webapp/o2o/js/page/activities/day.js

@@ -88,13 +88,11 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'pro
 			// 首页
 			$.newTouch('.btn-action-my-order', function (event) {
 				event.preventDefault();
-				user.checkLogin(function () {
 					$doc.trigger('spa:navigate', {
 						hash: '',
 						pushData: {
 							needReset: true
 						}
-					});
 				});
 			}, $view);
 			// 个人中心

www/webapp/o2o/js/page/bargain.js

@@ -1,15 +1,15 @@
-define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], function ($, template, IScroll, recharge, native, config, user) {
+define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user','product'], function ($, template, IScroll, recharge, native, config, user,product) {
     function back(event) {
         event.preventDefault();
         $(document).trigger('spa:navigate', {
-            hash: '',
+            hash: 'mine',
             pushData: {
                 dontNeedReload: true
             }
         });
     }
     return {
-        title: '企业服务',
+        title: '支付成功',
         body: '',
         init: function (pageData, dtd) {
             var $view = this;
@@ -32,16 +32,24 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
                 event.preventDefault();
                 window.location.href = '/index.php?r=o2o/advisory/enterprise';
             }, $view);
+            // 我的订单
+            $.newTouch('.btn-my-order', function (event) {
+                event.preventDefault();
+                $doc.trigger('spa:navigate', {
+                    hash: 'myOrder/1',
+                    pushData: {
+                        needReload: true
+                    }
+                });
+            }, $view);
             // 首页
-            $.newTouch('.btn-action-coupon', function (event) {
+            $.newTouch('.btn-action-my-order', function (event) {
                 event.preventDefault();
-                user.checkLogin(function () {
                     $doc.trigger('spa:navigate', {
                         hash: '',
                         pushData: {
                             needReset: true
                         }
-                    });
                 });
             }, $view);
             // im

www/webapp/o2o/js/page/home.js

@@ -50,7 +50,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			//加载弹框
 			setTimeout(function () {
 				$('.swiper-container').height($('.swiper-container img').height());
-				$('.pagination').css('bottom', '0.15rem');
+				// $('.pagination').css('bottom', '0.15rem');
 			}, 200);
 			/*setTimeout(function () {
 				$doc.trigger('spa:openpanel', ['simpleAlert', {

www/webapp/o2o/js/page/homeenterprise.js

@@ -44,15 +44,13 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 				// console.log('测试')
 			}, $view);
 			// 首页
-			$.newTouch('.btn-action-coupon', function (event) {
+			$.newTouch('.btn-action-my-order', function (event) {
 				event.preventDefault();
-				user.checkLogin(function () {
 					$doc.trigger('spa:navigate', {
 						hash: '',
 						pushData: {
 							needReset: true
 						}
-					});
 				});
 			}, $view);
 			// im

www/webapp/o2o/js/page/homestay.js

@@ -36,13 +36,11 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 			// 首页
 			$.newTouch('.btn-action-my-order', function (event) {
 				event.preventDefault();
-				user.checkLogin(function () {
 					$doc.trigger('spa:navigate', {
 						hash: '',
 						pushData: {
 							needReset: true
 						}
-					});
 				});
 			}, $view);
 			// im

www/webapp/o2o/js/page/im.js

@@ -35,13 +35,11 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 			// 首页
 			$.newTouch('.btn-action-my-order', function (event) {
 				event.preventDefault();
-				user.checkLogin(function () {
 					$doc.trigger('spa:navigate', {
 						hash: '',
 						pushData: {
 							needReset: true
 						}
-					});
 				});
 			}, $view);
 			// 个人中心

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

@@ -7,7 +7,6 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
     var orderBalance = 0; // 使用余额支付的金额
     var orderPayValue = 0; // 使用微信支付的金额
     var isRecharge = false; // 是否是充值
-
     function back() {
         $(document).trigger('spa:navigate', {
             hash: backHash,
@@ -17,7 +16,6 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
             }
         });
     }
-
     return {
         title: '壹管家上门服务',
         body: '',
@@ -28,7 +26,6 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
             function payResult(res) {
                 $doc.trigger('spa:closeloader');
                 if (res.success) {
-                    // console.log(res.data.body);//获取到活动产品
                     var orderInfo = user.getOrderInfo(orderID);
                     var params = {
                         orderInfo: orderInfo,
@@ -36,9 +33,18 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
                     };
                     native.pay(params, function (resA) {
                         if (resA.success) {
-                            $doc.trigger('spa:navigate', {
-                                hash: 'paySuccess'
-                            });
+                            if (res.data.body == "双11虹口区日常保洁特价体验"){
+                                /*$doc.trigger('spa:openpanel', ['simpleAlert', {
+                                    message: "活动产品支付成功了"
+                                }]);*/
+                                $doc.trigger('spa:navigate', {
+                                    hash: 'bargain'
+                                });
+                            }else {
+                                $doc.trigger('spa:navigate', {
+                                    hash: 'paySuccess'
+                                });
+                            }
                         } else {
                             $doc.trigger('spa:openpanel', ['simpleAlert', {
                                 message: resA.message
@@ -51,14 +57,12 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
                     }]);
                 }
             }
-
             $.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');
@@ -82,7 +86,6 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
                     });
                 }
             }, $view);
-
             //返回
             $.newTouch('.cancel-button', function (event) {
                 event.preventDefault();
@@ -96,7 +99,6 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
                 event.preventDefault();
                 back.call(this, event);
             });*/
-
             dtd.resolve();
         },
         beforeopen: function (pageData, dtd) {
@@ -105,7 +107,6 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
             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++) {
@@ -127,7 +128,6 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
                     }
                 }
             }
-
             var tpl = template('pay/index', {
                 showNavBar: !config.isWX && !config.isChubao,
                 wxPub: true,
@@ -139,9 +139,7 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
                 orderPayValue: orderPayValue
             });
             $('.spa-page-body', $view).html(tpl);
-
             dtd.resolve();
-
             // if (config.isAndroid || config.isIOS) {
             //   native.isWxAppInstalled(function(res){
             //     var showWX = true;

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 == "活动产品") {
+			if (product.name == "双11虹口区日常保洁特价体验") {
 				$('.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 !== "活动产品") {
+				if (!order.bookingTimeStr&& product.name !== "双11虹口区日常保洁特价体验") {
 					$doc.trigger('spa:openpanel', ['simpleAlert', {
 						message: '请选择上门时间'
 					}]);
@@ -826,9 +826,9 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
 						order.reset();
 						$('.booking-time', $view).html('请选择');
 						if (res.data.status == 1) {
-							if(res.data.products_str=='活动产品'){
+							if(res.data.products_str=='双11虹口区日常保洁特价体验'){
 								$doc.trigger('spa:navigate', {
-									hash: 'mine'
+									hash: 'bargain'
 								});
 							}else {
 								$doc.trigger('spa:navigate', {

www/webapp/o2o/tpl/bargain/index.html

@@ -12,11 +12,11 @@
         <div class="box-container box box-vertical">
             <div id="bargainScroll" class="scroll-container box-flex-1">
                 <div class="scroller">
-                    <h1 class="title" style="margin-top: 3rem;font-size: 24px">支付成功</h1>
-                    <p>购买已成功，请于11月11日至11月24日间，拨打400-806-5111预约服务时间，来电请说明是双11特价服务。壹管家期盼您的来电。</p>
-                    <div>
+                    <h1 style="margin-top: 3rem;font-size: 24px;text-align: center;">支付成功</h1>
+                    <p style="margin: 0 20px;">购买已成功，请于11月11日至11月24日间，拨打400-806-5111预约服务时间，来电请说明是双11特价服务。壹管家期盼您的来电。</p>
+                    <div style="text-align: center;margin-top: 1rem;">
                         <!--查看我的订单-->
-                        <span>查看我的订单</span>
+                        <span class="btn-my-order" style="display: block;width: 30%;line-height: 2rem;margin: 0 auto;background: #2a2400;color: #b28f00;">查看我的订单</span>
                     </div>
                 </div>
                 <div class="prevent-scroll">