长期定

www/protected/modules/common/controllers/ConfirmController.php

@@ -140,9 +140,4 @@ class ConfirmController extends CController{
             echo 'success';
         }
     }
-
-
-
-
-}
-
+}

www/webapp/o2o/build.js

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

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

@@ -33,7 +33,6 @@ 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

@@ -1 +0,0 @@
-define(["$","template","IScroll","recharge","native","config","user","product"],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 r=this,i=e(document);r.on("swipeRight",function(e){f.call(this,e)}),e.newTouch(".back-button",function(e){f.call(this,e)},r),r.on("tapBackButton",function(e){f.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:"longOrder"}})},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){var n=e.pushData;a=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("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/js/main.js

@@ -41,7 +41,6 @@ require.config({
 		pagePlaceOrder: './page/placeOrder',
 		pagePicker: './page/picker',
 		pagePay: './page/pay',
-		pageLongOrder: './page/longOrder',
 		pageAppendPay: './page/appendPay',
 		pageMyOrder: './page/myOrder',
 		pageMyOrderDetail: './page/myOrderDetail',
@@ -151,18 +150,7 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 			})
 		}
 	};
-	//长期订
-	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',
@@ -545,7 +533,7 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 		}
 	};
 
-	$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]);
+	$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',

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

@@ -1,116 +0,0 @@
-define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user', 'product'], function ($, template, IScroll, recharge, native, config, user, product) {
-	var backHash;
-
-	function back(event) {
-		event.preventDefault();
-		$(document).trigger('spa:navigate', {
-			hash: backHash,
-			pushData: {
-				dontNeedReload: true
-			}
-		});
-	}
-
-	return {
-		title: '民宿保洁',
-		body: '',
-		init: function (pageData, dtd) {
-			/* this是什么？ */
-			var $view = this;
-			var $doc = $(document);
-			// 返回
-			$view.on('swipeRight', function (event) {
-				back.call(this, event);
-			});
-			$.newTouch('.back-button', function (event) {
-				back.call(this, event);
-			}, $view);
-			$view.on('tapBackButton', function (event) {
-				back.call(this, event);
-			});
-			//跳转下单页面
-			$.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: 'longOrder'
-
-					}
-				});
-			}, $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) {
-			/*获取上一页跳转的路由名称*/
-			var pushData = pageData.pushData;
-			backHash = pushData.backHash ? pushData.backHash : '';
-			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

@@ -46,17 +46,6 @@ 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();