Эхлэл Бүгдийг харах Тусламж
Бүртгүүлэх Нэвтрэх
yiguanjia
/
php
2
0
Салаа 0
Файлууд Асуудлууд 0 Хуулах хүсэлтүүд 0 Мэдлэгийн сан
Эх сурвалжийг харах

Merge branch 'test'

DengTao 8 жил өмнө
parent
db2771d42e 47151c7ea9
commit
f80a3cb525
21 өөрчлөгдсөн 88 нэмэгдсэн , 159 устгасан
Өөрчлөлтийг ялгаж харах Өөрчлөлтийн статистик харах
  1. 9 5
      www/protected/controllers/ROrderController.php
  2. 5 0
      www/protected/modules/o2o/controllers/AdvisoryController.php
  3. 0 4
      www/protected/modules/o2o/views/advisory/SinglesDay.php
  4. 65 0
      www/protected/modules/o2o/views/advisory/im.php
  5. 0 1
      www/webapp/o2o/build.js
  6. 0 1
      www/webapp/o2o/dist/js/build.txt
  7. 0 0
      www/webapp/o2o/dist/js/main.js
  8. 0 0
      www/webapp/o2o/dist/js/page/home.js
  9. 1 1
      www/webapp/o2o/dist/js/page/homeenterprise.js
  10. 1 1
      www/webapp/o2o/dist/js/page/homestay.js
  11. 0 1
      www/webapp/o2o/dist/js/page/im.js
  12. 0 0
      www/webapp/o2o/dist/js/page/mine.js
  13. 1 1
      www/webapp/o2o/dist/js/page/secondary.js
  14. 0 0
      www/webapp/o2o/js/build/template.js
  15. 1 14
      www/webapp/o2o/js/main.js
  16. 1 15
      www/webapp/o2o/js/page/home.js
  17. 1 6
      www/webapp/o2o/js/page/homeenterprise.js
  18. 1 6
      www/webapp/o2o/js/page/homestay.js
  19. 0 91
      www/webapp/o2o/js/page/im.js
  20. 1 6
      www/webapp/o2o/js/page/mine.js
  21. 1 6
      www/webapp/o2o/js/page/secondary.js

+ 9 - 5
www/protected/controllers/ROrderController.php
Файл харах 

@@ -736,10 +736,14 @@ class ROrderController extends AdminController{
 
     }
 
 
     public function actionDelOrder(){
 
-       $delOrder =  array('5824ad3d9f5160cb048b4f4e', '5824ac019f5160a4048b4f02', '5824ab639f5160b8048b517b', '5824aae49f5160d0048b4ffa', '5824a9269f5160ac048b4fd5', '5824a7369f5160c3048b4ff9', '5824a6989f5160b5048b5127', '5824a6389f5160a7048b5071', '5824a55d9f5160bc048b5052', '5824a4ee9f5160d2048b4fe9', '5824a43d9f5160bb048b50b3', '5824a3bc9f5160bf048b50fe', '5824a3329f5160b3048b5156', '5824a2b29f5160b9048b509c', '5824a2379f5160a2048b4fdf', '5824cbde9f5160c5048b50cd', '5824c62d9f5160ce048b4f14', '5824c4949f5160c0048b5157', '5824c0e29f5160ab048b500d', '5824bf289f5160ad048b5209', '5824bda39f5160bc048b505a', '5824bd389f5160b7048b508a', '5824bcfd9f5160af048b4fb0', '5824bc329f5160b4048b5066',
 
-            '5824bc0a9f5160c5048b509e', '5824bbbc9f5160b9048b50b7', '5824ba109f5160d3048b4f20', '5824b8c39f5160cb048b4f5c', '5824b9059f5160a4048b4f0a', '5824b8429f5160b8048b51eb', '5824b6479f5160cb048b4f56', '5824b5f39f5160aa048b5259', '5824b5be9f5160d2048b4ff6', '5824b5359f5160ce048b4ee5', '5824b4169f5160c5048b5097', '5825324f9f5160ce048b4fa4',
 
-            '582501529f5160bf048b5140', '5824ff309f5160c5048b50e1', '5824ec9d9f5160bb048b5102', '5824dd7d9f5160c6048b501f', '5824dc1e9f5160b1048b504d', '5824dbd59f5160ae048b5309', '5824d81c9f5160b5048b5185', '5824d4869f5160cb048b4f9b', '5824ce439f5160ab048b5040', '5824caa19f5160c6048b5019', '5824c5229f5160b6048b513b', '582504169f5160ca048b5239', '5824fb839f5160d3048b4f36', '5824fb069f5160c5048b50da', '582508d09f5160cb048b4fcf', '582508ad9f5160c7048b5125', '5825075a9f5160ba048b507e', '5825070d9f5160ac048b5001', '5825055e9f5160b9048b50d1', '58227c829f5160a9048b4ef1', '582041a49f5160b1048b4e2c');
 
-        $total = 0;
 
+       $delOrder =  array('58250fc29f5160ca048b524a',
 
+           '5825090c9f5160bd048b51e4',
 
+           '582508ed9f5160c6048b502c',
 
+           '582508d29f5160b6048b5163',
 
+           '5825084e9f5160b6048b515d',
 
+           '5824d8469f5160b2048b4fb1',
 
+           '582492eb9f5160c4048b4f36');
 
+           $total = 0;
 
         foreach($delOrder as $value){
 
             $order = ROrder::model()->get(new MongoId($value));
 
             if($order->delete()){
 
@@ -752,4 +756,4 @@ class ROrderController extends AdminController{
 
 
     }
 
 
-}
 
+}

+ 5 - 0
www/protected/modules/o2o/controllers/AdvisoryController.php
Файл харах 

@@ -58,5 +58,10 @@ class AdvisoryController extends O2oBaseController {
 
         }
 
         $this->render('enterprise');
 
     }
 
+    //联系壹管家
 
+    public function  actionIm()
 
+    {
 
+        $this->render('im');
 
+    }
 
 
 }

+ 0 - 4
www/protected/modules/o2o/views/advisory/SinglesDay.php
Файл харах 

@@ -26,10 +26,6 @@
 
 </head>
 
 <body ng-controller="myctrl">
 
 <div class="">
 
-  <!--  <img style="width: 100%"-->
 
-  <!--       src="http://odulvej8l.bkt.clouddn.com/%E6%B0%91%E5%AE%BF%E4%BF%9D%E6%B4%81%E8%AF%A6%E6%83%85%E9%A1%B5.jpg"-->
 
-  <!--       alt="">-->
 
-<!--  <img src="http://oduj3utzz.bkt.clouddn.com/1111%E4%BA%8C%E7%BB%B4%E7%A0%81-01.jpg" alt="联系我们" style="width: 100%;">-->
 
   <form action="" method='post'
 
         class="container  form-horizontal  ng-valid ng-dirty ng-valid-parse" id='singlesDay'
 
         style="margin-bottom: 15%; ">

+ 65 - 0
www/protected/modules/o2o/views/advisory/im.php
Файл харах 

@@ -0,0 +1,65 @@
 
+<!--/**
 
+ * 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/o2o/dist/css/main.css?v=2016032401">
 
+  <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 = "壹管家";
 
+    })
 
+  </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">
 
+<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" href="/index.php?r=o2o/web/index">
 
+          <div class="logo logo-my-order" style="margin-bottom: 0.5rem;"></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="/index.php?r=o2o/web/index#im">
 
+          <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"style="margin-bottom: 0.5rem;"></div>
 
+          <div class="name">我的</div>
 
+        </a>
 
+      </div>
 
+    </div>
 
+  </div>
 
+</div>
 
+</body>
 
+</html>

+ 0 - 1
www/webapp/o2o/build.js
Файл харах 

@@ -11,7 +11,6 @@
 
 		include: [
 
 			'ratchet',
 
 			'pageHome',
 
-			'pageHomeIm',
 
 			'pageBargain',
 
 			'pageHelp',
 
 			'pageAbout',

+ 0 - 1
www/webapp/o2o/dist/js/build.txt
Файл харах 

@@ -21,7 +21,6 @@ build/template.js
 
 IScroll.js
 
 page/home.js
 
 model/recharge.js
 
-page/im.js
 
 page/bargain.js
 
 page/help.js
 
 page/about.js

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/o2o/dist/js/main.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/o2o/dist/js/page/home.js


+ 1 - 1
www/webapp/o2o/dist/js/page/homeenterprise.js
Файл харах 

@@ -1 +1 @@
 
-define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"企业服务",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},r),r.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/enterprise"},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("homeenterprise/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#homeenterpriseScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
 
+define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"企业服务",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){u.call(this,e)}),e.newTouch(".back-button",function(e){u.call(this,e)},r),r.on("tapBackButton",function(e){u.call(this,e)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/enterprise"},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/im"},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("homeenterprise/index",{showNavBar:!s.isWX,recharges:r.data});e(".spa-page-body",u).html(o),setTimeout(function(){i.scroll=new n("#homeenterpriseScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

+ 1 - 1
www/webapp/o2o/dist/js/page/homestay.js
Файл харах 

@@ -1 +1 @@
 
-define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"民宿保洁",body:"",init:function(t,n){var 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(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/SinglesDay"},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"im",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-coupon",function(e){e.preventDefault(),o.checkLogin(function(){i.trigger("spa:navigate",{hash:"mine",pushData:{needReset:!0}})})},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(i,o){var u=this,a=e(document);i.pushData.dontNeedReload||(a.trigger("spa:openloader"),r.getRechargeList(function(r){a.trigger("spa:closeloader");if(r.success){var o=t("homestay/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("#homestayScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});
 
+define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"民宿保洁",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},r),r.on("tapBackButton",function(e){history.go(-1)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/SinglesDay"},r),e.newTouch(".btn-action-my-order",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"",pushData:{needReset:!0}})},r),e.newTouch(".btn-action-logo",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/im"},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("homestay/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("#homestayScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

+ 0 - 1
www/webapp/o2o/dist/js/page/im.js
Файл харах 

@@ -1 +0,0 @@
 
-define(["$","template","IScroll","recharge","native","config","user"],function(e,t,n,r,i,s,o){function u(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}return{title:"联系我们",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){history.go(-1)}),e.newTouch(".back-button",function(e){history.go(-1)},r),r.on("tapBackButton",function(e){history.go(-1)}),e.newTouch(".o2o-btn-homestay",function(e){e.preventDefault(),window.location.href="/index.php?r=o2o/advisory/SinglesDay"},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("im/im",{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("#homeImScroll")},500)}})),o.resolve()},beforeclose:function(e,t){t.resolve()}}});

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/o2o/dist/js/page/mine.js


+ 1 - 1
www/webapp/o2o/dist/js/page/secondary.js
Файл харах 

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

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/o2o/js/build/template.js


+ 1 - 14
www/webapp/o2o/js/main.js
Файл харах 

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

+ 1 - 15
www/webapp/o2o/js/page/home.js
Файл харах 

@@ -216,12 +216,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 
 			// im
 
 			$.newTouch('.btn-action-logo', function (event) {
 
 				event.preventDefault();
 
-				$doc.trigger('spa:navigate', {
 
-					hash: 'im',
 
-					pushData: {
 
-						needReset: true
 
-					}
 
-				});
 
+				window.location.href = '/index.php?r=o2o/advisory/im';
 
 			}, $view);
 
 			// 个人中心
 
 			$.newTouch('.btn-action-coupon', function (event) {
 
@@ -344,12 +339,6 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 
 				setTimeout(function () {
 
 					pageData.scroll = new IScroll('#homeScroll');
 
 					var swiper = new Swiper('.swiper-container', {
 
-						/*	paginationClickable: true,
 
-						 pagination: '.pagination',
 
-						 spaceBetween: 30,
 
-						 centeredSlides: true,
 
-						 autoplay: 1500,
 
-						 autoplayDisableOnInteraction: false*/
 
 						pagination: '.pagination',
 
 						loop: true,
 
 						paginationClickable: true,
 
@@ -357,10 +346,7 @@ define(['$', 'template', 'IScroll', 'product', 'user', 'native', 'config', 'addr
 
 						// autoplay: 5000,
 
 						autoplayDisableOnInteraction: false
 
 					});
 
-					// $('.swiper-container').height($('.swiper-container img').height());
 
-
 
 				}, 20);
 
-
 
 				// 目前的作用只是供后端判断，该用户是否为新用户，所以没有回调。
 
 				product.getListAll(user.id);

+ 1 - 6
www/webapp/o2o/js/page/homeenterprise.js
Файл харах 

@@ -56,12 +56,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 
 			// im
 
 			$.newTouch('.btn-action-logo', function (event) {
 
 				event.preventDefault();
 
-				$doc.trigger('spa:navigate', {
 
-					hash: 'im',
 
-					pushData: {
 
-						needReset: true
 
-					}
 
-				});
 
+				window.location.href = '/index.php?r=o2o/advisory/im';
 
 			}, $view);
 
 			// 个人中心
 
 			$.newTouch('.btn-action-coupon', function (event) {

+ 1 - 6
www/webapp/o2o/js/page/homestay.js
Файл харах 

@@ -46,12 +46,7 @@ define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], fun
 
 			// im
 
 			$.newTouch('.btn-action-logo', function (event) {
 
 				event.preventDefault();
 
-				$doc.trigger('spa:navigate', {
 
-					hash: 'im',
 
-					pushData: {
 
-						needReset: true
 
-					}
 
-				});
 
+				window.location.href = '/index.php?r=o2o/advisory/im';
 
 			}, $view);
 
 			// 个人中心
 
 			$.newTouch('.btn-action-coupon', function (event) {

+ 0 - 91
www/webapp/o2o/js/page/im.js
Файл харах 

@@ -1,91 +0,0 @@
 
-define(['$', 'template', 'IScroll', 'recharge', 'native', 'config', 'user'], function ($, template, IScroll, recharge, native, config, user) {
 
-
 
-	function back(event) {
 
-		event.preventDefault();
 
-		$(document).trigger('spa:navigate', {
 
-			hash: '',
 
-			pushData: {
 
-				dontNeedReload: true
 
-			}
 
-		});
 
-	}
 
-	return {
 
-		title: '联系我们',
 
-		body: '',
 
-		init: function (pageData, dtd) {
 
-			/* 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('.o2o-btn-homestay',function (event) {
 
-				event.preventDefault();
 
-				window.location.href='/index.php?r=o2o/advisory/SinglesDay';
 
-				// console.log('测试')
 
-			},$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('im/im', {
 
-							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('#homeImScroll');
 
-						}, 500);
 
-					}
 
-				});
 
-			}
 
-			dtd.resolve();
 
-		},
 
-		beforeclose: function (pageData, dtd) {
 
-			dtd.resolve();
 
-		}
 
-	}
 
-})

+ 1 - 6
www/webapp/o2o/js/page/mine.js
Файл харах 

@@ -125,12 +125,7 @@ define(['$', 'template', 'IScroll', 'user', 'native', 'config', 'address', 'prod
 
 // im
 
 			$.newTouch('.btn-action-logo', function (event) {
 
 				event.preventDefault();
 
-				$doc.trigger('spa:navigate', {
 
-					hash: 'im',
 
-					pushData: {
 
-						needReset: true
 
-					}
 
-				});
 
+				window.location.href = '/index.php?r=o2o/advisory/im';
 
 			}, $view);
 
 			/* 定义按钮事件结束。*/

+ 1 - 6
www/webapp/o2o/js/page/secondary.js
Файл харах 

@@ -65,12 +65,7 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
 
             // im
 
             $.newTouch('.btn-action-logo', function (event) {
 
                 event.preventDefault();
 
-                $doc.trigger('spa:navigate', {
 
-                    hash: 'im',
 
-                    pushData: {
 
-                        needReset: true
 
-                    }
 
-                });
 
+                window.location.href = '/index.php?r=o2o/advisory/im';
 
             }, $view);
 
             /*首页*/
 
             $.newTouch('.btn-action-my-order', function () {

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно