添加活动支付成功界面

www/webapp/o2o/build.js

@@ -12,6 +12,7 @@
 			'ratchet',
 			'pageHome',
 			'pageHomeIm',
+			'pageBargain',
 			'pageHelp',
 			'pageAbout',
 			'pageRecharge',

www/webapp/o2o/css/bargain.css

@@ -0,0 +1,79 @@
+#bargainScroll .prevent-scroll {
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    background-color: #2a2400;
+}
+#bargainScroll .prevent-scroll .width-percent-33 .title-container-square {
+    padding: 20%;
+    position: relative;
+    text-align: center;
+}
+#bargainScroll .prevent-scroll .width-percent-33 .title-container-square a {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+}
+#bargainScroll .prevent-scroll .width-percent-33 .title-container-square a .logo {
+    background-size: 65% 65%;
+    background-position: center center;
+    padding: 10%;
+    margin-top: 5px;
+    display: inline-block;
+    border-radius: 50%;
+}
+#bargainScroll .prevent-scroll .width-percent-33 .title-container-square a .name {
+    display: block;
+    margin-top: -5px;
+    font-size: 12px;
+}
+#bargainScroll .prevent-scroll .width-percent-33:nth-child(1) a:active .logo {
+    border-radius: inherit;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_home.png") no-repeat;
+    background-size: 100%;
+    background-position: center center;
+}
+#bargainScroll .prevent-scroll .width-percent-33:nth-child(1) a:active .name {
+    color: #fff;
+}
+#bargainScroll .prevent-scroll .width-percent-33:nth-child(1) a .logo {
+    border-radius: inherit;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_home_pre.png") no-repeat;
+    background-size: 90%;
+    background-position: center center;
+}
+#bargainScroll .prevent-scroll .width-percent-33:nth-child(1) a .name {
+    color: #b89400;
+}
+#bargainScroll .prevent-scroll .width-percent-33:nth-child(2) a .logo {
+    border-radius: 50%;
+    display: inline-block;
+    padding: 25%;
+    background-size: 100%;
+    margin-top: -15px;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_butler.png") 0 0 no-repeat #2a2400;
+    background-size: 65% 65%;
+    background-position: center;
+}
+#bargainScroll .prevent-scroll .width-percent-33:nth-child(3) a .logo {
+    border-radius: inherit;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_me_pre.png");
+    background-repeat: no-repeat;
+    background-size: 90%;
+    background-position: center center;
+}
+#bargainScroll .prevent-scroll .width-percent-33:nth-child(3) a .name {
+    color: #b89400;
+}
+#bargainScroll .prevent-scroll .width-percent-33:nth-child(3) a:active .logo {
+    border-radius: inherit;
+    background: url("http://odulvej8l.bkt.clouddn.com/tab_me.png");
+    background-repeat: no-repeat;
+    background-size: 100%;
+    background-position: center center;
+}
+#bargainScroll .prevent-scroll .width-percent-33:nth-child(3) a:active .name {
+    color: #fff;
+}

www/webapp/o2o/css/main.css

@@ -9,6 +9,7 @@
 @import url("./secondary.css");
 @import url("./homestay.css");
 @import url("./homeenterprise.css");
+@import url("./bargain.css");
 @import url("./desc.css");
 @import url("./agreement.css");
 @import url("./review.css");

www/webapp/o2o/dist/js/build.txt

@@ -22,6 +22,7 @@ IScroll.js
 page/home.js
 model/recharge.js
 page/im.js
+page/bargain.js
 page/help.js
 page/about.js
 page/rechargee.js

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

@@ -0,0 +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()}}});

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){console.log(e.data.body);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()}}});

www/webapp/o2o/js/main.js

@@ -33,6 +33,7 @@ require.config({
 		pageRecharge: './page/rechargee',
 		pageHelp: './page/help',
 		pageHomeIm:'./page/im',
+		pageBargain:'./page/bargain',
 		pageHomestay: './page/homestay',
 		pageHomeenterprise: './page/homeenterprise',
 		pageAbout: './page/about',
@@ -113,6 +114,18 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 			})
 		}
 	};
+	//双十一支付
+	var pageBargain = {
+		route: 'bargain',
+		classname: 'bargain',
+		animate: 'fadeIn',
+		view: function () {
+			var $page = this;
+			requirejs(['pageBargain'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
 	//商品页
 	var pageProduct = {
 		route: 'product',
@@ -519,7 +532,7 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 		}
 	};
 
-	$doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageHelp, pageMine, pageSecondary, pageHomestay,pageHomeIm, pageHomeenterprise,pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
+	$doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageHelp, pageMine, pageSecondary, pageHomestay,pageHomeIm, pageBargain,pageHomeenterprise,pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
 
 	var panelAlert = {
 		id: 'simpleAlert',

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

@@ -0,0 +1,100 @@
+define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], function ($, template, IScroll, recharge, native, config, user) {
+    function back(event) {
+        event.preventDefault();
+        $(document).trigger('spa:navigate', {
+            hash: '',
+            pushData: {
+                dontNeedReload: true
+            }
+        });
+    }
+    return {
+        title: '企业服务',
+        body: '',
+        init: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
+
+            // 返回
+            $view.on('swipeRight', function (event) {
+                back.call(this, event);
+                // history.go(-1);
+            });
+
+            $.newTouch('.back-button', function (event) {
+                back.call(this, event);
+            }, $view);
+
+            $view.on('tapBackButton', function (event) {
+                back.call(this, event);
+            });
+            $.newTouch('.o2o-btn-homestay', function (event) {
+                event.preventDefault();
+                window.location.href = '/index.php?r=o2o/advisory/enterprise';
+            }, $view);
+            // 首页
+            $.newTouch('.btn-action-coupon', function (event) {
+                event.preventDefault();
+                user.checkLogin(function () {
+                    $doc.trigger('spa:navigate', {
+                        hash: '',
+                        pushData: {
+                            needReset: true
+                        }
+                    });
+                });
+            }, $view);
+            // im
+            $.newTouch('.btn-action-logo', function (event) {
+                event.preventDefault();
+                $doc.trigger('spa:navigate', {
+                    hash: 'im',
+                    pushData: {
+                        needReset: true
+                    }
+                });
+            }, $view);
+            // 个人中心
+            $.newTouch('.btn-action-coupon', function (event) {
+                event.preventDefault();
+                user.checkLogin(function () {
+                    $doc.trigger('spa:navigate', {
+                        hash: 'mine',
+                        pushData: {
+                            needReset: true
+                        }
+                    });
+                });
+            }, $view);
+            dtd.resolve();
+        },
+        beforeopen: function (pageData, dtd) {
+            dtd.resolve();
+        },
+        afteropen: function (pageData, dtd) {
+            var $view = this;
+            var $doc = $(document);
+
+            if (!pageData.pushData.dontNeedReload) {
+                $doc.trigger('spa:openloader');
+                recharge.getRechargeList(function (res) {
+                    $doc.trigger('spa:closeloader');
+                    if (res.success) {
+                        var tpl = template('bargain/index', {
+                            showNavBar: !config.isWX,
+                            recharges: res.data
+                        });
+                        $('.spa-page-body', $view).html(tpl);
+                        setTimeout(function () {
+                            pageData.scroll = new IScroll('#bargainScroll');
+                        }, 500);
+                    }
+                });
+            }
+            dtd.resolve();
+        },
+        beforeclose: function (pageData, dtd) {
+            dtd.resolve();
+        }
+    }
+});

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

@@ -24,13 +24,11 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
         init: function (pageData, dtd) {
             var $view = this;
             var $doc = $(document);
-
             // 充值的回调
             function payResult(res) {
                 $doc.trigger('spa:closeloader');
                 if (res.success) {
-                    console.log(res.data.body);//获取到活动产品
-                    // return false;
+                    // console.log(res.data.body);//获取到活动产品
                     var orderInfo = user.getOrderInfo(orderID);
                     var params = {
                         orderInfo: orderInfo,
@@ -38,7 +36,6 @@ define(['$', 'template', 'api', 'native', 'config', 'user'], function ($, templa
                     };
                     native.pay(params, function (resA) {
                         if (resA.success) {
-
                             $doc.trigger('spa:navigate', {
                                 hash: 'paySuccess'
                             });

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

@@ -0,0 +1,55 @@
+{{ if showNavBar }}
+<header class="bar bar-nav">
+    <a class="left-button back-button">
+        <div class="icon icon-left-nav"></div>
+    </a>
+    <h1 class="title">支付成功</h1>
+</header>
+{{ /if }}
+
+<div class="content">
+    <div class="box-container">
+        <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>
+                        <!--查看我的订单-->
+                        <span>查看我的订单</span>
+                    </div>
+                </div>
+                <div class="prevent-scroll">
+                    <div class="box my-action">
+                        <!--首页-->
+                        <div class="width-percent-33">
+                            <div class="title-container-square">
+                                <a class="btn-home-action btn-action-my-order">
+                                    <div class="logo logo-my-order"></div>
+                                    <div class="name">首页</div>
+                                </a>
+                            </div>
+                        </div>
+                        <!--LOGO-->
+                        <div class="width-percent-33">
+                            <div class="title-container-square">
+                                <a class="btn-home-action btn-action-logo" href="weixin://contacts/profile/honghaitzz">
+                                    <div class="logo logo-my-logo"></div>
+                                </a>
+                            </div>
+                        </div>
+                        <!--我的-->
+                        <div class="width-percent-33">
+                            <div class="title-container-square">
+                                <a class="btn-home-action btn-action-coupon">
+                                    <div class="logo logo-coupon"></div>
+                                    <div class="name">我的</div>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>