合并分支 '1iuzhen' 到 'master'

订单列表修改



查看合并请求 !18

@@ -243,7 +243,9 @@ class MemberSalesController extends HomeBaseController
         if(!$id) {
             $this->redirect(url('portal/MemberSales/order_type'));
         }
+        $user_id = cmf_get_current_user_sale_id();
         $order_where = [
+            'o.user_id' => $user_id,
             'o.is_stop' => 0,
             'o.delete_time' => 0
         ];
@@ -267,6 +269,7 @@ class MemberSalesController extends HomeBaseController
     public function choosetime_detail() {
         if($this->request->isAjax()) {
             $date = $this->request->param('date');
+            $sort_id = $this->request->param('sort_id');
             $user_id = cmf_get_current_user_sale_id();
             $order_where = [
                 'o.user_id' => $user_id,
@@ -281,8 +284,8 @@ class MemberSalesController extends HomeBaseController
                 ->where($order_where)
                 ->select();
             foreach ($orderList as $k=>$v) {
-                $orderList[$k]['detail_url'] = url('detail',['id'=>$v['id']]);
-                $orderList[$k]['edit_url'] = url('edit',['id'=>$v['id']]);
+                $orderList[$k]['detail_url'] = url('detail',['id'=>$sort_id,'order_id'=>$v['id']]);
+                $orderList[$k]['edit_url'] = url('edit',['id'=>$sort_id,'order_id'=>$v['id']]);
                 $orderList[$k]['create_time'] = date('Y-m-d',$v['create_time']);
             }
             $this->success('成功',strtotime($date),$orderList);

@@ -92,7 +92,8 @@
                 $('.choose_time').html(`<i class="iconfont icon-rili"></i>${birthday}`);
                 var date = result[0].value + '-' + result[1].value + '-' + result[2].value;
                 var data = {
-                    date: date
+                    date: date,
+                    sort_id: "{$sort_id}"
                 };
                 $.ajax({
                     url: "{:url('choosetime_detail')}",
@@ -142,15 +143,15 @@
             id: 'datePicker'
         });
     });
-    $('.change_btn').click(function(event){
+    $('.deal_list').on('click','.change_btn',function(event){
         event.stopPropagation();
         location.href = $(this).data('href');
     });
-    $('.list_style').click(function(){
+    $('.deal_list').on('click','.list_style',function(){
         event.stopPropagation();
         location.href = $(this).data('href');
     });
-    $('.write_order').click(function(){
+    $('.deal_list').on('click','.write_order',function(){
         location.href = "{$orderUrl}";
     });
 </script>

@@ -10,7 +10,9 @@
     <link rel="stylesheet" type="text/css" href="__TMPL__/public/mobile/css/pay/order_style.css" />
     <title>选择订单类型</title>
     <style type="text/css">
-
+        .container {
+            height: 100%;
+        }
     </style>
 </head>