Merge branch 'main' of git.njrzwl.cn:wangmingchuan/yanzong

app/api/controller/Store.php

@@ -125,7 +125,11 @@ class Store extends Controller
             $file = UploadFile::where('file_id', '=', $info['logo_image_id'])->find();
             $info['logo_image'] = $file->preview_url;
         }
-        
+        $info['login_img'] = "";
+        if ($info['login_img_id']) {
+            $file = UploadFile::where('file_id', '=', $info['login_img_id'])->find();
+            $info['login_img'] = $file->preview_url;
+        }
         return $this->renderSuccess($info);
     }
 

app/common/model/Store.php

@@ -92,6 +92,12 @@ class Store extends BaseModel
                 } else {
                     $list['rankingImg'] = null;
                 }
+                if ($list['login_img_id']) {
+                    $files = UploadFile::getFileList([$list['login_img_id']]);
+                    $list['loginImg'] = $files ? $files[0] : null;
+                } else {
+                    $list['loginImg'] = null;
+                }
             }
             return $list ?? null;
         } catch (\Exception $e) {