长期订

www/protected/config/yiguanjia_const.php

@@ -58,6 +58,7 @@ $wz['o2o_service'] = array(
     9=>array("name"=>"租房清洁"),
     10=>array("name"=>"擦玻璃"),
     11=>array("name"=>"活动产品"),
+    12=>array("name"=>"长期订"),
 );
 
 //新手礼包

www/webapp/o2o/build.js

@@ -21,6 +21,7 @@
 			'pageProduct',
 			'pagePlaceOrder',
 			'pagePicker',
+			'pageLongOrder',
 			'pagePay',
 			'pageMyOrder',
 			'pageMyCoupon',

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

@@ -33,6 +33,7 @@ model/cart.js
 page/product.js
 page/placeOrder.js
 page/picker.js
+page/longOrder.js
 page/pay.js
 page/myOrder.js
 page/myCoupon.js

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

@@ -0,0 +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){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},r),r.on("tapBackButton",function(e){history.go(-1)}),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("LongOrder/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("#longOrderScroll")},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 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),setTimeout(function(){e("#list0").height(e(".btn-product").height()*4+e(".prevent-scroll").height())},200)}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(".secondary-img",function(e){e.preventDefault(),o.trigger("spa:navigate",{hash:"longOrder",pushData:{needReset:!0,backHash:"secondary"}})},s),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),setTimeout(function(){e("#list0").height(e(".btn-product").height()*4+e(".prevent-scroll").height())},200)}i.resolve()},beforeclose:function(e,t){t.resolve()}}});

www/webapp/o2o/js/main.js

@@ -1,651 +1,664 @@
 require.config({
-    urlArgs: 'v=' + (new Date()).getTime(),
-    waitSeconds: 0,
-    paths: {
-        zepto: '../../common/js/zepto.min',
-        wx: '../../common/js/jweixin-1.0.0',
-        ctk: '../../common/js/ctk-1.0.0',
-        pingpp: '../../common/js/pingpp',
-        spa: '../../common/js/spa',
-        IScroll: '../../framework/iscroll5/iscroll-probe',
-        ratchet: '../../framework/ratchet-2.0.2/dist/js/ratchet.base',
-        $: '../../common/js/jq_extend',
-        autosize: '../../common/js/autosize',
-        config: '../../common/js/config',
-        helper: '../../common/js/helper',
-        native: '../../common/js/native',
-        storage: '../../common/js/storage',
-        base: '../../common/js/base',
-        template: './build/template',
-        api: './api',
-        bdmapapi: '../../common/js/bdmapapi',
-        BMap: 'http://api.map.baidu.com/getscript?v=2.0&ak=B349f0b32ef6e78b2e678f45cb9fddaf&services=&t=20160310104956',
-        //model
-        user: './model/user',
-        product: './model/product',
-        cart: './model/cart',
-        order: './model/order',
-        review: './model/review',
-        address: './model/address',
-        recharge: './model/recharge',
-        //page
-        pageHome: './page/home',
-        pageRecharge: './page/rechargee',
-        pageHelp: './page/help',
-        pageHomestay: './page/homestay',
-        pageHomeenterprise: './page/homeenterprise',
-        pageAbout: './page/about',
-        pageProduct: './page/product',
-        pageProductInfo: './page/productInfo',
-        pageDesc: './page/desc',
-        pagePlaceOrder: './page/placeOrder',
-        pagePicker: './page/picker',
-        pagePay: './page/pay',
-        pageAppendPay: './page/appendPay',
-        pageMyOrder: './page/myOrder',
-        pageMyOrderDetail: './page/myOrderDetail',
-        pageMyCoupon: './page/myCoupon',
-        pageOrderDone: './page/orderDone',
-        pageSuccess: './page/success',
-        pageAgreement: './page/agreement',
-        pageAddressList: './page/address/addressList',
-        pageAddressAdd: './page/address/addressAdd',
-        pageAddressDetail: './page/address/addressDetail',
-        pageAddressPoisiton: './page/address/addressPoi',
-        pageHire: './page/hire',
-        pageComing: './page/coming',
-        pageActivityCat: './page/activities/day',
-        pageActivityText: './page/activities/text',
-        pageActivityRule: './page/activities/rule',
-
-        pageAppend: './page/append',
-        pageRefund: './page/refund',
-        pageRefundSuccess: './page/refundSuccess',
-        pageBeautician: './page/beautician',
-        pageBeauticianDetail: './page/beauticianDetail',
-        pageMine: './page/mine',
-        pageSecondary: './page/secondary',
-        //panel
-        panelAlert: './panel/alert',
-        panelActionSheet: './panel/actionSheet',
-        // panelAddressAction: './panel/addressAction',
-        panelDataPicker: './panel/dataPicker',
-        panelProductOption: './panel/productOption',
-        panelPostReview: './panel/postReview',
-        panelActivity: './panel/activity'
-    },
-    shim: {
-        zepto: {
-            exports: '$'
-        },
-        IScroll: {
-            exports: 'IScroll'
-        },
-        BMap: {
-            exports: 'BMap'
-        }
-
-    }
+	urlArgs: 'v=' + (new Date()).getTime(),
+	waitSeconds: 0,
+	paths: {
+		zepto: '../../common/js/zepto.min',
+		wx: '../../common/js/jweixin-1.0.0',
+		ctk: '../../common/js/ctk-1.0.0',
+		pingpp: '../../common/js/pingpp',
+		spa: '../../common/js/spa',
+		IScroll: '../../framework/iscroll5/iscroll-probe',
+		ratchet: '../../framework/ratchet-2.0.2/dist/js/ratchet.base',
+		$: '../../common/js/jq_extend',
+		autosize: '../../common/js/autosize',
+		config: '../../common/js/config',
+		helper: '../../common/js/helper',
+		native: '../../common/js/native',
+		storage: '../../common/js/storage',
+		base: '../../common/js/base',
+		template: './build/template',
+		api: './api',
+		bdmapapi: '../../common/js/bdmapapi',
+		BMap: 'http://api.map.baidu.com/getscript?v=2.0&ak=B349f0b32ef6e78b2e678f45cb9fddaf&services=&t=20160310104956',
+		//model
+		user: './model/user',
+		product: './model/product',
+		cart: './model/cart',
+		order: './model/order',
+		review: './model/review',
+		address: './model/address',
+		recharge: './model/recharge',
+		//page
+		pageHome: './page/home',
+		pageRecharge: './page/rechargee',
+		pageHelp: './page/help',
+		pageHomestay: './page/homestay',
+		pageHomeenterprise: './page/homeenterprise',
+		pageAbout: './page/about',
+		pageProduct: './page/product',
+		pageProductInfo: './page/productInfo',
+		pageDesc: './page/desc',
+		pagePlaceOrder: './page/placeOrder',
+		pagePicker: './page/picker',
+		pagePay: './page/pay',
+		pageLongOrder: './page/longOrder',
+		pageAppendPay: './page/appendPay',
+		pageMyOrder: './page/myOrder',
+		pageMyOrderDetail: './page/myOrderDetail',
+		pageMyCoupon: './page/myCoupon',
+		pageOrderDone: './page/orderDone',
+		pageSuccess: './page/success',
+		pageAgreement: './page/agreement',
+		pageAddressList: './page/address/addressList',
+		pageAddressAdd: './page/address/addressAdd',
+		pageAddressDetail: './page/address/addressDetail',
+		pageAddressPoisiton: './page/address/addressPoi',
+		pageHire: './page/hire',
+		pageComing: './page/coming',
+		pageActivityCat: './page/activities/day',
+		pageActivityText: './page/activities/text',
+		pageActivityRule: './page/activities/rule',
+
+		pageAppend: './page/append',
+		pageRefund: './page/refund',
+		pageRefundSuccess: './page/refundSuccess',
+		pageBeautician: './page/beautician',
+		pageBeauticianDetail: './page/beauticianDetail',
+		pageMine: './page/mine',
+		pageSecondary: './page/secondary',
+		//panel
+		panelAlert: './panel/alert',
+		panelActionSheet: './panel/actionSheet',
+		// panelAddressAction: './panel/addressAction',
+		panelDataPicker: './panel/dataPicker',
+		panelProductOption: './panel/productOption',
+		panelPostReview: './panel/postReview',
+		panelActivity: './panel/activity'
+	},
+	shim: {
+		zepto: {
+			exports: '$'
+		},
+		IScroll: {
+			exports: 'IScroll'
+		},
+		BMap: {
+			exports: 'BMap'
+		}
+
+	}
 });
 require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function ($, spa, native, helper, ratchet, config, user) {
-    var $doc = $(document);
-
-    // 首页
-    var pageHome = {
-        route: '',
-        classname: 'home',
-        animate: 'fadeIn',
-        view: function () {
-            var $page = this;
-            requirejs(['pageHome'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-    //个人中心
-    var pageMine = {
-        route: 'mine',
-        classname: 'mine',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageMine'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-    //家庭保洁
-    var pageSecondary = {
-        route: 'secondary',
-        classname: 'secondary',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageSecondary'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-    //民宿保洁
-    var pageHomestay = {
-        route: 'homestay',
-        classname: 'homestay',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageHomestay'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-    //企业服务
-    var pageHomeenterprise = {
-        route: 'homeenterprise',
-        classname: 'homeenterprise',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageHomeenterprise'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-    //商品页
-    var pageProduct = {
-        route: 'product',
-        classname: 'product',
-        animate: 'slideInUp',
-        view: function () {
-            var $page = this;
-            requirejs(['pageProduct'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-    //充值卡
-    var pageRecharge = {
-        route: 'recharge',
-        classname: 'recharge',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageRecharge'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-    // 活动协议
-    var pageActivityText = {
-        route: 'activity-text',
-        classname: 'activity-text',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageActivityText'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-    //活动规则
-    var pageActivityRule = {
-        route: 'activity-rule',
-        classname: 'activity-rule',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageActivityRule'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-   
-    //商品提示信息
-    var pageProductInfo = {
-        route: 'product-info/:type',
-        classname: 'product-info',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageProductInfo'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-
-    //商品介绍页
-    var pageDesc = {
-        route: 'desc',
-        classname: 'desc',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageDesc'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-
-    //订单页
-    var pagePlaceOrder = {
-        route: 'placeOrder',
-        classname: 'place-order',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pagePlaceOrder'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-
-    //选择列表页
-    var pagePicker = {
-        route: 'picker',
-        classname: 'picker',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pagePicker'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-
-    //支付页面
-    var pagePay = {
-        route: 'pay',
-        classname: 'pay',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pagePay'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-
-    // 追加订单支付页面
-    var pageAppendPay = {
-        route: 'append-pay',
-        classname: 'append-pay',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageAppendPay'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-
-    //支付成功
-    var pagePaySuccess = {
-        route: 'paySuccess',
-        classname: 'pay-success',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageSuccess'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    //我的订单页
-    var pageMyOrder = {
-        route: 'myOrder(/:type)',
-        classname: 'my-order',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageMyOrder'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    var pageMyOrderDetail = {
-        route: 'OrderDetail/:id',
-        classname: 'my-order-detail',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageMyOrderDetail'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    //我的优惠券
-    var pageMyCoupon = {
-        route: 'myCoupon',
-        classname: 'my-coupon',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageMyCoupon'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    //用户服务协议
-    var pageAgreement = {
-        route: 'agreement',
-        classname: 'agreement',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageAgreement'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    //地址列表
-    var pageAddressList = {
-        route: 'addressList',
-        classname: 'address-list',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageAddressList'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    //地址添加
-    var pageAddressAdd = {
-        route: 'addressAdd',
-        classname: 'address-add',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageAddressAdd'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    //地址详情
-    var pageAddressDetail = {
-        route: 'addressDetail',
-        classname: 'address-detail',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageAddressDetail'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    //地址定位
-    var pageAddressPoisiton = {
-        route: 'addressPoisiton',
-        classname: 'address-poisition',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageAddressPoisiton'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    //招聘
-    var pageHire = {
-        route: 'hire',
-        classname: 'hire',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageHire'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    // 未上线
-    var pageComing = {
-        route: 'coming',
-        classname: 'coming',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageComing'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    // 活动
-    var pageActivityCat = {
-        route: 'activity-day',
-        classname: 'activities-day',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageActivityCat'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    // 追加服务
-    var pageAppend = {
-        route: 'append',
-        classname: 'append',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageAppend'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    // 申请退款
-    var pageRefund = {
-        route: 'refund',
-        classname: 'refund',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageRefund'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    // 申请成功
-    var pageRefundSuccess = {
-        route: 'refund-success',
-        classname: 'refund-success',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageRefundSuccess'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            });
-        }
-    };
-
-    // 订单确认完成
-    var pageOrderDone = {
-        route: 'order-done',
-        classname: 'order-done',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageOrderDone'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData])
-            })
-        }
-    };
-
-    var pageBeautician = {
-        route: 'beautician',
-        classname: 'beautician',
-        animate: 'pushInLeft',
-        view: function () {
-            var $page = this;
-            requirejs(['pageBeautician'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData]);
-            })
-        }
-    };
-
-    var pageBeauticianDetail = {
-        route: 'beautician-detail',
-        classname: 'beautician-detail',
-        animate: 'slideInUp',
-        view: function () {
-            var $page = this;
-            requirejs(['pageBeauticianDetail'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData]);
-            })
-        }
-    };
-
-    var pageHelp = {
-        route: 'help',
-        classname: 'help',
-        animate: 'slideInUp',
-        view: function () {
-            var $page = this;
-            requirejs(['pageHelp'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData]);
-            })
-        }
-    };
-
-    var pageAbout = {
-        route: 'about',
-        classname: 'about',
-        animate: 'slideInUp',
-        view: function () {
-            var $page = this;
-            requirejs(['pageAbout'], function (viewData) {
-                $doc.trigger('spa:initpage', [$page, viewData]);
-            })
-        }
-    };
-
-    $doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageHelp, pageMine, pageSecondary, pageHomestay, pageHomeenterprise, pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageActivityText, pageActivityRule, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
-
-    var panelAlert = {
-        id: 'simpleAlert',
-        classname: 'alert',
-        animate: 'zoomIn',
-        view: function () {
-            var $panel = this;
-            requirejs(['panelAlert'], function (viewData) {
-                $doc.trigger('spa:initpanel', [$panel, viewData]);
-            })
-        }
-    };
-
-    var panelActionSheet = {
-        id: 'actionSheet',
-        classname: 'action-sheet',
-        animate: 'overlayInUp',
-        view: function () {
-            var $panel = this;
-            requirejs(['panelActionSheet'], function (viewData) {
-                $doc.trigger('spa:initpanel', [$panel, viewData]);
-            })
-        }
-    };
-
-    var panelDataPicker = {
-        id: 'dataPicker',
-        classname: 'data-picker',
-        animate: 'overlayInUp',
-        view: function () {
-            var $panel = this;
-            requirejs(['panelDataPicker'], function (viewData) {
-                $doc.trigger('spa:initpanel', [$panel, viewData]);
-            })
-        }
-    };
-
-    var panelProductOption = {
-        id: 'productOption',
-        classname: 'product-option',
-        animate: 'overlayInUp',
-        view: function () {
-            var $panel = this;
-            requirejs(['panelProductOption'], function (viewData) {
-                $doc.trigger('spa:initpanel', [$panel, viewData]);
-            })
-        }
-    };
-
-    var panelPostReview = {
-        id: 'postReview',
-        classname: 'post-review',
-        animate: 'overlayInUp',
-        view: function () {
-            var $panel = this;
-            requirejs(['panelPostReview'], function (viewData) {
-                $doc.trigger('spa:initpanel', [$panel, viewData]);
-            })
-        }
-    };
-
-    var panelActivity = {
-        id: 'activity',
-        classname: 'activity',
-        animate: 'overlayInUp',
-        view: function () {
-            var $panel = this;
-            requirejs(['panelActivity'], function (viewData) {
-                $doc.trigger('spa:initpanel', [$panel, viewData]);
-            })
-        }
-    };
-
-    $doc.trigger('spa:panel', [panelAlert, panelActionSheet, panelDataPicker, panelProductOption, panelPostReview, panelActivity]);
-
-    $(function () {
-        if (config.isWX) {
-            //微信 去掉顶部导航栏
-            var styles = ".content {top: 0;}";
-            helper.includeStyleElement(styles, 'ios7');
-
-            //微信过来的登录后再启动
-            user.getUserInfo(function () {
-                $doc.trigger('spa:boot');
-            });
-
-        } else if (config.isAndroid || config.isIOS) {
-            //注册事件
-            native.delegateBackButton(true);
-
-            //安卓返回按钮
-            $(document).on('tapBackButton', function () {
-                $.spa.getCurPage().trigger('tapBackButton');
-            });
-
-            //ios7特殊样式 全屏幕往下移动20px
-            helper.osProxy({
-                ios: function () {
-                    var styles = ".bar-nav {height: 64px;padding-top: 20px;}\
+	var $doc = $(document);
+
+	// 首页
+	var pageHome = {
+		route: '',
+		classname: 'home',
+		animate: 'fadeIn',
+		view: function () {
+			var $page = this;
+			requirejs(['pageHome'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+	//个人中心
+	var pageMine = {
+		route: 'mine',
+		classname: 'mine',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageMine'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+	//家庭保洁
+	var pageSecondary = {
+		route: 'secondary',
+		classname: 'secondary',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageSecondary'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+	//民宿保洁
+	var pageHomestay = {
+		route: 'homestay',
+		classname: 'homestay',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageHomestay'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+	//企业服务
+	var pageHomeenterprise = {
+		route: 'homeenterprise',
+		classname: 'homeenterprise',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageHomeenterprise'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+	//长期订
+	var pageLongOrder = {
+		route: 'longOrder',
+		classname: 'longOrder',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageLongOrder'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+	//商品页
+	var pageProduct = {
+		route: 'product',
+		classname: 'product',
+		animate: 'slideInUp',
+		view: function () {
+			var $page = this;
+			requirejs(['pageProduct'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+	//充值卡
+	var pageRecharge = {
+		route: 'recharge',
+		classname: 'recharge',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageRecharge'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+	// 活动协议
+	var pageActivityText = {
+		route: 'activity-text',
+		classname: 'activity-text',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageActivityText'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+	//活动规则
+	var pageActivityRule = {
+		route: 'activity-rule',
+		classname: 'activity-rule',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageActivityRule'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	//商品提示信息
+	var pageProductInfo = {
+		route: 'product-info/:type',
+		classname: 'product-info',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageProductInfo'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+
+	//商品介绍页
+	var pageDesc = {
+		route: 'desc',
+		classname: 'desc',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageDesc'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+
+	//订单页
+	var pagePlaceOrder = {
+		route: 'placeOrder',
+		classname: 'place-order',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pagePlaceOrder'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+
+	//选择列表页
+	var pagePicker = {
+		route: 'picker',
+		classname: 'picker',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pagePicker'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+
+	//支付页面
+	var pagePay = {
+		route: 'pay',
+		classname: 'pay',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pagePay'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+
+	// 追加订单支付页面
+	var pageAppendPay = {
+		route: 'append-pay',
+		classname: 'append-pay',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageAppendPay'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+
+	//支付成功
+	var pagePaySuccess = {
+		route: 'paySuccess',
+		classname: 'pay-success',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageSuccess'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	//我的订单页
+	var pageMyOrder = {
+		route: 'myOrder(/:type)',
+		classname: 'my-order',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageMyOrder'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	var pageMyOrderDetail = {
+		route: 'OrderDetail/:id',
+		classname: 'my-order-detail',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageMyOrderDetail'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	//我的优惠券
+	var pageMyCoupon = {
+		route: 'myCoupon',
+		classname: 'my-coupon',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageMyCoupon'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	//用户服务协议
+	var pageAgreement = {
+		route: 'agreement',
+		classname: 'agreement',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageAgreement'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	//地址列表
+	var pageAddressList = {
+		route: 'addressList',
+		classname: 'address-list',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageAddressList'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	//地址添加
+	var pageAddressAdd = {
+		route: 'addressAdd',
+		classname: 'address-add',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageAddressAdd'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	//地址详情
+	var pageAddressDetail = {
+		route: 'addressDetail',
+		classname: 'address-detail',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageAddressDetail'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	//地址定位
+	var pageAddressPoisiton = {
+		route: 'addressPoisiton',
+		classname: 'address-poisition',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageAddressPoisiton'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	//招聘
+	var pageHire = {
+		route: 'hire',
+		classname: 'hire',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageHire'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	// 未上线
+	var pageComing = {
+		route: 'coming',
+		classname: 'coming',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageComing'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	// 活动
+	var pageActivityCat = {
+		route: 'activity-day',
+		classname: 'activities-day',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageActivityCat'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	// 追加服务
+	var pageAppend = {
+		route: 'append',
+		classname: 'append',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageAppend'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	// 申请退款
+	var pageRefund = {
+		route: 'refund',
+		classname: 'refund',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageRefund'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	// 申请成功
+	var pageRefundSuccess = {
+		route: 'refund-success',
+		classname: 'refund-success',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageRefundSuccess'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			});
+		}
+	};
+
+	// 订单确认完成
+	var pageOrderDone = {
+		route: 'order-done',
+		classname: 'order-done',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageOrderDone'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData])
+			})
+		}
+	};
+
+	var pageBeautician = {
+		route: 'beautician',
+		classname: 'beautician',
+		animate: 'pushInLeft',
+		view: function () {
+			var $page = this;
+			requirejs(['pageBeautician'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData]);
+			})
+		}
+	};
+
+	var pageBeauticianDetail = {
+		route: 'beautician-detail',
+		classname: 'beautician-detail',
+		animate: 'slideInUp',
+		view: function () {
+			var $page = this;
+			requirejs(['pageBeauticianDetail'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData]);
+			})
+		}
+	};
+
+	var pageHelp = {
+		route: 'help',
+		classname: 'help',
+		animate: 'slideInUp',
+		view: function () {
+			var $page = this;
+			requirejs(['pageHelp'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData]);
+			})
+		}
+	};
+
+	var pageAbout = {
+		route: 'about',
+		classname: 'about',
+		animate: 'slideInUp',
+		view: function () {
+			var $page = this;
+			requirejs(['pageAbout'], function (viewData) {
+				$doc.trigger('spa:initpage', [$page, viewData]);
+			})
+		}
+	};
+
+	$doc.trigger('spa:route', [pageHome, pageRecharge, pageAbout, pageLongOrder, pageHelp, pageMine, pageSecondary, pageHomestay, pageHomeenterprise, pageProduct, pageProductInfo, pageDesc, pagePlaceOrder, pagePicker, pagePay, pageAppendPay, pagePaySuccess, pageMyOrder, pageMyOrderDetail, pageMyCoupon, pageAgreement, pageAddressList, pageAddressAdd, pageAddressDetail, pageAddressPoisiton, pageHire, pageComing, pageActivityCat, pageActivityText, pageActivityRule, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
+
+	var panelAlert = {
+		id: 'simpleAlert',
+		classname: 'alert',
+		animate: 'zoomIn',
+		view: function () {
+			var $panel = this;
+			requirejs(['panelAlert'], function (viewData) {
+				$doc.trigger('spa:initpanel', [$panel, viewData]);
+			})
+		}
+	};
+
+	var panelActionSheet = {
+		id: 'actionSheet',
+		classname: 'action-sheet',
+		animate: 'overlayInUp',
+		view: function () {
+			var $panel = this;
+			requirejs(['panelActionSheet'], function (viewData) {
+				$doc.trigger('spa:initpanel', [$panel, viewData]);
+			})
+		}
+	};
+
+	var panelDataPicker = {
+		id: 'dataPicker',
+		classname: 'data-picker',
+		animate: 'overlayInUp',
+		view: function () {
+			var $panel = this;
+			requirejs(['panelDataPicker'], function (viewData) {
+				$doc.trigger('spa:initpanel', [$panel, viewData]);
+			})
+		}
+	};
+
+	var panelProductOption = {
+		id: 'productOption',
+		classname: 'product-option',
+		animate: 'overlayInUp',
+		view: function () {
+			var $panel = this;
+			requirejs(['panelProductOption'], function (viewData) {
+				$doc.trigger('spa:initpanel', [$panel, viewData]);
+			})
+		}
+	};
+
+	var panelPostReview = {
+		id: 'postReview',
+		classname: 'post-review',
+		animate: 'overlayInUp',
+		view: function () {
+			var $panel = this;
+			requirejs(['panelPostReview'], function (viewData) {
+				$doc.trigger('spa:initpanel', [$panel, viewData]);
+			})
+		}
+	};
+
+	var panelActivity = {
+		id: 'activity',
+		classname: 'activity',
+		animate: 'overlayInUp',
+		view: function () {
+			var $panel = this;
+			requirejs(['panelActivity'], function (viewData) {
+				$doc.trigger('spa:initpanel', [$panel, viewData]);
+			})
+		}
+	};
+
+	$doc.trigger('spa:panel', [panelAlert, panelActionSheet, panelDataPicker, panelProductOption, panelPostReview, panelActivity]);
+
+	$(function () {
+		if (config.isWX) {
+			//微信 去掉顶部导航栏
+			var styles = ".content {top: 0;}";
+			helper.includeStyleElement(styles, 'ios7');
+
+			//微信过来的登录后再启动
+			user.getUserInfo(function () {
+				$doc.trigger('spa:boot');
+			});
+
+		} else if (config.isAndroid || config.isIOS) {
+			//注册事件
+			native.delegateBackButton(true);
+
+			//安卓返回按钮
+			$(document).on('tapBackButton', function () {
+				$.spa.getCurPage().trigger('tapBackButton');
+			});
+
+			//ios7特殊样式 全屏幕往下移动20px
+			helper.osProxy({
+				ios: function () {
+					var styles = ".bar-nav {height: 64px;padding-top: 20px;}\
           .content {top: 64px;}\
           .bar-nav .left-button {padding-top: 20px;}\
           .bar-nav .right-button {padding-top: 20px;}";
-                    helper.includeStyleElement(styles, 'ios7');
-                }
-            });
-
-            $doc.trigger('spa:boot');
-        } else if (config.isChubao) {
-            var styles = ".content {top: 0;}";
-            helper.includeStyleElement(styles, 'ios7');
-            $doc.trigger('spa:boot');
-        } else {
-            $doc.trigger('spa:boot');
-        }
-    })
+					helper.includeStyleElement(styles, 'ios7');
+				}
+			});
+
+			$doc.trigger('spa:boot');
+		} else if (config.isChubao) {
+			var styles = ".content {top: 0;}";
+			helper.includeStyleElement(styles, 'ios7');
+			$doc.trigger('spa:boot');
+		} else {
+			$doc.trigger('spa:boot');
+		}
+	})
 })

www/webapp/o2o/js/page/longOrder.js

@@ -0,0 +1,123 @@
+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: '',
+			pushData: {
+				dontNeedReload: true
+			}
+		});
+	}
+
+	return {
+		title: '民宿保洁',
+		body: '',
+		init: function (pageData, dtd) {
+			/* this是什么？ */
+			var $view = this;
+			var $doc = $(document);
+			// 返回
+			$view.on('swipeRight', function (event) {
+				history.go(-1);
+			});
+			$.newTouch('.back-button', function (event) {
+				history.go(-1);
+			}, $view);
+			$view.on('tapBackButton', function (event) {
+				//back.call(this, event);
+				history.go(-1);
+			});
+
+
+			$.newTouch('.back-button', function (event) {
+				back.call(this, event);
+				// history.go(-1);
+			}, $view);
+
+			$view.on('tapBackButton', function (event) {
+				back.call(this, event);
+				// history.go(-1);
+			});
+			//跳转下单页面
+			$.newTouch('.btn-appliances', function (event) {
+				event.preventDefault();
+				var type = parseInt($(this).attr('data-product-type'));
+				$doc.trigger('spa:navigate', {
+					hash: 'placeOrder',
+					pushData: {
+						product: product.allList[type - 1],
+						needReset: true,
+						backHash:'activity-day'
+					}
+				});
+			}, $view);
+
+			// im
+			$.newTouch('.btn-action-logo', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'im',
+					pushData: {
+						needReset: true
+					}
+				});
+			}, $view);
+
+			// 首页
+			$.newTouch('.btn-action-my-order', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: '',
+					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('LongOrder/index', {
+							showNavBar: !config.isWX,
+							recharges: res.data
+						});
+						$('.spa-page-body', $view).html(tpl);
+						//var value = $(this).attr('data-value');
+						var value = $('.btn-add-recharge').attr('data-index');
+						for (var i = value; i < 2; i++) {
+						}
+						setTimeout(function () {
+							pageData.scroll = new IScroll('#longOrderScroll');
+						}, 500);
+					}
+				});
+			}
+			dtd.resolve();
+		},
+		beforeclose: function (pageData, dtd) {
+			dtd.resolve();
+		}
+	}
+})

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

@@ -34,7 +34,6 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
 			 */
 
 
-
 			// 返回
 			$view.on('swipeRight', function (event) {
 				back.call(this, event);
@@ -47,6 +46,17 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
 			$view.on('tapBackButton', function (event) {
 				back.call(this, event);
 			});
+			/*长期订入口-。.secondary-img/*/
+			$.newTouch('.secondary-img', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: 'longOrder',
+					pushData: {
+						needReset: true,
+						backHash: 'secondary'
+					}
+				});
+			}, $view);
 			/*活动入口*/
 			$.newTouch('.Long-term-set', function (event) {
 				event.preventDefault();
@@ -134,9 +144,9 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
 
 				setTimeout(function () {
 					/*设置页面高度-开始*/
-					$('#list0').height(($('.btn-product').height()*4)+$('.prevent-scroll').height());//设置ul高度；
+					$('#list0').height(($('.btn-product').height() * 4) + $('.prevent-scroll').height());//设置ul高度；
 					/*设置页面高度-结束*/
-				},200);
+				}, 200);
 			}
 
 			/* 又是这个。不知道什么玩意…… */

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

@@ -0,0 +1,57 @@
+{{ 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="longOrderScroll" class="scroll-container box-flex-1">
+				<div class="scroller">
+					<div class="box-container">
+						<div class="box-container box box-vertical" style="background: #fff">
+							<div class="btn-appliances btn-day" data-product-type="9"><img src="http://odulvej8l.bkt.clouddn.com/%E6%97%A5%E5%B8%B8.jpg" alt="日常保洁2小时体验"><div class="product2-img"></div></div>
+							<div class="btn-appliances btn-day" data-product-type="4"><img src="http://odulvej8l.bkt.clouddn.com/%E5%AE%B6%E7%94%B5.jpg" alt="家电清洗"><div class="product2-img"></div></div>
+							<div class="btn-appliances btn-day" data-product-type="6"><img src="http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83.jpg" alt="擦玻璃"><div class="product2-img"></div></div>
+						</div>
+					</div>
+					<div style="width: 100%;padding-bottom:13%; "></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>

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

@@ -15,7 +15,7 @@
                     <div class="secondary-content">
                         <div class="secondary-head">
                             <img src="http://odulvej8l.bkt.clouddn.com/banner-01.jpg" alt="">
-                            <img src="http://odulvej8l.bkt.clouddn.com/%E4%BA%8C%E7%BA%A7%E5%85%83%E7%B4%A0-01.png" alt="">
+                            <img class="secondary-img" src="http://odulvej8l.bkt.clouddn.com/%E4%BA%8C%E7%BA%A7%E5%85%83%E7%B4%A0-01.png" alt="">
                         </div>
                         <div class="secondary-list">
                             <ul class="products-list" id="list0">