wesmiler 报恩寺项目提交

app/Models/MemberModel.php

@@ -82,7 +82,7 @@ class MemberModel extends BaseModel
                 if($status>0){
                     $query->where('ms.status', $status);
                 }else{
-                    $query->whereIn('ms.status', [1,2]);
+                    $query->whereIn('ms.status', [1,2,3]);
                 }
 
                 $realname = isset($params['realname'])? trim($params['realname']) : '';

app/Services/MasterService.php

@@ -109,11 +109,11 @@ class MasterService extends BaseService
             ->select('ms.*','m.nickname','m.avatar')
             ->first();
         $info = $info ? $info->toArray() : [];
-        if (isset($info['avatar'])) {
-            $info['avatar'] = $info['avatar'] ? get_image_url($info['avatar']) : '';
-        }
-
         if($info){
+            if (isset($info['avatar'])) {
+                $info['avatar'] = $info['avatar'] ? get_image_url($info['avatar']) : '';
+            }
+
             $info['idcard_front_preview'] = $info['idcard_front']? get_image_url($info['idcard_front']) : '';
             $info['idcard_back_preview'] = $info['idcard_back']? get_image_url($info['idcard_back']) : '';
 

app/Services/MemberService.php

@@ -156,10 +156,8 @@ class MemberService extends BaseService
                 if($master){
                     $master['idcard_front_preview'] = $master['idcard_front']? get_image_url($master['idcard_front']) : '';
                     $master['idcard_back_preview'] = $master['idcard_back']? get_image_url($master['idcard_back']) : '';
-
                     $master['description_text'] = $master['description']? str_replace("\n","<br>", $master['description']) : '';
 
-
                 }
                 $info['master'] = $master? $master : [];
             }