咨询列表，增加已回复状态

app/Admin/Controllers/Ask/AskOrderController.php

@@ -67,11 +67,13 @@ class AskOrderController extends AdminController
             $grid->column('status')->using([
                 0 =>'待支付',
                 10=>'已支付',
+                15=>'已回复',
                 20=>'已结束',
             ])->label([
                     'default' => 'info', // 设置默认颜色，不设置则默认为 default
-                    0 => 'info',
+                    0  => 'info',
                     10 => 'danger',
+                    15 => 'warning',
                     20 => 'success',
                 ]);
             $grid->column('createtime')->display(function($createtime){
@@ -127,6 +129,7 @@ class AskOrderController extends AdminController
             $show->field('status')->using([
                 0 =>'待支付',
                 10=>'已支付',
+                15=>'已回复',
                 20=>'已结束',
             ]);
             $show->field('createtime')->as(function(){

app/Http/Controllers/Api/AskController.php

@@ -535,18 +535,20 @@ class AskController extends BaseController
             $where[] = ['ask_order.user_id','=',$user_id];
         }
 
-        //是否公开
-        /*$is_public = _empty_default_($request->is_public,'all');
-        if($is_public != 'all'){
-            $where[] = ['ask_order.is_public','=',$is_public];
-        }*/
-
         //搜索
         $keyword = _empty_default_($request->keyword,'');
         if($keyword){
             $where[] = ['ask_order.question','like','%'.$keyword.'%'];
         }
 
+        //如果登录了
+        if(($request->uid && $request->uid > 0) && ($request->uid == $user_id || $request->uid == $blogger_user_id)){
+            $where[] = ['ask_order.status','IN',[10,15,20]];
+        }else{
+            $where[] = ['ask_order.status','=',20];
+            $where[] = ['ask_order.is_public','=',1];
+        }
+
         //
         $list = DB::table('ask_order')
             ->leftJoin('wx_user as user','user.id','=','ask_order.user_id')
@@ -554,8 +556,6 @@ class AskController extends BaseController
             ->leftJoin('blogger','blogger.user_id','=','ask_order.blogger_user_id')
             ->select('ask_order.*','user.user_avatar','user.user_name','buser.user_avatar as blogger_avatar','buser.user_name as blogger_name','blogger.info as blogger_info')
             ->offset($offset)->limit($limit)
-            ->where('ask_order.status',20)
-            ->where('ask_order.is_public',1)
             ->where($where)
             ->orderBy('ask_order.id','desc')
             ->get();
@@ -648,13 +648,5 @@ class AskController extends BaseController
         return $this->success($list);
     }
 
-    //
-    //
-    //
-    //
-    //
-    //
-    //
-    //
 
 }