From c950d66a1586ec2cf718ff7c937dace424f27d5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Fri, 28 Mar 2025 11:29:44 +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=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-article-list-styles.vue             | 12 ++++----
 .../model-article-tabs-styles.vue             | 12 ++++----
 .../model-ask-tabs/model-ask-tabs-styles.vue  | 12 ++++----
 src/components/model-ask/index.vue            |  2 +-
 src/components/model-ask/model-ask-styles.vue | 12 ++++----
 .../model-binding/components/goods-index.vue  | 12 ++++----
 .../model-blog-list-styles.vue                | 12 ++++----
 .../model-blog-tabs-styles.vue                | 12 ++++----
 .../model-custom/model-custom-styles.vue      | 12 ++++----
 .../magic-cube-settings/tabs-styles.vue       | 12 ++++----
 .../model-goods-list-styles.vue               | 12 ++++----
 .../model-goods-tabs-styles.vue               | 12 ++++----
 .../model-nav-group-styles.vue                | 12 ++++----
 src/components/model-realstore/index.vue      | 28 +++++++++++++------
 .../model-realstore-styles.vue                | 12 ++++----
 .../model-shop/model-shop-styles.vue          | 12 ++++----
 16 files changed, 104 insertions(+), 94 deletions(-)

diff --git a/src/components/model-article-list/model-article-list-styles.vue b/src/components/model-article-list/model-article-list-styles.vue
index 68585aef..dc056821 100644
--- a/src/components/model-article-list/model-article-list-styles.vue
+++ b/src/components/model-article-list/model-article-list-styles.vue
@@ -90,13 +90,13 @@
                         <el-form-item label="间隔时间">
                             <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                         </el-form-item>
-                        <el-form-item label="滚动方式">
-                            <el-radio-group v-model="form.rolling_fashion">
-                                <el-radio value="translation">平移</el-radio>
-                                <el-radio value="cut-screen">切屏</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
                     </template>
+                    <el-form-item label="滚动方式">
+                        <el-radio-group v-model="form.rolling_fashion">
+                            <el-radio value="translation">平移</el-radio>
+                            <el-radio value="cut-screen">切屏</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
                 </card-container>
             </template>
             <!-- 角标 -->
diff --git a/src/components/model-article-tabs/model-article-tabs-styles.vue b/src/components/model-article-tabs/model-article-tabs-styles.vue
index db84d07e..fdae7c04 100644
--- a/src/components/model-article-tabs/model-article-tabs-styles.vue
+++ b/src/components/model-article-tabs/model-article-tabs-styles.vue
@@ -194,13 +194,13 @@
                         <el-form-item label="间隔时间">
                             <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                         </el-form-item>
-                        <el-form-item label="滚动方式">
-                            <el-radio-group v-model="form.rolling_fashion">
-                                <el-radio value="translation">平移</el-radio>
-                                <el-radio value="cut-screen">切屏</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
                     </template>
+                    <el-form-item label="滚动方式">
+                        <el-radio-group v-model="form.rolling_fashion">
+                            <el-radio value="translation">平移</el-radio>
+                            <el-radio value="cut-screen">切屏</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
                 </card-container>
             </template>
             <!-- 秒杀角标 -->
diff --git a/src/components/model-ask-tabs/model-ask-tabs-styles.vue b/src/components/model-ask-tabs/model-ask-tabs-styles.vue
index cb42fd36..501e74cf 100644
--- a/src/components/model-ask-tabs/model-ask-tabs-styles.vue
+++ b/src/components/model-ask-tabs/model-ask-tabs-styles.vue
@@ -140,13 +140,13 @@
                         <el-form-item label="间隔时间">
                             <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                         </el-form-item>
-                        <el-form-item label="滚动方式">
-                            <el-radio-group v-model="form.rolling_fashion">
-                                <el-radio value="translation">平移</el-radio>
-                                <el-radio value="cut-screen">切屏</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
                     </template>
+                    <el-form-item label="滚动方式">
+                        <el-radio-group v-model="form.rolling_fashion">
+                            <el-radio value="translation">平移</el-radio>
+                            <el-radio value="cut-screen">切屏</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
                 </card-container>
             </template>
         </el-form>
diff --git a/src/components/model-ask/index.vue b/src/components/model-ask/index.vue
index 316004ad..2a7a893e 100644
--- a/src/components/model-ask/index.vue
+++ b/src/components/model-ask/index.vue
@@ -48,7 +48,7 @@
                             <div :class="layout_type" :style="layout_style">
                                 <div class="oh w h flex-col gap-10 jc-sb" :style="layout_img_style">
                                     <div class="flex-row gap-10 align-b">
-                                        <div :style="trends_config('title')">{{ item.title }}</div>
+                                        <div :style="trends_config('title') + 'word-break: break-all;'">{{ item.title }}</div>
                                     </div>
                                     <div v-if="is_show('reply_status') || is_show('time')" class="flex-col gap-10">
                                         <span v-if="is_show('time')" :style="trends_config('time')">{{ item.add_time_date }}</span>
diff --git a/src/components/model-ask/model-ask-styles.vue b/src/components/model-ask/model-ask-styles.vue
index a4a3767f..19b09e41 100644
--- a/src/components/model-ask/model-ask-styles.vue
+++ b/src/components/model-ask/model-ask-styles.vue
@@ -51,13 +51,13 @@
                         <el-form-item label="间隔时间">
                             <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                         </el-form-item>
-                        <el-form-item label="滚动方式">
-                            <el-radio-group v-model="form.rolling_fashion">
-                                <el-radio value="translation">平移</el-radio>
-                                <el-radio value="cut-screen">切屏</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
                     </template>
+                    <el-form-item label="滚动方式">
+                        <el-radio-group v-model="form.rolling_fashion">
+                            <el-radio value="translation">平移</el-radio>
+                            <el-radio value="cut-screen">切屏</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
                 </card-container>
             </template>
         </el-form>
diff --git a/src/components/model-binding/components/goods-index.vue b/src/components/model-binding/components/goods-index.vue
index 09dac36e..7b91b60f 100644
--- a/src/components/model-binding/components/goods-index.vue
+++ b/src/components/model-binding/components/goods-index.vue
@@ -69,13 +69,13 @@
                 <el-form-item label="间隔时间">
                     <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                 </el-form-item>
-                <el-form-item label="滚动方式">
-                    <el-radio-group v-model="form.rolling_fashion">
-                        <el-radio value="translation">平移</el-radio>
-                        <el-radio value="cut-screen">切屏</el-radio>
-                    </el-radio-group>
-                </el-form-item>
             </template>
+            <el-form-item label="滚动方式">
+                <el-radio-group v-model="form.rolling_fashion">
+                    <el-radio value="translation">平移</el-radio>
+                    <el-radio value="cut-screen">切屏</el-radio>
+                </el-radio-group>
+            </el-form-item>
         </card-container>
     </template>
     <div class="divider-line"></div>
diff --git a/src/components/model-blog-list/model-blog-list-styles.vue b/src/components/model-blog-list/model-blog-list-styles.vue
index 6531333c..82849e33 100644
--- a/src/components/model-blog-list/model-blog-list-styles.vue
+++ b/src/components/model-blog-list/model-blog-list-styles.vue
@@ -90,13 +90,13 @@
                         <el-form-item label="间隔时间">
                             <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                         </el-form-item>
-                        <el-form-item label="滚动方式">
-                            <el-radio-group v-model="form.rolling_fashion">
-                                <el-radio value="translation">平移</el-radio>
-                                <el-radio value="cut-screen">切屏</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
                     </template>
+                    <el-form-item label="滚动方式">
+                        <el-radio-group v-model="form.rolling_fashion">
+                            <el-radio value="translation">平移</el-radio>
+                            <el-radio value="cut-screen">切屏</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
                 </card-container>
             </template>
             <!-- 角标 -->
diff --git a/src/components/model-blog-tabs/model-blog-tabs-styles.vue b/src/components/model-blog-tabs/model-blog-tabs-styles.vue
index 9a9f4b50..7c21185b 100644
--- a/src/components/model-blog-tabs/model-blog-tabs-styles.vue
+++ b/src/components/model-blog-tabs/model-blog-tabs-styles.vue
@@ -194,13 +194,13 @@
                         <el-form-item label="间隔时间">
                             <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                         </el-form-item>
-                        <el-form-item label="滚动方式">
-                            <el-radio-group v-model="form.rolling_fashion">
-                                <el-radio value="translation">平移</el-radio>
-                                <el-radio value="cut-screen">切屏</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
                     </template>
+                    <el-form-item label="滚动方式">
+                        <el-radio-group v-model="form.rolling_fashion">
+                            <el-radio value="translation">平移</el-radio>
+                            <el-radio value="cut-screen">切屏</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
                 </card-container>
             </template>
             <!-- 秒杀角标 -->
diff --git a/src/components/model-custom/model-custom-styles.vue b/src/components/model-custom/model-custom-styles.vue
index 7b7645ea..ff35c493 100644
--- a/src/components/model-custom/model-custom-styles.vue
+++ b/src/components/model-custom/model-custom-styles.vue
@@ -11,13 +11,13 @@
                             <el-form-item label="间隔时间">
                                 <slider v-model="form.interval_time" :min="1" :max="100" @operation_end="operation_end"></slider>
                             </el-form-item>
-                            <el-form-item label="滚动方式">
-                                <el-radio-group v-model="form.rolling_fashion" @change="operation_end">
-                                    <el-radio value="translation">平移</el-radio>
-                                    <el-radio value="cut-screen">切屏</el-radio>
-                                </el-radio-group>
-                            </el-form-item>
                         </template>
+                        <el-form-item label="滚动方式">
+                            <el-radio-group v-model="form.rolling_fashion" @change="operation_end">
+                                <el-radio value="translation">平移</el-radio>
+                                <el-radio value="cut-screen">切屏</el-radio>
+                            </el-radio-group>
+                        </el-form-item>
                 </card-container>
                 <div class="divider-line data-tabs-line" />
                 <card-container class="card-container">
diff --git a/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue b/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue
index ad37d0dd..aff778e0 100644
--- a/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue
+++ b/src/components/model-data-magic/components/magic-cube-settings/tabs-styles.vue
@@ -13,16 +13,16 @@
                             <el-radio value="vertical">纵向</el-radio>
                         </el-radio-group>
                     </el-form-item>
-                    <el-form-item v-if="['goods', 'custom'].includes(tabs_content.data_type)" label="滚动方式">
-                        <el-radio-group v-model="form.rolling_fashion">
-                            <el-radio value="translation">平移</el-radio>
-                            <el-radio value="cut-screen">切屏</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
                     <el-form-item label="间隔时间">
                         <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                     </el-form-item>
                 </template>
+                <el-form-item v-if="['goods', 'custom'].includes(tabs_content.data_type)" label="滚动方式">
+                    <el-radio-group v-model="form.rolling_fashion">
+                        <el-radio value="translation">平移</el-radio>
+                        <el-radio value="cut-screen">切屏</el-radio>
+                    </el-radio-group>
+                </el-form-item>
             </template>
             <el-form-item v-if="tabs_content.data_type != 'custom'" :label="tabs_content.data_type != 'video' ? '图片圆角' : '视频圆角'">
                 <radius :key="form.carouselKey" :value="form.img_radius"></radius>
diff --git a/src/components/model-goods-list/model-goods-list-styles.vue b/src/components/model-goods-list/model-goods-list-styles.vue
index c6249b07..b0f265cc 100644
--- a/src/components/model-goods-list/model-goods-list-styles.vue
+++ b/src/components/model-goods-list/model-goods-list-styles.vue
@@ -100,13 +100,13 @@
                         <el-form-item label="间隔时间">
                             <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                         </el-form-item>
-                        <el-form-item label="滚动方式">
-                            <el-radio-group v-model="form.rolling_fashion">
-                                <el-radio value="translation">平移</el-radio>
-                                <el-radio value="cut-screen">切屏</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
                     </template>
+                    <el-form-item label="滚动方式">
+                        <el-radio-group v-model="form.rolling_fashion">
+                            <el-radio value="translation">平移</el-radio>
+                            <el-radio value="cut-screen">切屏</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
                 </card-container>
             </template>
             <!-- 秒杀角标 -->
diff --git a/src/components/model-goods-tabs/model-goods-tabs-styles.vue b/src/components/model-goods-tabs/model-goods-tabs-styles.vue
index d5b21694..40829e51 100644
--- a/src/components/model-goods-tabs/model-goods-tabs-styles.vue
+++ b/src/components/model-goods-tabs/model-goods-tabs-styles.vue
@@ -212,13 +212,13 @@
                         <el-form-item label="间隔时间">
                             <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                         </el-form-item>
-                        <el-form-item label="滚动方式">
-                            <el-radio-group v-model="form.rolling_fashion">
-                                <el-radio value="translation">平移</el-radio>
-                                <el-radio value="cut-screen">切屏</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
                     </template>
+                    <el-form-item label="滚动方式">
+                        <el-radio-group v-model="form.rolling_fashion">
+                            <el-radio value="translation">平移</el-radio>
+                            <el-radio value="cut-screen">切屏</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
                 </card-container>
                 <div class="divider-line"></div>
             </template>
diff --git a/src/components/model-nav-group/model-nav-group-styles.vue b/src/components/model-nav-group/model-nav-group-styles.vue
index ed5316c2..e8b64702 100644
--- a/src/components/model-nav-group/model-nav-group-styles.vue
+++ b/src/components/model-nav-group/model-nav-group-styles.vue
@@ -31,13 +31,13 @@
                         <el-form-item label="间隔时间">
                             <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                         </el-form-item>
-                        <el-form-item v-if="data_content.row === 1" label="滚动方式">
-                            <el-radio-group v-model="form.rolling_fashion">
-                                <el-radio value="translation">平移</el-radio>
-                                <el-radio value="cut-screen">切屏</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
                     </template>
+                    <el-form-item v-if="data_content.row === 1" label="滚动方式">
+                        <el-radio-group v-model="form.rolling_fashion">
+                            <el-radio value="translation">平移</el-radio>
+                            <el-radio value="cut-screen">切屏</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
                 </card-container>
                 <div class="divider-line"></div>
                 <card-container>
diff --git a/src/components/model-realstore/index.vue b/src/components/model-realstore/index.vue
index 8822a91d..d92c688f 100644
--- a/src/components/model-realstore/index.vue
+++ b/src/components/model-realstore/index.vue
@@ -23,14 +23,14 @@
                                                 <div v-if="(item.alias || null) != null" :style="shop_label_style">{{ item.alias }}</div>
                                                 <div class="text-line-2" :style="trends_config('title')">{{ item.name }}</div>
                                             </div>
-                                            <div v-if="['0', '2'].includes(theme)" class="flex-row align-c" :style="`gap: ${ new_style.phone_navigation_spacing }px;`">
-                                                <img-or-icon-or-text :value="props.value" type="phone" />
-                                                <img-or-icon-or-text :value="props.value" type="navigation" />
+                                            <div v-if="['0', '2'].includes(theme) && (!isEmpty(item.service_data.service_tel) || ( item.lat != 0 && item.lng != 0 ))" class="flex-row align-c" :style="`gap: ${ new_style.phone_navigation_spacing }px;`">
+                                                <img-or-icon-or-text v-if="!isEmpty(item.service_data.service_tel)" :value="props.value" type="phone" />
+                                                <img-or-icon-or-text v-if="item.lat != 0 && item.lng != 0" :value="props.value" type="navigation" />
                                             </div>
                                         </div>
-                                        <div class="flex-row gap-2 align-c">
+                                        <div v-if="!isEmpty(item.status_info) && !isEmpty(item.status_info.time)" class="flex-row gap-2 align-c">
                                             <img-or-icon-or-text :value="props.value" type="time" />
-                                            <div v-if="!isEmpty(item.status_info)" class="flex-1 flex-row align-c">
+                                            <div class="flex-1 flex-row align-c">
                                                 <span class="text-line-1" :style="trends_config('state') + `color: ${ item.status_info.status == 1 ? new_style.realstore_state_color : new_style.realstore_default_state_color }`">{{ item.status_info.msg }}</span>
                                                 <span v-if="!isEmpty(item.status_info.msg) || !isEmpty(item.status_info.time)" :style="'color: #ccc;' + margin_computer(new_style.realstore_business_distance)">|</span>
                                                 <span class="text-line-1" :style="trends_config('business_hours')">{{ item.status_info.time }}</span>
@@ -47,7 +47,7 @@
                                                 </div>
                                                 <span v-if="!isEmpty(item.distance) && theme != '1' && form.is_location_distance_show == '1'" :style="trends_config('distance')">距您{{ item.distance || '0km' }}</span>
                                             </div>
-                                            <template v-if="!['0', '2'].includes(theme)">
+                                            <template v-if="!['0', '2'].includes(theme) && item.lat != 0 && item.lng != 0">
                                                 <img-or-icon-or-text :value="props.value" type="navigation" />
                                             </template>
                                         </div>
@@ -88,11 +88,11 @@
                                             <div class="text-line-2" :style="trends_config('title')">{{ item.name }}</div>
                                         </div>
                                         <div class="flex-row jc-sb align-c">
-                                            <div class="flex-1 flex-row gap-2 align-c">
+                                            <div v-if="!isEmpty(item.status_info) && !isEmpty(item.status_info.time)" class="flex-1 flex-row gap-2 align-c">
                                                 <img-or-icon-or-text :value="props.value" type="time" />
-                                                <span v-if="!isEmpty(item.status_info)" class="text-line-1" :style="trends_config('state') + `color: ${ item.status_info.status == 1 ? new_style.realstore_state_color : new_style.realstore_default_state_color }`">{{ item.status_info.msg }}</span>
+                                                <span class="text-line-1" :style="trends_config('state') + `color: ${ item.status_info.status == 1 ? new_style.realstore_state_color : new_style.realstore_default_state_color }`">{{ item.status_info.msg }}</span>
                                             </div>
-                                            <img-or-icon-or-text :value="props.value" type="navigation" />
+                                            <img-or-icon-or-text v-if="item.lat != 0 && item.lng != 0" :value="props.value" type="navigation" />
                                         </div>
                                     </div>
                                 </div>
@@ -177,6 +177,11 @@ type data_list = {
     address: string;
     distance: string,
     time: string;
+    lat: number,
+    lng: number,
+    service_data: {
+        service_tel: string;
+    },
     status_info: info;
 }
 const default_list = {
@@ -189,6 +194,11 @@ const default_list = {
     logo: '',
     new_cover: [],
     distance: '12km',
+    lat: 3,
+    lng: 66,
+    service_data: {
+        service_tel: '20006',
+    },
     status_info: {
         msg: '营业中',
         time: '7:00-22:00',
diff --git a/src/components/model-realstore/model-realstore-styles.vue b/src/components/model-realstore/model-realstore-styles.vue
index f441bdd6..7a9003a1 100644
--- a/src/components/model-realstore/model-realstore-styles.vue
+++ b/src/components/model-realstore/model-realstore-styles.vue
@@ -127,13 +127,13 @@
                         <el-form-item label="间隔时间">
                             <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                         </el-form-item>
-                        <el-form-item label="滚动方式">
-                            <el-radio-group v-model="form.rolling_fashion">
-                                <el-radio value="translation">平移</el-radio>
-                                <el-radio value="cut-screen">切屏</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
                     </template>
+                    <el-form-item label="滚动方式">
+                        <el-radio-group v-model="form.rolling_fashion">
+                            <el-radio value="translation">平移</el-radio>
+                            <el-radio value="cut-screen">切屏</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
                 </card-container>
             </template>
             <template v-else>
diff --git a/src/components/model-shop/model-shop-styles.vue b/src/components/model-shop/model-shop-styles.vue
index 49cba875..3b6fd93c 100644
--- a/src/components/model-shop/model-shop-styles.vue
+++ b/src/components/model-shop/model-shop-styles.vue
@@ -85,13 +85,13 @@
                         <el-form-item label="间隔时间">
                             <slider v-model="form.interval_time" :min="1" :max="100"></slider>
                         </el-form-item>
-                        <el-form-item label="滚动方式">
-                            <el-radio-group v-model="form.rolling_fashion">
-                                <el-radio value="translation">平移</el-radio>
-                                <el-radio value="cut-screen">切屏</el-radio>
-                            </el-radio-group>
-                        </el-form-item>
                     </template>
+                    <el-form-item label="滚动方式">
+                        <el-radio-group v-model="form.rolling_fashion">
+                            <el-radio value="translation">平移</el-radio>
+                            <el-radio value="cut-screen">切屏</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
                 </card-container>
             </template>
         </el-form>