洪海涛 8 năm trước cách đây
mục cha
commit
18b419c668
32 tập tin đã thay đổi với 825 bổ sung748 xóa
  1. 130 114
      www/protected/modules/o2o/controllers/AdvisoryController.php
  2. 2 0
      www/protected/modules/o2o/views/advisory/im.php
  3. 39 0
      www/protected/modules/o2o/views/advisory/xyhIm.php
  4. 1 0
      www/webapp/o2o/css/main.css
  5. 19 0
      www/webapp/o2o/css/month.css
  6. 33 33
      www/webapp/o2o/css/product.css
  7. 0 0
      www/webapp/o2o/dist/css/main.css
  8. 0 0
      www/webapp/o2o/dist/js/build/template.js
  9. 0 0
      www/webapp/o2o/dist/js/main.js
  10. 0 0
      www/webapp/o2o/dist/js/model/product.js
  11. 0 0
      www/webapp/o2o/dist/js/page/home.js
  12. 1 0
      www/webapp/o2o/dist/js/page/month/four.js
  13. 1 0
      www/webapp/o2o/dist/js/page/month/one.js
  14. 1 0
      www/webapp/o2o/dist/js/page/month/three.js
  15. 1 0
      www/webapp/o2o/dist/js/page/month/two.js
  16. 0 0
      www/webapp/o2o/dist/js/page/product.js
  17. 0 0
      www/webapp/o2o/js/build/template.js
  18. 54 1
      www/webapp/o2o/js/main.js
  19. 0 537
      www/webapp/o2o/js/model/product.js
  20. 21 14
      www/webapp/o2o/js/page/home.js
  21. 104 0
      www/webapp/o2o/js/page/month/four.js
  22. 97 0
      www/webapp/o2o/js/page/month/one.js
  23. 104 0
      www/webapp/o2o/js/page/month/three.js
  24. 104 0
      www/webapp/o2o/js/page/month/two.js
  25. 7 2
      www/webapp/o2o/js/page/product.js
  26. 0 39
      www/webapp/o2o/tpl/hire/index.html
  27. 7 5
      www/webapp/o2o/tpl/home/index.html
  28. 24 0
      www/webapp/o2o/tpl/month/four.html
  29. 24 0
      www/webapp/o2o/tpl/month/one.html
  30. 24 0
      www/webapp/o2o/tpl/month/three.html
  31. 24 0
      www/webapp/o2o/tpl/month/two.html
  32. 3 3
      www/webapp/o2o/tpl/product/index.html

+ 130 - 114
www/protected/modules/o2o/controllers/AdvisoryController.php

@@ -1,123 +1,139 @@
 <?php
+
 /**
  * Created by PhpStorm.
  * User: PHP
  * Date: 2016/11/9
  * Time: 17:55
  */
-class AdvisoryController extends O2oBaseController {
-
-    public function actionIndex(){
-        $status_option = CommonFn::getComboboxData(Advisory::$status_option, 1, true, 100);
-        $this->render('index', [
-            'status_option' => $status_option
-           ]);
-    }
-    public function actionList(){
-        $pageParams = CommonFn::getPageParams();
-
-        $id     = intval(Yii::app()->request->getParam('id'));
-        $search = Yii::app()->request->getParam('search', '');
-        $status = intval(Yii::app()->request->getParam('status', 100));
-
-        $criteria = new EMongoCriteria($pageParams);
-        // id筛选
-        if ($id) {
-            $criteria->_id('==', new MongoId($id));
-        }
-        // 状态筛选
-        if ($status != 100) {
-            $criteria->status('==', $status);
-        }
-
-        $cursor = Advisory::model()->findAll($criteria);
-        $rows = CommonFn::getRowsFromCursor($cursor);
-        $parsedRows = Advisory::model()->parse($rows);
-        $total = $cursor->count();
-
-        echo CommonFn::composeDatagridData($parsedRows, $total);
-
-    }
-    public function actionEdit(){
-        $status = intval(Yii::app()->request->getParam('status', 100));
-        $id     = Yii::app()->request->getParam('id');
-        if (!$id) {
-            CommonFn::requestAjax(false, '');
-        }
-        if ($status == 100) {
-            CommonFn::requestAjax(false, '请选择状态');
-        }
-        $advisory = Advisory::model()->get(new MongoId($id));
-        $advisory->status = $status;
-        $success = $advisory->save();
-        if ($success) {
-            CommonFn::requestAjax(true, '修改成功');
-        }
-
-    }
-
-
-
-
-    //名宿保洁
-    public function actionSinglesDay(){
-
-        $name = Yii::app()->request->getParam('user_name','');
-        $area = str_replace('string:',"",Yii::app()->request->getParam('area',''));
-        $homeType = str_replace('string:',"",Yii::app()->request->getParam('homeType',''));
-        $num = str_replace('string:',"",Yii::app()->request->getParam('num',''));
-        $mobile = Yii::app()->request->getParam('mobile');
-        $tech_content = Yii::app()->request->getParam('tech_content','');
-        if ($name) {
-            $advisory = new Advisory();
-            $advisory->user_name = $name;
-            $advisory->area = $area;
-            $advisory->homeType = $homeType;
-            $advisory->mobile = $mobile;
-            $advisory->num = $num;
-            $advisory->area =$area;
-            $advisory->type = '名宿保洁';
-            $advisory->time = time();
-            $advisory->status = 1;
-            $advisory->tech_content = $tech_content;
-            if ($advisory->save()) {
-                echo '您的咨询已发送成功,请等待我们的企业管家与您联系,温馨提示,一般是一个工作日内,日间致电给您,请留意。';exit;
-            }
-        }
-
-        $this->render('SinglesDay');
-    }
-    //企业服务
-    public function actionEnterprise(){
-        $name = Yii::app()->request->getParam('user_name','');
-        $area = str_replace('string:',"",Yii::app()->request->getParam('area',''));
-        $homeType = str_replace('string:',"",Yii::app()->request->getParam('homeType',''));
-        $num = str_replace('string:',"",Yii::app()->request->getParam('num',''));
-        $mobile = Yii::app()->request->getParam('mobile');
-        $tech_content = str_replace('string:',"",Yii::app()->request->getParam('tech_content',''));
-        if ($name) {
-            $advisory = new Advisory();
-            $advisory->user_name = $name;
-            $advisory->area = $area;
-            $advisory->homeType = $homeType;
-            $advisory->mobile = $mobile;
-            $advisory->num = $num;
-            $advisory->area = $area;
-            $advisory->time = time();
-            $advisory->type = '企业服务';
-            $advisory->status = 1;
-            $advisory->tech_content = $tech_content;
-            if ($advisory->save()) {
-                echo '您的咨询已发送成功,请等待我们的企业管家与您联系,温馨提示,一般是一个工作日内,日间致电给您,请留意。';
-                exit;
-            }
-        }
-        $this->render('enterprise');
-    }
-    //联系壹管家
-    public function  actionIm()
-    {
-        $this->render('im');
-    }
+class AdvisoryController extends O2oBaseController
+{
+
+	public function actionIndex()
+	{
+		$status_option = CommonFn::getComboboxData(Advisory::$status_option, 1, true, 100);
+		$this->render('index', [
+			'status_option' => $status_option
+		]);
+	}
+
+	public function actionList()
+	{
+		$pageParams = CommonFn::getPageParams();
+
+		$id = intval(Yii::app()->request->getParam('id'));
+		$search = Yii::app()->request->getParam('search', '');
+		$status = intval(Yii::app()->request->getParam('status', 100));
+
+		$criteria = new EMongoCriteria($pageParams);
+		// id筛选
+		if ($id) {
+			$criteria->_id('==', new MongoId($id));
+		}
+		// 状态筛选
+		if ($status != 100) {
+			$criteria->status('==', $status);
+		}
+
+		$cursor = Advisory::model()->findAll($criteria);
+		$rows = CommonFn::getRowsFromCursor($cursor);
+		$parsedRows = Advisory::model()->parse($rows);
+		$total = $cursor->count();
+
+		echo CommonFn::composeDatagridData($parsedRows, $total);
+
+	}
+
+	public function actionEdit()
+	{
+		$status = intval(Yii::app()->request->getParam('status', 100));
+		$id = Yii::app()->request->getParam('id');
+		if (!$id) {
+			CommonFn::requestAjax(false, '');
+		}
+		if ($status == 100) {
+			CommonFn::requestAjax(false, '请选择状态');
+		}
+		$advisory = Advisory::model()->get(new MongoId($id));
+		$advisory->status = $status;
+		$success = $advisory->save();
+		if ($success) {
+			CommonFn::requestAjax(true, '修改成功');
+		}
+
+	}
+
+
+	//名宿保洁
+	public function actionSinglesDay()
+	{
+
+		$name = Yii::app()->request->getParam('user_name', '');
+		$area = str_replace('string:', "", Yii::app()->request->getParam('area', ''));
+		$homeType = str_replace('string:', "", Yii::app()->request->getParam('homeType', ''));
+		$num = str_replace('string:', "", Yii::app()->request->getParam('num', ''));
+		$mobile = Yii::app()->request->getParam('mobile');
+		$tech_content = Yii::app()->request->getParam('tech_content', '');
+		if ($name) {
+			$advisory = new Advisory();
+			$advisory->user_name = $name;
+			$advisory->area = $area;
+			$advisory->homeType = $homeType;
+			$advisory->mobile = $mobile;
+			$advisory->num = $num;
+			$advisory->area = $area;
+			$advisory->type = '名宿保洁';
+			$advisory->time = time();
+			$advisory->status = 1;
+			$advisory->tech_content = $tech_content;
+			if ($advisory->save()) {
+				echo '您的咨询已发送成功,请等待我们的企业管家与您联系,温馨提示,一般是一个工作日内,日间致电给您,请留意。';
+				exit;
+			}
+		}
+
+		$this->render('SinglesDay');
+	}
+
+	//企业服务
+	public function actionEnterprise()
+	{
+		$name = Yii::app()->request->getParam('user_name', '');
+		$area = str_replace('string:', "", Yii::app()->request->getParam('area', ''));
+		$homeType = str_replace('string:', "", Yii::app()->request->getParam('homeType', ''));
+		$num = str_replace('string:', "", Yii::app()->request->getParam('num', ''));
+		$mobile = Yii::app()->request->getParam('mobile');
+		$tech_content = str_replace('string:', "", Yii::app()->request->getParam('tech_content', ''));
+		if ($name) {
+			$advisory = new Advisory();
+			$advisory->user_name = $name;
+			$advisory->area = $area;
+			$advisory->homeType = $homeType;
+			$advisory->mobile = $mobile;
+			$advisory->num = $num;
+			$advisory->area = $area;
+			$advisory->time = time();
+			$advisory->type = '企业服务';
+			$advisory->status = 1;
+			$advisory->tech_content = $tech_content;
+			if ($advisory->save()) {
+				echo '您的咨询已发送成功,请等待我们的企业管家与您联系,温馨提示,一般是一个工作日内,日间致电给您,请留意。';
+				exit;
+			}
+		}
+		$this->render('enterprise');
+	}
+
+	//享月会联系
+	public function actionXyhIm()
+	{
+		$this->render('xyhIm');
+	}
+
+	//联系壹管家
+	public function actionIm()
+	{
+		$this->render('im');
+	}
 
 }

+ 2 - 0
www/protected/modules/o2o/views/advisory/im.php

@@ -26,6 +26,8 @@
   <script>
     $(function () {
       document.title = "壹管家";
+	    $('img').height($(window).height());
+	    $('img').width($(window).width());
     })
   </script>
 </head>

+ 39 - 0
www/protected/modules/o2o/views/advisory/xyhIm.php

@@ -0,0 +1,39 @@
+<!--/**
+ * Created by PhpStorm.
+ * User: Jinguo
+ * Date: 2016/11/11
+ * Time: 13:14
+ */-->
+<!DOCTYPE html>
+<!--HTML5 doctype-->
+<html ng-app="myapp">
+<head>
+	<title>壹管家</title>
+	<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+	<meta name="viewport"
+	      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
+	<meta http-equiv="Pragma" content="no-cache">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<!--引入css文件-->
+	<link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/css/common.css">
+	<link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/bootstrap-3.3.7.min.css">
+	<!--引入js文件-->
+	<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/jquery-3.1.1.min.js"></script>
+	<script src="<?php echo Yii::app()->request->baseUrl; ?>/js/bootstrap-3.3.7.min.js"></script>
+	<!--修改title-->
+	<script>
+		$(function () {
+			document.title = "壹管家";
+			$('img').height($(window).height());
+			$('img').width($(window).width());
+		})
+	</script>
+</head>
+<body>
+<img src="http://odulvej8l.bkt.clouddn.com/1110%E4%BA%8C%E7%BB%B4%E7%A0%81.jpg" alt="联系我们"
+     style="width: 100%;margin-top: -0.2rem">
+</body>
+
+</html>

+ 1 - 0
www/webapp/o2o/css/main.css

@@ -22,3 +22,4 @@
 @import url("./orderFinish.css");
 @import url("./orderDetail.css");
 @import url("./beautician.css");
+@import url("./month.css");

+ 19 - 0
www/webapp/o2o/css/month.css

@@ -0,0 +1,19 @@
+.request {
+	width: 60%;
+	position: fixed;
+	margin-left: calc(20% - 4px);
+	bottom: 0;
+}
+
+.request div {
+	width: 50%;
+	color: #fff;
+	line-height: 30px;
+	border-radius: 5px;
+	text-align: center;
+	float: left;
+	display: inline-block;
+	padding: 5px 35px;
+	border: 1px solid rgba(0, 0, 0, 0.11);
+	background-color: rgba(255, 182, 233, 0.83);
+}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 33 - 33
www/webapp/o2o/css/product.css


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
www/webapp/o2o/dist/css/main.css


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
www/webapp/o2o/dist/js/main.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
www/webapp/o2o/dist/js/model/product.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
www/webapp/o2o/dist/js/page/home.js


+ 1 - 0
www/webapp/o2o/dist/js/page/month/four.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){a.call(this,e)}),setInterval(function(){e(".product2-img").fadeToggle()},500),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".im",function(e){e.preventDefault(),e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/xyhIm"},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("month/four",{showNavBar:!s.isWX,recharges:r.data,title:"至尊套餐"});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#monthFourScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

+ 1 - 0
www/webapp/o2o/dist/js/page/month/one.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){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(".im",function(e){e.preventDefault(),console.log("测试"),window.location.href="/index.php?r=o2o/advisory/xyhIm"},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),e.newTouch(".appointment",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",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("month/one",{showNavBar:!s.isWX,recharges:r.data,title:"至惠套餐"});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#monthOneScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

+ 1 - 0
www/webapp/o2o/dist/js/page/month/three.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){a.call(this,e)}),setInterval(function(){e(".product2-img").fadeToggle()},500),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".im",function(e){e.preventDefault(),e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/xyhIm"},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("month/three",{showNavBar:!s.isWX,recharges:r.data,title:"至享套餐"});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#monthThreeScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

+ 1 - 0
www/webapp/o2o/dist/js/page/month/two.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){a.call(this,e)}),setInterval(function(){e(".product2-img").fadeToggle()},500),e.newTouch(".back-button",function(e){a.call(this,e)},r),r.on("tapBackButton",function(e){a.call(this,e)}),e.newTouch(".im",function(e){e.preventDefault(),e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/xyhIm"},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("month/two",{showNavBar:!s.isWX,recharges:r.data,title:"至悦套餐"});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#monthTwoScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
www/webapp/o2o/dist/js/page/product.js


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
www/webapp/o2o/js/build/template.js


+ 54 - 1
www/webapp/o2o/js/main.js

@@ -59,6 +59,12 @@ require.config({
 		pageActivityText: './page/activities/text',
 		pageActivityRule: './page/activities/rule',
 
+		pageMonthOne:'./page/month/one',
+		pageMonthTwo:'./page/month/two',
+		pageMonthThree:'./page/month/three',
+		pageMonthFour:'./page/month/four',
+
+
 		pageAppend: './page/append',
 		pageRefund: './page/refund',
 		pageRefundSuccess: './page/refundSuccess',
@@ -445,6 +451,53 @@ require(['$', 'spa', 'native', 'helper', 'ratchet', 'config', 'user'], function
 		}
 	};
 
+	//享月会
+	var pageMonthOne={
+		route:'month-one',
+		classname:'month-one',
+		animate:'pushInLeft',
+		view:function () {
+			var $page=this;
+			requirejs(["pageMonthOne"],function (viewData) {
+				$doc.trigger('spa:initpage',[$page,viewData])
+			});
+		}
+	};
+	var pageMonthTwo={
+		route:'month-two',
+		classname:'month-two',
+		animate:'pushInLeft',
+		view:function () {
+			var $page=this;
+			requirejs(["pageMonthTwo"],function (viewData) {
+				$doc.trigger('spa:initpage',[$page,viewData])
+			});
+		}
+	};
+	var pageMonthThree={
+		route:'month-three',
+		classname:'month-three',
+		animate:'pushInLeft',
+		view:function () {
+			var $page=this;
+			requirejs(["pageMonthThree"],function (viewData) {
+				$doc.trigger('spa:initpage',[$page,viewData])
+			});
+		}
+	};
+
+	var pageMonthFour={
+		route:'month-four',
+		classname:'month-four',
+		animate:'pushInLeft',
+		view:function () {
+			var $page=this;
+			requirejs(["pageMonthFour"],function (viewData) {
+				$doc.trigger('spa:initpage',[$page,viewData])
+			});
+		}
+	};
+
 	// 追加服务
 	var pageAppend = {
 		route: 'append',
@@ -545,7 +598,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, 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,pageMonthOne,pageMonthTwo,pageMonthThree,pageMonthFour, pageAppend, pageRefund, pageRefundSuccess, pageOrderDone, pageBeautician, pageBeauticianDetail]);
 
 	var panelAlert = {
 		id: 'simpleAlert',

+ 0 - 537
www/webapp/o2o/js/model/product.js

@@ -169,543 +169,6 @@ define(['base', '$', 'api'], function (base, $, api) {
 				action_user: "",
 				action_time: "",
 				action_log: ""
-			},
-			{
-				id: "57e0e0879f5160b8048b4571",
-				price: "8",
-				name: "新居开荒",
-				// imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92%E9%A6%96%E5%9B%BE.jpg',
-				desc: [{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/1128%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92%E9%A6%96%E5%9B%BE.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_01%28720x1209%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_02%28720x1041%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_03%28720x1264%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_04%28720x1295%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_05%28720x685%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_06%28720x717%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_07%28720x685%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_08%28720x1083%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_09%28720x915%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_10%28720x785%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_11%28720x958%29.jpg"}],
-				status: 1,
-				is_extra: 0,
-				order: 0,
-				type: "6",
-				type_str: "新居开荒",
-				action_user: "",
-				action_time: "",
-				action_log: "",
-				/*pics: [
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92%E9%A6%96%E5%9B%BE.jpg",
-						width: 750,
-						height: 585
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_01%28720x1209%29.jpg",
-						width: 720,
-						height: 1209
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_02%28720x1041%29.jpg",
-						width: 720,
-						height: 1041
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_03%28720x1264%29.jpg",
-						width: 720,
-						height: 1264
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_04%28720x1295%29.jpg",
-						width: 720,
-						height: 1295
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_05%28720x685%29.jpg",
-						width: 720,
-						height: 685
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_06%28720x717%29.jpg",
-						width: 720,
-						height: 717
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_07%28720x685%29.jpg",
-						width: 720,
-						height: 685
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_08%28720x1083%29.jpg",
-						width: 720,
-						height: 1083
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_09%28720x915%29.jpg",
-						width: 720,
-						height: 915
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_10%28720x785%29.jpg",
-						width: 720,
-						height: 785
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%96%B0%E5%B1%85%E5%BC%80%E8%8D%92_1_11%28720x958%29.jpg",
-						width: 720,
-						height: 958
-					}
-				]*/
-			},
-			{
-				id: "57fb4a909f5160b2048b4a0e",
-				price: "10",
-				name: "擦玻璃",
-				// imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E6%93%A6%E7%8E%BB%E7%92%83%E9%A6%96%E5%9B%BE%E6%94%B9.jpg',
-				desc: [{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_01.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_02.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_03.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_04.jpg"}],
-				status: 1,
-				is_extra: 0,
-				order: 0,
-				type: "10",
-				type_str: "擦玻璃",
-				action_user: "",
-				action_time: "",
-				action_log: "",
-				/*pics: [
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_01%28720+608%29.jpg",
-						width: 720,
-						height: 608
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_02%28720+802%29.jpg",
-						width: 720,
-						height: 802
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_04%28720+516%29.jpg",
-						width: 720,
-						height: 516
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_03%28720+666%29.jpg",
-						width: 720,
-						height: 666
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_06%28720+820%29.jpg",
-						width: 720,
-						height: 802
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%93%A6%E7%8E%BB%E7%92%83%E8%AF%A6%E6%83%85%E9%A1%B5_07%28720+1071%29.jpg",
-						width: 720,
-						height: 1071
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128-%E7%8E%BB%E7%92%83%E6%B8%85%E6%B4%81_05%28720+846%29.jpg",
-						width: 720,
-						height: 846
-					}
-				]*/
-			},
-			{
-				id: "57e3a5a49f5160c9048b457c",
-				price: "",
-				name: "母婴房清洁",
-				// imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E6%AF%8D%E5%A9%B4%E6%88%BF%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
-				desc: [{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128%E6%AF%8D%E5%A9%B4%E6%88%BF%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_1%28730x522%29.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_2%28730x791%29.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_3%28730x823%29.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_4%28730x808%29.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_5%28730x1196%29.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_6%28730x1111%29.jpg"}],
-				status: 1,
-				is_extra: 0,
-				order: 200,
-				type: "8",
-				type_str: "母婴房清洁",
-				extra: [
-					{
-						type: "整间日常清洁",
-						price: "388"
-					},
-					{
-						type: "整间深度清洁",
-						price: "888"
-					}
-				],
-				action_user: "",
-				action_time: "",
-				action_log: "",
-				/*pics: [
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128%E6%AF%8D%E5%A9%B4%E6%88%BF%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg",
-						width: 750,
-						height: 585
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_1%28730x522%29.jpg",
-						width: 730,
-						height: 522
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_2%28730x791%29.jpg",
-						width: 730,
-						height: 791
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_3%28730x823%29.jpg",
-						width: 730,
-						height: 823
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_4%28730x808%29.jpg",
-						width: 730,
-						height: 808
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_5%28730x1196%29.jpg",
-						width: 730,
-						height: 1196
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E6%AF%8D%E5%A9%B4%E6%88%BF_6%28730x1111%29.jpg",
-						width: 730,
-						height: 1111
-					}
-				]*/
-			},
-			{
-				id: "58085f4b9f5160a9048b490e",
-				name: "租房大扫除",
-				// imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E9%A6%96%E5%9B%BE%E6%94%B9.jpg',
-				desc: [{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/1128%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E9%A6%96%E5%9B%BE%E6%94%B9.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_02%28720x404%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_03%28720x783%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_04%28720x1048%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_05%28720x915%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_08%28720x1213%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_09%28720x657%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_10%28720x720%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_11%28720x1104%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_12%28720x951%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_13%28720x812%29.jpg"},{ "type": 1,  "content": "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_14%28720x850%29.jpg"}],
-				status: 1,
-				is_extra: 0,
-				order: 0,
-				type: "9",
-				type_str: "租房清洁",
-				extra: [
-					{
-						type: "客厅清洁",
-						price: "100"
-					},
-					{
-						type: "厨房清洁",
-						price: "150"
-					},
-					{
-						type: "卧室清洁",
-						price: "100"
-					},
-					{
-						type: "卫生间清洁",
-						price: "150"
-					}
-				],
-				action_user: "",
-				action_time: "",
-				action_log: "",
-				/*pics: [
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E9%A6%96%E5%9B%BE%E6%94%B9.jpg",
-						width: 750,
-						height: 585
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_02%28720x404%29.jpg",
-						width: 720,
-						height: 404
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_03%28720x783%29.jpg",
-						width: 720,
-						height: 783
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_04%28720x1048%29.jpg",
-						width: 720,
-						height: 1048
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_05%28720x915%29.jpg",
-						width: 720,
-						height: 915
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_06%28720x758%29.jpg",
-						width: 720,
-						height: 758
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_07%28720x1129%29.jpg",
-						width: 720,
-						height: 1129
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_08%28720x1213%29.jpg",
-						width: 720,
-						height: 1213
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_09%28720x657%29.jpg",
-						width: 720,
-						height: 657
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_10%28720x720%29.jpg",
-						width: 720,
-						height: 720
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_11%28720x1104%29.jpg",
-						width: 720,
-						height: 1104
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_12%28720x951%29.jpg",
-						width: 720,
-						height: 951
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_13%28720x812%29.jpg",
-						width: 720,
-						height: 812
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_14%28720x850%29.jpg",
-						width: 720,
-						height: 850
-					}
-				]*/
-			},
-			{
-				id: "58324b7e9f5160a4048b5758",//test //583247cca84ea01d428b46a1 master//  58324b7e9f5160a4048b5758
-				price: "48",
-				name: "首单日常保洁2小时体验",//双11虹口区日常保洁特价体验//首单日常保洁2小时体验
-				// imgSrc: 'http://odulvej8l.bkt.clouddn.com/1%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81%E9%A6%96%E5%9B%BE.jpg',
-				desc: [{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_01.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_02.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_03.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_04.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_05.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_06.jpg"}],
-				status: 1,
-				is_extra: 0,
-				order: 0,
-				type: "11",
-				type_str: "日常保洁2小时体验",
-				action_user: "",
-				action_time: "",
-				action_log: "",
-				/*pics: [
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_01%28720+609%29.jpg",
-						width: 720,
-						height: 609
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_02%28720+811%29.jpg",
-						width: 720,
-						height: 811
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_03%28720+456%29.jpg",
-						width: 720,
-						height: 456
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_04%28720+1219%29.jpg",
-						width: 720,
-						height: 1219
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_05%28720+855%29.jpg",
-						width: 720,
-						height: 855
-					}
-				]*/
-			},
-			{
-				id: "5835418aa84ea0a7748b4587",//5835418aa84ea0a7748b4587
-				name: "小时工单次",
-				// imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E9%95%BF%E6%9C%9F%E8%AE%A2%E9%A6%96%E5%9B%BE.jpg',
-				desc: [{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_01.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_02.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_03.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_04.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_05.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_06.jpg"}],
-				status: 1,
-				is_extra: 0,
-				order: 0,
-				type: "12",
-				type_str: "长期订",
-				extra: [
-					{
-						type: "2小时/人",
-						price: "90"
-					},
-					{
-						type: "3小时/人",
-						price: "135"
-					}
-				],
-				action_user: "",
-				action_time: "",
-				action_log: "",
-				/*pics: [
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128%E9%95%BF%E6%9C%9F%E8%AE%A2%E9%A6%96%E5%9B%BE.jpg",
-						width: 750,
-						height: 585
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_02%28720x404%29.jpg",
-						width: 720,
-						height: 404
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_03%28720x783%29.jpg",
-						width: 720,
-						height: 783
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_04%28720x1048%29.jpg",
-						width: 720,
-						height: 1048
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_05%28720x915%29.jpg",
-						width: 720,
-						height: 915
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_06%28720x758%29.jpg",
-						width: 720,
-						height: 758
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_07%28720x1129%29.jpg",
-						width: 720,
-						height: 1129
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_08%28720x1213%29.jpg",
-						width: 720,
-						height: 1213
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_09%28720x657%29.jpg",
-						width: 720,
-						height: 657
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_10%28720x720%29.jpg",
-						width: 720,
-						height: 720
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_11%28720x1104%29.jpg",
-						width: 720,
-						height: 1104
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_12%28720x951%29.jpg",
-						width: 720,
-						height: 951
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_13%28720x812%29.jpg",
-						width: 720,
-						height: 812
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_14%28720x850%29.jpg",
-						width: 720,
-						height: 850
-					}
-				]*/
-			},
-			{
-				id: "5835423fa84ea0ac7a8b4568",
-				name: "小时工多次",
-				// imgSrc: 'http://odulvej8l.bkt.clouddn.com/1128%E9%95%BF%E6%9C%9F%E8%AE%A2%E9%A6%96%E5%9B%BE.jpg',
-				desc: [{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_01.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_02.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_03.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_04.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_05.jpg"},{"type":1,"content":"http://odulvej8l.bkt.clouddn.com/1128-%E6%97%A5%E5%B8%B8%E6%B8%85%E6%B4%81_06.jpg"}],
-				status: 1,
-				is_extra: 0,
-				order: 0,
-				type: "12",
-				type_str: "长期订",
-				extra: [
-					{
-						type: "3张(2小时/人)",
-						price: "32"
-					},
-					{
-						type: "3张(3小时/人)",
-						price: "33"
-					},
-					{
-						type: "6张(2小时/人)",
-						price: "62"
-					},
-					{
-						type: "6张(3小时/人)",
-						price: "63"
-					}
-				],
-				action_user: "",
-				action_time: "",
-				action_log: "",
-				/*pics: [
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/1128%E9%95%BF%E6%9C%9F%E8%AE%A2%E9%A6%96%E5%9B%BE.jpg",
-						width: 750,
-						height: 585
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_02%28720x404%29.jpg",
-						width: 720,
-						height: 404
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_03%28720x783%29.jpg",
-						width: 720,
-						height: 783
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_04%28720x1048%29.jpg",
-						width: 720,
-						height: 1048
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_05%28720x915%29.jpg",
-						width: 720,
-						height: 915
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_06%28720x758%29.jpg",
-						width: 720,
-						height: 758
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_07%28720x1129%29.jpg",
-						width: 720,
-						height: 1129
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_08%28720x1213%29.jpg",
-						width: 720,
-						height: 1213
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_09%28720x657%29.jpg",
-						width: 720,
-						height: 657
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_10%28720x720%29.jpg",
-						width: 720,
-						height: 720
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_11%28720x1104%29.jpg",
-						width: 720,
-						height: 1104
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_12%28720x951%29.jpg",
-						width: 720,
-						height: 951
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_13%28720x812%29.jpg",
-						width: 720,
-						height: 812
-					},
-					{
-						url: "http://odulvej8l.bkt.clouddn.com/%E7%A7%9F%E6%88%BF%E5%A4%A7%E6%89%AB%E9%99%A4%E8%AF%A6%E6%83%85%E9%A1%B5_14%28720x850%29.jpg",
-						width: 720,
-						height: 850
-					}
-				]*/
 			}
 		];
 		// this.allList=[];

+ 21 - 14
www/webapp/o2o/js/page/home.js

@@ -79,52 +79,59 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 			}, $view);
 
 
-			// 家庭保洁
-			$.newTouch('.btn-secondary', function (event) {
+			// 至惠套餐
+			$.newTouch('.month-one', function (event) {
 				event.preventDefault();
 				$doc.trigger('spa:navigate', {
-					hash: 'secondary',
+					hash: 'month-one',
 					pushData: {
 						needReset: true,
 						backHash: ''
 					}
 				});
 			}, $view);
-			/* 家电清洗 */
-			$.newTouch('.btn-appliances', function (event) {
+
+			// 至悦套餐
+			$.newTouch('.month-two', function (event) {
 				event.preventDefault();
-				var type = parseInt($(this).attr('data-product-type'));
 				$doc.trigger('spa:navigate', {
-					hash: 'product',
+					hash: 'month-two',
 					pushData: {
-						product: product.allList[type-1],
 						needReset: true,
 						backHash: ''
 					}
 				});
 			}, $view);
-			//民宿保洁
-			$.newTouch('.btn-homestay', function (event) {
+
+
+			// 至享套餐
+			$.newTouch('.month-three', function (event) {
 				event.preventDefault();
 				$doc.trigger('spa:navigate', {
-					hash: 'homestay',
+					hash: 'month-three',
 					pushData: {
 						needReset: true,
 						backHash: ''
 					}
 				});
 			}, $view);
-			// 企业服务
-			$.newTouch('.btn-homeenterprise', function (event) {
+
+			// 至尊套餐
+			$.newTouch('.month-four', function (event) {
 				event.preventDefault();
 				$doc.trigger('spa:navigate', {
-					hash: 'homeenterprise',
+					hash: 'month-four',
 					pushData: {
 						needReset: true,
 						backHash: ''
 					}
 				});
 			}, $view);
+
+
+
+
+
 			// im
 			$.newTouch('.btn-action-logo', function (event) {
 				event.preventDefault();

+ 104 - 0
www/webapp/o2o/js/page/month/four.js

@@ -0,0 +1,104 @@
+/**
+ * Created by Jinguo on 2016/12/15.
+ */
+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) {
+				back.call(this, event);
+			});
+
+			/*特效*/
+			setInterval(function run() {
+				$('.product2-img').fadeToggle();
+			}, 500);
+
+			$.newTouch('.back-button', function (event) {
+				back.call(this, event);
+			}, $view);
+
+			$view.on('tapBackButton', function (event) {
+				back.call(this, event);
+			});
+
+			// im
+			$.newTouch('.im', function (event) {
+				event.preventDefault();
+				event.preventDefault();
+				window.location.href = '/index.php?r=o2o/advisory/xyhIm';
+			}, $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('month/four', {
+							showNavBar: !config.isWX,
+							recharges: res.data,
+							title:"至尊套餐"
+						});
+						$('.spa-page-body', $view).html(tpl);
+						setTimeout(function () {
+							pageData.scroll = new IScroll('#monthFourScroll');
+						}, 500);
+					}
+				});
+			}
+
+			dtd.resolve();
+		},
+		beforeclose: function (pageData, dtd) {
+			dtd.resolve();
+		}
+	}
+})

+ 97 - 0
www/webapp/o2o/js/page/month/one.js

@@ -0,0 +1,97 @@
+/**
+ * Created by Jinguo on 2016/12/15.
+ */
+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) {
+				back.call(this, event);
+			});
+
+			$.newTouch('.back-button', function (event) {
+				back.call(this, event);
+			}, $view);
+
+			$view.on('tapBackButton', function (event) {
+				back.call(this, event);
+			});
+
+			// im
+			$.newTouch('.im', function (event) {
+				event.preventDefault();
+				console.log("测试");
+				window.location.href = '/index.php?r=o2o/advisory/xyhIm';
+			}, $view);
+
+			// 首页
+			$.newTouch('.btn-action-my-order', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: '',
+					pushData: {
+						needReset: true
+					}
+				});
+			}, $view);
+			// 预约
+			$.newTouch('.appointment', function (event) {
+				event.preventDefault();
+				$doc.trigger('spa:navigate', {
+					hash: '',
+					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('month/one', {
+							showNavBar: !config.isWX,
+							recharges: res.data,
+							title:"至惠套餐"
+						});
+						$('.spa-page-body', $view).html(tpl);
+						setTimeout(function () {
+							pageData.scroll = new IScroll('#monthOneScroll');
+						}, 500);
+					}
+				});
+			}
+
+			dtd.resolve();
+		},
+		beforeclose: function (pageData, dtd) {
+			dtd.resolve();
+		}
+	}
+})

+ 104 - 0
www/webapp/o2o/js/page/month/three.js

@@ -0,0 +1,104 @@
+/**
+ * Created by Jinguo on 2016/12/15.
+ */
+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) {
+				back.call(this, event);
+			});
+
+			/*特效*/
+			setInterval(function run() {
+				$('.product2-img').fadeToggle();
+			}, 500);
+
+			$.newTouch('.back-button', function (event) {
+				back.call(this, event);
+			}, $view);
+
+			$view.on('tapBackButton', function (event) {
+				back.call(this, event);
+			});
+
+			// im
+			$.newTouch('.im', function (event) {
+				event.preventDefault();
+				event.preventDefault();
+				window.location.href = '/index.php?r=o2o/advisory/xyhIm';
+			}, $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('month/three', {
+							showNavBar: !config.isWX,
+							recharges: res.data,
+							title:"至享套餐"
+						});
+						$('.spa-page-body', $view).html(tpl);
+						setTimeout(function () {
+							pageData.scroll = new IScroll('#monthThreeScroll');
+						}, 500);
+					}
+				});
+			}
+
+			dtd.resolve();
+		},
+		beforeclose: function (pageData, dtd) {
+			dtd.resolve();
+		}
+	}
+})

+ 104 - 0
www/webapp/o2o/js/page/month/two.js

@@ -0,0 +1,104 @@
+/**
+ * Created by Jinguo on 2016/12/15.
+ */
+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) {
+				back.call(this, event);
+			});
+
+			/*特效*/
+			setInterval(function run() {
+				$('.product2-img').fadeToggle();
+			}, 500);
+
+			$.newTouch('.back-button', function (event) {
+				back.call(this, event);
+			}, $view);
+
+			$view.on('tapBackButton', function (event) {
+				back.call(this, event);
+			});
+
+			// im
+			$.newTouch('.im', function (event) {
+				event.preventDefault();
+				event.preventDefault();
+				window.location.href = '/index.php?r=o2o/advisory/xyhIm';
+			}, $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('month/two', {
+							showNavBar: !config.isWX,
+							recharges: res.data,
+							title:"至悦套餐"
+						});
+						$('.spa-page-body', $view).html(tpl);
+						setTimeout(function () {
+							pageData.scroll = new IScroll('#monthTwoScroll');
+						}, 500);
+					}
+				});
+			}
+
+			dtd.resolve();
+		},
+		beforeclose: function (pageData, dtd) {
+			dtd.resolve();
+		}
+	}
+})

+ 7 - 2
www/webapp/o2o/js/page/product.js

@@ -88,7 +88,13 @@ define(['$', 'template', 'product', 'cart', 'api', 'order', 'user', 'config', 'r
 					}
 				});
 			}, $view);
-
+			/*预约服务*/
+			/*联系我们*/
+			$.newTouch('.product-new-im', function (event) {
+				event.preventDefault();
+				window.location.href = '/index.php?r=o2o/advisory/xyhIm';
+				console.log("测试");
+			},$view);
 			// 提示信息
 			$.newTouch('.group-title-container', function (event) {
 				if ($(this).find('.group-title').hasClass('active')) {
@@ -228,7 +234,6 @@ define(['$', 'template', 'product', 'cart', 'api', 'order', 'user', 'config', 'r
 				}, false);
 			}
 
-			dtd.resolve();
 		}
 	}
 });

+ 0 - 39
www/webapp/o2o/tpl/hire/index.html

@@ -1,39 +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" id="placeOrderScroll">
-	<div class="top-content">
-		<p>招募上门宠物保洁师</p>
-	</div>
-	<div class="page-content">
-		<div class="logo-box">
-			<div class="logo"></div>
-			<h2>壹管家宠物</h2>
-			<h3>专业宠物服务平台</h3>
-		</div>
-		<div class="des">
-			<p>岗位职责</p>
-			<p>资深保洁师:独立操作各种宠物造型的修剪工作。</p>
-			<p>保洁师助理:独立完成宠物洗澡工作。</p>
-			<br>
-
-			<p class="bold">公司福利</p>
-			<p class="bold">1.远高于传统美容店的底薪。</p>
-			<p class="bold">2.全上海各区都有宿舍,就近安排住宿。</p>
-			<p class="bold">3.完善的晋升机制,对业绩考评优秀的保洁师,公司将统一组织培训深造、考级。</p>
-			<br>
-			{{ if !showNavBar }}
-            <p class="bold">联系电话: <a href="tel:021-62109097">021-62109097</a> </p>
-			{{ else }}
-			<p class="bold">联系电话: <a class="service-telephone">021-62109097</a> </p>
-			{{ /if }}
-			<br>
-		</div>
-	</div>
-</div>
-

+ 7 - 5
www/webapp/o2o/tpl/home/index.html

@@ -31,17 +31,19 @@
 
 						<div class="home-box">
 							<div class="width-percent-50 box-align-center">
-								<img class="btn-secondary lazy" src="http://odulvej8l.bkt.clouddn.com/4-1-01.png" alt="">
+								<img class="month-one" src="http://odulvej8l.bkt.clouddn.com/4-1-01.png"
+								     alt="">
 							</div>
 							<div class="width-percent-50 box-align-center ">
-								<img class="btn-appliances lazy" data-product-type="4" src="http://odulvej8l.bkt.clouddn.com/4-2-01.png"
+								<img class="month-two" data-product-type="2" src="http://odulvej8l.bkt.clouddn.com/4-2-01.png"
 								     alt="">
 							</div>
 							<div class="width-percent-50 box-align-center">
-								<img class="btn-homestay lazy" src="http://odulvej8l.bkt.clouddn.com/4-3-01.png" alt="">
+								<img class="month-three" src="http://odulvej8l.bkt.clouddn.com/4-3-01.png"
+								     alt="">
 							</div>
-							<div class="width-percent-50 box-align-center">
-								<img class="btn-homeenterprise lazy" src="http://odulvej8l.bkt.clouddn.com/4-4-01.png" alt="">
+							<div class="width-percent-50  box-align-center">
+								<img class="month-four" src="http://odulvej8l.bkt.clouddn.com/4-4-01.png" alt="">
 							</div>
 						</div>
 					</div>

+ 24 - 0
www/webapp/o2o/tpl/month/four.html

@@ -0,0 +1,24 @@
+{{ if showNavBar }}
+<header class="bar bar-nav">
+	<a class="left-button back-button">
+		<div class="icon icon-left-nav"></div>
+	</a>
+	<h1 class="title">{{title}}</h1>
+</header>
+{{ /if }}
+
+<div class="content">
+	<div class="box-container">
+		<div class="box-container box box-vertical">
+			<div id="monthFourScroll" class="scroll-container box-flex-1" style="background: #dadada;">
+				<div class="scroller">
+					<img
+						src="http://odulvej8l.bkt.clouddn.com/1107%E4%BC%81%E4%B8%9A%E6%9C%8D%E5%8A%A1%E8%AF%A6%E6%83%85%E9%A1%B5.jpg"
+						style="width: 100%;">
+					<!--<div style="width: 100%;padding-bottom:15%; "></div>-->
+				</div>
+				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
+			</div>
+		</div>
+	</div>
+</div>

+ 24 - 0
www/webapp/o2o/tpl/month/one.html

@@ -0,0 +1,24 @@
+{{ if showNavBar }}
+<header class="bar bar-nav">
+	<a class="left-button back-button">
+		<div class="icon icon-left-nav"></div>
+	</a>
+	<h1 class="title">{{title}}</h1>
+</header>
+{{ /if }}
+
+<div class="content">
+	<div class="box-container">
+		<div class="box-container box box-vertical">
+			<div id="monthOneScroll" class="scroll-container box-flex-1" style="background: #dadada;">
+				<div class="scroller">
+					<img
+						src="http://odulvej8l.bkt.clouddn.com/1107%E4%BC%81%E4%B8%9A%E6%9C%8D%E5%8A%A1%E8%AF%A6%E6%83%85%E9%A1%B5.jpg"
+						style="width: 100%;">
+					<!--<div style="width: 100%;padding-bottom:15%; "></div>-->
+				</div>
+				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
+			</div>
+		</div>
+	</div>
+</div>

+ 24 - 0
www/webapp/o2o/tpl/month/three.html

@@ -0,0 +1,24 @@
+{{ if showNavBar }}
+<header class="bar bar-nav">
+	<a class="left-button back-button">
+		<div class="icon icon-left-nav"></div>
+	</a>
+	<h1 class="title">{{title}}</h1>
+</header>
+{{ /if }}
+
+<div class="content">
+	<div class="box-container">
+		<div class="box-container box box-vertical">
+			<div id="monthThreeScroll" class="scroll-container box-flex-1" style="background: #dadada;">
+				<div class="scroller">
+					<img
+						src="http://odulvej8l.bkt.clouddn.com/1107%E4%BC%81%E4%B8%9A%E6%9C%8D%E5%8A%A1%E8%AF%A6%E6%83%85%E9%A1%B5.jpg"
+						style="width: 100%;">
+					<!--<div style="width: 100%;padding-bottom:15%; "></div>-->
+				</div>
+				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
+			</div>
+		</div>
+	</div>
+</div>

+ 24 - 0
www/webapp/o2o/tpl/month/two.html

@@ -0,0 +1,24 @@
+{{ if showNavBar }}
+<header class="bar bar-nav">
+	<a class="left-button back-button">
+		<div class="icon icon-left-nav"></div>
+	</a>
+	<h1 class="title">{{title}}</h1>
+</header>
+{{ /if }}
+
+<div class="content">
+	<div class="box-container">
+		<div class="box-container box box-vertical">
+			<div id="monthTwoScroll" class="scroll-container box-flex-1" style="background: #dadada;">
+				<div class="scroller">
+					<img
+						src="http://odulvej8l.bkt.clouddn.com/1107%E4%BC%81%E4%B8%9A%E6%9C%8D%E5%8A%A1%E8%AF%A6%E6%83%85%E9%A1%B5.jpg"
+						style="width: 100%;">
+					<!--<div style="width: 100%;padding-bottom:15%; "></div>-->
+				</div>
+				<div class="request"><div class="appointment">预约</div><div class="im">咨询</div></div>
+			</div>
+		</div>
+	</div>
+</div>

+ 3 - 3
www/webapp/o2o/tpl/product/index.html

@@ -8,12 +8,12 @@
 {{ /if }}
 
 <div class="content">
-  <div class="control-bar box-center {{if type > 10}}hide{{/if}}">
+<!--  <div class="control-bar box-center {{if type > 10}}hide{{/if}}">
       <div class="segmented-control type-control prevent-scroll">
       <a class="control-item active" data-type="1">详情</a>
       <a class="control-item" data-type="2">评价({{commentCounts}})</a>
     </div>
-  </div>
+  </div>-->
 
   <div class="product-main-container" {{if type > 10}}style="top: 0"{{/if}}>
     <div class="box-container type-container" id="descContainer">
@@ -98,5 +98,5 @@
       </div>
     </div>
   </div>
-<div class="product-new"><div class="product-new-btn">立即下单</div></div>
+<div class="product-new"><div class="product-new-btn">预约</div><div class="product-new-im">咨询</div></div>
 </div>

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác