Merge branch 'test' of git.oschina.net:yiguanjia/php into test

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-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!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()}}});
+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:"secondary",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,backHash:"activity-day"}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!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 +0,0 @@
-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/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:"",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(".pay-agreement",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-text",pushData:{needReload:!0}})},i),e.newTouch(".pay-rule",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-rule",pushData:{needReload:!0}})},i),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);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);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 a(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:u,pushData:{dontNeedReload:!0}})}var u;return{title:"充值规则",body:"",init:function(t,n){var i=this,s=e(document);i.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},i),i.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".pay-agreement",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-text",pushData:{needReload:!0}})},i),e.newTouch(".pay-rule",function(e){e.preventDefault(),s.trigger("spa:navigate",{hash:"activity-rule",pushData:{needReload:!0}})},i),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){var n=e.pushData;u=n.backHash?n.backHash:"",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);var f=e(".btn-add-recharge").attr("data-index");for(var l=f;l<2;l++);setTimeout(function(){i.scroll=new n("#rechargeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -1 +1 @@
-define(["$","template","IScroll","user","product","native","config","address"],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 s=this,o=e(document);s.on("swipeRight",function(e){a.call(this,e)}),e.newTouch(".back-button",function(e){a.call(this,e)},s),s.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));o.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:i.allList[n-1],needReset:!0,backHash:"secondary"}})},s),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/im"},s),e.newTouch(".btn-action-my-order",function(){event.preventDefault(),o.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},s),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),r.checkLogin(function(){o.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},s),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(r,i){var s=this,u=e(document);if(r.pushData&&r.pushData.needReset){var a=t("secondary/index",{showNavBar:!o.isWX});e(".spa-page-body",s).html(a),setTimeout(function(){r.scroll=new n("#secondaryScroll")},500)}i.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","user","product","native","config","address"],function(e,t,n,r,i,s,o,u){function f(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:a,pushData:{dontNeedReload:!0}})}var a;return{title:"家庭保洁",body:"",init:function(t,n){var s=this,o=e(document);s.on("swipeRight",function(e){f.call(this,e)}),e.newTouch(".back-button",function(e){f.call(this,e)},s),s.on("tapBackButton",function(e){f.call(this,e)}),e.newTouch(".Long-term-set",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"activity-day",pushData:{needReset:!0,backHash:"secondary"}})},s),e.newTouch(".btn-product",function(t){t.preventDefault();var n=parseInt(e(this).attr("data-product-type"));o.trigger("spa:navigate",{hash:"placeOrder",pushData:{product:i.allList[n-1],needReset:!0,backHash:"secondary"}})},s),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/im"},s),e.newTouch(".btn-action-my-order",function(){event.preventDefault(),o.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},s),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),r.checkLogin(function(){o.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},s),n.resolve()},beforeopen:function(e,t){var n=e.pushData;a=n.backHash?n.backHash:"",t.resolve()},afteropen:function(r,i){var s=this,u=e(document);if(r.pushData&&r.pushData.needReset){var a=t("secondary/index",{showNavBar:!o.isWX});e(".spa-page-body",s).html(a),setTimeout(function(){r.scroll=new n("#secondaryScroll")},500)}i.resolve()},beforeclose:function(e,t){t.resolve()}}});

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

@@ -3,7 +3,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'pro
 	function back(event) {
 		event.preventDefault();
 		$(document).trigger('spa:navigate', {
-			hash: '',
+			hash:'secondary',
 			pushData: {
 				dontNeedReload: true
 			}
@@ -41,41 +41,12 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'pro
 					hash: 'placeOrder',
 					pushData: {
 						product: product.allList[type - 1],
-						needReset: true
+						needReset: true,
+						backHash:'activity-day'
 					}
 				});
 			}, $view);
-			// // 双十一活动
-			// $.newTouch('.btn-home-day', function (event) {
-			// 	event.preventDefault();
-			// // 	$doc.trigger('spa:navigate', {
-			// // 		hash: 'activity-day',
-			// // 		pushData: {
-			// // 			needReset: true
-			// // 		}
-			// // 	});
-			// // }, $view);
-			// //优惠券
-			// $.newTouch('.btn-banner-coupon', function (event) {
-			// 	event.preventDefault();
-			// 	$doc.trigger('spa:navigate', {
-			// 		hash: 'myCoupon',
-			// 		pushData: {
-			// 			needReload: true
-			// 		}
-			// 	});
-			// }, $view);
 
-			//充值卡
-			// $.newTouch('.btn-banner-recharge', function (event) {
-			// 	event.preventDefault();
-			// 	$doc.trigger('spa:navigate', {
-			// 		hash: 'recharge',
-			// 		pushData: {
-			// 			needReload: true
-			// 		}
-			// 	});
-			// }, $view);
 			// im
 			$.newTouch('.btn-action-logo', function (event) {
 				event.preventDefault();
@@ -86,7 +57,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'pro
 					}
 				});
 			}, $view);
-			
+
 			// 首页
 			$.newTouch('.btn-action-my-order', function (event) {
 				event.preventDefault();

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

@@ -1,108 +0,0 @@
-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: 'mine',
-            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-my-order', function (event) {
-                event.preventDefault();
-                $doc.trigger('spa:navigate', {
-                    hash: 'myOrder/1',
-                    pushData: {
-                        needReload: true
-                    }
-                });
-            }, $view);
-            // 首页
-            $.newTouch('.btn-action-my-order', function (event) {
-                event.preventDefault();
-                    $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/home.js

@@ -64,7 +64,8 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				$doc.trigger('spa:navigate', {
 					hash: 'recharge',
 					pushData: {
-						needReload: true
+						needReload: true,
+						backHash: ''
 					}
 				});
 			}, $view);
@@ -122,7 +123,8 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 				$doc.trigger('spa:navigate', {
 					hash: 'secondary',
 					pushData: {
-						needReset: true
+						needReset: true,
+						backHash: ''
 					}
 				});
 			}, $view);

www/webapp/o2o/js/page/mine.js

@@ -85,7 +85,9 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config', 'address', 'prod
 				$doc.trigger('spa:navigate', {
 					hash: 'recharge',
 					pushData: {
-						needReload: true
+						needReload: true,
+						backHash:'mine'
+						
 					}
 				});
 			}, $view);

www/webapp/o2o/js/page/placeOrder.js

@@ -862,6 +862,7 @@ define(['$', 'template', 'order', 'native', 'helper', 'user', 'api', 'config', '
             var pushData = pageData.pushData;
           
             /* 只有首页跳转来，才会带有needReset = true */
+            /*获取上一页跳转的路由名称*/
             backHash = pushData.backHash ? pushData.backHash : '';
             console.log(backHash);
 

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

@@ -1,9 +1,10 @@
 define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], function ($, template, IScroll, recharge, native, config, user) {
+	var backHash;
 
 	function back(event) {
 		event.preventDefault();
 		$(document).trigger('spa:navigate', {
-			hash: '',
+			hash: backHash,
 			pushData: {
 				dontNeedReload: true
 			}
@@ -90,6 +91,9 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 			dtd.resolve();
 		},
 		beforeopen: function (pageData, dtd) {
+			/*获取上一页跳转的路由名称*/
+			var pushData = pageData.pushData;
+			backHash = pushData.backHash ? pushData.backHash : '';
 			dtd.resolve();
 		},
 		afteropen: function (pageData, dtd) {

www/webapp/o2o/js/page/secondary.js

@@ -1,9 +1,10 @@
 define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'address'], function ($, template, IScroll, user, product, native, config, address) {
+    var backHash;
 
     function back(event) {
         event.preventDefault();
         $(document).trigger('spa:navigate', {
-            hash: '',
+            hash: backHash,
             pushData: {
                 dontNeedReload: true
             }
@@ -45,15 +46,16 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
                 back.call(this, event);
             });
             /*活动入口*/
-            /*$.newTouch('.Long-term-set', function (event) {
+            $.newTouch('.Long-term-set', function (event) {
                 event.preventDefault();
                 $doc.trigger('spa:navigate', {
                     hash: 'activity-day',
                     pushData: {
-                        needReset: true
+                        needReset: true,
+                        backHash:'secondary'
                     }
                 });
-            }, $view);*/
+            }, $view);
 
             /* 点击产品列表的某一项 */
             $.newTouch('.btn-product', function (event) {
@@ -103,6 +105,9 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
             dtd.resolve();
         },
         beforeopen: function (pageData, dtd) {
+            /*获取上一页跳转的路由名称*/
+            var pushData = pageData.pushData;
+            backHash = pushData.backHash ? pushData.backHash : '';
             dtd.resolve();
         },
         afteropen: function (pageData, dtd) {

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

@@ -1,55 +0,0 @@
-{{ 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 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 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">
-                    <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>