From 94f5149b5fe226fe1b58f19a00c408568c3bbbda Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Tue, 29 Aug 2023 14:56:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=8C=BA=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common.php          |  8 +++++++-
 app/controller/Zone.php |  6 +++---
 app/model/ZoneGoods.php | 10 ++++++++--
 route/app.php           |  6 +++---
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/common.php b/app/common.php
index 0a223cf..8e842d1 100644
--- a/app/common.php
+++ b/app/common.php
@@ -82,7 +82,13 @@ function generate_random_str(int $length = 8): string
 function get_image_url($imageUrl):string
 {
     $url = config('filesystem.disks.public.url');
-    return $url . DIRECTORY_SEPARATOR . $imageUrl;
+    $strpos1 = strpos($imageUrl,'http');
+    $strpos2 = strpos($imageUrl,$url);
+    if ($strpos1 !== false || $strpos2 !== false) {
+        return $imageUrl;
+    } else {
+        return $url . DIRECTORY_SEPARATOR . $imageUrl;
+    }
 }
 
 /**
diff --git a/app/controller/Zone.php b/app/controller/Zone.php
index cd13edc..447a027 100644
--- a/app/controller/Zone.php
+++ b/app/controller/Zone.php
@@ -27,9 +27,9 @@ class Zone extends BaseController
      * @param $zone_id
      * @return array
      */
-    public function zoneGoodsList($zone_id)
+    public function zoneGoodsList($zoneId)
     {
-        return $this->renderSuccess('数据返回成功',ZoneGoods::getList($zone_id));
+        return $this->renderSuccess('数据返回成功',ZoneGoods::getList($zoneId));
     }
 
     /**
@@ -57,7 +57,7 @@ class Zone extends BaseController
 
     /**
      * 结束刮奖
-     * @param $zoneOrderId
+     * @param $c_r_id
      * @return array|void
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
diff --git a/app/model/ZoneGoods.php b/app/model/ZoneGoods.php
index 72fffe9..53fa9e9 100644
--- a/app/model/ZoneGoods.php
+++ b/app/model/ZoneGoods.php
@@ -10,12 +10,18 @@ class ZoneGoods extends \think\Model
 
         $where = ['status' => 1];
         if (isset($param['zone_id'])) $where['zone_id'] = $param['zone_id'];
-        $field = 'zone_id,title,important,price,cover_image';
+        $field = 'id,title,important,price,cover_image';
         $list = self::where($where)->field($field)->order('id desc')->select()->toArray();
         foreach ($list as &$item) {
-            $item['cover_image'] = get_image_url($item['cover_image']);
+            if ($item['cover_image']) $item['cover_image'] = get_image_url($item['cover_image']);
         }
         return $list;
     }
 
+    public static function getFind($id)
+    {
+        #$item = self::find($id)->field('id,important,cover_image')->toArray();
+        #if ($item['bg_image']) $item['bg_image'] = get_image_url($item['bg_image']);
+        #return $item;
+    }
 }
\ No newline at end of file
diff --git a/route/app.php b/route/app.php
index 2dfeab7..1305184 100644
--- a/route/app.php
+++ b/route/app.php
@@ -34,9 +34,9 @@ Route::group('user',function (){
 
 Route::group('zone',function(){
     Route::get('zoneList','zone/zoneList');
-    Route::get('zoneGoodsList','zone/zoneGoodsList/:zoneId');
-    Route::get('begin','zone/beginLottery/:zoneGoodsId');
-    Route::get('begin','zone/endLottery/:c_r_id');
+    Route::post('zoneGoodsList/:zoneId','zone/zoneGoodsList');
+    Route::get('beginLottery/:zoneGoodsId','zone/beginLottery');
+    Route::get('endLottery/:c_r_id','zone/endLottery');
 });