From 3f819331bd6f2227ed20597b6d7b521390d67e97 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Tue, 14 Nov 2023 14:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=BF=94=E5=9B=9E=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common.php          | 17 +++++++++++++++++
 app/controller/Zone.php |  7 ++++++-
 app/model/ZoneGoods.php |  7 ++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/app/common.php b/app/common.php
index b595212..2bc3fb4 100644
--- a/app/common.php
+++ b/app/common.php
@@ -111,6 +111,23 @@ function get_new_image_url($imageUrl):string
     }
 }
 
+/**
+ * 获取图片路径数据
+ * @param string $imageUrl
+ * @return array
+ */
+function get_image_path_data(string $imageUrl): array
+{
+    $domain = env('app.image_url');
+    $url = config('filesystem.disks.public.url');
+    if (!$domain) $domain = \think\facade\Request::instance()->domain();
+    return [
+        'domain' => $domain,
+        'image_path' => $url . '/' . $imageUrl,
+        'image_url' => get_new_image_url($imageUrl)
+    ];
+}
+
 /**
  * 返回跳转链接地址
  * @param $jump_url
diff --git a/app/controller/Zone.php b/app/controller/Zone.php
index b0cbd5f..865f88b 100644
--- a/app/controller/Zone.php
+++ b/app/controller/Zone.php
@@ -57,7 +57,12 @@ class Zone extends BaseController
                          ->find();
         if (empty($info)) $this->renderError('数据不存在');
         $info['important'] = '最高中奖金额'.format_money($info['max_awards_amount']);
-        if ($info['bg_image']) $info['bg_image'] = get_new_image_url($info['bg_image']);
+        if ($info['bg_image']) {
+            $imageData = get_image_path_data($info['bg_image']);
+            $info['bg_image'] = $imageData['image_url'];
+            $info['image_path'] = $imageData['image_path'];
+            $info['domain'] = $imageData['domain'];
+        }
         $code = ZoneGoodsPlay::where('id',$info['play_id'])->value('play_code');
         $info['code'] = $code ?? '';
         unset($info['max_awards_amount'],$info['play_id']);
diff --git a/app/model/ZoneGoods.php b/app/model/ZoneGoods.php
index 5ddf587..4dca2c2 100644
--- a/app/model/ZoneGoods.php
+++ b/app/model/ZoneGoods.php
@@ -15,7 +15,12 @@ class ZoneGoods extends \think\Model
         $field = 'id,title,max_awards_amount,price,cover_image,status';
         $list = self::where($where)->field($field)->order('id desc')->select()->toArray();
         foreach ($list as &$item) {
-            if ($item['cover_image']) $item['cover_image'] = get_new_image_url($item['cover_image']);
+            if ($item['cover_image']) {
+                $imageData = get_image_path_data($item['cover_image']);
+                $item['cover_image'] = $imageData['image_url'];
+                $item['image_path'] = $imageData['image_path'];
+                $item['image_url'] = $imageData['image_url'];
+            }
             $item['max_awards_amount'] = PinyinNumber::getChinese($item['max_awards_amount'],'元');
             if ($is_manage) {
                 unset($item['status']);