From eb55747319ae1bdc97f9dc2c32dd648abd9679df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Mon, 26 Aug 2024 10:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-shop-list-content.vue               |  1 +
 .../model-shop-list-styles.vue                | 50 ++++++++++---------
 .../model-shop-tabs-styles.vue                | 38 +++++++-------
 3 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/src/components/model-shop-list/model-shop-list-content.vue b/src/components/model-shop-list/model-shop-list-content.vue
index 42bccfc8..c74cd89a 100644
--- a/src/components/model-shop-list/model-shop-list-content.vue
+++ b/src/components/model-shop-list/model-shop-list-content.vue
@@ -82,6 +82,7 @@ const base_list = reactive({
         { name: '两列展示(横向)', value: '4' },
         { name: '三列展示', value: '3' },
         { name: '左右滑动展示', value: '5' },
+        { name: '无图模式', value: '6' },
     ],
     product_list: [
         { name: '指定商品', value: '0' },
diff --git a/src/components/model-shop-list/model-shop-list-styles.vue b/src/components/model-shop-list/model-shop-list-styles.vue
index 468136be..42c32e8b 100644
--- a/src/components/model-shop-list/model-shop-list-styles.vue
+++ b/src/components/model-shop-list/model-shop-list-styles.vue
@@ -15,12 +15,14 @@
                 <el-form-item label="价格色值">
                     <color-picker v-model="form.shop_price_color" default-color="#000000"></color-picker>
                 </el-form-item>
-                <el-form-item label="已售数量">
-                    <text-size-type v-model:typeface="form.shop_sold_number_typeface" v-model:size="form.shop_sold_number_size"></text-size-type>
-                </el-form-item>
-                <el-form-item label="数量设置">
-                    <color-picker v-model="form.shop_sold_number_color" default-color="#000000"></color-picker>
-                </el-form-item>
+                <template v-if="theme != '6'">
+                    <el-form-item label="已售数量">
+                        <text-size-type v-model:typeface="form.shop_sold_number_typeface" v-model:size="form.shop_sold_number_size"></text-size-type>
+                    </el-form-item>
+                    <el-form-item label="数量设置">
+                        <color-picker v-model="form.shop_sold_number_color" default-color="#000000"></color-picker>
+                    </el-form-item>
+                </template>
                 <!-- <el-form-item label="评分">
                     <text-size-type v-model:typeface="form.shop_score_typeface" v-model:size="form.shop_score_size"></text-size-type>
                 </el-form-item>
@@ -30,25 +32,27 @@
                 <el-form-item label="内容圆角">
                     <radius :value="form.shop_radius" @update:value="shop_radius_change"></radius>
                 </el-form-item>
-                <el-form-item label="图片圆角">
-                    <radius :value="form.shop_img_radius" @update:value="img_radius_change"></radius>
-                </el-form-item>
-                <el-form-item label="内间距">
-                    <padding :value="form.shop_padding" @update:value="shop_padding_change"></padding>
-                </el-form-item>
-                <el-form-item v-if="['0', '4'].includes(theme)" label="内容间距">
-                    <slider v-model="form.content_spacing" :max="100"></slider>
-                </el-form-item>
-                <el-form-item label="商品间距">
-                    <slider v-model="form.content_outer_spacing" :max="100"></slider>
-                </el-form-item>
-                <template v-if="theme == '5'">
-                    <el-form-item label="内容宽度">
-                        <slider v-model="form.content_outer_width" :max="1000"></slider>
+                <template v-if="theme != '6'">
+                    <el-form-item label="图片圆角">
+                        <radius :value="form.shop_img_radius" @update:value="img_radius_change"></radius>
                     </el-form-item>
-                    <el-form-item label="内容高度">
-                        <slider v-model="form.content_outer_height" :max="1000"></slider>
+                    <el-form-item label="内间距">
+                        <padding :value="form.shop_padding" @update:value="shop_padding_change"></padding>
                     </el-form-item>
+                    <el-form-item v-if="['0', '4'].includes(theme)" label="内容间距">
+                        <slider v-model="form.content_spacing" :max="100"></slider>
+                    </el-form-item>
+                    <el-form-item label="商品间距">
+                        <slider v-model="form.content_outer_spacing" :max="100"></slider>
+                    </el-form-item>
+                    <template v-if="theme == '5'">
+                        <el-form-item label="内容宽度">
+                            <slider v-model="form.content_outer_width" :max="1000"></slider>
+                        </el-form-item>
+                        <el-form-item label="内容高度">
+                            <slider v-model="form.content_outer_height" :max="1000"></slider>
+                        </el-form-item>
+                    </template>
                 </template>
             </card-container>
             <card-container class="mb-8">
diff --git a/src/components/model-shop-tabs/model-shop-tabs-styles.vue b/src/components/model-shop-tabs/model-shop-tabs-styles.vue
index c369f49c..4e07a592 100644
--- a/src/components/model-shop-tabs/model-shop-tabs-styles.vue
+++ b/src/components/model-shop-tabs/model-shop-tabs-styles.vue
@@ -21,6 +21,26 @@
             </card-container>
             <card-container class="mb-8">
                 <div class="mb-12">内容样式</div>
+                <el-form-item label="商品名称">
+                    <text-size-type v-model:typeface="form.shop_title_typeface" v-model:size="form.shop_title_size"></text-size-type>
+                </el-form-item>
+                <el-form-item label="名称色值">
+                    <color-picker v-model="form.shop_title_color" default-color="#000000"></color-picker>
+                </el-form-item>
+                <el-form-item label="商品价格">
+                    <text-size-type v-model:typeface="form.shop_price_typeface" v-model:size="form.shop_price_size"></text-size-type>
+                </el-form-item>
+                <el-form-item label="价格色值">
+                    <color-picker v-model="form.shop_price_color" default-color="#000000"></color-picker>
+                </el-form-item>
+                <template v-if="theme != '6'">
+                    <el-form-item label="已售数量">
+                        <text-size-type v-model:typeface="form.shop_sold_number_typeface" v-model:size="form.shop_sold_number_size"></text-size-type>
+                    </el-form-item>
+                    <el-form-item label="数量设置">
+                        <color-picker v-model="form.shop_sold_number_color" default-color="#000000"></color-picker>
+                    </el-form-item>
+                </template>
                 <el-form-item label="内容圆角">
                     <radius :value="form.shop_radius" @update:value="shop_radius_change"></radius>
                 </el-form-item>
@@ -46,24 +66,6 @@
                         </el-form-item>
                     </template>
                 </template>
-                <el-form-item label="商品名称">
-                    <text-size-type v-model:typeface="form.shop_title_typeface" v-model:size="form.shop_title_size"></text-size-type>
-                </el-form-item>
-                <el-form-item label="名称色值">
-                    <color-picker v-model="form.shop_title_color" default-color="#000000"></color-picker>
-                </el-form-item>
-                <el-form-item label="商品价格">
-                    <text-size-type v-model:typeface="form.shop_price_typeface" v-model:size="form.shop_price_size"></text-size-type>
-                </el-form-item>
-                <el-form-item label="价格色值">
-                    <color-picker v-model="form.shop_price_color" default-color="#000000"></color-picker>
-                </el-form-item>
-                <el-form-item label="已售数量">
-                    <text-size-type v-model:typeface="form.shop_sold_number_typeface" v-model:size="form.shop_sold_number_size"></text-size-type>
-                </el-form-item>
-                <el-form-item label="数量设置">
-                    <color-picker v-model="form.shop_sold_number_color" default-color="#000000"></color-picker>
-                </el-form-item>
                 <!-- <el-form-item label="评分">
                     <text-size-type v-model:typeface="form.shop_score_typeface" v-model:size="form.shop_score_size"></text-size-type>
                 </el-form-item>