vhall-mini-sdk 0.1.1 → 0.2.0

package/README.md

@@ -29,22 +29,22 @@ uni-app工程安装完成后，会在当前工程目录下自动生成 wxcompone
 (1) 原生微信小程序开发
 
 ```js
-const VhallMiniSdk = require('vhall-mini-sdk/sdk/main/index.js').default;
-const CustomMenuServer = require('vhall-mini-sdk/sdk/plugins/CustomMenuServer.js').default;
-const ChatServer = require('vhall-mini-sdk/sdk/plugins/ChatServer.js').default;
-const ProductServer = require('vhall-mini-sdk/sdk/plugins/ProductServer.js').default;
-const InteractServer = require('vhall-mini-sdk/sdk/plugins/InteractServer.js').default;
+const VhallMiniSdk = require('vhall-mini-sdk/sdk/main/index.js');
+const CustomMenuServer = require('vhall-mini-sdk/sdk/plugins/CustomMenuServer.js');
+const ChatServer = require('vhall-mini-sdk/sdk/plugins/ChatServer.js');
+const ProductServer = require('vhall-mini-sdk/sdk/plugins/ProductServer.js');
+const InteractServer = require('vhall-mini-sdk/sdk/plugins/InteractServer.js');
 ```
 
 (2) uni-app小程序开发
 
 ```js
 import { ref, onMounted } from 'vue';
-const VhallMiniSdk = require('../../wxcomponents/vhall-mini-sdk/sdk/main/index.js').default;
-const CustomMenuServer = require('../../wxcomponents/vhall-mini-sdk/sdk/plugins/CustomMenuServer.js').default;
-const ChatServer = require('../../wxcomponents/vhall-mini-sdk/sdk/plugins/ChatServer.js').default;
-const ProductServer = require('../../wxcomponents/vhall-mini-sdk/sdk/plugins/ProductServer.js').default;
-const InteractServer = require('../../wxcomponents/vhall-mini-sdk/sdk/plugins/InteractServer.js').default;
+const VhallMiniSdk = require('../../wxcomponents/vhall-mini-sdk/sdk/main/index.js');
+const CustomMenuServer = require('../../wxcomponents/vhall-mini-sdk/sdk/plugins/CustomMenuServer.js');
+const ChatServer = require('../../wxcomponents/vhall-mini-sdk/sdk/plugins/ChatServer.js');
+const ProductServer = require('../../wxcomponents/vhall-mini-sdk/sdk/plugins/ProductServer.js');
+const InteractServer = require('../../wxcomponents/vhall-mini-sdk/sdk/plugins/InteractServer.js');
 ```
 
 4. 更多接入支持，参考文档: https://vhall.apifox.cn/dev/sdk/wmp/quick-start

package/lib/components/chat/chat-edit/chat-edit.js

@@ -62,19 +62,22 @@ Component({
           })
         },
         'permissions': (val) => {
-          const status = _sdkInstance.store.get('liveInfo.status');
-          // 4 点播  5 回放 && 开启了回放禁言
+          const status = _sdkInstance.store.get('webinarStatus');
           if ((status == 4 || status == 5) && val['ui.watch_record_no_chatting'] == 1) {
             this.setData({
               isAllBanned: true,
             });
           }
         },
-        'liveInfo.status': (status) => {
-          if (status == 3) {
+        webinarStatus: (status) => {
+          if (status == 3 || status == 5 && _sdkInstance.store.get('permissions')['ui.watch_record_no_chatting'] == 1) {
             this.setData({
               isAllBanned: true,
             });
+          } else {
+            this.setData({
+              isAllBanned: _sdkInstance.store.get('interactToolStatus.all_banned'),
+            });
           }
         },
       });

package/lib/components/chat/chat-list/chat-list.js

@@ -88,7 +88,7 @@ Component({
         this._handleMsg(message);
       };
       eventObj[this.sdkInstance.EVENT.DELETE_MSG] = (message) => {
-        const msgIds  = message.msg_ids.split(',');
+        const msgIds = message.msg_ids.split(',');
         LastMsgList = LastMsgList.filter((item) => !msgIds.includes(item.msg_id));
         this.setData({
           chatList: this.data.chatList.filter((item) => !msgIds.includes(item.msg_id)),

package/lib/components/live-landscape/live-landscape.js

@@ -31,6 +31,11 @@ Component({
             liveInfo: val,
           });
         },
+        webinarStatus: (val) => {
+          this.setData({
+            webinarStatus: val,
+          });
+        },
         customMenu: (_customMenu) => {
           if (_customMenu) {
             this.handleCustomMenu(_customMenu);
@@ -75,9 +80,8 @@ Component({
             tabList.push({ id: tabItem.id, name: tabItem.name, type: tabItem.type })
           }
         } else if (tabItem.type == 3) {
-          // 聊天 ( 预约页 和 结束 不展示聊天)
-          const liveInfo = this.sdkInstance.store.get('liveInfo');
-          if (tabItem.status == 1 && (liveInfo.status !== 2 && liveInfo.status !== 3)) {
+          const webinarStatus = this.sdkInstance.store.get('webinarStatus');
+          if (tabItem.status == 1 && (webinarStatus !== 2 && webinarStatus !== 3)) {
             tabList.push({ id: tabItem.id, name: tabItem.name, type: tabItem.type })
           }
         } else if (tabItem.type === 1) {
@@ -106,10 +110,10 @@ Component({
         status: tabItem.status, // status 1显示,2隐藏,3预告结束隐藏,4预告结束显示
         cid: menuDetail.components[0].component_id,
       };
-      const liveInfo = this.sdkInstance.store.get('liveInfo');
-      if (liveInfo?.status && inviteRankMenu.id) {
+      const webinarStatus = this.sdkInstance.store.get('webinarStatus');
+      if (webinarStatus && inviteRankMenu.id) {
         // 预告页和结束页不展示
-        if (liveInfo.status === 2 && inviteRankMenu.status === 3) return;
+        if (webinarStatus === 2 && inviteRankMenu.status === 3) return;
         const idx = tabList.findIndex((item) => item.id === inviteRankMenu.id);
         if (idx == -1) {
           tabList.push(inviteRankMenu)
@@ -140,7 +144,7 @@ Component({
       };
       obj[this.sdkInstance.EVENT.LIVE_END] = () => {
         this.sdkInstance.leaveRoom(true);
-        this.sdkInstance.store.set('liveInfo.status', 3);
+        this.sdkInstance.store.set('webinarStatus', 3);
       };
       obj[this.sdkInstance.EVENT.KICKOUT] = () => {};
       obj[this.sdkInstance.EVENT.RECORD_WATCH_EXPIRE_ALERT] = () => {

package/lib/components/live-landscape/live-landscape.wxml

@@ -2,7 +2,7 @@
   <view class="live_landscape_player">
     <vhall-player sdkInstance="{{sdkInstance}}"></vhall-player>
   </view>
-  <start-countdown sdkInstance="{{sdkInstance}}" wx:if="{{liveInfo.status==2}}"></start-countdown>
+  <start-countdown sdkInstance="{{sdkInstance}}" wx:if="{{webinarStatus==2}}"></start-countdown>
   <vhall-tabs class="live-landscape-tab" tab-class="tab-action" swiper-class="menu-swiper" wx:if="{{tabList.length > 0}}" tabs="{{tabList}}" activeTab="{{activeTab}}" bindtabclick="onTabClick" bindchange="onTabChange">
     <block wx:for="{{tabList}}" wx:key="id">
       <view class="tab-content" data-set="{{item}}" slot="tab-content-{{index}}-{{id}}" wx:if="{{activeTab==index}}">
@@ -23,7 +23,7 @@
   <!-- 我的邀请明细 -->
   <my-invite-detail sdkInstance="{{sdkInstance}}"></my-invite-detail>
   <!-- 直播开始提示弹框(居中展示) -->
-  <vh-popup wx:if="{{liveInfo.status==2||liveInfo.status==3}}" visible="{{showStartDialog}}" showClose="{{false}}">
+  <vh-popup wx:if="{{webinarStatus==2||webinarStatus==3}}" visible="{{showStartDialog}}" showClose="{{false}}">
     <view class="start-dialog dialog-content">
       <view class="dialog-image">
         <image class="image-item start_live_img" src="https://cnstatic01.e.vhall.com/common-static/images/mp/live_start.png" mode="widthFix" alt="开始直播"></image>

package/lib/components/live-portrait/live-portrait.js

@@ -42,6 +42,11 @@ Component({
             liveInfo: val,
           });
         },
+        webinarStatus: (val) => {
+          this.setData({
+            webinarStatus: val,
+          });
+        },
         customMenu: (_customMenu) => {
           if (_customMenu) {
             this.handleCustomMenu(_customMenu);
@@ -105,9 +110,8 @@ Component({
             }
           }
         } else if (tabItem.type == 3) {
-          // 聊天 ( 预约页 和 结束 不展示聊天), 竖屏模式聊天不在tab中而是在外面展示
-          const liveInfo = this.sdkInstance.store.get('liveInfo');
-          if (tabItem.status == 1 && (liveInfo.status !== 2 && liveInfo.status !== 3)) {
+          const webinarStatus = this.sdkInstance.store.get('webinarStatus');
+          if (tabItem.status == 1 && (webinarStatus !== 2 && webinarStatus !== 3)) {
             this.setData({ showChat: true })
           } else {
             this.setData({ showChat: false })
@@ -130,10 +134,10 @@ Component({
         status: tabItem.status, // status 1显示,2隐藏,3预告结束隐藏,4预告结束显示
         cid: menuDetail.components[0].component_id,
       };
-      const liveInfo = this.sdkInstance.store.get('liveInfo');
-      if (liveInfo?.status && inviteRankMenu.id) {
+      const webinarStatus = this.sdkInstance.store.get('webinarStatus');
+      if (webinarStatus && inviteRankMenu.id) {
         // 预告页和结束页不展示
-        if (liveInfo.status === 2 && inviteRankMenu.status === 3) return;
+        if (webinarStatus === 2 && inviteRankMenu.status === 3) return;
         const idx = tabList.findIndex((item) => item.id === inviteRankMenu.id);
         if (idx == -1) {
           tabList.push(inviteRankMenu)
@@ -169,7 +173,7 @@ Component({
       };
       obj[this.sdkInstance.EVENT.LIVE_END] = () => {
         this.sdkInstance.leaveRoom(true);
-        this.sdkInstance.store.set('liveInfo.status', 3);
+        this.sdkInstance.store.set('webinarStatus', 3);
       };
       obj[this.sdkInstance.EVENT.KICKOUT] = () => {};
       obj[this.sdkInstance.EVENT.RECORD_WATCH_EXPIRE_ALERT] = () => {
@@ -198,6 +202,10 @@ Component({
 
     // 点击小黄车，显示商品列表弹窗
     showProductList() {
+      const productServer = this.sdkInstance.get('productServer');
+      if (productServer) {
+        productServer.getProductList();
+      }
       this.setData({
         showProductList: true
       });

package/lib/components/live-portrait/live-portrait.wxml

@@ -2,11 +2,11 @@
   <view class="live_portrait_player">
     <vhall-player sdkInstance="{{sdkInstance}}" objectFit="{{playerObjectFit}}"></vhall-player>
   </view>
-  <view class="count_down_cover" wx:if="{{liveInfo.status==2}}">
+  <view class="count_down_cover" wx:if="{{webinarStatus==2}}">
     <start-countdown class="count_down" sdkInstance="{{sdkInstance}}"></start-countdown>
   </view>
   <!-- 聊天及其它菜单展示处理 -->
-  <vhall-chat class="live_portrait_chat {{liveInfo.status==5?'live_back':''}}" wx:if="{{showChat}}" mode="{{0}}" bind:commentCheck="commentCheck" sdkInstance="{{sdkInstance}}">
+  <vhall-chat class="live_portrait_chat {{webinarStatus==5?'live_back':''}}" wx:if="{{showChat}}" mode="{{0}}" bind:commentCheck="commentCheck" sdkInstance="{{sdkInstance}}">
     <view class="gift-button" wx:if="{{giftAuth}}" bindtap="showGiftList">
       <image class="gift-icon" src="https://cnstatic01.e.vhall.com/common-static/saas-wap/static/img/icon_gift.020803f8.png" mode="aspectFit"></image>
     </view>
@@ -46,7 +46,7 @@
   <!-- 我的邀请明细 -->
   <my-invite-detail sdkInstance="{{sdkInstance}}"></my-invite-detail>
   <!-- 直播开始提示弹框 -->
-  <vh-popup wx:if="{{liveInfo.status==2||liveInfo.status==3}}" visible="{{showStartDialog}}" showClose="{{false}}">
+  <vh-popup wx:if="{{webinarStatus==2||webinarStatus==3}}" visible="{{showStartDialog}}" showClose="{{false}}">
     <view class="start-dialog dialog-content">
       <view class="dialog-image">
         <image src="https://cnstatic01.e.vhall.com/common-static/images/mp/live_start.png" mode="widthFix" class="start_live_img" alt="开始直播"></image>

package/lib/components/live-portrait/live-portrait.wxss

@@ -1 +1 @@
-.live_portrait{display:flex;flex-direction:column;height:100%}.live_portrait .live_portrait_player{display:block;height:100%;width:100vw;z-index:0}.live_portrait .live_portrait_chat{bottom:0;height:32vh;left:0;position:absolute;right:0;z-index:100}.live_portrait .live_portrait_chat.live_back{bottom:80rpx}.live_portrait .live_portrait_chat.live_back .chat-edit{padding-bottom:0}.live_portrait .nochat-bar{bottom:constant(safe-area-inset-bottom);bottom:env(safe-area-inset-bottom);display:flex;flex-direction:row;height:32px;padding-bottom:10px;padding-right:16px;position:absolute;right:0;z-index:100}.live_portrait .live-portrait-tab{box-sizing:border-box;display:flex;flex:1;height:calc(100vh - 56.25vw);padding-bottom:env(safe-area-inset-bottom);width:100vw}.live_portrait .live-portrait-tab .tab-action{color:#fff!important}.live_portrait .live-portrait-tab .tab-content{height:100%;overflow:auto;width:100%}.live_portrait .live-portrait-tab .tab-chat{display:block;height:100%;width:100%}.live_portrait .live-portrait-tab .tab-introduction{display:block;padding:20rpx}.live_portrait .count_down{color:#fff;height:100vh;left:0;margin-top:-52rpx;position:fixed;top:0;top:50%;width:100vw;z-index:100}.live_portrait .menu_icon{align-items:center;background-color:rgba(0,0,0,.14);border-radius:50%;display:flex;height:2rem;justify-content:center;margin-right:16rpx;width:2rem}.live_portrait .menu_icon .menu_icon_image{height:100%;width:100%}.live_portrait .start_live_img{margin-bottom:20rpx;width:150rpx}.live_portrait .gift-display{left:0;position:fixed;top:60vh}.menu-dialog{box-sizing:border-box;height:70%;padding:20rpx}.menu-dialog .weui-half-screen-dialog__ft,.menu-dialog .weui-half-screen-dialog__hd{display:none}.menu-dialog .content-box{display:flex;height:100%}.menu-dialog .content-box .live-protrait-tab{flex:1}.menu-dialog .content-box .live-protrait-tab .tab-content{box-sizing:border-box;height:100%;overflow:auto}.count_down_cover{background-color:rgba(0,0,0,.5);height:100vh;left:0;position:fixed;top:0;width:100vw;z-index:100}.start-dialog{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;justify-content:center;padding-top:24rpx;width:520rpx}.start-dialog .light-button{border:none;color:#fb2626}.start-dialog .start-dialog-footer{margin-top:24rpx}.weui-dialog__btn{color:#fb2626!important}.dialog-content--expire{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;justify-content:center;padding-top:24rpx;width:520rpx}.dialog-content--expire .dialog-image{margin-bottom:24rpx}.dialog-content--expire .dialog-image .image-item{width:200rpx}.dialog-content--expire .dialog-footer{margin-top:36rpx}.gift-button{align-items:center;background:rgba(6,6,6,.25);border-radius:50%;display:flex;justify-content:center;margin-right:16rpx;position:relative}.cart-button,.gift-button,.gift-icon{height:2rem;width:2rem}.cart-button{align-items:center;background:rgba(6,6,6,.25);border-radius:50%;display:flex;justify-content:center;margin-right:16rpx;position:relative}.cart-button .cart-icon{height:2rem;margin-top:-.8rem;width:2rem}.cart-button .cart-badge{align-items:center;background-color:#ff4757;border-radius:16rpx;color:#fff;display:flex;font-size:.79rem;font-weight:700;height:32rpx;justify-content:center;min-width:32rpx;padding:0 8rpx;position:absolute;right:-8rpx;top:-8rpx}.product-list-popup{display:flex;flex-direction:column;max-height:70vh;width:100%}.product-list-popup .popup-header{align-items:center;border-bottom:1rpx solid #f0f0f0;display:flex;justify-content:space-between;padding:24rpx 32rpx}.product-list-popup .popup-header .popup-title{color:#333;font-size:1.14rem;font-weight:700}.product-list-popup .popup-header .popup-count{color:#999;font-size:.93rem}.product-list-popup .product-scroll{flex:1;max-height:calc(70vh - 80rpx)}
+.live_portrait{display:flex;flex-direction:column;height:100%;overflow:hidden}.live_portrait .live_portrait_player{display:block;height:100%;width:100vw;z-index:0}.live_portrait .live_portrait_chat{bottom:0;height:32vh;left:0;position:absolute;right:0;z-index:100}.live_portrait .live_portrait_chat.live_back{bottom:80rpx}.live_portrait .live_portrait_chat.live_back .chat-edit{padding-bottom:0}.live_portrait .nochat-bar{bottom:constant(safe-area-inset-bottom);bottom:env(safe-area-inset-bottom);display:flex;flex-direction:row;height:32px;padding-bottom:10px;padding-right:16px;position:absolute;right:0;z-index:100}.live_portrait .live-portrait-tab{box-sizing:border-box;display:flex;flex:1;height:calc(100vh - 56.25vw);padding-bottom:env(safe-area-inset-bottom);width:100vw}.live_portrait .live-portrait-tab .tab-action{color:#fff!important}.live_portrait .live-portrait-tab .tab-content{height:100%;overflow:auto;width:100%}.live_portrait .live-portrait-tab .tab-chat{display:block;height:100%;width:100%}.live_portrait .live-portrait-tab .tab-introduction{display:block;padding:20rpx}.live_portrait .count_down{color:#fff;height:100vh;left:0;margin-top:-52rpx;position:fixed;top:0;top:50%;width:100vw;z-index:100}.live_portrait .menu_icon{align-items:center;background-color:rgba(0,0,0,.14);border-radius:50%;display:flex;height:2rem;justify-content:center;margin-right:16rpx;width:2rem}.live_portrait .menu_icon .menu_icon_image{height:100%;width:100%}.live_portrait .start_live_img{margin-bottom:20rpx;width:150rpx}.live_portrait .gift-display{left:0;position:fixed;top:60vh}.menu-dialog{box-sizing:border-box;height:70%;padding:20rpx}.menu-dialog .weui-half-screen-dialog__ft,.menu-dialog .weui-half-screen-dialog__hd{display:none}.menu-dialog .content-box{display:flex;height:100%}.menu-dialog .content-box .live-protrait-tab{flex:1}.menu-dialog .content-box .live-protrait-tab .tab-content{box-sizing:border-box;height:100%;overflow:auto}.count_down_cover{background-color:rgba(0,0,0,.5);height:100vh;left:0;position:fixed;top:0;width:100vw;z-index:100}.start-dialog{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;justify-content:center;padding-top:24rpx;width:520rpx}.start-dialog .light-button{border:none;color:#fb2626}.start-dialog .start-dialog-footer{margin-top:24rpx}.weui-dialog__btn{color:#fb2626!important}.dialog-content--expire{align-items:center;box-sizing:border-box;display:flex;flex-direction:column;justify-content:center;padding-top:24rpx;width:520rpx}.dialog-content--expire .dialog-image{margin-bottom:24rpx}.dialog-content--expire .dialog-image .image-item{width:200rpx}.dialog-content--expire .dialog-footer{margin-top:36rpx}.gift-button{align-items:center;background:rgba(6,6,6,.25);border-radius:50%;display:flex;justify-content:center;margin-right:16rpx;position:relative}.cart-button,.gift-button,.gift-icon{height:2rem;width:2rem}.cart-button{align-items:center;background:rgba(6,6,6,.25);border-radius:50%;display:flex;justify-content:center;margin-right:16rpx;position:relative}.cart-button .cart-icon{height:2rem;margin-top:-.8rem;width:2rem}.cart-button .cart-badge{align-items:center;background-color:#ff4757;border-radius:16rpx;color:#fff;display:flex;font-size:.79rem;font-weight:700;height:32rpx;justify-content:center;min-width:32rpx;padding:0 8rpx;position:absolute;right:-8rpx;top:-8rpx}.product-list-popup{display:flex;flex-direction:column;max-height:70vh;width:100%}.product-list-popup .popup-header{align-items:center;border-bottom:1rpx solid #f0f0f0;display:flex;justify-content:space-between;padding:24rpx 32rpx}.product-list-popup .popup-header .popup-title{color:#333;font-size:1.14rem;font-weight:700}.product-list-popup .popup-header .popup-count{color:#999;font-size:.93rem}.product-list-popup .product-scroll{flex:1;max-height:calc(70vh - 80rpx)}

package/lib/components/lottery/lottery.wxml

@@ -53,7 +53,7 @@
     <view wx:if="{{showHistoryBadge}}" class="history-badge"></view>
 </view>
 <!-- 领奖弹框组件 -->
-<lottery-accept visible="{{showReceiveModal}}" lotteryId="{{currentLottery && (currentLottery.lottery_id || currentLottery.id)}}" sdkInstance="{{sdkInstance}}" publishWinner="{{currentLottery && currentLottery.publish_winner}}" bind:close="onReceiveModalClose" bind:success="onReceiveSuccess" bind:viewWinners="viewWinnersList"></lottery-accept>
+<lottery-accept visible="{{showReceiveModal}}" lotteryId="{{currentLottery ? (currentLottery.lottery_id || currentLottery.id) : ''}}" sdkInstance="{{sdkInstance}}" publishWinner="{{currentLottery && currentLottery.publish_winner}}" bind:close="onReceiveModalClose" bind:success="onReceiveSuccess" bind:viewWinners="viewWinnersList"></lottery-accept>
 <!-- 抽奖历史弹窗组件 -->
 <lottery-history visible="{{showHistory}}" winLotteryHistory="{{winLotteryHistory}}" bind:takeAward="onTakeAward" bind:close="onHistoryClose" bind:itemClick="onHistoryItemClick"></lottery-history>
 <!-- 奖池底部弹窗 -->
@@ -75,4 +75,4 @@
     </view>
 </view>
 <!-- 中奖名单弹窗组件 -->
-<lottery-winners visible="{{showWinnersList}}" lotteryId="{{currentLottery && (currentLottery.lottery_id || currentLottery.id)}}" sdkInstance="{{sdkInstance}}" bind:close="onWinnersClose"></lottery-winners>
+<lottery-winners visible="{{showWinnersList}}" lotteryId="{{currentLottery ? (currentLottery.lottery_id || currentLottery.id) : ''}}" sdkInstance="{{sdkInstance}}" bind:close="onWinnersClose"></lottery-winners>

package/lib/components/mall-reward/index.js

@@ -142,6 +142,7 @@ Component({
       this.unlistener = this.sdkInstance.on(obj);
     },
     async checkAndFetchMallRewardInfo(from, extra) {
+      this.sdkInstance.BRSAgent?.customLog(`checkAndFetchMallRewardInfo from=${from}`, JSON.stringify(extra));
       log.info('mall-reward checkAndFetchMallRewardInfo start');
       const mallRewardServer = this.sdkInstance.get('mallRewardServer');
       if (!mallRewardServer) return;

package/lib/components/player/extensions/observers.js

@@ -10,17 +10,17 @@ export function createObservers() {
           _that.setData({
             liveInfo,
           });
-          const options = _that.store.get('');
+          // const options = _that.store.get('');
           // console.log('liveInfo:', JSON.stringify(options));
-          _that.initVhallPlayer(options);
+          // _that.initVhallPlayer(options);
           _that.setHot();
         },
-        'liveInfo.status': (status) => {
+        webinarStatus: (status) => {
           _that.setData({
-            ['liveInfo.status']: status,
+            webinarStatus: status,
           });
+          _that.initVhallPlayer(_that.store.get(''));
           _that.setHot();
-          // 直播结束
           if (status === 3) {
             _that.destroy();
           }

package/lib/components/player/player.js

@@ -76,6 +76,11 @@ VeComponent({
       this.vhallPlayerCore?.destroy();
     },
     show() {
+      // 预约(webinarStatus===2)和结束(webinarStatus===3)状态不恢复上报，避免切后台/切前台把已停止的 30s 心跳重新拉起
+      if (this.data.webinarStatus === 2 || this.data.webinarStatus === 3) {
+        logger.debug('pageLifetimes show: live scheduled or ended, skip reporting resume');
+        return;
+      }
       logger.debug('pageLifetimes show');
       this.vhallPlayerCore?.resume();
     },

package/lib/components/player/player.wxml

@@ -7,7 +7,7 @@
     }
 </wxs>
 <view class='vhall-layout-root' style='{{_style}}'>
-  <player-main catchtap="onToggleControls" wx:if="{{liveInfo.status!=3}}" id='{{id}}' class='vhall-player-root' src='{{videoSrc}}' type='{{type}}' autoplay='{{autoplay}}' objectFit='{{objectFit}}' muted='{{mutedFlag}}' mode='{{liveDelayMode}}' pictureInPictureMode='{{pictureInPictureMode}}' poster='{{posterUrl}}' controls='{{controls}}' show-progress="{{showProgress}}" loop="{{loop}}" initialSeekTime='{{initialSeekTime}}' bindfullscreenchange='onfullscreenchange' bindpictureinpicturechange='onpictureinpicturechange' bindtimeupdate='ontimeupdate' bindplay='onplay' bindpause='onpause' bindended='onended' bindloadedmetadata='onloadedmetadata' binderror='onerror' bindwaiting='onwaiting' bindloadStart='onloadStart' bindreconnecting='onreconnecting'>
+  <player-main catchtap="onToggleControls" wx:if="{{webinarStatus!=3}}" id='{{id}}' class='vhall-player-root' src='{{videoSrc}}' type='{{type}}' autoplay='{{autoplay}}' objectFit='{{objectFit}}' muted='{{mutedFlag}}' mode='{{liveDelayMode}}' pictureInPictureMode='{{pictureInPictureMode}}' poster='{{posterUrl}}' controls='{{controls}}' show-progress="{{showProgress}}" loop="{{loop}}" initialSeekTime='{{initialSeekTime}}' bindfullscreenchange='onfullscreenchange' bindpictureinpicturechange='onpictureinpicturechange' bindtimeupdate='ontimeupdate' bindplay='onplay' bindpause='onpause' bindended='onended' bindloadedmetadata='onloadedmetadata' binderror='onerror' bindwaiting='onwaiting' bindloadStart='onloadStart' bindreconnecting='onreconnecting'>
     <block wx:if="{{type=='live'}}">
       <!-- 纯音频播放蒙层图片 -->
       <image wx:if='{{showAudioCover}}' class='vhall-player-audio-cover' mode='scaleToFill' src='https://cnstatic01.e.vhall.com/common-static/saas-watch/static/img/video.110b96d1.gif' />
@@ -38,9 +38,9 @@
     </block>
   </player-main>
   <slot name='vhall-player-01' />
-  <view wx:if="{{liveInfo.status==2||liveInfo.status==3}}" class="webinar_warn">
+  <view wx:if="{{webinarStatus==2||webinarStatus==3}}" class="webinar_warn">
     <image class="cover_img" src="{{liveInfo.coverImg}}" />
-    <view wx:if="{{liveInfo.status==3}}" class="webinar_status">
+    <view wx:if="{{webinarStatus==3}}" class="webinar_status">
       <image class="status-img" mode="widthFix" src="https://cnstatic01.e.vhall.com/common-static/images/mp/live_end.png" />
       <text class="status-text">直播已结束</text>
     </view>

package/lib/components/product/product-card/product-card.js

@@ -46,6 +46,7 @@ Component({
             const filteredProducts = val.filter(product => product.push_status === 1);
             // 最多显示3个商品卡片
             const products = filteredProducts.slice(0, 3);
+            this.properties.sdkInstance.get('logReportServer').report('116999', { stage: 'productCardUpdate', logData: products });
             this.setData({
               products: products
             });

package/lib/components/product/product-card/product-card.wxss

@@ -1 +1 @@
-.product-card-container{align-items:flex-end;bottom:180rpx;display:flex;flex-direction:column;gap:16rpx;position:fixed;right:20rpx;z-index:999}.product-card{animation:slideIn .3s ease-out forwards;background-color:#fff;border-radius:12rpx;box-shadow:0 4rpx 12rpx rgba(0,0,0,.15);opacity:0;overflow:hidden;position:relative;transform:translateX(100%);width:240rpx}.product-card:first-child{animation-delay:0s}.product-card:nth-child(2){animation-delay:.1s}.product-card:nth-child(3){animation-delay:.2s}@keyframes slideIn{0%{opacity:0;transform:translateX(100%)}to{opacity:1;transform:translateX(0)}}.product-card-badge{background-color:rgba(0,0,0,.6);border-radius:30rpx;color:#fff;font-size:.71rem;left:8rpx;padding:4rpx 20rpx;position:absolute;top:8rpx;z-index:10}.product-card-badge .product-card-badge-icon{height:20rpx}.product-card-close{color:#fff;font-size:1.14rem;padding:0 14rpx;position:absolute;right:0rpx;top:0rpx;z-index:10}.product-card-image{height:240rpx;position:relative;width:100%}.product-card-image .product-card-img{height:100%;object-fit:cover;width:100%}.product-card-info{padding:12rpx}.product-card-title{color:#333;display:block;font-size:.86rem;font-weight:500;margin-bottom:12rpx;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.product-card-price-container{align-items:center;background:#fb2626;border-radius:8rpx;color:#fff;display:flex;height:50rpx;justify-content:space-between;margin-top:12rpx;padding-left:10rpx}.product-card-buy{background-color:#ff4d4f;border-radius:6rpx;color:#fff;cursor:pointer;font-size:.71rem;padding:8rpx 16rpx}.product-card-mask{align-items:center;background-color:rgba(0,0,0,.4);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.product-card-mask-text{border-radius:20rpx;color:#fff;font-size:.86rem;padding:8rpx 16rpx}.product-card-disabled{opacity:.7}.product-card-disabled .product-card-price{color:#fff}.product-card-disabled .product-card-price-container{opacity:.6}.buy-icon{display:block;height:100%}.product-card-small{width:180rpx}.product-card-small .product-card-image{height:180rpx}.product-card-small .product-card-price-container{height:40rpx}.product-card-small .product-card-badge{font-size:.64rem;padding:3rpx 16rpx}.product-card-small .product-card-close{font-size:1rem;padding:0 10rpx}.product-card-small .buy-icon{display:none}
+.product-card-container{align-items:flex-end;bottom:180rpx;display:flex;flex-direction:column;gap:16rpx;position:fixed;right:20rpx;z-index:999}.product-card{background-color:#fff;border-radius:12rpx;box-shadow:0 4rpx 12rpx rgba(0,0,0,.15);overflow:hidden;position:relative;width:240rpx}.product-card-badge{background-color:rgba(0,0,0,.6);border-radius:30rpx;color:#fff;font-size:.71rem;left:8rpx;padding:4rpx 20rpx;position:absolute;top:8rpx;z-index:10}.product-card-badge .product-card-badge-icon{height:20rpx}.product-card-close{color:#fff;font-size:1.14rem;padding:0 14rpx;position:absolute;right:0rpx;top:0rpx;z-index:10}.product-card-image{height:240rpx;position:relative;width:100%}.product-card-image .product-card-img{height:100%;object-fit:cover;width:100%}.product-card-info{padding:12rpx}.product-card-title{color:#333;display:block;font-size:.86rem;font-weight:500;margin-bottom:12rpx;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.product-card-price-container{align-items:center;background:#fb2626;border-radius:8rpx;color:#fff;display:flex;height:50rpx;justify-content:space-between;margin-top:12rpx;padding-left:10rpx}.product-card-buy{background-color:#ff4d4f;border-radius:6rpx;color:#fff;cursor:pointer;font-size:.71rem;padding:8rpx 16rpx}.product-card-mask{align-items:center;background-color:rgba(0,0,0,.4);bottom:0;display:flex;justify-content:center;left:0;position:absolute;right:0;top:0}.product-card-mask-text{border-radius:20rpx;color:#fff;font-size:.86rem;padding:8rpx 16rpx}.product-card-disabled{opacity:.7}.product-card-disabled .product-card-price{color:#fff}.product-card-disabled .product-card-price-container{opacity:.6}.buy-icon{display:block;height:100%}.product-card-small{width:180rpx}.product-card-small .product-card-image{height:180rpx}.product-card-small .product-card-price-container{height:40rpx}.product-card-small .product-card-badge{font-size:.64rem;padding:3rpx 16rpx}.product-card-small .product-card-close{font-size:1rem;padding:0 10rpx}.product-card-small .buy-icon{display:none}

package/lib/components/product/product-list/product-list.js

@@ -50,6 +50,7 @@ Component({
       this.unsub = this.properties.sdkInstance.store.get({
         productList: (val) => {
           if (val) {
+            this.properties.sdkInstance.get('logReportServer').report('116999', { stage: 'productListUpdate', logData: val });
             this.setData({ productList: val });
           }
         }

package/lib/components/product/product-list/product-list.wxml

@@ -1,16 +1,8 @@
 <view class="product-container">
-  <view class="product-list">
+  <scroll-view scroll-y class="product-list">
     <view wx:if="{{productList.length === 0}}" class="product-empty">暂无商品</view>
     <view wx:else>
-      <product-item 
-        webinarId="{{webinarId}}"
-        wx:for="{{productList}}" 
-        wx:key="{{item.id}}" 
-        index="{{index}}"
-        product="{{item}}" 
-        bind:openDetail="openProductDetail"
-        bind:buyClick="onBuyClick"
-      />
+      <product-item webinarId="{{webinarId}}" wx:for="{{productList}}" wx:key="{{item.id}}" index="{{index}}" product="{{item}}" bind:openDetail="openProductDetail" bind:buyClick="onBuyClick" />
     </view>
-  </view>
+  </scroll-view>
 </view>

package/lib/components/signin/signin-dialog.js

@@ -127,6 +127,7 @@ Component({
         // 发起签到
         case 'sign_in_push':
           this.sdkInstance.BRSAgent?.customLog('sign_in_push');
+          this.sdkInstance.get('logReportServer').report('116999', { stage: "sign_in_push" });
           this.handleSigninPush(msg.data);
           break;
         // 结束签到

package/lib/pubComponents/error-page/index.js

@@ -1,3 +1,4 @@
+import { reloadCurrentPage } from '../../shared/mpUtils.js'
 const errorMap = {
   512002: {
     msg: '活动不存在或已删除'
@@ -121,26 +122,7 @@ Component({
   methods: {
     onTap() {
       if (this.data.code === 900004 && this.data.secondText > 0) return;
-      // 获取页面栈
-      const pageStack = getCurrentPages();
-      const currentPage = pageStack[pageStack.length - 1];
-      const route = currentPage.route;
-      const options = currentPage.options;
-
-      // 拼接路由参数
-      let queryStr = '';
-      const params = [];
-      for (const key in options) {
-        params.push(`${key}=${encodeURIComponent(options[key])}`);
-      }
-      if (params.length) {
-        queryStr = '?' + params.join('&');
-      }
-
-      // redirectTo：关闭当前页面，重新打开同页面，页面栈层级不变
-      wx.redirectTo({
-        url: `/${route}${queryStr}`
-      });
+      reloadCurrentPage();
     },
   },
 });

package/lib/sdk/config/index.js

@@ -1 +1 @@
-!function(){"use strict";var t={d:function(n,e){for(var o in e)t.o(e,o)&&!t.o(n,o)&&Object.defineProperty(n,o,{enumerable:!0,get:e[o]})},o:function(t,n){return Object.prototype.hasOwnProperty.call(t,n)},r:function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},n={};t.r(n),t.d(n,{_PLATFORM:function(){return o},envConfig:function(){return e}});const e={production:{BASE_URL:"https://open-api.vhall.com",VHALLYUN_API_BASE:"https://api.vhallyun.com",LOG_REPORT_BASE_URL:"https://dc.e.vhall.com/login",PUBLIC_KEY:"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0eUJFtW3vryA2NXx4M4f\n1w7dg3PHwOCA6Kx7JVfD/9eBGfqLhqsp+pg4AXG4PhuQx8EsV+sncQIiQO5J2//T\n3pO8LftDtCQztLnxnhq+BjhbFeswgfez2CwV2YKLTX2zyZ69T1Vu/M4H4gWSLeiV\n1FcH6xycA2+jG+EvOxSSItCKYT9EkB9BZSKf5RU7gM+qPtzdPtJP5vlsMCa0WnpY\nI6Qrmu/w9CZkL0397gUek9nBpPHkyPYg7ZijF3Gj8EqCMCVVTYpX96k4dd/Rz1em\ns4OSPF5jDsYZi58p+LmTcc3g7W9bD3QWWxzn47ie/Dh9LbnWfCqpGjUaHd3d42vR\ncQIDAQAB\n-----END PUBLIC KEY-----"},test:{BASE_URL:"https://test01-open-api.vhou.tv",VHALLYUN_API_BASE:"https://test01-api.vhallyun.com",LOG_REPORT_BASE_URL:"https://t-dc.e.vhall.com/login",PUBLIC_KEY:"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxWGCgHz2NLdVNa91CsNX\nFfCsxfgkTx738t3yMpuPYLL/5wwuWRrX7hBfNsfC+R5BW5b13ISzD001NNt+BWGK\np3V5fdWO18j9M/AhaTV2Ao/IpdP5huvVoNFVWPUQvX70FHu0sPVTev8ycAZHUpKx\n+mm83wxOpWBN5vAMJYx75pRCQfidb73XbOm6JXLJlxN91TUTrTiblxBhRwH0AQyr\ns9dUr+IJUZ1ea2uU3fkB4uYh7V/cHuNDMsJowfLtEU2+9IqEuJY4OwqX0qdfPF72\nsGMjCgghgL0z/7kv7Qe1+tOkJTBQTzODXBheGTVbF7hH2+5XuZsK2TfgBIew0I4k\n1wIDAQAB\n-----END PUBLIC KEY-----"}},o=19;module.exports=n}();
+"use strict";const envConfig={production:{BASE_URL:"https://open-api.vhall.com",VHALLYUN_API_BASE:"https://api.vhallyun.com",LOG_REPORT_BASE_URL:"https://dc.e.vhall.com/login",PUBLIC_KEY:"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0eUJFtW3vryA2NXx4M4f\n1w7dg3PHwOCA6Kx7JVfD/9eBGfqLhqsp+pg4AXG4PhuQx8EsV+sncQIiQO5J2//T\n3pO8LftDtCQztLnxnhq+BjhbFeswgfez2CwV2YKLTX2zyZ69T1Vu/M4H4gWSLeiV\n1FcH6xycA2+jG+EvOxSSItCKYT9EkB9BZSKf5RU7gM+qPtzdPtJP5vlsMCa0WnpY\nI6Qrmu/w9CZkL0397gUek9nBpPHkyPYg7ZijF3Gj8EqCMCVVTYpX96k4dd/Rz1em\ns4OSPF5jDsYZi58p+LmTcc3g7W9bD3QWWxzn47ie/Dh9LbnWfCqpGjUaHd3d42vR\ncQIDAQAB\n-----END PUBLIC KEY-----"},test:{BASE_URL:"https://test01-open-api.vhou.tv",VHALLYUN_API_BASE:"https://test01-api.vhallyun.com",LOG_REPORT_BASE_URL:"https://t-dc.e.vhall.com/login",PUBLIC_KEY:"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxWGCgHz2NLdVNa91CsNX\nFfCsxfgkTx738t3yMpuPYLL/5wwuWRrX7hBfNsfC+R5BW5b13ISzD001NNt+BWGK\np3V5fdWO18j9M/AhaTV2Ao/IpdP5huvVoNFVWPUQvX70FHu0sPVTev8ycAZHUpKx\n+mm83wxOpWBN5vAMJYx75pRCQfidb73XbOm6JXLJlxN91TUTrTiblxBhRwH0AQyr\ns9dUr+IJUZ1ea2uU3fkB4uYh7V/cHuNDMsJowfLtEU2+9IqEuJY4OwqX0qdfPF72\nsGMjCgghgL0z/7kv7Qe1+tOkJTBQTzODXBheGTVbF7hH2+5XuZsK2TfgBIew0I4k\n1wIDAQAB\n-----END PUBLIC KEY-----"}};exports._PLATFORM=19,exports.envConfig=envConfig;