From 395510db338fad1cfb9b1b99c0ab76ac6ebf2e83 Mon Sep 17 00:00:00 2001
From: "wangmingchuan321@qq.com" <wangmingchuan321@qq.com>
Date: Wed, 31 Jan 2024 10:11:39 +0800
Subject: [PATCH] 111

---
 app/api/controller/Goods.php |  3 +--
 app/api/controller/Order.php |  1 +
 app/api/service/Goods.php    | 23 ++++++++++++++++++++---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/api/controller/Goods.php b/app/api/controller/Goods.php
index f12d4f0a..d44f13fd 100644
--- a/app/api/controller/Goods.php
+++ b/app/api/controller/Goods.php
@@ -50,7 +50,7 @@ class Goods extends Controller
      */
     public function detail(int $goodsId, bool $verifyStatus = true): Json
     {
-        // 商品详情
+        // wmc商品详情
         $model = new GoodsModel;
         $goodsInfo = $model->getDetails($goodsId, $verifyStatus);
         return $this->renderSuccess(['detail' => $goodsInfo]);
@@ -142,7 +142,6 @@ class Goods extends Controller
     }
 
 
-
     public function cityInfo(): Json
     {
         $service = new GoodsService;
diff --git a/app/api/controller/Order.php b/app/api/controller/Order.php
index 85e0bb1f..bbc2ecad 100644
--- a/app/api/controller/Order.php
+++ b/app/api/controller/Order.php
@@ -36,6 +36,7 @@ class Order extends Controller
      */
     public function list(string $dataType): Json
     {
+        echo 12113;die;
         $model = new OrderModel;
         $list = $model->getList($dataType);
         return $this->renderSuccess(compact('list'));
diff --git a/app/api/service/Goods.php b/app/api/service/Goods.php
index 9ed72ff9..c89060af 100644
--- a/app/api/service/Goods.php
+++ b/app/api/service/Goods.php
@@ -181,15 +181,32 @@ class Goods extends GoodsService
     public function cityInfo(): array
     {
         $model = new ShopModel;
-        $list = $model->where([
+        $info = $model->where([
             'is_delete' => 0,
             'status' => 1,
             'store_id' => $_GET['store_id'],
             'is_main' => 1,
-        ])->field('shop_name,star,shop_hours,
+        ])->field('shop_name,star,shop_hours,summary,phone,
         province_id,city_id,region_id,shop_id,address,latitude,longitude')->find()->toArray();
 
-        return $list;
+        $info['remark'] = ['手机选购', '电脑选购'];
+        $info['star'] = 5;
+        $info['fuwu_hours'] = 5;
+        $info['fuwu_num'] = 15;
+        $info['star'] = 5;
+        $info['wechat'] = 'https://www.saas.njrenzhou.com/uploads/10001/20240127/12bb1b1747e652d258443247a5c4777c.png';
+        $info['history'] = ['time' => '2022-01-01', 'contenmt' => 'yml与2000年成立'];
+        $info['evaluate'] = [
+            'image' => 'https://www.saas.njrenzhou.com/uploads/10001/20240116/18adc22ad9ea021ab2586878fe1035b0.png',
+            'nickname' => 'wmc',
+            'content' => '很好',
+        ];
+        $info['imageList'] = [
+            'https://www.saas.njrenzhou.com/uploads/10001/20240116/18adc22ad9ea021ab2586878fe1035b0.png',
+            'https://www.saas.njrenzhou.com/uploads/10001/20240116/18adc22ad9ea021ab2586878fe1035b0.png'
+
+        ];
+        return $info;
     }
 
 //    //抢购会场列表