From 1cb5cea34952f5c2225c71dd2303802af77700ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Tue, 22 Oct 2024 18:05:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=91=8A=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                   |  8 ++++----
 components/diy/notice.vue | 19 ++++++++++++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/App.vue b/App.vue
index f9ebf908..2cc8131a 100644
--- a/App.vue
+++ b/App.vue
@@ -7,12 +7,12 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                //request_url: 'http://shopxo.com/',
-                    request_url:'https://new.shopxo.vip/',
+                request_url: 'http://shopxo.com/',
+                //    request_url:'https://new.shopxo.vip/',
 
                 // 静态资源地址（如系统根目录不在public目录下面请在静态地址后面加public目录、如：https://d1.shopxo.vip/public/）
-                //static_url: 'http://shopxo.com/',
-                    static_url:'https://new.shopxo.vip/',
+                static_url: 'http://shopxo.com/',
+                //    static_url:'https://new.shopxo.vip/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
diff --git a/components/diy/notice.vue b/components/diy/notice.vue
index 8f561f8d..7b731c2d 100644
--- a/components/diy/notice.vue
+++ b/components/diy/notice.vue
@@ -18,11 +18,16 @@
                         </template>
                         <swiper class="swiper flex-1" circular :indicator-dots="false" :autoplay="true" :interval="interval_time" :vertical="direction_type == 'vertical'" :style="container_height">
                             <swiper-item v-for="(item, index) in notice_list" :key="index">
-                                <view class="swiper-item flex-row align-c ht-auto" :style="content_title_style + 'color:' + form_style.news_color" :data-value="item.notice_link.page" @tap="url_event">{{ item.notice_title }}</view>
+                                <view class="swiper-item flex-row align-c ht-auto" :style="content_title_style + 'color:' + form_style.news_color" :data-value="item.notice_link.page" @tap="url_event">
+                                    <view class="text-line-1">{{ item.notice_title }}</view>
+                                </view>
                             </swiper-item>
                         </swiper>
-                        <view v-if="form_content.is_right_button == '1'" class="text-size-xs" :data-value="form_content.more_link.page" @tap="url_event">
-                            <iconfont name="icon-arrow-right" :color="form_style.button_color || '#999'" propContainerDisplay="flex"></iconfont>
+                        <view v-if="form_content.is_right_button == '1'" class="flex-row" :style="'color: ' + form_style.right_button_color + ';font-size:' + form_style.right_button_size * 2 + 'rpx;'" :data-value="form_content.more_link.page" @tap="url_event">
+                            {{ form_content.right_title }}
+                            <view class="pr top-xs">
+                                <iconfont name="icon-arrow-right" :color="form_style.right_button_color || '#999'" propContainerDisplay="flex"></iconfont>
+                            </view>
                         </view>
                     </view>
                 </view>
@@ -40,12 +45,12 @@
                                 </template>
                             </template>
                             <template v-else>
-                                <view :style="title_style" class="padding-horizontal-sm border-radius-sm">{{ form_content.title || '公告' }}</view>
+                                <view :style="title_style" class="padding-horizontal-sm border-radius-sm">{{ form_content.title }}</view>
                             </template>
-                            <view v-if="form_content.is_right_button == '1'" class="text-size-xs flex-row" :style="'color: ' + form_style.button_color" :data-value="form_content.more_link.page" @tap="url_event">
-                                更多
+                            <view v-if="form_content.is_right_button == '1'" class="flex-row" :style="'color: ' + form_style.right_button_color + ';font-size:' + form_style.right_button_size * 2 + 'rpx;'" :data-value="form_content.more_link.page" @tap="url_event">
+                                {{ form_content.right_title }}
                                 <view class="pr top-xs">
-                                    <iconfont name="icon-arrow-right" :color="form_style.button_color || '#999'" propContainerDisplay="flex"></iconfont>
+                                    <iconfont name="icon-arrow-right" :color="form_style.right_button_color || '#999'" propContainerDisplay="flex"></iconfont>
                                 </view>
                             </view>
                         </view>