From c77f2cfeaa61a03aee4333705ee40b0c203e4b4a Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Sun, 8 Feb 2026 11:53:59 +0800
Subject: [PATCH] 21

---
 .../goods/components/GoodsAddDialog.vue       | 72 ++++++++++---------
 .../goods/components/GoodsEditDialog.vue      | 72 ++++++++++---------
 2 files changed, 74 insertions(+), 70 deletions(-)

diff --git a/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsAddDialog.vue b/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsAddDialog.vue
index d7e1953e..e03ca956 100644
--- a/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsAddDialog.vue
+++ b/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsAddDialog.vue
@@ -82,42 +82,44 @@
         />
       </el-form-item>
 
-      <!-- 开关配置 -->
-      <el-divider content-position="left">开关配置</el-divider>
-      
-      <el-row :gutter="20">
-        <el-col :span="8" v-if="fieldConfig.showShouZhe">
-          <el-form-item label="首抽五折">
-            <el-switch v-model="formData.isShouZhe" :active-value="1" :inactive-value="0" />
-            <div class="form-tip">开启后，新用户首次抽奖的第一抽享受5折优惠（仅限从未下过单的用户）</div>
-          </el-form-item>
-        </el-col>
-        <!-- 是否最新 - 已隐藏，前端未展示相关icon
-        <el-col :span="8">
-          <el-form-item label="是否最新">
-            <el-switch v-model="formData.newIs" :active-value="1" :inactive-value="0" />
-          </el-form-item>
-        </el-col>
-        -->
-        <el-col :span="8" v-if="fieldConfig.showShowIs">
-          <el-form-item label="首页显示">
-            <el-switch v-model="formData.showIs" :active-value="1" :inactive-value="0" />
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <!-- 开关配置 - 当有任何开关需要显示时才显示此区块 -->
+      <template v-if="fieldConfig.showShouZhe || fieldConfig.showShowIs || fieldConfig.showCoupon || fieldConfig.showIntegral">
+        <el-divider content-position="left">开关配置</el-divider>
+        
+        <el-row :gutter="20">
+          <el-col :span="8" v-if="fieldConfig.showShouZhe">
+            <el-form-item label="首抽五折">
+              <el-switch v-model="formData.isShouZhe" :active-value="1" :inactive-value="0" />
+              <div class="form-tip">开启后，新用户首次抽奖的第一抽享受5折优惠（仅限从未下过单的用户）</div>
+            </el-form-item>
+          </el-col>
+          <!-- 是否最新 - 已隐藏，前端未展示相关icon
+          <el-col :span="8">
+            <el-form-item label="是否最新">
+              <el-switch v-model="formData.newIs" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+          </el-col>
+          -->
+          <el-col :span="8" v-if="fieldConfig.showShowIs">
+            <el-form-item label="首页显示">
+              <el-switch v-model="formData.showIs" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="20" v-if="fieldConfig.showCoupon || fieldConfig.showIntegral">
-        <el-col :span="8" v-if="fieldConfig.showCoupon">
-          <el-form-item label="发券开关">
-            <el-switch v-model="formData.couponIs" :active-value="1" :inactive-value="0" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" v-if="fieldConfig.showIntegral">
-          <el-form-item label="发积分开关">
-            <el-switch v-model="formData.integralIs" :active-value="1" :inactive-value="0" />
-          </el-form-item>
-        </el-col>
-      </el-row>
+        <el-row :gutter="20" v-if="fieldConfig.showCoupon || fieldConfig.showIntegral">
+          <el-col :span="8" v-if="fieldConfig.showCoupon">
+            <el-form-item label="发券开关">
+              <el-switch v-model="formData.couponIs" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="fieldConfig.showIntegral">
+            <el-form-item label="发积分开关">
+              <el-switch v-model="formData.integralIs" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </template>
 
       <!-- 套数/库存配置（一番赏/幸运赏/福袋/盲盒） -->
       <template v-if="fieldConfig.showStock">
diff --git a/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsEditDialog.vue b/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsEditDialog.vue
index a30c1bc3..5f03203e 100644
--- a/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsEditDialog.vue
+++ b/server/HoneyBox/src/HoneyBox.Admin/admin-web/src/views/business/goods/components/GoodsEditDialog.vue
@@ -87,42 +87,44 @@
         />
       </el-form-item>
 
-      <!-- 开关配置 -->
-      <el-divider content-position="left">开关配置</el-divider>
-      
-      <el-row :gutter="20">
-        <el-col :span="8" v-if="fieldConfig.showShouZhe">
-          <el-form-item label="首抽五折">
-            <el-switch v-model="formData.isShouZhe" :active-value="1" :inactive-value="0" />
-            <div class="form-tip">开启后，新用户首次抽奖的第一抽享受5折优惠（仅限从未下过单的用户）</div>
-          </el-form-item>
-        </el-col>
-        <!-- 是否最新 - 已隐藏，前端未展示相关icon
-        <el-col :span="8">
-          <el-form-item label="是否最新">
-            <el-switch v-model="formData.newIs" :active-value="1" :inactive-value="0" />
-          </el-form-item>
-        </el-col>
-        -->
-        <el-col :span="8" v-if="fieldConfig.showShowIs">
-          <el-form-item label="首页显示">
-            <el-switch v-model="formData.showIs" :active-value="1" :inactive-value="0" />
-          </el-form-item>
-        </el-col>
-      </el-row>
+      <!-- 开关配置 - 当有任何开关需要显示时才显示此区块 -->
+      <template v-if="fieldConfig.showShouZhe || fieldConfig.showShowIs || fieldConfig.showCoupon || fieldConfig.showIntegral">
+        <el-divider content-position="left">开关配置</el-divider>
+        
+        <el-row :gutter="20">
+          <el-col :span="8" v-if="fieldConfig.showShouZhe">
+            <el-form-item label="首抽五折">
+              <el-switch v-model="formData.isShouZhe" :active-value="1" :inactive-value="0" />
+              <div class="form-tip">开启后，新用户首次抽奖的第一抽享受5折优惠（仅限从未下过单的用户）</div>
+            </el-form-item>
+          </el-col>
+          <!-- 是否最新 - 已隐藏，前端未展示相关icon
+          <el-col :span="8">
+            <el-form-item label="是否最新">
+              <el-switch v-model="formData.newIs" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+          </el-col>
+          -->
+          <el-col :span="8" v-if="fieldConfig.showShowIs">
+            <el-form-item label="首页显示">
+              <el-switch v-model="formData.showIs" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row :gutter="20" v-if="fieldConfig.showCoupon || fieldConfig.showIntegral">
-        <el-col :span="8" v-if="fieldConfig.showCoupon">
-          <el-form-item label="发券开关">
-            <el-switch v-model="formData.couponIs" :active-value="1" :inactive-value="0" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" v-if="fieldConfig.showIntegral">
-          <el-form-item label="发积分开关">
-            <el-switch v-model="formData.integralIs" :active-value="1" :inactive-value="0" />
-          </el-form-item>
-        </el-col>
-      </el-row>
+        <el-row :gutter="20" v-if="fieldConfig.showCoupon || fieldConfig.showIntegral">
+          <el-col :span="8" v-if="fieldConfig.showCoupon">
+            <el-form-item label="发券开关">
+              <el-switch v-model="formData.couponIs" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="fieldConfig.showIntegral">
+            <el-form-item label="发积分开关">
+              <el-switch v-model="formData.integralIs" :active-value="1" :inactive-value="0" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </template>
 
       <!-- 套数/库存配置（一番赏/幸运赏/福袋/盲盒） -->
       <template v-if="fieldConfig.showStock">