From b78bdcb64bb53f3ffeb90a5154e51ff450dd7257 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, 27 Nov 2025 18:11:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B7=B7=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/live-content/live-content.vue  | 34 +++++++++++--------
 pages/plugins/live/pull/pull.nvue             | 30 +++-------------
 pages/plugins/live/pull/pull.vue              | 25 +++-----------
 3 files changed, 28 insertions(+), 61 deletions(-)

diff --git a/pages/plugins/live/pull/components/live-content/live-content.vue b/pages/plugins/live/pull/components/live-content/live-content.vue
index 2c3c85c7..1a574cf4 100644
--- a/pages/plugins/live/pull/components/live-content/live-content.vue
+++ b/pages/plugins/live/pull/components/live-content/live-content.vue
@@ -15,11 +15,11 @@
                 </view>
             </view>
             <view class="flex-row align-c">
-                <!-- <view class="flex-row align-c pr" style="direction: rtl;">
+                <view class="flex-row align-c pr" style="direction: rtl;">
                     <view v-for="(item, index) in viewers" :key="index" class="viewer-wrapper" :style="'z-index:' + (index + 1) + ';' + (index == 0 ? 'margin-right: 0;' : '')">
                         <image :src="item.avatar" class="viewer-avatar"  mode="aspectFill"></image>
                     </view>
-                </view> -->
+                </view>
                 <view class="viewer-back ml-5 flex-row align-c jc-c " @tap="live_back">
                     <component-icon name="close-fillup" class="viewer-back-icon" size="50rpx" color="#fff"></component-icon>
                 </view>
@@ -27,7 +27,7 @@
         </view>
         <view class="flex-1 bottom-line-exclude-bottom flex-row">
             <view class="flex-1 flex-col jc-e">
-                <view class="flex-row jc-sb">
+                <view class="pr">
                     <view class="bulletin-area pr" :style="'width:' + (windowWidth - 150) + 'px;'">
                         <!-- #ifdef APP-NVUE -->
                         <!-- nvue 使用 list进行列表渲染 -->
@@ -99,13 +99,11 @@
                             <text class="cr-10 cr-red">{{ message_num }}条新消息</text>
                         </view>
                     </view>
-                    <view class="flex-row align-e mb-10">
-                        <view class="explain-goods">
-                            <image :src="explain_goods.goods_avatar" class="explain-goods-image" mode="aspectFill"></image>
-                            <view class="explain-goods-content mt-10">
-                                <text class="explain-goods-name text-line-2 size-12">{{ explain_goods.goods_name }}</text>
-                                <text class="explain-goods-price cr-red mt-10 size-12">¥{{ explain_goods.goods_price }}</text>
-                            </view>
+                    <view v-if="!isEmpty(explain_goods)" class="explain-goods">
+                        <image :src="explain_goods.goods_avatar" class="explain-goods-image" style="width: 198rpx;height: 198rpx;"  mode="aspectFill"></image>
+                        <view class="explain-goods-content mt-10" style="padding: 8rpx;box-sizing: border-box;">
+                            <text class="explain-goods-name text-line-2 size-12">{{ explain_goods.goods_name }}</text>
+                            <text class="explain-goods-price cr-red mt-10 size-12">¥{{ explain_goods.goods_price }}</text>
                         </view>
                     </view>
                 </view>
@@ -129,7 +127,7 @@
                             <component-icon name="givealike-o" color="#fff" size="32rpx"></component-icon>
                         </view>
                     </component-like-button>
-                    <view class="bottom-actions-icon">
+                    <view class="bottom-actions-icon" @tap="share_event">
                         <component-icon name="share-solid" color="#fff" size="32rpx"></component-icon>
                     </view>
                 </view>
@@ -153,6 +151,7 @@
     import componentIcon from "@/pages/plugins/live/pull/components/icon/icon.vue";
     import componentPopup from "@/pages/plugins/live/pull/components/popup/popup";
     import componentLikeButton from "@/pages/plugins/live/pull/components/like-button/like-button";
+    import { isEmpty } from '@/common/js/common/common.js';
     const app = getApp();
     export default {
         name: 'LiveContent',
@@ -303,6 +302,7 @@
             }
         },
         methods: {
+            isEmpty,
             //#region 头部样式和页面宽度处理
             init_window_info() {
                 const data = uni.getWindowInfo();
@@ -555,6 +555,10 @@
                 this.$refs.popupGoodsRef.open();
             },
             //#endregion
+            share_event() {
+                // 分享菜单处理
+                app.globalData.page_share_handle();
+            },
         }
     }
 </script>
@@ -776,10 +780,10 @@
     background: #fff;
     padding: 4rpx;
     box-sizing: border-box;
-    .explain-goods-image {
-        width: 100%;
-        height: 180rpx;
-    }
+    position: absolute;
+    right: 0;
+    bottom: 20rpx;
+    border-radius: 20rpx;
 }
 
 /* #ifdef MP-WEIXIN | APP-PLUS */
diff --git a/pages/plugins/live/pull/pull.nvue b/pages/plugins/live/pull/pull.nvue
index 2f6aef77..b06762a0 100644
--- a/pages/plugins/live/pull/pull.nvue
+++ b/pages/plugins/live/pull/pull.nvue
@@ -1,5 +1,5 @@
 <template>
-    <view :class="theme_view + ' bg-white flex-row'" :style="'width:' + windowWidth + 'px;height:' + windowHeight + 'px;'">
+    <view :class="theme_view + ' bg-0 flex-row'" :style="'width:' + windowWidth + 'px;height:' + windowHeight + 'px;'">
         <view class="flex-1">
             <live-video src="http://live-pull-all.shopxo.vip/68f764013572f9240ca7ce6c/shopxo122.m3u8"></live-video>
         </view>
@@ -11,39 +11,19 @@
 <script>
     import liveVideo from './components/video/video.vue';
     import liveContent from './components/live-content/live-content.vue';
+    // 引入混入公共逻辑，避免nvue和vue使用同一套逻辑出现问题
+    import mixins from './mixins/mixins.js';
     const app = getApp();
     export default {
         components: {
             liveVideo,
             liveContent
         },
+        mixins: [mixins],
         data() {
             return {
-                windowWidth: 0,
-                windowHeight: 1000,
+                theme_view: app.globalData.get_theme_value_view(),
             }
-        },
-        
-        onLoad(params) {
-            // 调用公共事件方法
-            app.globalData.page_event_onload_handle(params);
-            // 设置参数
-            this.params = app.globalData.launch_params_handle(params);
-        },
-        
-        onShow() {
-            // 调用公共事件方法
-            app.globalData.page_event_onshow_handle();
-
-            // 分享菜单处理
-            app.globalData.page_share_handle();
-            const data = uni.getWindowInfo();
-            this.windowWidth = data.windowWidth;
-            this.windowHeight = data.windowHeight;
-            console.log(data);
-        },
-        methods: {
-            
         }
     }
 </script>
diff --git a/pages/plugins/live/pull/pull.vue b/pages/plugins/live/pull/pull.vue
index 3f731f55..3948f40a 100644
--- a/pages/plugins/live/pull/pull.vue
+++ b/pages/plugins/live/pull/pull.vue
@@ -11,37 +11,20 @@
 <script>
     import liveVideo from './components/video/video.vue';
     import liveContent from './components/live-content/live-content.vue';
+    // 引入混入公共逻辑，避免nvue和vue使用同一套逻辑出现问题
+    import mixins from './mixins/mixins.js';
     const app = getApp();
     export default {
         components: {
             liveVideo,
             liveContent
         },
+        mixins: [mixins],
         data() {
             return {
+                theme_view: app.globalData.get_theme_value_view(),
             }
         },
-        
-        onLoad(params) {
-            // 调用公共事件方法
-            app.globalData.page_event_onload_handle(params);
-        
-            // 设置参数
-            this.setData({
-                params: app.globalData.launch_params_handle(params),
-            });
-        },
-        
-        onShow() {
-            // 调用公共事件方法
-            app.globalData.page_event_onshow_handle();
-
-            // 分享菜单处理
-            app.globalData.page_share_handle();
-        },
-        methods: {
-            
-        }
     }
 </script>
 <style scoped>