diff --git a/app/api/service/Goods.php b/app/api/service/Goods.php index 2cedcce0..2d49d698 100644 --- a/app/api/service/Goods.php +++ b/app/api/service/Goods.php @@ -215,24 +215,14 @@ class Goods extends GoodsService 'store_id' => $storeid, 'is_main' => 1, ])->field('shop_name,star,shop_hours,summary,phone, - province_id,city_id,region_id,shop_id,address,latitude,longitude,wechat_img_id,history1,history2,history3,remark')->find()->toArray(); + province_id,city_id,region_id,shop_id,address,latitude,longitude,wechat_img_id,history1,history2,history3,remark,history,parking_name,parking_desc,parking_latitude,parking_longitude')->find()->toArray(); //todo wmc - $info['remark'] = json_decode($info['remark']); + $info['remark'] = json_decode($info['remark'],true); $info['fuwu_hours'] = 5; $info['fuwu_num'] = 15; // $info['wechat'] = 'https://www.saas.njrenzhou.com/uploads/10001/20240127/12bb1b1747e652d258443247a5c4777c.png'; - $history = []; - if (!empty($info['history1'])) { - $history[] = json_decode($info['history1'], true); - } - if (!empty($info['history2'])) { - $history[] = json_decode($info['history2'], true); - } - if (!empty($info['history3'])) { - $history[] = json_decode($info['history3'], true); - } - $info['history'] = $history; - // $info['history'] = ['time' => '2023-01-01', 'contenmt' => 'yml上市']; + + $info['history'] = json_decode($info['history'], true); $info['evaluate'][] = [ 'image' => 'http://qiniu.shop.royaum.com.cn/10001/20240201/13f2e675794e25176352fc039dfb6dcb.jpg', 'nickname' => 'wmc', @@ -243,13 +233,6 @@ class Goods extends GoodsService 'http://qiniu.shop.royaum.com.cn/10001/20240201/13f2e675794e25176352fc039dfb6dcb.jpg' ]; - //读取门店停车场 - $parkingModel = new ParkingModel(); - $parkingInfo = $parkingModel::where(['shop_id' => $info['shop_id']])->find(); - $info['parking_name'] = $parkingInfo->parking_name ?? ''; - $info['parking_desc'] = $parkingInfo->desc ?? ''; - $info['parking_longitude'] = $parkingInfo->longitude ?? ''; - $info['parking_latitude'] = $parkingInfo->latitude ?? ''; return $info; }