预约看铺

application/index/controller/WatchShop.php

@@ -72,13 +72,14 @@ class WatchShop extends Basic
             $data['list']  = [];
             $data['total'] = 0;
 
-            if ($params['type'] == 1) {
-                $data['list']  = $applies->getAppointWatchShopList($pageNo, $pageSize, 'id DESC', '*', $where);
+            if ($params['check_status'] == 1) {
+                $data['list']  = $applies->getAppointWatchShopList($pageNo, $pageSize, 'id DESC', 'a.*', $where);
                 $data['total'] = $applies->getAppointWatchShopListTotal($where);
             }
 
-            if ($params['type'] == 2) {
-                $data['list']  = $applies->getAppointWatchOurList($pageNo, $pageSize, 'id DESC', '*', $where);
+            if ($params['check_status'] == 2) {
+                $where['b.agent_id'] = $this->userId;
+                $data['list']  = $applies->getAppointWatchOurList($pageNo, $pageSize, 'id DESC', 'a.*', $where);
                 $data['total'] = $applies->getAppointWatchOurTotal($where);
             }
             

application/model/AppointWatchShop.php

@@ -81,7 +81,7 @@ class AppointWatchShop extends BaseModel
             ->field($field)
             ->alias('a')
             ->join('u_users b', 'a.user_id=b.id', 'left')
-            ->join('a_agents c', 'b.id=c.agent_id', 'left')
+            ->join('a_agents c', 'b.agent_id=c.id', 'left')
             ->where($params)
             ->order($order_)
             ->limit($pageSize)
@@ -100,7 +100,7 @@ class AppointWatchShop extends BaseModel
         return $this
             ->alias('a')
             ->join('u_users b', 'a.user_id=b.id', 'left')
-            ->join('a_agents c', 'b.id=c.agent_id', 'left')
+            ->join('a_agents c', 'b.agent_id=c.id', 'left')
             ->where($params)
             ->count();
     }