From 04f091d6c45ac716b1c8f99fc2c5489d748699d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 14 Oct 2025 15:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E8=8E=B7=E5=8F=96=E5=8F=8A=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/elder/eldertag/ElderTag.data.ts       | 17 ++++++++++++++++-
 .../elder/eldertag/components/ElderTagForm.vue  | 16 +++++++++++++++-
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/views/elder/eldertag/ElderTag.data.ts b/src/views/elder/eldertag/ElderTag.data.ts
index aae2eb7..7d8f6d4 100644
--- a/src/views/elder/eldertag/ElderTag.data.ts
+++ b/src/views/elder/eldertag/ElderTag.data.ts
@@ -42,6 +42,21 @@ export const columns: BasicColumn[] = [
     },
     // customRender: render.renderImage,
   },
+  {
+    title: '焦点图标',
+    align: 'center',
+    dataIndex: 'picFocus',
+    customRender: ({ text, record }) => {
+      // 如果 text 为空或 null/undefined，使用默认图片
+      const imageUrl = text
+        ? opeMediaAddress +  text
+        : record.type == 'tx'
+          ? opeMediaAddress +  import.meta.env.VITE_DEFAULT_ELDER_TAG_BODY_PIC
+          : opeMediaAddress +  import.meta.env.VITE_DEFAULT_ELDER_TAG_EMO_PIC;
+      return render.renderImage({ text: imageUrl });
+    },
+    // customRender: render.renderImage,
+  },
   // {
   //   title: '排序',
   //   align: 'center',
@@ -59,7 +74,7 @@ export const superQuerySchema = {
   type: { title: '标签类型', order: 0, view: 'text', type: 'string' },
   tagName: { title: '标签名称', order: 1, view: 'text', type: 'string' },
   price: { title: '价格', order: 2, view: 'number', type: 'number' },
-  pic: { title: '图标', order: 3, view: 'text', type: 'string' },
+/*  pic: { title: '图标', order: 3, view: 'text', type: 'string' },*/
   sort: { title: '排序', order: 4, view: 'number', type: 'number' },
   izEnabled: { title: '是否启用', order: 5, view: 'text', type: 'string' },
 };
diff --git a/src/views/elder/eldertag/components/ElderTagForm.vue b/src/views/elder/eldertag/components/ElderTagForm.vue
index d2b65cb..ae75730 100644
--- a/src/views/elder/eldertag/components/ElderTagForm.vue
+++ b/src/views/elder/eldertag/components/ElderTagForm.vue
@@ -37,6 +37,15 @@
                 </JImageUploadToOpe>
               </a-form-item>
             </a-col>
+            <a-col :span="24">
+              <a-form-item label="焦点图标" v-bind="validateInfos.picFocus" id="ElderTagForm-picFocus" name="picFocus">
+                <!-- <JImageUploadToOpe v-if="opeType == 'dmlook'" :fileMax="1" v-model:value="dmlookVal">
+                </JImageUploadToOpe> -->
+                <JImageUploadToOpe :toOpe="true" :bizPath="'eldertag'" :fileMax="1" v-model:value="formData.picFocus"
+                                   :disabled="!!formData.id || !isMain">
+                </JImageUploadToOpe>
+              </a-form-item>
+            </a-col>
             <!-- <a-col :span="24">
               <a-form-item label="排序" v-bind="validateInfos.sort" id="ElderTagForm-sort" name="sort">
                 <a-input-number v-model:value="formData.sort" placeholder="请输入排序" style="width: 100%" />
@@ -45,7 +54,7 @@
             <a-col :span="24">
               <a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="ElderTagForm-izEnabled" name="izEnabled">
                 <j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled"
-                  placeholder="请选择是否启用"  allowClear />
+                  placeholder="请选择是否启用" allowClear />
               </a-form-item>
             </a-col>
           </a-row>
@@ -105,6 +114,7 @@ const formData = reactive<Record<string, any>>({
   tagName: '',
   price: 0,
   pic: defaultBodyPic,
+  picFocus: defaultBodyPic,
   sort: 99,
   izEnabled: '0',
   describ: '',
@@ -169,8 +179,10 @@ function edit(record) {
       if (!formData.pic) {
         if (formData.type == 'qx') {
           formData.pic = defaultEmoPic
+          formData.picFocus = defaultEmoPic
         } else {
           formData.pic = defaultBodyPic
+          formData.picFocus = defaultBodyPic
         }
       }
       // }
@@ -233,8 +245,10 @@ function handleTypeChanged(v_) {
   if (!formData.pic || formData.pic == defaultEmoPic || formData.pic == defaultBodyPic) {
     if (v_ == 'qx') {
       formData.pic = defaultEmoPic
+      formData.picFocus = defaultEmoPic
     } else {
       formData.pic = defaultBodyPic
+      formData.picFocus = defaultBodyPic
     }
   }
 }