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

www/webapp/moonclub/dist/js/page/YorderInfo.js

@@ -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),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){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()}}});

www/webapp/moonclub/js/page/YorderInfo.js

@@ -19,6 +19,7 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
     $('.model-content').html(content);
     return;
   }
+
   // 订单信息
   var orderInfo;
 
@@ -85,6 +86,20 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
 
         // model('确认修改工作时间', '确定')
       }, $view);
+
+      // 取消对话框
+      $.newTouch('.model-content-stop', function (event) {
+        event.preventDefault();
+        // $('.model').css('bottom', '');
+        // $('.model-box').css('display', 'none');
+        $doc.trigger('spa:navigate', {
+          hash: 'service-info',
+          pushData: {
+            needReload: true
+          }
+        });
+      }, $view);
+
       dtd.resolve();
     },
     beforeopen: function (pageData, dtd) {

www/webapp/moonclub/js/page/serviceList.js

@@ -12,11 +12,13 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
 
   // tab切换
   function tab($view, status) {
+    var $doc = $(document);
+    $doc.trigger('spa:openloader');
     api.getPOrderListByEmployerId({
       id: oldId,
       status: status
     }, function (resList) {
-      console.log(resList)
+
       if (resList.success) {
         listArr = resList.data;
         for (var i = 0; i < listArr.length; i++) {
@@ -42,6 +44,7 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
           type: status
         });
         $('.spa-page-body', $view).html(tpl);
+        $doc.trigger('spa:closeloader');
       }
     });
   }
@@ -141,12 +144,11 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
         user_id: user.id
       }, function (res) {
         if (res.success) {
-          console.log(res.data);
           authArr.auth = parseInt(res.data.auth);
           // 判断是否为养老院服务
           if (authArr.auth === 6) {
             oldId = res.data._id.$id
-            tab($view, 1)
+            tab($view, 0)
           } else {
             // 获取订单信息
             api.getTechInfoByUserId({

www/webapp/moonclub/tpl/employe/YorderInfo.html

@@ -48,7 +48,32 @@
        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';margin: 0 auto;width: 80%;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="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>

www/webapp/moonclub/tpl/employe/serviceList.html

@@ -1,6 +1,7 @@
 {{if authArr.auth === 6}}
 <div class="service-list-header">
   <div class="segmented-control order-type-control">
+    <a class="control-item {{if type == '0'}}active{{/if}}" data-order-type="0">派单中</a>
     <a class="control-item {{if type == '1'}}active{{/if}}" data-order-type="1">进行中</a>
     <a class="control-item {{if type == '2'}}active{{/if}}" data-order-type="2">已完成</a>
   </div>
@@ -31,8 +32,12 @@
               空房清洁
               {{/if}}
             </div>
+            {{if type != 0}}
             <div>进房时间：{{item.in_room_time}}</div>
+            {{/if}}
+            {{if type == 2}}
             <div>出房时间：{{item.out_room_time}}</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>