seam 8 năm trước cách đây
mục cha
commit
5535cb524d

+ 1 - 0
package.json

@@ -10,6 +10,7 @@
     "cz-conventional-changelog": "^1.1.5"
   },
   "scripts": {
+    "commit": "git add . && git status && git commit -m 0",
     "push": "git add . && git status && git commit -m 0 && git pull && git push",
     "test": "echo \"Error: no test specified\" && exit 1"
   },

+ 1 - 1
www/webapp/moonclub/js/page/serviceList.js

@@ -96,7 +96,7 @@ define(['$', 'template', 'native', 'config', 'user', 'api'], function ($, templa
               var tpl = template('employe/serviceList', {
                 authArr: authArr,
                 order_info: listArr,
-                type: 2
+                type: 1
               });
               $('.spa-page-body', $view).html(tpl);
             }

+ 60 - 0
www/webapp/moonclub/tpl/.debug.js

@@ -0,0 +1,60 @@
+/*! <DEBUG:undefined> */
+function anonymous($data,$filename) {'use strict';var $utils=this,$helpers=$utils.$helpers,authArr=$data.authArr,type=$data.type,$each=$utils.$each,order_info=$data.order_info,item=$data.item,i=$data.i,$escape=$utils.$escape,$out='';if(authArr.auth === 3){
+$out+=' <div class="segmented-control order-type-control service-list-header"> <a class="control-item ';
+if(type == '1'){
+$out+='active';
+}
+$out+='" data-order-type="1">进行中</a> <a class="control-item ';
+if(type == '2'){
+$out+='active';
+}
+$out+='" data-order-type="2">已完成</a> </div> <div> ';
+$each(order_info,function(item,i){
+$out+=' <div class="my-order-body btn-status-edit" data-index="';
+$out+=$escape(i);
+$out+='"> <div> <br><br><br><br><br><br><br><br><br><br><br><br><br><br> <br><br><br><br><br><br><br><br><br><br><br><br><br><br> </div> <div>订单编号:';
+$out+=$escape(item.num);
+$out+='</div> <div>订单ID:';
+$out+=$escape(item.xyh_order_id);
+$out+='</div> <div>用户名:';
+$out+=$escape(item.user_name);
+$out+='</div> <div>预产期:';
+$out+=$escape(item.posts_time);
+$out+='</div> <div>生产日期:';
+$out+=$escape(item.end_time);
+$out+='</div> <div>订单状态:';
+$out+=$escape(item.status_str);
+$out+='</div> <div>月子地址:';
+$out+=$escape(item.month_address);
+$out+='</div> <div>备注:';
+$out+=$escape(item.remarks);
+$out+='</div> </div> ';
+});
+$out+=' </div> ';
+}else{
+$out+=' <div class="content" id="employeListScroll" style="background: #fff;"> <div class="page-content"> <div class="container"> ';
+$each(order_info,function(item,i){
+$out+=' <div class="my-order-body btn-status-edit" data-index="';
+$out+=$escape(i);
+$out+='"> <div>订单编号:';
+$out+=$escape(item.num);
+$out+='</div> <div>订单ID:';
+$out+=$escape(item.xyh_order_id);
+$out+='</div> <div>用户名:';
+$out+=$escape(item.user_name);
+$out+='</div> <div>预产期:';
+$out+=$escape(item.posts_time);
+$out+='</div> <div>生产日期:';
+$out+=$escape(item.end_time);
+$out+='</div> <div>订单状态:';
+$out+=$escape(item.status_str);
+$out+='</div> <div>月子地址:';
+$out+=$escape(item.month_address);
+$out+='</div> <div>备注:';
+$out+=$escape(item.remarks);
+$out+='</div> </div> ';
+}
+$out+=' </div> </div> </div> ';
+});
+$out+=' ';
+return new String($out);}

+ 37 - 38
www/webapp/moonclub/tpl/employe/serviceList.html

@@ -1,44 +1,43 @@
+{{if authArr.auth === 3}}
+<div class="segmented-control order-type-control service-list-header">
+  <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>
+<div>
+  {{each order_info as item i}}
+  <div class="my-order-body btn-status-edit" data-index="{{i}}">
+    <div>
+      <br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+      <br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    </div>
+    <div>订单编号:{{item.num}}</div>
+    <div>订单ID:{{item.xyh_order_id}}</div>
+    <div>用户名:{{item.user_name}}</div>
+    <div>预产期:{{item.posts_time}}</div>
+    <div>生产日期:{{item.end_time}}</div>
+    <div>订单状态:{{item.status_str}}</div>
+    <div>月子地址:{{item.month_address}}</div>
+    <div>备注:{{item.remarks}}</div>
+  </div>
+  {{/each}}
+</div>
+{{else}}
 <div class="content" id="employeListScroll" style="background: #fff;">
   <div class="page-content">
     <div class="container">
-      {{if authArr.auth === 3}}
-          <div class="segmented-control order-type-control service-list-header">
-            <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>
-          <div>
-            {{each order_info as item i}}
-              <div class="my-order-body btn-status-edit" data-index="{{i}}">
-                <div>
-                  <br><br><br><br><br><br><br><br><br><br><br><br><br><br>
-                  <br><br><br><br><br><br><br><br><br><br><br><br><br><br>
-                </div>
-                <div>订单编号:{{item.num}}</div>
-                <div>订单ID:{{item.xyh_order_id}}</div>
-                <div>用户名:{{item.user_name}}</div>
-                <div>预产期:{{item.posts_time}}</div>
-                <div>生产日期:{{item.end_time}}</div>
-                <div>订单状态:{{item.status_str}}</div>
-                <div>月子地址:{{item.month_address}}</div>
-                <div>备注:{{item.remarks}}</div>
-              </div>
-            {{/each}}
-          </div>
-
-      {{else}}
-        {{each order_info as item i}}
-          <div class="my-order-body btn-status-edit" data-index="{{i}}">
-            <div>订单编号:{{item.num}}</div>
-            <div>订单ID:{{item.xyh_order_id}}</div>
-            <div>用户名:{{item.user_name}}</div>
-            <div>预产期:{{item.posts_time}}</div>
-            <div>生产日期:{{item.end_time}}</div>
-            <div>订单状态:{{item.status_str}}</div>
-            <div>月子地址:{{item.month_address}}</div>
-            <div>备注:{{item.remarks}}</div>
-          </div>
-        {{/each}}
+      {{each order_info as item i}}
+      <div class="my-order-body btn-status-edit" data-index="{{i}}">
+        <div>订单编号:{{item.num}}</div>
+        <div>订单ID:{{item.xyh_order_id}}</div>
+        <div>用户名:{{item.user_name}}</div>
+        <div>预产期:{{item.posts_time}}</div>
+        <div>生产日期:{{item.end_time}}</div>
+        <div>订单状态:{{item.status_str}}</div>
+        <div>月子地址:{{item.month_address}}</div>
+        <div>备注:{{item.remarks}}</div>
+      </div>
       {{/if}}
     </div>
   </div>
-</div>
+</div>
+{{/each}}

+ 276 - 275
www/webapp/o2o/js/page/myOrder.js

@@ -1,308 +1,309 @@
 define(['$', 'template', 'user', 'config', 'native', 'IScroll'], function ($, template, user, config, native, IScroll) {
 
-    var backHash;
-    function back(event) {
-        event.preventDefault();
+  var backHash;
 
-        $(document).trigger('spa:navigate', {
-            hash: backHash,
-            pushData: {
-                dontNeedReload: true
-            }
-        });
-    }
+  function back(event) {
+    event.preventDefault();
 
-    function reloadData(pageData, type, more) {
-        var $view = this;
-        var $doc = $(document);
+    $(document).trigger('spa:navigate', {
+      hash: backHash,
+      pushData: {
+        dontNeedReload: true
+      }
+    });
+  }
 
-        $doc.trigger('spa:openloader');
-        user.getOrderList(user.id, type, function (res) {
-            $doc.trigger('spa:closeloader');
-            if (res.success) {
-                var time = new Date().getTime();
-                var tpl = template('myOrder/list', {
-                    orders: user.orders[type].data,
-                    hasMore: user.orders[type].hasMore,
-                    type: type,
-                    time: parseInt(time / 1000),
-                    chubao: config.isChubao
-                });
-                $('.more-container', $view).find('.btn-more-orders').attr('data-type', type);
+  function reloadData(pageData, type, more) {
+    var $view = this;
+    var $doc = $(document);
 
-                if (res.current_page >= res.sum_page) {
-                    $('.more-container', $view).addClass('hide');
-                } else {
-                    $('.more-container', $view).removeClass('hide');
-                }
-                // if (more) {
-                // 	$('.list-content', $view).append(tpl);
-                // } else {
-                // 	$('.list-content', $view).html(tpl);
-                // }
-                $('.list-content', $view).html(tpl);
+    $doc.trigger('spa:openloader');
+    user.getOrderList(user.id, type, function (res) {
+      $doc.trigger('spa:closeloader');
+      if (res.success) {
+        var time = new Date().getTime();
+        var tpl = template('myOrder/list', {
+          orders: user.orders[type].data,
+          hasMore: user.orders[type].hasMore,
+          type: type,
+          time: parseInt(time / 1000),
+          chubao: config.isChubao
+        });
+        $('.more-container', $view).find('.btn-more-orders').attr('data-type', type);
 
-                setTimeout(function () {
-                    pageData.scroll = new IScroll('#myOrderScroll');
-                }, 1000);
+        if (res.current_page >= res.sum_page) {
+          $('.more-container', $view).addClass('hide');
+        } else {
+          $('.more-container', $view).removeClass('hide');
+        }
+        // if (more) {
+        // 	$('.list-content', $view).append(tpl);
+        // } else {
+        // 	$('.list-content', $view).html(tpl);
+        // }
+        $('.list-content', $view).html(tpl);
 
-                // if (pageData.scroll) {
-                // 	pageData.scroll.refresh();
-                // }
-            } else {
-                $doc.trigger('spa:openpanel', ['simpleAlert', {
-                    message: res.message
-                }]);
-            }
-        }, more)
-    }
+        setTimeout(function () {
+          pageData.scroll = new IScroll('#myOrderScroll');
+        }, 1000);
 
-    var t = 0;
-    return {
-        title: '壹管家上门服务',
-        body: '',
-        init: function (pageData, dtd) {
-            var $view = this;
-            var $doc = $(document);
+        // if (pageData.scroll) {
+        // 	pageData.scroll.refresh();
+        // }
+      } else {
+        $doc.trigger('spa:openpanel', ['simpleAlert', {
+          message: res.message
+        }]);
+      }
+    }, more)
+  }
 
-            //返回
-            $view.on('swipeRight', function (event) {
-                back.call(this, event);
-            });
+  var t = 0;
+  return {
+    title: '壹管家上门服务',
+    body: '',
+    init: function (pageData, dtd) {
+      var $view = this;
+      var $doc = $(document);
 
-            $.newTouch('.back-button', function (event) {
-                back.call(this, event);
-            }, $view);
+      //返回
+      $view.on('swipeRight', function (event) {
+        back.call(this, event);
+      });
 
-            $view.on('tapBackButton', function (event) {
-                back.call(this, event);
-            });
+      $.newTouch('.back-button', function (event) {
+        back.call(this, event);
+      }, $view);
 
-            // tab切换
-            $.newTouch('.order-type-control .control-item', function (event) {
-                var orderType = $(this).data('order-type');
-                var i = $(this).index();
-                t = parseFloat(i) + 1;
-                reloadData.call($view, pageData, orderType);
-            }, $view);
+      $view.on('tapBackButton', function (event) {
+        back.call(this, event);
+      });
 
-            // 详情 OrderDetail
-            $.newTouch('.btn-order-detail', function (event) {
-                var id = $(this).attr('data-order-id');
-                var i = $(this).parents('.table-view').index();
-                $doc.trigger('spa:navigate', {
-                    hash: 'OrderDetail/' + id,
-                    pushData: {
-                        index: i
-                    }
-                });
-            }, $view);
+      // tab切换
+      $.newTouch('.order-type-control .control-item', function (event) {
+        var orderType = $(this).data('order-type');
+        var i = $(this).index();
+        t = parseFloat(i) + 1;
+        reloadData.call($view, pageData, orderType);
+      }, $view);
 
-            // 更多
-            $.newTouch('.btn-more-orders', function (event) {
-                var orderType = $(this).attr('data-type');
-                reloadData.call($view, pageData, orderType, true);
-            }, $view);
+      // 详情 OrderDetail
+      $.newTouch('.btn-order-detail', function (event) {
+        var id = $(this).attr('data-order-id');
+        var i = $(this).parents('.table-view').index();
+        $doc.trigger('spa:navigate', {
+          hash: 'OrderDetail/' + id,
+          pushData: {
+            index: i
+          }
+        });
+      }, $view);
 
-            // 去支付
-            $.newTouch('.order-btn-pay', function (event) {
-                event.preventDefault();
+      // 更多
+      $.newTouch('.btn-more-orders', function (event) {
+        var orderType = $(this).attr('data-type');
+        reloadData.call($view, pageData, orderType, true);
+      }, $view);
 
-                $doc.trigger('spa:navigate', {
-                    hash: 'pay',
-                    pushData: {
-                        animate: 'slideInUp',
-                        orderID: $(this).data('order-id'),
-                        backHash: 'myOrder/1'
-                    }
-                });
-            }, $view);
+      // 去支付
+      $.newTouch('.order-btn-pay', function (event) {
+        event.preventDefault();
 
-            // 取消
-            $.newTouch('.order-btn-cancel', function (event) {
-                event.preventDefault();
-                var orderID = $(this).attr('data-order-id');
-                $doc.trigger('spa:openloader');
-                user.cancelOrder(orderID, function (res) {
-                    $doc.trigger('spa:closeloader');
-                    if (res.success) {
-                        reloadData.call($view, pageData, 1);
-                        $doc.trigger('spa:openpanel', ['simpleAlert', {
-                            message: '取消订单成功'
-                        }]);
-                    } else
-                        $doc.trigger('spa:openpanel', ['simpleAlert', {
-                            message: res.message
-                        }]);
-                })
-            }, $view);
+        $doc.trigger('spa:navigate', {
+          hash: 'pay',
+          pushData: {
+            animate: 'slideInUp',
+            orderID: $(this).data('order-id'),
+            backHash: 'myOrder/1'
+          }
+        });
+      }, $view);
 
-            // 去评价
-            $.newTouch('.order-btn-review', function (event) {
-                var obj = $(this);
-                if (obj.hasClass('disable')) {
-                    return false;
-                }
-                var orderID = obj.data('order-id');
-                $doc.trigger('spa:openpanel', ['postReview', {
-                    orderID: orderID,
-                    didPostReview: function () {
-                        obj.addClass('disable').text('已评价');
-                    }
-                }]);
-            }, $view);
+      // 取消
+      $.newTouch('.order-btn-cancel', function (event) {
+        event.preventDefault();
+        var orderID = $(this).attr('data-order-id');
+        $doc.trigger('spa:openloader');
+        user.cancelOrder(orderID, function (res) {
+          $doc.trigger('spa:closeloader');
+          if (res.success) {
+            reloadData.call($view, pageData, 1);
+            $doc.trigger('spa:openpanel', ['simpleAlert', {
+              message: '取消订单成功'
+            }]);
+          } else
+            $doc.trigger('spa:openpanel', ['simpleAlert', {
+              message: res.message
+            }]);
+        })
+      }, $view);
 
-            // 申请退款
-            $.newTouch('.order-btn-refund', function (event) {
-                var html = '<a href="tel:4000328170">4000328170</a>';
-                if ($(this).hasClass('btn-alert-info')) {
-                    $doc.trigger('spa:openpanel', ['simpleAlert', {
-                        message: '预约时间两个小时内申请退款将扣除50%订单金额。确定退款请电话联系客服。',
-                        html: config.isWX ? html : '',
-                        buttons: [{
-                            text: '取消',
-                            class: 'btn-default',
-                            callback: function () {
+      // 去评价
+      $.newTouch('.order-btn-review', function (event) {
+        var obj = $(this);
+        if (obj.hasClass('disable')) {
+          return false;
+        }
+        var orderID = obj.data('order-id');
+        $doc.trigger('spa:openpanel', ['postReview', {
+          orderID: orderID,
+          didPostReview: function () {
+            obj.addClass('disable').text('已评价');
+          }
+        }]);
+      }, $view);
 
-                            }
-                        }, {
-                            text: '联系客服',
-                            class: 'btn-primary',
-                            callback: function () {
-                                native.call('4000328170');
-                            }
-                        }]
-                    }]);
-                    return;
-                } else {
-                    var orderID = $(this).attr('data-order-id');
-                    $doc.trigger('spa:openpanel', ['simpleAlert', {
-                        title: '申请退款',
-                        message: '退款将退至您的支付账户',
-                        html: '(3-10个工作日内到账)',
-                        buttons: [{
-                            text: '确定申请',
-                            class: 'btn-primary',
-                            callback: function () {
-                                user.refundOrder(orderID, function (res) {
-                                    if (res.success) {
-                                        $('.control-item', $view).eq(2).addClass('active').siblings().removeClass('active');
-                                        reloadData.call($view, pageData, 2);
-                                    } else {
-                                        $doc.trigger('spa:openpanel', ['simpleAlert', {
-                                            message: res.message
-                                        }]);
-                                    }
-                                });
-                            }
-                        }, {
-                            text: '取消申请',
-                            class: 'btn-default',
-                            callback: function () {
+      // 申请退款
+      $.newTouch('.order-btn-refund', function (event) {
+        var html = '<a href="tel:4000328170">4000328170</a>';
+        if ($(this).hasClass('btn-alert-info')) {
+          $doc.trigger('spa:openpanel', ['simpleAlert', {
+            message: '预约时间两个小时内申请退款将扣除50%订单金额。确定退款请电话联系客服。',
+            html: config.isWX ? html : '',
+            buttons: [{
+              text: '取消',
+              class: 'btn-default',
+              callback: function () {
 
-                            }
-                        }]
+              }
+            }, {
+              text: '联系客服',
+              class: 'btn-primary',
+              callback: function () {
+                native.call('4000328170');
+              }
+            }]
+          }]);
+          return;
+        } else {
+          var orderID = $(this).attr('data-order-id');
+          $doc.trigger('spa:openpanel', ['simpleAlert', {
+            title: '申请退款',
+            message: '退款将退至您的支付账户',
+            html: '(3-10个工作日内到账)',
+            buttons: [{
+              text: '确定申请',
+              class: 'btn-primary',
+              callback: function () {
+                user.refundOrder(orderID, function (res) {
+                  if (res.success) {
+                    $('.control-item', $view).eq(2).addClass('active').siblings().removeClass('active');
+                    reloadData.call($view, pageData, 2);
+                  } else {
+                    $doc.trigger('spa:openpanel', ['simpleAlert', {
+                      message: res.message
                     }]);
-                }
-            }, $view);
-
-            // 追加服务
-            $.newTouch('.order-btn-append', function (event) {
-                var appendType = $(this).attr('data-type');
-                var orderID = $(this).attr('data-order-id');
-                var petName = $(this).attr('data-order-name');
-
-                var i = $(this).parents('.table-view').index();
-                $doc.trigger('spa:navigate', {
-                    hash: 'append',
-                    pushData: {
-                        appendType: appendType,
-                        orderID: orderID,
-                        petName: petName,
-                        index: i
-                    }
+                  }
                 });
-            }, $view);
+              }
+            }, {
+              text: '取消申请',
+              class: 'btn-default',
+              callback: function () {
 
-            // 确认完成
-            $.newTouch('.order-btn-done', function (event) {
-                event.preventDefault();
-                var orderId = $(this).attr('data-order-id');
-                $doc.trigger('spa:openpanel', ['simpleAlert', {
-                    message: '确认服务已完成?',
-                    buttons: [{
-                        text: '确认',
-                        class: 'btn-primary',
-                        callback: function () {
-                            user.finishOrder(orderId, function (res) {
-                                if (res.success) {
-                                    $doc.trigger('spa:navigate', {
-                                        hash: 'order-done'
-                                    });
-                                } else {
-                                    $doc.trigger('spa:openpanel', ['simpleAlert', {
-                                        message: res.message
-                                    }]);
-                                }
-                            });
-                        }
-                    }, {
-                        text: '取消',
-                        class: 'btn-default',
-                        callback: function () {
+              }
+            }]
+          }]);
+        }
+      }, $view);
 
-                        }
-                    }]
-                }]);
-            }, $view);
+      // 追加服务
+      $.newTouch('.order-btn-append', function (event) {
+        var appendType = $(this).attr('data-type');
+        var orderID = $(this).attr('data-order-id');
+        var petName = $(this).attr('data-order-name');
 
-            dtd.resolve();
-        },
-        beforeopen: function (pageData, dtd) {
-            var $view = this;
-            var $doc = $(document);
-            /* 只有首页跳转来,才会带有needReset = true */
-            var pushData = pageData.pushData;
-            /*获取上一页跳转的路由名称*/
-            backHash = pushData.backHash ? pushData.backHash : '';
-            var tpl = template('myOrder/index', {
-                showNavBar: !config.isWX && !config.isChubao,
-                type: t == 0 ? pageData.requestData[0] : t
-            });
-            $('.spa-page-body', $view).html(tpl);
+        var i = $(this).parents('.table-view').index();
+        $doc.trigger('spa:navigate', {
+          hash: 'append',
+          pushData: {
+            appendType: appendType,
+            orderID: orderID,
+            petName: petName,
+            index: i
+          }
+        });
+      }, $view);
 
-            if (pageData.scroll) {
-                pageData.scroll.destroy();
-                pageData.scroll = null;
+      // 确认完成
+      $.newTouch('.order-btn-done', function (event) {
+        event.preventDefault();
+        var orderId = $(this).attr('data-order-id');
+        $doc.trigger('spa:openpanel', ['simpleAlert', {
+          message: '确认服务已完成?',
+          buttons: [{
+            text: '确认',
+            class: 'btn-primary',
+            callback: function () {
+              user.finishOrder(orderId, function (res) {
+                if (res.success) {
+                  $doc.trigger('spa:navigate', {
+                    hash: 'order-done'
+                  });
+                } else {
+                  $doc.trigger('spa:openpanel', ['simpleAlert', {
+                    message: res.message
+                  }]);
+                }
+              });
             }
-            var orderType = t == 0 ? pageData.requestData[0] : t;
-            // var orderType = parseFloat(pageData.requestData[0]) || 1;
-            var orderArray = [1, 3, 2];
+          }, {
+            text: '取消',
+            class: 'btn-default',
+            callback: function () {
 
-            reloadData.call(this, pageData, orderArray[orderType - 1]);
-            dtd.resolve();
-        },
-        afteropen: function (pageData, dtd) {
-            var $view = this;
-            dtd.resolve();
-            if (config.isWX) {
-                wx.ready(function () {
-                    wx.onMenuShareTimeline({
-                        title: '家政服务,首选壹管家',
-                        link: 'http://www.yiguanjia.me/o2o/web/index',
-                        imgUrl: 'http://odulvej8l.bkt.clouddn.com/4-1-01.png'
-                    });
-                    wx.onMenuShareAppMessage({
-                        title: '家政服务,首选壹管家',
-                        desc: '全程管家,精心每一个细节!',
-                        link: 'http://www.yiguanjia.me/o2o/web/index',
-                        imgUrl: 'http://odulvej8l.bkt.clouddn.com/4-1-01.png'
-                    });
-                });
             }
-        },
-        afterclose: function (pageData, dtd) {
-            t = 0;
-        }
+          }]
+        }]);
+      }, $view);
+
+      dtd.resolve();
+    },
+    beforeopen: function (pageData, dtd) {
+      var $view = this;
+      var $doc = $(document);
+      /* 只有首页跳转来,才会带有needReset = true */
+      var pushData = pageData.pushData;
+      /*获取上一页跳转的路由名称*/
+      backHash = pushData.backHash ? pushData.backHash : '';
+      var tpl = template('myOrder/index', {
+        showNavBar: !config.isWX && !config.isChubao,
+        type: t == 0 ? pageData.requestData[0] : t
+      });
+      $('.spa-page-body', $view).html(tpl);
+
+      if (pageData.scroll) {
+        pageData.scroll.destroy();
+        pageData.scroll = null;
+      }
+      var orderType = t == 0 ? pageData.requestData[0] : t;
+      // var orderType = parseFloat(pageData.requestData[0]) || 1;
+      var orderArray = [1, 3, 2];
+
+      reloadData.call(this, pageData, orderArray[orderType - 1]);
+      dtd.resolve();
+    },
+    afteropen: function (pageData, dtd) {
+      var $view = this;
+      dtd.resolve();
+      if (config.isWX) {
+        wx.ready(function () {
+          wx.onMenuShareTimeline({
+            title: '家政服务,首选壹管家',
+            link: 'http://www.yiguanjia.me/o2o/web/index',
+            imgUrl: 'http://odulvej8l.bkt.clouddn.com/4-1-01.png'
+          });
+          wx.onMenuShareAppMessage({
+            title: '家政服务,首选壹管家',
+            desc: '全程管家,精心每一个细节!',
+            link: 'http://www.yiguanjia.me/o2o/web/index',
+            imgUrl: 'http://odulvej8l.bkt.clouddn.com/4-1-01.png'
+          });
+        });
+      }
+    },
+    afterclose: function (pageData, dtd) {
+      t = 0;
     }
+  }
 })

+ 2 - 1
www/webapp/o2o/tpl/myOrder/index.html

@@ -18,7 +18,8 @@
       <div class="page-content list-content">
 
       </div>
-      <div class="btn-more-container box-center more-container hide"> <a class="btn btn-block btn-more-orders" data-type="1">加载更多</a> </div>
+      <div class="btn-more-container box-center more-container hide"><a class="btn btn-block btn-more-orders"
+                                                                        data-type="1">加载更多</a></div>
     </div>
   </div>
 </div>