From 24b5dd74abf5f13f1e1188e6c5d56fc5eb212647 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, 6 Jan 2026 15:35:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E5=87=BA=E6=A1=86?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../live/pull/components/goods/goods.vue      | 28 +++++++++++--------
 .../components/live-content/live-content.vue  |  2 +-
 .../live/pull/components/popup/popup.vue      |  2 ++
 .../pull/components/transition/transition.vue |  4 +--
 pages/plugins/live/pull/pull.vue              |  2 +-
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/pages/plugins/live/pull/components/goods/goods.vue b/pages/plugins/live/pull/components/goods/goods.vue
index c822e092..4d79a9d2 100644
--- a/pages/plugins/live/pull/components/goods/goods.vue
+++ b/pages/plugins/live/pull/components/goods/goods.vue
@@ -2,7 +2,7 @@
     <view v-if="!is_loading" class="flex-row align-c jc-c pa-20 box-border-box oh bg-f9" :style="good_style">
         <block v-if="good_list.length > 0">
             <!-- 固定在顶部的商品操作栏 -->
-            <view class="goods-header-fixed" :style="'width:' + windowWidth + 'px;'">
+            <view class="goods-header-fixed" :style="'width:' + propWindowWidth + 'px;'">
                 <view class="flex-row align-c jc-e pa-10">
                     <view class="flex-col" @tap="goods_order">
                         <component-icon propName="list-setup" propSize="36rpx" propColor="#999"></component-icon>
@@ -25,7 +25,7 @@
                 <view v-for="(item, index) in good_list" :key="item.id">
             <!-- #endif -->
                     <!-- 商品项 -->
-                    <view :class="'goods-item flex-row align-c box-border-box'  + (item.id == explanation_id ? ' bg-red-light' : '')" :style="'width:' + (windowWidth - 24) + 'px;'" :data-index="index" :data-value="item.checkbox" :data-url="item.goods_url" @tap="goods_detail">
+                    <view :class="'goods-item flex-row align-c box-border-box'  + (item.id == explanation_id ? ' bg-red-light' : '')" :style="'width:' + (propWindowWidth - 24) + 'px;'" :data-index="index" :data-value="item.checkbox" :data-url="item.goods_url" @tap="goods_detail">
                         <view class="flex-1">
                             <view class="flex-row align-c">
                                 <view class="pr goods-item-image-container">
@@ -83,7 +83,7 @@
             <!-- #ifdef APP-NVUE -->
                 </cell>
                 <cell>
-                    <component-bottom-line :propStatus="bottom_line_status" :propWidth="windowWidth"></component-bottom-line>
+                    <component-bottom-line :propStatus="bottom_line_status" :propWidth="propWindowWidth"></component-bottom-line>
                 </cell>
             </list>
             <!-- #endif -->
@@ -132,7 +132,15 @@ export default {
         propLiveRoomId: {
             type: Number,
             default: 0
-        }
+        },
+        propWindowWidth: {
+            type: Number,
+            default: 0
+        },
+        propWindowHeight: {
+            type: Number,
+            default: 0
+        },
     },
     data() {
         return {
@@ -145,9 +153,6 @@ export default {
             //#region 打开商品弹出框
             popup_goods_show: false,
             good_list: [],
-            // 获取屏幕大小, 这个组件需要再vue页面和nvue页面使用，所以不能设置为100%，需要获取固定屏幕大小
-            windowWidth: 0,
-            windowHeight: 0,
             //#endregion
     
             //#region 商品列表处理
@@ -176,10 +181,12 @@ export default {
         good_style() {
             // 判断是否是弹出框形式
             if (!this.propIsGoodsPopup) {
-                return `width:${ this.windowWidth }px;height: ${ this.windowHeight }px;`;
+                return `width:${ this.propWindowWidth }px;height: ${ this.propWindowHeight }px;`;
             } else {
+                console.log(this.propWindowHeight);
+                
                 // 如果是弹出框模式的就不全屏显示
-                return `width:${ this.windowWidth }px;height: ${ this.windowHeight - 300}px;`;
+                return `width:${ this.propWindowWidth }px;height: ${ this.propWindowHeight - 300}px;`;
             }
         },
         //#endregion
@@ -219,9 +226,6 @@ export default {
         //#endregion
     },
     mounted() {
-        const data = uni.getWindowInfo();
-        this.windowWidth = data.windowWidth;
-        this.windowHeight = data.windowHeight;
         // 初始化商品列表
         this.init();
         
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 1f46283c..50eea6a7 100644
--- a/pages/plugins/live/pull/components/live-content/live-content.vue
+++ b/pages/plugins/live/pull/components/live-content/live-content.vue
@@ -156,7 +156,7 @@
         </view>
         <!-- 商品弹出框 -->
         <component-popup ref="popupGoodsRef" propMode="bottom" class="pointer-events-auto" propTitle="添加商品" :propCloseable="true">
-           <component-goods propIsGoodsPopup></component-goods>
+           <component-goods propIsGoodsPopup :propWindowWidth="propWindowWidth" :propWindowHeight="propWindowHeight"></component-goods>
         </component-popup>
         <!-- 分享弹窗 -->
         <component-share-popup ref="share" class="pointer-events-auto"></component-share-popup>
diff --git a/pages/plugins/live/pull/components/popup/popup.vue b/pages/plugins/live/pull/components/popup/popup.vue
index fb46ad1a..dadea702 100644
--- a/pages/plugins/live/pull/components/popup/popup.vue
+++ b/pages/plugins/live/pull/components/popup/popup.vue
@@ -619,6 +619,8 @@
 <style lang="scss" scoped>
     .uni-popup {
         position: fixed;
+        max-width: 1600rpx;
+        margin: 0 auto;
         /* #ifndef APP-NVUE */
         z-index: 99;
 
diff --git a/pages/plugins/live/pull/components/transition/transition.vue b/pages/plugins/live/pull/components/transition/transition.vue
index 94ed81c3..87bad8fe 100644
--- a/pages/plugins/live/pull/components/transition/transition.vue
+++ b/pages/plugins/live/pull/components/transition/transition.vue
@@ -1,11 +1,11 @@
 <template>
     <!-- #ifndef APP-NVUE -->
-    <view v-if="isShow" ref="ani" :animation="animationData" :class="propCustomClass" :style="transformStyles" @click="onClick">
+    <view v-if="isShow" ref="ani" class="page-width-max" :animation="animationData" :class="propCustomClass" :style="transformStyles" @click="onClick">
         <slot></slot>
     </view>
     <!-- #endif -->
     <!-- #ifdef APP-NVUE -->
-    <view v-if="isShow" ref="ani" :animation="animationData" :class="propCustomClass" :style="transformStyles" @click="onClick">
+    <view v-if="isShow" ref="ani" class="page-width-max" :animation="animationData" :class="propCustomClass" :style="transformStyles" @click="onClick">
         <slot></slot>
     </view>
     <!-- #endif -->
diff --git a/pages/plugins/live/pull/pull.vue b/pages/plugins/live/pull/pull.vue
index a87236ad..27434ed2 100644
--- a/pages/plugins/live/pull/pull.vue
+++ b/pages/plugins/live/pull/pull.vue
@@ -7,7 +7,7 @@
         </view>
         <template v-if="!is_loading"> 
             <view class="live-content pointer-events-none">
-                <component-live-content ref="liveContent" :propWindowWidth="windowWidth" :propLiveData="live_data" :propLiveConfig="live_config" :propLiveShowImgs="like_show_imgs" @liveBack="live_back" @liveStatus="socket_live_status"></component-live-content>
+                <component-live-content ref="liveContent" :propWindowWidth="windowWidth" :propWindowHeight="windowHeight" :propLiveData="live_data" :propLiveConfig="live_config" :propLiveShowImgs="like_show_imgs" @liveBack="live_back" @liveStatus="socket_live_status"></component-live-content>
             </view>
             <view v-if="is_live_ended" class="live-ended flex-row align-c jc-c">
                 <view class="flex-col align-c">