From 2b0fff4cd7f02e72c92cf46f283a4e6a32f2c952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 13 Mar 2025 11:14:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/model-realstore/index.vue |  8 ++++----
 src/components/model-shop/index.vue      | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/model-realstore/index.vue b/src/components/model-realstore/index.vue
index 01b239fa..ec1d155a 100644
--- a/src/components/model-realstore/index.vue
+++ b/src/components/model-realstore/index.vue
@@ -19,9 +19,9 @@
                                 <div class="flex-1 flex-col" :style="content_style">
                                     <div class="flex-col jc-sb gap-10">
                                         <div class="flex-row jc-sb align-c gap-10">
-                                            <div class="text-line-2" :style="trends_config('title') + 'vertical-align: middle;'">
+                                            <div class="text-line-2" :style="trends_config('title')">
                                                 <template v-for="(item1, index1) in new_url_list(item.title_url)" :key="index1">
-                                                    <img :src="item1.url" class="title-img" :style="title_img_style(item.title_url, index1)" />
+                                                    <img :src="item1.url" class="title-img" :style="title_img_style(item.title_url, index1) + 'vertical-align: middle;'" />
                                                 </template>{{ item.title }}
                                             </div>
                                             <div v-if="['0', '2'].includes(theme)" class="flex-row align-c" :style="`gap: ${ new_style.phone_navigation_spacing }px;`">
@@ -78,9 +78,9 @@
                                         </div>
                                     </template>
                                     <div class="flex-1 flex-col jc-sb gap-10" :style="content_style">
-                                        <div class="text-line-2" :style="trends_config('title') + 'vertical-align: middle;'">
+                                        <div class="text-line-2" :style="trends_config('title')">
                                             <template v-for="(item1, index1) in new_url_list(item.title_url)" :key="index1">
-                                                <img :src="item1.url" class="title-img" :style="title_img_style(item.title_url, index1)" />
+                                                <img :src="item1.url" class="title-img" :style="title_img_style(item.title_url, index1) + 'vertical-align: middle;'" />
                                             </template>{{ item.title }}
                                         </div>
                                         <div class="flex-row jc-sb align-c">
diff --git a/src/components/model-shop/index.vue b/src/components/model-shop/index.vue
index 893d8ef5..79ebb72c 100644
--- a/src/components/model-shop/index.vue
+++ b/src/components/model-shop/index.vue
@@ -17,12 +17,12 @@
                             </template>
                             <div class="flex-1 flex-row jc-sb gap-10" :style="content_style">
                                 <div class="flex-1 flex-col jc-sb gap-10">
-                                    <div class="text-line-2" :style="trends_config('title') + 'vertical-align: middle;'">
+                                    <div class="text-line-2" :style="trends_config('title')">
                                         <template v-for="(item1, index1) in new_url_list(item.title_url)" :key="index1">
-                                            <img :src="item1.url" class="title-img" :style="title_img_style(item.title_url, index1)" />
+                                            <img :src="item1.url" class="title-img" :style="title_img_style(item.title_url, index1) + 'vertical-align: middle;'" />
                                         </template>{{ item.title }}
                                     </div>
-                                    <span :class="form.shop_desc_row == '2' ? 'text-line-2' : 'text-line-1'" :style="trends_config('desc', 'desc')">{{ item.desc }}</span>
+                                    <span v-if="form.shop_desc == '1'" :class="form.shop_desc_row == '2' ? 'text-line-2' : 'text-line-1'" :style="trends_config('desc', 'desc')">{{ item.desc }}</span>
                                 </div>
                                 <div v-if="theme == '0'" class="flex-row align-c">
                                     <img-or-icon-or-text :value="props.value" type="right" />
@@ -47,12 +47,12 @@
                                         </div>
                                     </template>
                                     <div class="flex-col jc-sb gap-10" :style="content_style">
-                                        <div class="text-line-2" :style="trends_config('title') + 'vertical-align: middle;'">
+                                        <div class="text-line-2" :style="trends_config('title')">
                                             <template v-for="(item1, index1) in new_url_list(item.title_url)" :key="index1">
-                                                <img :src="item1.url" class="title-img" :style="title_img_style(item.title_url, index1)" />
+                                                <img :src="item1.url" class="title-img" :style="title_img_style(item.title_url, index1) + 'vertical-align: middle;'" />
                                             </template>{{ item.title }}
                                         </div>
-                                        <span :class="form.shop_desc_row == '2' ? 'text-line-2' : 'text-line-1'" :style="trends_config('desc', 'desc')">{{ item.desc }}</span>
+                                        <span v-if="form.shop_desc == '1'" :class="form.shop_desc_row == '2' ? 'text-line-2' : 'text-line-1'" :style="trends_config('desc', 'desc')">{{ item.desc }}</span>
                                     </div>
                                 </div>
                             </div>