diff --git a/app/admin/controller/Controller.php b/app/admin/controller/Controller.php index 5f001349..807037c9 100644 --- a/app/admin/controller/Controller.php +++ b/app/admin/controller/Controller.php @@ -90,7 +90,7 @@ class Controller extends BaseController } } else { //超级管理员看到所有的 - $list = Channel::where('status', 1)->where('is_delete',0 )->select(); + $list = Channel::where('status', 1)->where('is_delete',0)->select(); } return $list; } diff --git a/app/admin/controller/Store.php b/app/admin/controller/Store.php index afe535d1..acb9f20c 100644 --- a/app/admin/controller/Store.php +++ b/app/admin/controller/Store.php @@ -196,6 +196,9 @@ class Store extends Controller foreach ($list as $key => $value) { $platformList[$value['code']] = $value['name']; } + // echo "
"; + // print_r($platformList); + // exit(); //$platformList = config('app.platformList'); return $this->renderSuccess($platformList); } diff --git a/app/store/controller/Store.php b/app/store/controller/Store.php index f3639397..8e952a96 100644 --- a/app/store/controller/Store.php +++ b/app/store/controller/Store.php @@ -19,7 +19,7 @@ use app\admin\model\Store as AdminStoreModel; use app\common\model\Channel; use app\common\model\PriceSet; use app\common\model\OpenShop; - +use app\common\model\UploadFile; /** * 商家中心控制器 * Class Store @@ -47,6 +47,14 @@ class Store extends Controller $list = $list->toArray(); foreach ($list['data'] as &$value) { $value['store_version'] = $value['store_version'] == 0 ? "单商户" : "多商户"; + $info = UploadFile::detail($value['id_card_face_image']); + $value['id_card_face_image_url'] = $info['preview_url'] ?? ""; + $info = UploadFile::detail($value['id_card_back_image']); + $value['id_card_back_image_url'] = $info['preview_url'] ?? ""; + $info = UploadFile::detail($value['license_image']); + $value['license_image_url'] = $info['preview_url'] ?? ""; + $info = UploadFile::detail($value['legal_person_license_image']); + $value['legal_person_license_image_url'] = $info['preview_url'] ?? ""; } } return $this->renderSuccess(compact('list')); @@ -96,6 +104,7 @@ class Store extends Controller { // 商城详情 $model = StoreModel::detail($this->storeId); + return $this->renderSuccess(['storeInfo' => $model]); }