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

app/common/model/store/StoreSettle.php

@@ -33,7 +33,7 @@ class StoreSettle extends BaseModel
         'status_text'
     ];
 
-    protected function getStatusText($value, $data): string
+    protected function getStatusTextAttr($value, $data): string
     {
         if ($data['status'] == 0) {
             return '待审核';

app/store/controller/Store.php

@@ -52,7 +52,7 @@ class Store extends Controller
     /**
      * 门店入驻列表
      */
-    public function getStoreSettleList(): array {
+    public function settleList(): Json {
         $list = StoreSettle::where('store_id', '=', $this->storeId)
             ->select();
         return $this->renderSuccess($list->toArray());
@@ -61,9 +61,9 @@ class Store extends Controller
     /**
      * 门店入驻详情
      */
-    public function getStoreSettleDetail(int $id): Json
+    public function settleDetail(int $id): Json
     {
         $detail = StoreSettle::get($id);
-        return $this->renderSuccess($detail->toArray());
+        return $this->renderSuccess(compact('detail'));
     }
 }