Inicio Explorar Ayuda
Registro Iniciar sesión
yiguanjia
/
php
2
0
Fork 0
Archivos Incidencias 0 Pull Requests 0 Wiki
Explorar el Código

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

north hace 8 años
padre
c030e29eff ed7ab43b8a
commit
41023f0959
Se han modificado 17 ficheros con 538 adiciones y 252 borrados
Dividir vista Mostrar estadísticas de diff
  1. 260 0
      www/protected/modules/moonclub/views/web/index (复件).php
  2. 73 75
      www/protected/modules/moonclub/views/web/index.php
  3. 0 0
      www/webapp/moonclub/dist/js/build/template.js
  4. 0 0
      www/webapp/moonclub/dist/js/main.js
  5. 1 1
      www/webapp/moonclub/dist/js/page/YorderInfo.js
  6. 1 1
      www/webapp/moonclub/dist/js/page/modeifyStatus.js
  7. 1 1
      www/webapp/moonclub/dist/js/page/month.js
  8. 0 0
      www/webapp/moonclub/dist/js/page/serviceList.js
  9. 0 0
      www/webapp/moonclub/js/build/template.js
  10. 25 16
      www/webapp/moonclub/js/page/YorderInfo.js
  11. 40 38
      www/webapp/moonclub/js/page/home.js
  12. 2 0
      www/webapp/moonclub/js/page/modeifyStatus.js
  13. 54 49
      www/webapp/moonclub/js/page/month.js
  14. 12 1
      www/webapp/moonclub/js/page/serviceList.js
  15. 40 40
      www/webapp/moonclub/tpl/employe/YorderInfo.html
  16. 5 6
      www/webapp/moonclub/tpl/employe/serviceList.html
  17. 24 24
      www/webapp/moonclub/tpl/month/index.html

+ 260 - 0
www/protected/modules/moonclub/views/web/index (复件).php
Ver fichero 

@@ -0,0 +1,260 @@
 
+<!DOCTYPE html>
 
+<html>
 
+<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="viewport" content="width=device-width,minimum-scale=1.0,maximum-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/framework/ratchet-2.0.2/dist/css/ratchet.min.css?v=201708">
 
+  <link rel="stylesheet"
 
+        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=201708">
 
+  <link rel="stylesheet"
 
+        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=20170901104">
 
+  <!--    <link href="-->
 
+  <?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=20170901104" rel="stylesheet">-->
 
+  <link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/bootstrap-3.3.7.min.css?v=201708">
 
+  <link rel="stylesheet" href="http://odulvej8l.bkt.clouddn.com/LCalendar.css?v=201708">
 
+<!-- js -->
 
+  <!--     <script src="-->
 
+  <?php //echo Yii::app()->request->baseUrl; ?><!--/js/o2o/swiper.min.js?v=20170901104"></script> -->
 
+  <link rel="stylesheet"
 
+        href="https://raw.githubusercontent.com/andreruffert/rangeslider.js/develop/dist/rangeslider.css?v=201708" media="screen"
 
+        title="no title">
 
+  <script
 
+    src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=201708"></script>
 
+  <!--<script src="<?php /*echo Yii::app()->request->baseUrl; */ ?>/js/bootstrap-3.3.7.min.js?v=201708"></script>-->
 
+  <script src="http://odulvej8l.bkt.clouddn.com/LCalendar.js?v=201708"></script>
 
+  <style>
 
+    html {
 
+      height: 100%
 
+    }
 
+
 
+    body {
 
+      position: relative;
 
+      margin: 0;
 
+      padding: 0;
 
+      width: 100%;
 
+      height: 100%;
 
+      overflow: hidden
 
+    }
 
+
 
+    .spa-fullscreen {
 
+      position: absolute;
 
+      left: 0;
 
+      top: 0;
 
+      margin: 0;
 
+      padding: 0;
 
+      width: 100%;
 
+      visibility: hidden;
 
+      overflow: hidden;
 
+      z-index: -1
 
+    }
 
+
 
+    .spa-page {
 
+      position: absolute;
 
+      left: 0;
 
+      top: 0;
 
+      bottom: 0;
 
+      right: 0;
 
+      margin: 0;
 
+      padding: 0;
 
+      overflow: hidden;
 
+      z-index: 2000;
 
+      -webkit-transform: translateZ(0);
 
+      -webkit-backface-visibility: hidden;
 
+      -webkit-transform-style: preserve-3d
 
+    }
 
+
 
+    .spa-page-bg {
 
+      position: absolute;
 
+      left: 0;
 
+      top: 0;
 
+      bottom: 0;
 
+      right: 0;
 
+      margin: 0;
 
+      padding: 0
 
+    }
 
+
 
+    .spa-page-body {
 
+      position: absolute;
 
+      left: 0;
 
+      top: 0;
 
+      bottom: 0;
 
+      right: 0;
 
+      margin: 0;
 
+      padding: 0;
 
+      overflow: hidden;
 
+      -webkit-transform: translateZ(0);
 
+      -webkit-backface-visibility: hidden;
 
+      -webkit-transform-style: preserve-3d
 
+    }
 
+
 
+    .spa-scroll {
 
+      overflow: auto
 
+    }
 
+
 
+    .spa-scroll-touch {
 
+      -webkit-overflow-scrolling: touch
 
+    }
 
+
 
+    .spa-scroll-x {
 
+      overflow-y: hidden
 
+    }
 
+
 
+    .spa-scroll-y {
 
+      overflow-x: hidden
 
+    }
 
+
 
+    .spa-cover {
 
+      display: none;
 
+      position: absolute;
 
+      left: 0;
 
+      right: 0;
 
+      top: 0;
 
+      bottom: 0;
 
+      text-align: center;
 
+      z-index: 5000
 
+    }
 
+
 
+    .spa-loader {
 
+      position: absolute;
 
+      left: 0;
 
+      right: 0;
 
+      top: 0;
 
+      bottom: 0;
 
+      text-align: center;
 
+      overflow: hidden;
 
+      z-index: 5001
 
+    }
 
+
 
+    .loading {
 
+      position: absolute;
 
+      width: 70%;
 
+      height: 100%;
 
+      left: 15%;
 
+      background: rgba(255, 255, 255, 0.21);
 
+      z-index: 99
 
+    }
 
+
 
+    .loading p {
 
+      position: fixed;
 
+      left: 50%;
 
+      top: 50%;
 
+      -webkit-transform: translate(-50%, -50%);
 
+      text-align: center;
 
+      color: #222;
 
+      font-size: .8rem
 
+    }
 
+
 
+    .loading .process {
 
+      position: absolute;
 
+      top: 45%;
 
+      left: 50%;
 
+      -webkit-transform: translate(-50%, -50%);
 
+      width: 90%;
 
+      height: 10px;
 
+      border-radius: 10px;
 
+      border: 1px solid #ccc;
 
+      background: rgba(255, 255, 255, 0.34);
 
+      overflow: hidden
 
+    }
 
+
 
+    .loading .process .cs {
 
+      background: rgba(78, 26, 66, 0.79);
 
+      width: 0;
 
+      height: 100%;
 
+      animation: myfirst 4s infinite;
 
+      -moz-animation: myfirst 4s infinite;
 
+      -webkit-animation: myfirst 4s infinite;
 
+      -o-animation: myfirst 4s infinite
 
+    }
 
+
 
+    @keyframes myfirst {
 
+      0% {
 
+        width: 0
 
+      }
 
+      100% {
 
+        width: 100%
 
+      }
 
+    }
 
+  </style>
 
+  <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js?v=20170901104"
 
+          crossOrigin="anonymous"></script>
 
+  <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=20170901104"></script>
 
+  <script type="text/javascript">
 
+    window.bughd = window.bughd || function () {
 
+      };
 
+    bughd("create", {key: "aebe40c5d5b2975056629dc7980676ce"})
 
+  </script>
 
+</head>
 
+<body style="height: 100%">
 
+<!-- loading -->
 
+<!-- loading -->
 
+<div class="spa-fullscreen"></div>
 
+<div class="spa-loader">
 
+  <div class="loading">
 
+    <div class="process">
 
+      <div class="cs"></div>
 
+    </div>
 
+  </div>
 
+  <div style="position: absolute;top: 50%;width:60%;left:20%;text-align: center;">加载君拼命加载中。。。</div>
 
+</div>
 
+<script type="text/javascript" id="graceMain"></script>
 
+<script type="text/javascript" id="debugMain"></script>
 
+<script type="text/javascript" id="wxMain" data-sign="<?php echo @htmlentities(json_encode($signPackage)); ?>"></script>
 
+<script type="text/javascript">
 
+  (function () {
 
+    var ua = navigator.userAgent.toLowerCase();
 
+    <?php
 
+    if (isset($from_channel)) {
 
+      echo "var from_channel = '$from_channel';";
 
+      if (!empty($userId) && $from_channel == 'baidu') {
 
+        echo "var bd_userId = localStorage.setItem('bd_userId',  '" . $userId . "');";
 
+      }
 
+    }
 
+    ?>
 
+    if (ua.match(/MicroMessenger/i) == 'micromessenger') {
 
+      <?php
 
+      if (!empty($userId) && !empty($appToken)) {
 
+        echo '
 
+            var xyhwxUserID = localStorage.setItem("xyhwxUserID",  "' . $userId . '");
 
+            var xyhwxAppToken = localStorage.setItem("xyhwxAppToken", "' . $appToken . '");
 
+          ';
 
+      } /*else {
 
+          echo 'localStorage.clear();';
 
+        }*/
 
+      ?>
 
+
 
+      var userID = localStorage.getItem('xyhwxUserID');
 
+      var appToken = localStorage.getItem('xyhwxAppToken');
 
+      if (!userID || !appToken) {
 
+        localStorage.clear();
 
+        location.href = '<?php echo Yii::app()->request->baseUrl . '/index.php?r=/moonclub/web/wxIndex'; ?>';
 
+      }
 
+      document.write('<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"><\/script>');
 
+    }
 
+    if (location.hash == '#rd') {
 
+      location.hash = '';
 
+    }
 
+    var debug = false;
 
+//    var main = '<?php //echo Yii::app()->request->baseUrl;?>///webapp/moonclub/dist/js/main.js?v=20170901104';
 
+    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=20170901104';
 
+    if (debug) {
 
+      main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/js/main.js?v=20170901104' + (new Date()).getTime();
 
+      document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';
 
+    }
 
+    document.getElementById('graceMain').setAttribute('data-main', main);
 
+    document.getElementById('graceMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/require.js';
 
+  })();
 
+</script>
 
+
 
+</body>
 
+
 
+</html>

+ 73 - 75
www/protected/modules/moonclub/views/web/index.php
Ver fichero 

@@ -4,7 +4,7 @@
 
   <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">
 
+  content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
 
   <meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-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"/>
 
@@ -12,24 +12,21 @@
 
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
   <!-- css -->
 
   <link rel="stylesheet"
 
-        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css?v=201708">
 
+  href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet.min.css?v=201708">
 
   <link rel="stylesheet"
 
-        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=201708">
 
+  href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/ratchet-2.0.2/dist/css/ratchet-theme-ios.min.css?v=201708">
 
   <link rel="stylesheet"
 
-        href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=201708011">
 
+  href="<?php echo Yii::app()->request->baseUrl; ?>/webapp/moonclub/dist/css/main.css?v=20170901110">
 
   <!--    <link href="-->
 
-  <?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=201708011" rel="stylesheet">-->
 
+  <?php //echo Yii::app()->request->baseUrl; ?><!--/css/common_o2o/swiper.css?v=20170901110" rel="stylesheet">-->
 
   <link rel="stylesheet" href=" <?php echo Yii::app()->request->baseUrl; ?>/css/bootstrap-3.3.7.min.css?v=201708">
 
   <link rel="stylesheet" href="http://odulvej8l.bkt.clouddn.com/LCalendar.css?v=201708">
 
-<!-- js -->
 
-  <!--     <script src="-->
 
-  <?php //echo Yii::app()->request->baseUrl; ?><!--/js/o2o/swiper.min.js?v=201708011"></script> -->
 
+  <!-- js -->
 
   <link rel="stylesheet"
 
-        href="https://raw.githubusercontent.com/andreruffert/rangeslider.js/develop/dist/rangeslider.css?v=201708" media="screen"
 
-        title="no title">
 
+  href="https://raw.githubusercontent.com/andreruffert/rangeslider.js/develop/dist/rangeslider.css?v=201708" media="screen"
 
+  title="no title">
 
   <script
 
-    src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=201708"></script>
 
-  <!--<script src="<?php /*echo Yii::app()->request->baseUrl; */ ?>/js/bootstrap-3.3.7.min.js?v=201708"></script>-->
 
+  src="<?php echo Yii::app()->request->baseUrl; ?>/webapp/framework/iscroll5/iscroll-probe.js?v=201708"></script>
 
   <script src="http://odulvej8l.bkt.clouddn.com/LCalendar.js?v=201708"></script>
 
   <style>
 
     html {
 
@@ -185,76 +182,77 @@
 
       }
 
     }
 
   </style>
 
-  <script type="text/javascript" src="https://dn-bughd-web.qbox.me/bughd.min.js?v=201708011"
 
-          crossOrigin="anonymous"></script>
 
-  <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=201708011"></script>
 
-  <script type="text/javascript">
 
-    window.bughd = window.bughd || function () {
 
-      };
 
-    bughd("create", {key: "aebe40c5d5b2975056629dc7980676ce"})
 
-  </script>
 
+  <script src="//cdn.bootcss.com/iScroll/5.2.0/iscroll-probe.min.js?v=20170901110"></script>
 
 </head>
 
 <body style="height: 100%">
 
-<!-- loading -->
 
-<!-- loading -->
 
-<div class="spa-fullscreen"></div>
 
-<div class="spa-loader">
 
-  <div class="loading">
 
-    <div class="process">
 
-      <div class="cs"></div>
 
+  <!-- loading -->
 
+  <!-- loading -->
 
+  <div class="spa-fullscreen"></div>
 
+  <div class="spa-loader">
 
+    <div class="loading">
 
+      <div class="process">
 
+        <div class="cs"></div>
 
+      </div>
 
     </div>
 
+    <div style="position: absolute;top: 50%;width:60%;left:20%;text-align: center;">加载君拼命加载中。。。</div>
 
   </div>
 
-  <div style="position: absolute;top: 50%;width:60%;left:20%;text-align: center;">加载君拼命加载中。。。</div>
 
-</div>
 
-<script type="text/javascript" id="graceMain"></script>
 
-<script type="text/javascript" id="debugMain"></script>
 
-<script type="text/javascript" id="wxMain" data-sign="<?php echo @htmlentities(json_encode($signPackage)); ?>"></script>
 
-<script type="text/javascript">
 
-  (function () {
 
-    var ua = navigator.userAgent.toLowerCase();
 
-    <?php
 
-    if (isset($from_channel)) {
 
-      echo "var from_channel = '$from_channel';";
 
-      if (!empty($userId) && $from_channel == 'baidu') {
 
-        echo "var bd_userId = localStorage.setItem('bd_userId',  '" . $userId . "');";
 
-      }
 
-    }
 
-    ?>
 
-    if (ua.match(/MicroMessenger/i) == 'micromessenger') {
 
+  <script type="text/javascript" id="graceMain"></script>
 
+  <script type="text/javascript" id="debugMain"></script>
 
+  <script type="text/javascript" id="wxMain" data-sign="<?php echo @htmlentities(json_encode($signPackage)); ?>"></script>
 
+  <script type="text/javascript">
 
+    (function () {
 
+      var ua = navigator.userAgent.toLowerCase();
 
       <?php
 
-      if (!empty($userId) && !empty($appToken)) {
 
-        echo '
 
-            var xyhwxUserID = localStorage.setItem("xyhwxUserID",  "' . $userId . '");
 
-            var xyhwxAppToken = localStorage.setItem("xyhwxAppToken", "' . $appToken . '");
 
-          ';
 
-      } /*else {
 
-          echo 'localStorage.clear();';
 
-        }*/
 
+      if (isset($from_channel)) {
 
+        echo "var from_channel = '$from_channel';";
 
+        if (!empty($userId) && $from_channel == 'baidu') {
 
+          echo "var bd_userId = localStorage.setItem('bd_userId',  '" . $userId . "');";
 
+        }
 
+      }
 
       ?>
 
+      if (ua.match(/MicroMessenger/i) == 'micromessenger') {
 
+        <?php
 
+        if (!empty($userId) && !empty($appToken)) {
 
+          echo '
 
+          var xyhwxUserID = localStorage.setItem("xyhwxUserID",  "' . $userId . '");
 
+          var xyhwxAppToken = localStorage.setItem("xyhwxAppToken", "' . $appToken . '");
 
+          ';
 
+        }
 
+        ?>
 
 
-      var userID = localStorage.getItem('xyhwxUserID');
 
-      var appToken = localStorage.getItem('xyhwxAppToken');
 
-      if (!userID || !appToken) {
 
-        localStorage.clear();
 
-        location.href = '<?php echo Yii::app()->request->baseUrl . '/index.php?r=/moonclub/web/wxIndex'; ?>';
 
+        var userID = localStorage.getItem('xyhwxUserID');
 
+        var appToken = localStorage.getItem('xyhwxAppToken');
 
+        if (!userID || !appToken) {
 
+          localStorage.clear();
 
+          location.href = '<?php echo Yii::app()->request->baseUrl . '/index.php?r=/moonclub/web/wxIndex'; ?>';
 
+        }
 
+        document.write('<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"><\/script>');
 
       }
 
-      document.write('<script src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"><\/script>');
 
-    }
 
-    if (location.hash == '#rd') {
 
-      location.hash = '';
 
-    }
 
-    var debug = false;
 
-//    var main = '<?php //echo Yii::app()->request->baseUrl;?>///webapp/moonclub/dist/js/main.js?v=201708011';
 
-    var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=201708011';
 
-    if (debug) {
 
-      main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/js/main.js?v=201708011' + (new Date()).getTime();
 
-      document.getElementById('debugMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/debuggap.js';
 
-    }
 
-    document.getElementById('graceMain').setAttribute('data-main', main);
 
-    document.getElementById('graceMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/require.js';
 
-  })();
 
-</script>
 
-
 
+      if (location.hash == '#rd') {
 
+        location.hash = '';
 
+      }
 
+      var main = '<?php echo Yii::app()->request->baseUrl;?>/webapp/moonclub/dist/js/main.js?v=20170901110';
 
+      document.getElementById('graceMain').setAttribute('data-main', main);
 
+      document.getElementById('graceMain').src = '<?php echo Yii::app()->request->baseUrl; ?>/webapp/common/js/require.js';
 
+    })();
 
+  </script>
 
+  <!-- 浏览器返回事件处理 -->
 
+  <!--<script>
 
+    // 处理浏览器返回事件
 
+    window.addEventListener("popstate", function(e) {
 
+      var test = false;
 
+      var uri = location.href;
 
+      var href = '';
 
+      if (uri.indexOf('service-info') > -1) {
 
+        test = true;
 
+        href = 'service-info';
 
+      }
 
+      if (test) {
 
+        location.href = "http://common.yiguanjia.me/index.php?r=moonclub/web/index#"+ href;
 
+      } else {
 
+        location.href = "http://common.yiguanjia.me/index.php?r=moonclub/web/index#"+ href;
 
+      }
 
+    }, false);
 
+  </script>-->
 
 </body>
 
-
 
 </html>

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
www/webapp/moonclub/dist/js/build/template.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
www/webapp/moonclub/dist/js/main.js


+ 1 - 1
www/webapp/moonclub/dist/js/page/YorderInfo.js
Ver fichero 

@@ -1 +1 @@
 
-define(["$","template","native","config","user","api"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}function u(t,n){e(".model-box").css("display","inline"),e(".model").css("bottom","0"),e(".model-title").html(t),e(".model-content").html(n);return}var a;return{title:"雇员",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},r),r.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch("#submit",function(e){e.preventDefault()},r),e.newTouch(".model-content",function(t){s.getModifyPOrderStatus({id:a.id,status:2},function(e){e.success&&i.trigger("spa:navigate",{hash:"service-info",pushData:{needReload:!0}})});return;var n},r),e.newTouch("#submit",function(t){var n=e(".in-room-time").text(),r=e(".out-room-time").text();n==="暂无服务时间"?u("是否开始清洁服务","确定"):r==="暂无服务时间"&&u("是否结束清洁服务","确定")},r),e.newTouch(".model-content-stop",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"service-info",pushData:{needReload:!0}})},r),n.resolve()},beforeopen:function(n,r){var i=this,s=e(document);a=n.pushData.orderInfo,console.log(a);if(n.pushData.orderInfo===undefined)s.trigger("spa:navigate",{hash:"service-info",pushData:{needReload:!0}});else{var o=t("employe/YorderInfo",{orderInfo:a});e(".spa-page-body",i).html(o),e(".in-room-time").text()==="暂无服务时间"?e("#submit").html("开始"):e("#submit").html("结束")}r.resolve()},afteropen:function(e,t){t.resolve()},beforeclose:function(e,t){t.resolve()}}});
 
+define(["$","template","native","config","user","api"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}function u(t,n){e(".model-box").css("display","inline"),e(".model").css("bottom","0"),e(".model-title").html(t),e(".model-content").html(n);return}var a;return{title:"雇员",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},r),r.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch("#submit",function(e){e.preventDefault()},r),e.newTouch(".model-content",function(t){console.log(e(".model-title").html());var n=1;e(".model-title").html()=="是否开始清洁服务"?n=1:n=2,s.getModifyPOrderStatus({id:a.id,status:n},function(e){e.success&&i.trigger("spa:navigate",{hash:"service-info",pushData:{needReload:!0}})});return;var r},r),e.newTouch("#submit",function(t){var n=e(".in-room-time").text(),r=e(".out-room-time").text();n==="暂无服务时间"?u("是否开始清洁服务","确定"):r==="暂无服务时间"&&u("是否结束清洁服务","确定")},r),e.newTouch(".model-content-stop",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"service-info",pushData:{needReload:!0}})},r),n.resolve()},beforeopen:function(n,r){var i=this,s=e(document);a=n.pushData.orderInfo,console.log(a);if(n.pushData.orderInfo===undefined)s.trigger("spa:navigate",{hash:"service-info",pushData:{needReload:!0}});else{console.log(a);var o=t("employe/YorderInfo",{orderInfo:a});e(".spa-page-body",i).html(o),e(".in-room-time").text()==="暂无服务时间"?e("#submit").html("开始"):e("#submit").html("结束")}r.resolve()},afteropen:function(t,n){n.resolve(),t.prevPage=e(".spa-page-empty")},beforeclose:function(e,t){t.resolve()}}});

+ 1 - 1
www/webapp/moonclub/dist/js/page/modeifyStatus.js
Ver fichero 

@@ -1 +1 @@
 
-define(["$","template","native","config","user","api"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}function l(t,n){e(".model-box").css("display","inline"),e(".model").css("bottom","0"),e(".model-title").html(t),e(".model-content").html(n);return}var u={},a=[],f=[];return{title:"雇员",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},r),r.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch("#submit",function(t){t.preventDefault();var n=parseInt(e(".user-auth").val());n===5?l("当前订单已经结束，不可修改状态","确定"):s.getModifyStatus({auth:u.auth,_id:a.id,status:n},function(e){e.success&&l("订单状态修改成功,请及时处理！","确定")})},r),e.newTouch(".model-content",function(t){var n=e(".model-title")[0].innerHTML;e(".model").css("bottom",""),e(".model-box").css("display","none"),i.trigger("spa:navigate",{hash:"service-info",pushData:{needReload:!0}})},r),n.resolve()},beforeopen:function(n,r){var i=this,o=e(document);u=n.pushData.authArr,a=n.pushData.listArr;var l={index:"",title:""};parseInt(a.status)===2?(l.index=5,l.title="暂无可选状态"):s.getServiceStatus({auth:u.auth},function(n){if(n.success){f=n.data,l.index=parseInt(a.status)+1,l.title=f[parseInt(a.status)+1],o.trigger("spa:openloader");if(o){o.trigger("spa:closeloader");var s=t("employe/modeifyStatus",{authArr:u,listArr:a,status:l});e(".spa-page-body",i).html(s)}r.resolve()}})},afteropen:function(e,t){t.resolve()},beforeclose:function(e,t){t.resolve()}}});
 
+define(["$","template","native","config","user","api"],function(e,t,n,r,i,s){function o(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:"",pushData:{dontNeedReload:!0}})}function l(t,n){e(".model-box").css("display","inline"),e(".model").css("bottom","0"),e(".model-title").html(t),e(".model-content").html(n);return}var u={},a=[],f=[];return{title:"雇员",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){o.call(this,e)}),e.newTouch(".back-button",function(e){o.call(this,e)},r),r.on("tapBackButton",function(e){o.call(this,e)}),e.newTouch("#submit",function(t){t.preventDefault();var n=parseInt(e(".user-auth").val());n===5?l("当前订单已经结束，不可修改状态","确定"):s.getModifyStatus({auth:u.auth,_id:a.id,status:n},function(e){e.success&&l("订单状态修改成功,请及时处理！","确定")})},r),e.newTouch(".model-content",function(t){var n=e(".model-title")[0].innerHTML;e(".model").css("bottom",""),e(".model-box").css("display","none"),i.trigger("spa:navigate",{hash:"service-info",pushData:{needReload:!0}})},r),n.resolve()},beforeopen:function(n,r){var i=this,o=e(document);u=n.pushData.authArr,a=n.pushData.listArr;var l={index:"",title:""};parseInt(a.status)===2?(l.index=5,l.title="暂无可选状态"):s.getServiceStatus({auth:u.auth},function(n){if(n.success){f=n.data,l.index=parseInt(a.status)+1,l.title=f[parseInt(a.status)+1],o.trigger("spa:openloader");if(o){o.trigger("spa:closeloader");var s=t("employe/modeifyStatus",{authArr:u,listArr:a,status:l});e(".spa-page-body",i).html(s)}r.resolve()}})},afteropen:function(t,n){n.resolve(),t.prevPage=e(".spa-page-empty")},beforeclose:function(e,t){t.resolve()}}});

+ 1 - 1
www/webapp/moonclub/dist/js/page/month.js
Ver fichero 

@@ -1 +1 @@
 
-define(["$","template","recharge","native","config","user","product"],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(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=moonclub/reserve/month&user_id="+s.id},r),e.newTouch(".im",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"advisory-advisory",pushData:{needReset:!0,backHash:""}})},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(n,r){var s=this,o=e(document),u=n.pushData,a=u.product;if(s){o.trigger("spa:openloader");if(o){o.trigger("spa:closeloader");var f=t("month/index",{product:a,showNavBar:i.isWX});e(".spa-page-body",s).html(f),setTimeout(function(){n.scroll=new IScroll("#mOneScroll")},700)}}r.resolve()},beforeclose:function(e,t){t.resolve()}}});
 
+define(["$","template","recharge","native","config","user","product"],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(".appointment",function(e){e.preventDefault(),window.location.href="/index.php?r=moonclub/reserve/month&user_id="+s.id},r),e.newTouch(".im",function(e){e.preventDefault(),i.trigger("spa:navigate",{hash:"advisory-advisory",pushData:{needReset:!0,backHash:""}})},r),n.resolve()},beforeopen:function(e,t){t.resolve()},afteropen:function(n,r){var s=this,o=e(document),u=n.pushData,a=u.product;console.log(a);if(a===undefined)o.trigger("spa:navigate",{hash:"",pushData:{needReload:!0}});else{var f=t("month/index",{product:a,showNavBar:i.isWX});e(".spa-page-body",s).html(f),setTimeout(function(){n.scroll=new IScroll("#mOneScroll")},700)}r.resolve()},beforeclose:function(e,t){t.resolve()}}});

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
www/webapp/moonclub/dist/js/page/serviceList.js


La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 0 - 0
www/webapp/moonclub/js/build/template.js


+ 25 - 16
www/webapp/moonclub/js/page/YorderInfo.js
Ver fichero 

@@ -1,4 +1,4 @@
 
-define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, template, native, config, user, api) {
 
+define(['$', 'template', 'native', 'config', 'user', 'api'], function($, template, native, config, user, api) {
 
   // 返回事件
 
   function back(event) {
 
     event.preventDefault();
 
@@ -26,32 +26,39 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
 
   return {
 
     title: '雇员',
 
     body: '',
 
-    init: function (pageData, dtd) {
 
+    init: function(pageData, dtd) {
 
       /* this是什么？ */
 
       var $view = this;
 
       var $doc = $(document);
 
       // 返回
 
-      $view.on('swipeRight', function (event) {
 
+      $view.on('swipeRight', function(event) {
 
         back.call(this, event);
 
       });
 
-      $.newTouch('.back-button', function (event) {
 
+      $.newTouch('.back-button', function(event) {
 
         back.call(this, event);
 
       }, $view);
 
-      $view.on('tapBackButton', function (event) {
 
+      $view.on('tapBackButton', function(event) {
 
         back.call(this, event);
 
       });
 
 
-      $.newTouch('#submit', function (event) {
 
+      $.newTouch('#submit', function(event) {
 
         event.preventDefault();
 
 
       }, $view)
 
 
       // 模态框
 
-      $.newTouch('.model-content', function (event) {
 
+      $.newTouch('.model-content', function(event) {
 
+        console.log($('.model-title').html());
 
+        var orderStatus = 1;
 
+        if ($('.model-title').html() == "是否开始清洁服务") {
 
+          orderStatus = 1
 
+        } else {
 
+          orderStatus = 2
 
+        }
 
         api.getModifyPOrderStatus({
 
           id: orderInfo.id,
 
-          status: 2
 
-        }, function (res) {
 
+          status: orderStatus
 
+        }, function(res) {
 
           if (res.success) {
 
             $doc.trigger('spa:navigate', {
 
               hash: 'service-info',
 
@@ -75,7 +82,7 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
 
         });
 
       }, $view);
 
       // 修改时间
 
-      $.newTouch('#submit', function (event) {
 
+      $.newTouch('#submit', function(event) {
 
         var inTime = $('.in-room-time').text();
 
         var outTime = $('.out-room-time').text();
 
         if (inTime === "暂无服务时间") {
 
@@ -88,7 +95,7 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
 
       }, $view);
 
 
       // 取消对话框
 
-      $.newTouch('.model-content-stop', function (event) {
 
+      $.newTouch('.model-content-stop', function(event) {
 
         event.preventDefault();
 
         // $('.model').css('bottom', '');
 
         // $('.model-box').css('display', 'none');
 
@@ -102,7 +109,7 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
 
 
       dtd.resolve();
 
     },
 
-    beforeopen: function (pageData, dtd) {
 
+    beforeopen: function(pageData, dtd) {
 
       var $view = this;
 
       var $doc = $(document);
 
       orderInfo = pageData.pushData.orderInfo
 
@@ -116,7 +123,7 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
 
         });
 
       } else {
 
         // var submit = $('#submit').html();
 
-
 
+        console.log(orderInfo)
 
         var tpl = template('employe/YorderInfo', {
 
           orderInfo: orderInfo
 
         });
 
@@ -132,11 +139,13 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
 
       }
 
       dtd.resolve();
 
     },
 
-    afteropen: function (pageData, dtd) {
 
+    afteropen: function(pageData, dtd) {
 
       dtd.resolve();
 
+      //强制设置首页的上一页是空的，后面再调整框架
 
+      pageData.prevPage = $('.spa-page-empty');
 
     },
 
-    beforeclose: function (pageData, dtd) {
 
+    beforeclose: function(pageData, dtd) {
 
       dtd.resolve();
 
     }
 
   }
 
-});
 
+});

+ 40 - 38
www/webapp/moonclub/js/page/home.js
Ver fichero 

@@ -3,10 +3,10 @@ define(['$', 'template',  'user', 'native', 'config', 'address', 'api','product'
 
 	/*
 
 	 * 先定义一些模块内用到的function
 
 	 */
 
-	function back(event) {
 
-		event.preventDefault();
 
-		native.back();
 
-	}
 
+	 function back(event) {
 
+	 	event.preventDefault();
 
+	 	native.back();
 
+	 }
 
 
 	/*
 
 	 * 模块结构：5部分。
 
@@ -18,14 +18,14 @@ define(['$', 'template',  'user', 'native', 'config', 'address', 'api','product'
 
 	 * afteropen:做一些网络请求。
 
 	 * beforeclose：
 
 	 */
 
-	return {
 
-		title: '壹管家上门服务',
 
-		body: '',
 
-		init: function (pageData, dtd) {
 
-			/* this是什么？ */
 
-			var $view = this;
 
-			var $doc = $(document);
 
-			/*提示信息*/
 
+	 return {
 
+	 	title: '壹管家上门服务',
 
+	 	body: '',
 
+	 	init: function (pageData, dtd) {
 
+	 		/* this是什么？ */
 
+	 		var $view = this;
 
+	 		var $doc = $(document);
 
+	 		/*提示信息*/
 
 			/* 定义按钮事件。
 
 			 * 为什么不是$(selector).onclick(function)呢？
 
 			 */
 
@@ -45,28 +45,28 @@ define(['$', 'template',  'user', 'native', 'config', 'address', 'api','product'
 
 
 			// 跳转套餐
 
 			$.newTouch('.btn-month',function () {
 
-                event.preventDefault();
 
-                var type=parseInt($(this).attr('data-product-type'));
 
-                $doc.trigger('spa:navigate', {
 
-                    hash: 'month',
 
-                    pushData: {
 
-                        needReset: true,
 
-                        product:product.allList[type],
 
-                        backHash: ''
 
-                    }
 
-                });
 
+				event.preventDefault();
 
+				var type=parseInt($(this).attr('data-product-type'));
 
+				$doc.trigger('spa:navigate', {
 
+					hash: 'month',
 
+					pushData: {
 
+						needReset: true,
 
+						product:product.allList[type],
 
+						backHash: ''
 
+					}
 
+				});
 
 			},$view);
 
       // 完善资料
 
       // 跳转套餐
 
       $.newTouch('.btn-user-info',function () {
 
-        event.preventDefault();
 
-        $doc.trigger('spa:navigate', {
 
-          hash: 'user-info',
 
-          pushData: {
 
-            needReset: true,
 
-            backHash: ''
 
-          }
 
-        });
 
+      	event.preventDefault();
 
+      	$doc.trigger('spa:navigate', {
 
+      		hash: 'user-info',
 
+      		pushData: {
 
+      			needReset: true,
 
+      			backHash: ''
 
+      		}
 
+      	});
 
       },$view);
 
 			//预约
 
 			$.newTouch('.appointment', function (event) {
 
@@ -84,6 +84,7 @@ define(['$', 'template',  'user', 'native', 'config', 'address', 'api','product'
 
 					}
 
 				})
 
 			}, $view);
 
+			
 			dtd.resolve();
 
 		},
 
 		beforeopen: function (pageData, dtd) {
 
@@ -102,14 +103,14 @@ define(['$', 'template',  'user', 'native', 'config', 'address', 'api','product'
 
 				 * 使用模版语法把数据填到html文件，生成一个js文件。
 
 				 * var tpl = template(html文件路径，数据)
 
 				 */
 
-				var tpl = template('home/index', {
 
-					showNavBar: !config.isWX && !config.isChubao
 
-				});
 
-				$('.spa-page-body', $view).html(tpl);
 
-                setTimeout(function () {
 
-                    pageData.scroll = new IScroll('#homeScroll');
 
-                }, 700);
 
-				/* 建立IScroll-setInterval- setTimeout*/
 
+				 var tpl = template('home/index', {
 
+				 	showNavBar: !config.isWX && !config.isChubao
 
+				 });
 
+				 $('.spa-page-body', $view).html(tpl);
 
+				 setTimeout(function () {
 
+				 	pageData.scroll = new IScroll('#homeScroll');
 
+				 }, 700);
 
+				 /* 建立IScroll-setInterval- setTimeout*/
 
 				// setTimeout(function () {
 
 				// 	var swiper = new Swiper('.swiper-container', {
 
 				// 		// pagination: '.pagination',
 
@@ -127,6 +128,7 @@ define(['$', 'template',  'user', 'native', 'config', 'address', 'api','product'
 
 					request_from: 'weixin',
 
 					user_id: user.id
 
 				});
 
+
 
 				$doc.trigger('spa:closeloader');
 
 			}
 
 		},

+ 2 - 0
www/webapp/moonclub/js/page/modeifyStatus.js
Ver fichero 

@@ -113,6 +113,8 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
 
     },
 
     afteropen: function (pageData, dtd) {
 
       dtd.resolve();
 
+      //强制设置首页的上一页是空的，后面再调整框架
 
+      pageData.prevPage = $('.spa-page-empty');
 
     },
 
     beforeclose: function (pageData, dtd) {
 
       dtd.resolve();

+ 54 - 49
www/webapp/moonclub/js/page/month.js
Ver fichero 

@@ -1,79 +1,84 @@
 
 define(['$', 'template', 'recharge', 'native', 'config', 'user','product'], function ($, template, 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);
 
+  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);
 
+              back.call(this, event);
 
             });
 
             $.newTouch('.back-button', function (event) {
 
-                back.call(this, event);
 
+              back.call(this, event);
 
             }, $view);
 
             $view.on('tapBackButton', function (event) {
 
-                back.call(this, event);
 
+              back.call(this, event);
 
             });
 
 
             //预约
 
             $.newTouch('.appointment', function (event) {
 
-                event.preventDefault();
 
-                window.location.href = '/index.php?r=moonclub/reserve/month&user_id=' + user.id;
 
+              event.preventDefault();
 
+              window.location.href = '/index.php?r=moonclub/reserve/month&user_id=' + user.id;
 
             }, $view);
 
 
             // 咨询
 
             $.newTouch('.im', function (event) {
 
-                event.preventDefault();
 
-                $doc.trigger('spa:navigate', {
 
-                    hash: 'advisory-advisory',
 
-                    pushData: {
 
-                        needReset: true,
 
-                        backHash: ''
 
-                    }
 
-                })
 
+              event.preventDefault();
 
+              $doc.trigger('spa:navigate', {
 
+                hash: 'advisory-advisory',
 
+                pushData: {
 
+                  needReset: true,
 
+                  backHash: ''
 
+                }
 
+              })
 
             }, $view);
 
 
             dtd.resolve();
 
-        },
 
-        beforeopen: function (pageData, dtd) {
 
+          },
 
+          beforeopen: function (pageData, dtd) {
 
             dtd.resolve();
 
-        },
 
-        afteropen: function (pageData, dtd) {
 
+          },
 
+          afteropen: function (pageData, dtd) {
 
             var $view = this;
 
             var $doc = $(document);
 
             var pushData=pageData.pushData;
 
             var product=pushData.product;
 
-            if ($view) {
 
-                $doc.trigger('spa:openloader');
 
-                if ($doc) {
 
-                    $doc.trigger('spa:closeloader');
 
-                    var tpl = template('month/index', {
 
-                        product:product,
 
-                        showNavBar:config.isWX
 
-                    });
 
-                    $('.spa-page-body', $view).html(tpl);
 
-                    setTimeout(function () {
 
-                        pageData.scroll = new IScroll('#mOneScroll');
 
-                    }, 700);
 
+            console.log(product)
 
+            if (product === undefined) {
 
+              $doc.trigger('spa:navigate', {
 
+                hash: '',
 
+                pushData: {
 
+                  needReload: true
 
                 }
 
+              });
 
+            } else {
 
+              var tpl = template('month/index', {
 
+                product:product,
 
+                showNavBar:config.isWX
 
+              });
 
+              $('.spa-page-body', $view).html(tpl);
 
+              setTimeout(function () {
 
+                pageData.scroll = new IScroll('#mOneScroll');
 
+              }, 700);
 
             }
 
+
 
             dtd.resolve();
 
-        },
 
-        beforeclose: function (pageData, dtd) {
 
+          },
 
+          beforeclose: function (pageData, dtd) {
 
             dtd.resolve();
 
+          }
 
         }
 
-    }
 
-});
 
+      });

+ 12 - 1
www/webapp/moonclub/js/page/serviceList.js
Ver fichero 

@@ -107,6 +107,7 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
 
       // 订单信息修改
 
       $.newTouch('.btn-old-status-edit', function () {
 
         var orderID = $(this).attr('data-order-id');
 
+        // console.log($('.old-status').html())
 
         if ($('.old-status').html() !== '服务完成') {
 
           for (var i = 0; i < listArr.length; i++) {
 
             if (orderID === listArr[i].id) {
 
@@ -130,6 +131,15 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
 
         $('.model-box').css('display', 'none');
 
       }, $view)
 
 
+      // 处理浏览器返回事件
 
+      window.addEventListener("popstate", function (e) {
 
+        if (config.test) {
 
+          location.href = "http://admin.yiguanjiadev.me/index.php?r=moonclub/emp/index#service-info"
 
+        } else {
 
+          location.href = "http://common.yiguanjia.me/index.php?r=moonclub/emp/index#service-info";
 
+        }
 
+        console.log("我监听到了浏览器的返回按钮事件啦");
 
+      }, false);
 
       dtd.resolve();
 
     },
 
     beforeopen: function (pageData, dtd) {
 
@@ -184,9 +194,10 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
 
     },
 
     afteropen: function (pageData, dtd) {
 
       dtd.resolve();
 
+      pageData.prevPage = $('.spa-page-empty');
 
     },
 
     beforeclose: function (pageData, dtd) {
 
       dtd.resolve();
 
     }
 
   }
 
-});
 
+});

+ 40 - 40
www/webapp/moonclub/tpl/employe/YorderInfo.html
Ver fichero 

@@ -7,24 +7,24 @@
 
         <div>日期：{{orderInfo.order_time}}</div>
 
         <div>服务地址：{{orderInfo.address.floor}}号楼{{orderInfo.address.room}}号房</div>
 
         <div>服务标准：
 
-          {{if orderInfo.service_standards === "1"}}
 
+          {{if orderInfo.service_standards == 0}}
 
           大清洁
 
-          {{else if orderInfo.service_standards === "2"}}
 
+          {{else if orderInfo.service_standards == 1}}
 
           小清洁
 
-          {{else if orderInfo.service_standards === "3"}}
 
+          {{else if orderInfo.service_standards == 2}}
 
           深度清洁
 
-          {{else if orderInfo.service_standards === "4"}}
 
+          {{else if orderInfo.service_standards == 3}}
 
           空房清洁
 
           {{/if}}
 
         </div>
 
         <div>进房时间：<span class="in-room-time">{{orderInfo.in_room_time}}</span></div>
 
         <div>出房时间：<span class="out-room-time">{{orderInfo.out_room_time}}</span></div>
 
         <div>状态：
 
-          {{if orderInfo.status === 0}}
 
+          {{if orderInfo.status == 0}}
 
           已派单
 
-          {{else if orderInfo.status === 1}}
 
+          {{else if orderInfo.status == 1}}
 
           正在服务
 
-          {{else if orderInfo.status ===2}}
 
+          {{else if orderInfo.status ==2}}
 
           服务完成
 
           {{/if}}
 
         </div>
 
@@ -34,46 +34,46 @@
 
       <!--按钮-->
 
       <div class="form-group">
 
         <div id="submit" class="btn-user-info btn btn-success col-xs-12"
 
-             style="background: #570044;color:rgb(255,255,255);border: 0;padding: 4px 0;font-size: 22px;width: 100%;display: block;text-align: center;">
 
-          提交
 
-        </div>
 
+        style="background: #570044;color:rgb(255,255,255);border: 0;padding: 4px 0;font-size: 22px;width: 100%;display: block;text-align: center;">
 
+        提交
 
       </div>
 
     </div>
 
   </div>
 
 </div>
 
+</div>
 
 <!--模态框-->
 
 <div class="model" style="width: 100%;position: fixed;top: 0;left:0;background: rgba(0,0,0,0.4)">
 
   <!--错误提示容器-->
 
   <div class="model-box"
 
-       style="border-radius: 10px;min-height: 80px;display:none;width: 70%;background: #fff;margin: 0 auto;top:30%;left:15%;position: fixed;">
 
-    <div class="model-title"
 
-         style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';width: 100%;text-align: center;font-size: 1.1rem;margin-top: 5%;"></div>
 
-    <!--按钮-->
 
-    <div class="model-content"
 
-         style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';
 
-    width: 40%;
 
-    margin-left: 7%;
 
-    float: left;
 
-    background: #2f004e;
 
-    color: rgb(255, 255, 255);
 
-    margin-bottom: 15px;
 
-    font-size: 1.3rem;
 
-    margin-top: 15px;
 
-    text-align: center;
 
-    padding: 5px 0 5px 0;"></div>
 
+  style="border-radius: 10px;min-height: 80px;display:none;width: 70%;background: #fff;margin: 0 auto;top:30%;left:15%;position: fixed;">
 
+  <div class="model-title"
 
+  style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';width: 100%;text-align: center;font-size: 1.1rem;margin-top: 5%;"></div>
 
+  <!--按钮-->
 
+  <div class="model-content"
 
+  style="font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';
 
+  width: 40%;
 
+  margin-left: 7%;
 
+  float: left;
 
+  background: #2f004e;
 
+  color: rgb(255, 255, 255);
 
+  margin-bottom: 15px;
 
+  font-size: 1.3rem;
 
+  margin-top: 15px;
 
+  text-align: center;
 
+  padding: 5px 0 5px 0;"></div>
 
 
-    <div class="model-content-stop"
 
-         style="
 
-   font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';
 
-    width: 40%;
 
-    margin-right: 7%;
 
-    float: right;
 
-    background: #2f004e;
 
-    color: rgb(255, 255, 255);
 
-    margin-bottom: 15px;
 
-    font-size: 1.3rem;
 
-    margin-top: 15px;
 
-    text-align: center;
 
-    padding: 5px 0 5px 0;">取消</div>
 
-  </div>
 
+  <div class="model-content-stop"
 
+  style="
 
+  font-family: '微软雅黑', 'Microsoft YaHei', 'STHeiti Light';
 
+  width: 40%;
 
+  margin-right: 7%;
 
+  float: right;
 
+  background: #2f004e;
 
+  color: rgb(255, 255, 255);
 
+  margin-bottom: 15px;
 
+  font-size: 1.3rem;
 
+  margin-top: 15px;
 
+  text-align: center;
 
+  padding: 5px 0 5px 0;">取消</div>
 
+</div>
 
 </div>

+ 5 - 6
www/webapp/moonclub/tpl/employe/serviceList.html
Ver fichero 

@@ -22,13 +22,13 @@
 
             <div>日期：{{item.order_time}}</div>
 
             <div>服务地址：{{item.address.floor}}号楼{{item.address.room}}号房</div>
 
             <div>服务标准：
 
-              {{if item.service_standards === "1"}}
 
+              {{if item.service_standards == 0}}
 
               大清洁
 
-              {{else if item.service_standards === "2"}}
 
+              {{else if item.service_standards == 1}}
 
               小清洁
 
-              {{else if item.service_standards === "3"}}
 
+              {{else if item.service_standards == 2}}
 
               深度清洁
 
-              {{else if item.service_standards === "4"}}
 
+              {{else if item.service_standards == 3}}
 
               空房清洁
 
               {{/if}}
 
             </div>
 
@@ -37,9 +37,8 @@
 
             {{/if}}
 
             {{if type == 2}}
 
             <div>出房时间：{{item.out_room_time}}</div>
 
+            <div style="height: 0;overflow: hidden;">状态：<span class="old-status">{{if item.status === 0}}已派单{{else if item.status === 1}}正在服务{{else if item.status ===2}}服务完成{{/if}}</span></div>
 
             {{/if}}
 
-            <div>状态：<span class="old-status">{{if item.status === 0}}已派单{{else if item.status === 1}}正在服务{{else if item.status ===2}}服务完成{{/if}}</span>
 
-            </div>
 
             <div>备注：{{item.desc}}</div>
 
           </div>
 
           {{/each}}

+ 24 - 24
www/webapp/moonclub/tpl/month/index.html
Ver fichero 

@@ -1,32 +1,32 @@
 
 <!--{{ if showNavBar }}-->
 
 <!--<header class="bar bar-nav">-->
 
-    <!--<a class="left-button back-button">-->
 
-        <!--<div class="icon icon-left-nav"></div>-->
 
-    <!--</a>-->
 
-    <!--<h1 class="title">{{product.name}}</h1>-->
 
+<!--<a class="left-button back-button">-->
 
+<!--<div class="icon icon-left-nav"></div>-->
 
+<!--</a>-->
 
+<!--<h1 class="title">{{product.name}}</h1>-->
 
 <!--</header>-->
 
 <!--{{ /if }}-->
 
 <div class="content">
 
-    <div class="box-container">
 
-        <div class="box-container box box-vertical">
 
-            <div id="mOneScroll" class="scroll-container box-flex-1">
 
-                <div class="scroller">
 
-                    <div class="home-stay-content">
 
-                        <div>hello</div>
 
-                        <div style="padding-bottom:10%;"></div>
 
-                    </div>
 
-                </div>
 
-                <div class="request">
 
-                    <!--预约-->
 
-                    <div class="width-percent-50 appointment">
 
-                        预约
 
-                    </div>
 
-                    <!--咨询-->
 
-                    <div class="width-percent-50 im">
 
-                        咨询
 
-                    </div>
 
-                </div>
 
-            </div>
 
+  <div class="box-container">
 
+    <div class="box-container box box-vertical">
 
+      <div id="mOneScroll" class="scroll-container box-flex-1">
 
+        <div class="scroller">
 
+          <div class="home-stay-content">
 
+            <img style="width: 100%;display: block;" src="{{product.url}}" alt="{{product.name}}">
 
+            <div style="padding-bottom:10%;"></div>
 
+          </div>
 
         </div>
 
+        <div class="request">
 
+          <!--预约-->
 
+          <div class="width-percent-50 appointment">
 
+            预约
 
+          </div>
 
+          <!--咨询-->
 
+          <div class="width-percent-50 im">
 
+            咨询
 
+          </div>
 
+        </div>
 
+      </div>
 
     </div>
 
+  </div>
 
 </div>

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio