From 8ba2274d050c5cdf78c54ea7981dd8991049a096 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, 22 May 2026 09:49:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9socket=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E5=92=8C=E5=85=AC=E5=91=8A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/diy/components/diy/notice.vue            | 17 +++--------------
 .../components/live-content/live-content.vue   | 18 ++----------------
 pages/plugins/live/detail/mixins/mixins.js     |  2 --
 3 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/pages/diy/components/diy/notice.vue b/pages/diy/components/diy/notice.vue
index 741077c5..917b89a5 100644
--- a/pages/diy/components/diy/notice.vue
+++ b/pages/diy/components/diy/notice.vue
@@ -62,23 +62,12 @@
                         </template>
                         <!-- 非全部显示：滚动或单行省略 -->
                         <template v-else>
-                            <view v-if="marquee_scroll_on && marquee_display_text" class="news-marquee-scroll flex-1 flex-width" :style="marquee_content_height" :data-value="marquee_link_page" @tap="url_event">
+                            <view v-if="marquee_scroll_on && marquee_display_text" class="news-marquee-scroll flex-1 flex-width" :style="marquee_content_height" :data-value="marquee_link_page">
                                 <view class="news-marquee-scroll-box">
-                                    <text
-                                        :id="marquee_text_id"
-                                        class="news-marquee-scroll-text"
-                                        :class="{ 'news-marquee-scroll-text--run': marquee_scroll_running }"
-                                        :style="marquee_scroll_anim_style + marquee_body_text_style"
-                                    >{{ marquee_display_text }}</text>
+                                    <text :id="marquee_text_id" class="news-marquee-scroll-text" :class="{ 'news-marquee-scroll-text--run': marquee_scroll_running }" :style="marquee_scroll_anim_style + marquee_body_text_style">{{ marquee_display_text }}</text>
                                 </view>
                             </view>
-                            <view
-                                v-else-if="marquee_display_text"
-                                class="news-marquee-static flex-1 flex-width"
-                                :style="marquee_content_height"
-                                :data-value="marquee_link_page"
-                                @tap="url_event"
-                            >
+                            <view v-else-if="marquee_display_text" class="news-marquee-static flex-1 flex-width" :style="marquee_content_height" :data-value="marquee_link_page">
                                 <view class="news-marquee-static-text" :style="marquee_body_text_style">{{ marquee_display_text }}</view>
                             </view>
                         </template>
diff --git a/pages/plugins/live/detail/components/live-content/live-content.vue b/pages/plugins/live/detail/components/live-content/live-content.vue
index 1c9db549..e9215e3b 100644
--- a/pages/plugins/live/detail/components/live-content/live-content.vue
+++ b/pages/plugins/live/detail/components/live-content/live-content.vue
@@ -179,7 +179,7 @@
                                 <!-- #endif -->
                             </view>
                         </template>
-                        <template v-else-if="need_live_socket">
+                        <template v-else>
                             <view class="flex-1">
                                 <button class="bottom-actions-button cr-f size-14" type="primary"  style="border-radius: 50rpx;background: rgba(40,40,40,0.45);border: 1rpx solid rgba(40,40,40,0.45);" :hover-class="is_socket_error ? 'none' : 'button-hover'" @tap="socket_connect_manual">{{ socket_error_content }}</button>
                             </view>
@@ -363,7 +363,6 @@
                 is_live_chat_on: false,
                 is_live_goods_buy_on: false,
                 is_live_like_on: false,
-                need_live_socket: false,
                 //#region 顶部返回和搜索
                 menu_button_info: '',
                 header_padding_left: '',
@@ -396,15 +395,6 @@
                         this.live_goods_explain_auto_close_time = new_value.live_goods_explain_auto_close_time;
                         // 直播提示语
                         this.live_tips = new_value?.live_tips || '';
-                        // 三项都关闭时不连接 socket
-                        if (!this.need_live_socket) {
-                            if (this.task != null) {
-                                this.socket_close();
-                            }
-                            this.is_socket_success = false;
-                            this.is_socket_error = false;
-                            return;
-                        }
                         // socket 地址更新
                         if (!isEmpty(new_value.socket_connect)) {
                             const { host, port, is_wss } = new_value.socket_connect;
@@ -468,7 +458,6 @@
                 this.is_live_chat_on = this.is_live_config_on(c.is_live_chat);
                 this.is_live_goods_buy_on = this.is_live_config_on(c.is_live_goods_buy);
                 this.is_live_like_on = this.is_live_config_on(c.is_live_like);
-                this.need_live_socket = this.is_live_chat_on || this.is_live_goods_buy_on || this.is_live_like_on;
                 this.live_feature_ready = true;
             },
             /**
@@ -625,9 +614,6 @@
              * @param {Boolean} is_manual - 是否手动连接
              */
             socket_connect(is_manual = false) {
-                if (!this.need_live_socket) {
-                    return;
-                }
                 // 一开始就设置为false，避免连接失败时，页面显示错误
                 this.is_socket_error = false;
                 this.is_socket_success = false;
@@ -1023,7 +1009,7 @@
              * @param {Event} e - 点击事件对象
              */
             like_button_click(e) {
-                if (!this.is_live_like_on || !this.need_live_socket) {
+                if (!this.is_live_like_on) {
                     return;
                 }
                 // 临时存储点赞数量
diff --git a/pages/plugins/live/detail/mixins/mixins.js b/pages/plugins/live/detail/mixins/mixins.js
index 9cf77b32..e24664ab 100644
--- a/pages/plugins/live/detail/mixins/mixins.js
+++ b/pages/plugins/live/detail/mixins/mixins.js
@@ -41,7 +41,6 @@ export default {
             is_live_chat_on: false,
             is_live_goods_buy_on: false,
             is_live_like_on: false,
-            need_live_socket: false,
         }
     },
 
@@ -119,7 +118,6 @@ export default {
             this.is_live_chat_on = this.is_live_config_on(c.is_live_chat);
             this.is_live_goods_buy_on = this.is_live_config_on(c.is_live_goods_buy);
             this.is_live_like_on = this.is_live_config_on(c.is_live_like);
-            this.need_live_socket = this.is_live_chat_on || this.is_live_goods_buy_on || this.is_live_like_on;
             this.live_feature_ready = true;
         },
         /**

From 6584ac2526ce8262e5daab7c29d629f90711e535 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, 22 May 2026 15:40:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9socket=E9=87=8D=E8=BF=9E?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   8 +-
 .../components/live-content/live-content.vue  | 128 +++++++++++-------
 2 files changed, 83 insertions(+), 53 deletions(-)

diff --git a/App.vue b/App.vue
index e7fe2bae..9cc0fd28 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,10 @@
             data: {
                 // 基础配置
                 // 数据接口请求地址
-                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/',
 
                 // 系统类型（默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立）
                 system_type: 'default',
@@ -23,10 +23,10 @@
                 application_logo: '',
 
                 // 版本号、如: v1.0.0
-                version: 'v6.9.0',
+                version: 'v6.8.0',
 
                 // app版本信息、如: v1.0.0 20180118
-                app_version_info: 'v6.9.0 20260525',
+                app_version_info: 'v6.8.0 20260305',
 
                 // 货币价格符号
                 currency_symbol: '￥',
diff --git a/pages/plugins/live/detail/components/live-content/live-content.vue b/pages/plugins/live/detail/components/live-content/live-content.vue
index e9215e3b..17883508 100644
--- a/pages/plugins/live/detail/components/live-content/live-content.vue
+++ b/pages/plugins/live/detail/components/live-content/live-content.vue
@@ -168,9 +168,9 @@
                 </view>
                 <!-- 底部交互区域 -->
                 <view class="flex-row align-c mt-5 pointer-events-auto pr">
-                    <template v-if="live_feature_ready && is_live_chat_on">
-                        <template v-if="is_socket_success">
-                            <view class="flex-1 bottom-actions-input">
+                    <template v-if="live_feature_ready">
+                        <view class="flex-1">
+                            <view v-if="is_live_chat_on && is_socket_success" class="bottom-actions-input">
                                 <!-- #ifdef APP-NVUE -->
                                 <input :value="comment_value" type="text" confirm-type="done" :adjust-position="false" style="color: #fff;" placeholder="说点什么" placeholder-style="font-size:14px" @focus="add_comment" @input="(e) => comment_value = e.detail.value" @confirm="comment_input_confirm"  />
                                 <!-- #endif -->
@@ -178,22 +178,21 @@
                                 <input :value="comment_value" type="text" confirm-type="done" :adjust-position="false" style="color: #fff;" placeholder="说点什么" placeholder-style="font-size:28rpx" @focus="add_comment" @input="(e) => comment_value = e.detail.value" @confirm="comment_input_confirm"  />
                                 <!-- #endif -->
                             </view>
-                        </template>
-                        <template v-else>
-                            <view class="flex-1">
-                                <button class="bottom-actions-button cr-f size-14" type="primary"  style="border-radius: 50rpx;background: rgba(40,40,40,0.45);border: 1rpx solid rgba(40,40,40,0.45);" :hover-class="is_socket_error ? 'none' : 'button-hover'" @tap="socket_connect_manual">{{ socket_error_content }}</button>
+                            <view v-else-if="!is_socket_success" class="flex-1">
+                                <button class="bottom-actions-button cr-f size-14" type="primary" style="border-radius: 50rpx;background: rgba(40,40,40,0.45);border: 1rpx solid rgba(40,40,40,0.45);" :hover-class="is_socket_error ? 'none' : 'button-hover'" @tap="socket_connect_manual">{{ socket_error_content }}</button>
                             </view>
-                        </template>
-                    </template>
-                    <view v-else-if="live_feature_ready && (is_live_goods_buy_on || is_live_like_on)" class="flex-1"></view>
-                    <view v-if="live_feature_ready && is_live_goods_buy_on" class="bottom-actions-icon" @tap="add_goods">
-                        <u-icon propName="shopping-cart-tall" propColor="#fff" propSize="32rpx"></u-icon>
-                    </view>
-                    <component-like-button v-if="live_feature_ready && is_live_like_on" ref="likeButton" :propShowImgs="propLiveShowImgs" @handleClick="like_button_click">
-                        <view class="bottom-actions-icon">
-                            <u-icon propName="givealike-o" propColor="#fff" propSize="32rpx"></u-icon>
+                            <view v-else class="bottom-actions-input-placeholder"></view>
                         </view>
-                    </component-like-button>
+                        <view class="bottom-actions-icon" :class="!is_live_goods_buy_on ? 'bottom-actions-icon-placeholder' : ''" @tap="add_goods">
+                            <u-icon v-if="is_live_goods_buy_on" propName="shopping-cart-tall" propColor="#fff" propSize="32rpx"></u-icon>
+                        </view>
+                        <component-like-button v-if="is_live_like_on" ref="likeButton" :propShowImgs="propLiveShowImgs" @handleClick="like_button_click">
+                            <view class="bottom-actions-icon">
+                                <u-icon propName="givealike-o" propColor="#fff" propSize="32rpx"></u-icon>
+                            </view>
+                        </component-like-button>
+                        <view v-else class="bottom-actions-icon bottom-actions-icon-placeholder"></view>
+                    </template>
                     <view class="bottom-actions-icon" @tap="share_event">
                         <u-icon propName="share-solid" propColor="#fff" propSize="32rpx"></u-icon>
                     </view>
@@ -347,6 +346,8 @@
                 listener_height: 0,
                 //#endregion
                 reconnect_count: 0,
+                is_socket_closing: false,
+                socket_reconnect_timer: null,
                 // socket连接错误
                 is_socket_error: false,
                 socket_error_content: '连接失败点击重试',
@@ -402,9 +403,7 @@
                             const url = `${protocol}://${host}:${port}`;
 
                             if (url != this.live_websocket_url) {
-                                if (this.task != null) {
-                                    this.socket_close();
-                                }
+                                this.socket_close();
                                 this.live_websocket_url = url;
                                 this.socket_connect();
                             } else if (this.task == null) {
@@ -475,8 +474,6 @@
                 // 如果有胶囊的时候，做处理
                 if (is_current_single_page == 0) {
                     const custom = uni.getMenuButtonBoundingClientRect();
-                    console.log(custom);
-                    
                     this.menu_button_info = `max-width:calc(100% - ${custom.width + 10}px);`;
                     this.header_style = `padding-top: ${custom.top + custom.height}px;`;
                 }
@@ -601,6 +598,31 @@
                 // 连接socket
                 this.socket_connect();
             },
+            clear_socket_reconnect_timer() {
+                if (this.socket_reconnect_timer != null) {
+                    clearTimeout(this.socket_reconnect_timer);
+                    this.socket_reconnect_timer = null;
+                }
+            },
+            schedule_socket_reconnect() {
+                if (this.socket_reconnect_timer != null) {
+                    return;
+                }
+                if ((this.reconnect_count + 1) >= 30) {
+                    this.is_socket_error = false;
+                    this.reconnect_count = 0;
+                    this.socket_error_content = '连接失败点击重试';
+                    return;
+                }
+                this.is_socket_error = true;
+                this.is_socket_success = false;
+                this.socket_error_content = `第${this.reconnect_count + 1}次连接失败`;
+                this.socket_reconnect_timer = setTimeout(() => {
+                    this.socket_reconnect_timer = null;
+                    this.reconnect_count++;
+                    this.socket_connect();
+                }, 2000);
+            },
             /**
              * 手动连接WebSocket
              */
@@ -614,10 +636,18 @@
              * @param {Boolean} is_manual - 是否手动连接
              */
             socket_connect(is_manual = false) {
-                // 一开始就设置为false，避免连接失败时，页面显示错误
+                this.clear_socket_reconnect_timer();
+                if (this.task != null) {
+                    this.is_socket_closing = true;
+                    this.task.close();
+                    this.task = null;
+                }
+                if (is_manual) {
+                    this.reconnect_count = 0;
+                }
+                this.is_socket_closing = false;
                 this.is_socket_error = false;
                 this.is_socket_success = false;
-                // 第一次连接时显示连接中...
                 if (this.reconnect_count == 0) {
                     this.socket_error_content = '连接中...';
                 } else {
@@ -632,43 +662,32 @@
                     complete: () => {}
                 });
             
-                // 连接打开事件
                 this.task.onOpen((res) => {
-                    // 连接成功后重置重连计数
                     this.reconnect_count = 0;
                     this.is_socket_success = true;
+                    this.is_socket_error = false;
                 });
                 
                 this.task.onMessage((res) => {
                     this.socket_message_back_handle(res);
                 });
                 this.task.onClose((res) => {
-                    this.is_socket_error = true;
-                    // 尝试重连，最多30次
-                    if ((this.reconnect_count + 1) < 30) {
-                        const _this = this;
-                        setTimeout(() => {
-                            _this.is_socket_error = true;
-                            _this.socket_error_content = `第${_this.reconnect_count + 1}次连接失败`;
-                            console.log(`聊天第${_this.reconnect_count + 1}次连接失败`);
-                            setTimeout(() => {
-                                // 增加重连计数
-                                _this.reconnect_count++;
-                                _this.socket_connect();
-                                console.log(`聊天第${_this.reconnect_count + 1}次连接`);
-                            }, 1000); // 逐步增加重连间隔，最大10秒
-                        }, 1000); // 逐步增加重连间隔，最大10秒
-                    } else {
+                    if (this.is_socket_closing) {
+                        this.is_socket_closing = false;
+                        return;
+                    }
+                    this.is_socket_success = false;
+                    this.schedule_socket_reconnect();
+                });
+                this.task.onError((res) => {
+                    this.is_socket_success = false;
+                    if ((this.reconnect_count + 1) >= 30) {
                         this.is_socket_error = false;
                         this.reconnect_count = 0;
                         this.socket_error_content = '连接失败点击重试';
+                    } else if (!this.is_socket_closing) {
+                        this.schedule_socket_reconnect();
                     }
-                });
-                this.task.onError((res) => {
-                    this.socket_close();
-                    this.is_socket_error = false;
-                    this.reconnect_count = 0;
-                    this.socket_error_content = `连接失败点击重试`;
                     if (is_manual) {
                         uni.showModal({
                             title: '提示',
@@ -678,8 +697,10 @@
                     }
                 });
             },
-            socket_close() { 
+            socket_close() {
+                this.clear_socket_reconnect_timer();
                 if (this.task != null) {
+                    this.is_socket_closing = true;
                     this.task.close();
                     this.task = null;
                 }
@@ -1190,6 +1211,15 @@
     justify-content: center;
     margin-left: 20rpx;
 }
+.bottom-actions-icon-placeholder {
+    visibility: hidden;
+    pointer-events: none;
+}
+.bottom-actions-input-placeholder {
+    min-height: 72rpx;
+    visibility: hidden;
+    pointer-events: none;
+}
 .keyboard-input {
     position: fixed;
     left: 0;