vhall-mini-sdk 0.3.1 → 0.4.1

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

@@ -38,6 +38,10 @@ export function createMethods() {
             currentQuality: vodPlayInfo.currentQuality,
           });
           this.triggerEvent('ready', null);
+          // 暖场视频：自动播放由我们手动控制（受 advancePlayTime 时间限制约束），不直接依赖 video 的 autoplay
+          if (this.data.warmVideoIds.length > 0 && this.data.autoplay && this.canPlayWarmup()) {
+            this.play();
+          }
         } catch (e) {
           console.error(e);
         }
@@ -176,6 +180,7 @@ export function createMethods() {
         showLoading: false,
         showError: false,
         showPoster: false,
+        showBigPlay: false,
       });
     },
     /**
@@ -185,10 +190,15 @@ export function createMethods() {
     onpause(e) {
       console.log(`暂停pause事件：`, e.detail);
       this.triggerEvent('pause', e.detail);
-      this.setData({
+      const data = {
         playStatus: 'paused',
         pausedFlag: true,
-      });
+      };
+      // 暖场视频暂停时，只显示大播放按钮（不显示封面）
+      if (this.data.warmVideoIds.length > 0) {
+        data.showBigPlay = true;
+      }
+      this.setData(data);
     },
     /**
      * 结束事件（仅点播）
@@ -197,13 +207,69 @@ export function createMethods() {
     onended(e) {
       console.log(`播放ended事件：`, e.detail);
       this.triggerEvent('ended', e.detail);
+      // 暖场视频连续播放/循环播放处理
+      const { warmVideoIds, warmVideoIndex, warmupPlayerType } = this.data;
+      if (warmVideoIds.length === 0) return;
+      const isLast = warmVideoIndex >= warmVideoIds.length - 1;
+      if (!isLast) {
+        // 还有下一个，直接续播
+        this.playNextWarmVideo(warmVideoIndex + 1);
+      } else if (warmupPlayerType === 2) {
+        // 循环播放：回到第一个继续（单视频时即重播当前视频）
+        this.playNextWarmVideo(0);
+      } else {
+        // 单次播放（warmupPlayerType===1）播完最后一个，回到封面+大播放按钮
+        // 重置回第一个视频（仅更新地址，不自动播放，等用户点击大播放按钮）
+        this.setData({
+          showPoster: true,
+          showBigPlay: true,
+          playStatus: 'paused',
+          pausedFlag: true,
+          currentVodPlayTime: 0,
+        });
+        this.playNextWarmVideo(0, false);
+      }
+    },
+    /**
+     * 播放指定索引的暖场视频（连续/循环播放）
+     * @param {number} nextIndex 下一个视频索引
+     */
+    async playNextWarmVideo(nextIndex, autoPlay = true) {
+      const nextId = this.data.warmVideoIds[nextIndex];
+      // 更新调度实例中的点播 id
+      if (this.vhallPlayerCore && this.vhallPlayerCore.scheduler) {
+        this.vhallPlayerCore.scheduler.option.paasVodId = nextId;
+      }
+      // 切换视频前先隐藏自定义大播放按钮，避免切换间隙（尤其横屏全屏）
+      // video 原生居中播放按钮闪现时与自定义按钮重叠。
+      // 仅 autoPlay（续播/循环）时隐藏；autoPlay=false（单次播完重置地址）时保留外层设置的 showBigPlay
+      this.setData({ warmVideoIndex: nextIndex });
+      if (autoPlay) {
+        this.setData({ showBigPlay: false });
+      }
+      // 重新拉取播放地址并播放
+      if (this.data.type == 'vod') {
+        try {
+          const vodPlayInfo = await this.vhallPlayerCore.initVhallyunVod();
+          this.setData({
+            videoSrc: vodPlayInfo.videoSrc,
+            qualitys: vodPlayInfo.qualitys,
+            currentQuality: vodPlayInfo.currentQuality,
+          }, () => {
+            if (autoPlay) {
+              this.play();
+            }
+          });
+        } catch (err) {
+          console.error('播放下一个暖场视频失败', err);
+        }
+      }
     },
     /**
      * loadedmetadata事件（仅点播）
      * @param {*} e
      */
     onloadedmetadata(e) {
-      console.log(`播放loadedmetadata事件：`, e.detail);
       this.triggerEvent('loadedmetadata', e.detail);
       const { duration, width, height } = e.detail;
       this.setData({
@@ -249,6 +315,41 @@ export function createMethods() {
     onreconnecting(e) {
       this.triggerEvent('reconnecting', e.detail);
     },
+    /**
+     * 判断暖场视频当前是否到达可观看时间
+     * advancePlayTime===0：开播前随时可看（默认）
+     * advancePlayTime>0：开播前 advancePlayTime 秒才可观看
+     * @returns {boolean}
+     */
+    canPlayWarmup() {
+      const { advancePlayTime, webinarStartTime } = this.data;
+      if (advancePlayTime <= 0) return true; // 0 表示开播前随时可看
+      if (!webinarStartTime) return true; // 无开播时间则放行
+      const startTs = new Date(String(webinarStartTime).replace(/-/g, '/')).getTime();
+      if (isNaN(startTs)) return true;
+      const nowTs = Date.now();
+      // 距离开播还有多少秒
+      const remainSec = (startTs - nowTs) / 1000;
+      // remainSec <= 0 表示已开播；remainSec <= advancePlayTime 表示已进入可观看窗口
+      return remainSec <= advancePlayTime;
+    },
+    /**
+     * 点播封面上的播放按钮点击
+     */
+    handlePosterPlay() {
+      // 暖场视频：点击播放前校验可观看时间
+      if (this.data.warmVideoIds.length > 0 && !this.canPlayWarmup()) {
+        wx.showToast({
+          title: '尚未到暖场视频播放时间',
+          icon: 'none',
+        });
+        return;
+      }
+      this.play();
+      if (this.data.type == 'live') {
+        this.resume();
+      }
+    },
     startWatchExpire(info) {
       if (!info) return;
       const webinar = this.sdkInstance.store.get('watchInitData.webinar');

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

@@ -10,18 +10,16 @@ export function createObservers() {
           _that.setData({
             liveInfo,
           });
-          // const options = _that.store.get('');
-          // console.log('liveInfo:', JSON.stringify(options));
-          // _that.initVhallPlayer(options);
           _that.setHot();
         },
         webinarStatus: (status) => {
-          _that.setData({
-            webinarStatus: status,
-          });
+          console.log('webinarStatus', status);
+          // 直播状态变化处理
+          _that.setData({ webinarStatus: status });
           _that.initVhallPlayer(_that.store.get(''));
           _that.setHot();
           if (status === 3) {
+            // 直播结束
             _that.destroy();
           }
         },
@@ -85,10 +83,17 @@ export function createObservers() {
     'posterOption.**': function (option) {
       const { enable, url } = option;
       if (enable && url.length > 0) {
-        this.setData({
+        const data = {
           showPoster: true,
           posterUrl: url,
-        });
+        };
+        // 暖场视频：未到可观看时间时不显示大播放按钮
+        if (this.data.warmVideoIds.length > 0) {
+          data.showBigPlay = this.canPlayWarmup ? this.canPlayWarmup() : true;
+        } else {
+          data.showBigPlay = true;
+        }
+        this.setData(data);
       }
     },
     audioMode: function (audioMode) {

package/lib/components/player/player.wxml

@@ -7,7 +7,7 @@
     }
 </wxs>
 <view class='vhall-layout-root' style='{{_style}}'>
-  <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'>
+  <player-main catchtap="onToggleControls" wx:if="{{webinarStatus!=3}}" id='{{id}}' class='vhall-player-root' src='{{videoSrc}}' type='{{type}}' autoplay='{{isWarmVideo ? false : autoplay}}' objectFit='{{objectFit}}' muted='{{mutedFlag}}' mode='{{liveDelayMode}}' pictureInPictureMode='{{pictureInPictureMode}}' poster='{{type=="vod" ? "" : posterUrl}}' controls='{{controls}}' show-progress="{{isWarmVideo ? false : showProgress}}" show-bottom-progress="{{isWarmVideo ? false : showBottomProgress}}" show-center-play-btn="{{!isWarmVideo}}" 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' />
@@ -33,14 +33,25 @@
       <online-hot wx:if="{{!controlsHiddenFlag}}" fullscreen="{{fullscreenFlag}}" showPerson="{{showPerson}}" personValue="{{personValue}}" showHot="{{showHot}}" hotValue="{{hotValue}}"></online-hot>
     </block>
     <block wx:else>
-      <!-- 点播：在线人数和热度。 点播使用的video原生控制栏，没法判断展示还是隐藏状态 -->
-      <online-hot fullscreen="{{fullscreenFlag}}" showPerson="{{showPerson}}" personValue="{{personValue}}" showHot="{{showHot}}" hotValue="{{hotValue}}"></online-hot>
+      <!-- 预告||点播||回放：自定义封面（铺满），不使用 video 原生 poster -->
+      <vhall-player-poster wx:if="{{showPoster && tools.canShow(ignores, 'vhall-player-poster')}}" url='{{posterUrl}}' />
+      <!-- 预告||点播||回放：封面上的居中播放按钮（可独立于封面显示，如暂停时） -->
+      <view class="vod-poster-play" wx:if="{{showBigPlay}}" catchtap="handlePosterPlay">
+        <view class="play-triangle"></view>
+      </view>
+      <!-- 回放：在线人数和热度。 点播使用的video原生控制栏，没法判断展示还是隐藏状态 -->
+      <online-hot wx:if="{{webinarStatus==5}}" fullscreen="{{fullscreenFlag}}" showPerson="{{showPerson}}" personValue="{{personValue}}" showHot="{{showHot}}" hotValue="{{hotValue}}"></online-hot>
     </block>
   </player-main>
   <slot name='vhall-player-01' />
-  <view wx:if="{{webinarStatus==2||webinarStatus==3}}" class="webinar_warn">
+  <!-- 直播预告 && 无暖场视频 -->
+  <view wx:if="{{webinarStatus==2 && !isWarmVideo }}" class="webinar_not_live">
     <image class="cover_img" src="{{liveInfo.coverImg}}" />
-    <view wx:if="{{webinarStatus==3}}" class="webinar_status">
+  </view>
+  <!-- 直播结束 -->
+  <view wx:elif="{{ webinarStatus==3}}" class="webinar_not_live">
+    <image class="cover_img" src="{{liveInfo.coverImg}}" />
+    <view 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/player/player.wxss

@@ -1 +1 @@
-.vhall-layout-root{height:100%;transition:width .3s ease-in-out,height .3s ease-in-out;width:100%}.webinar_warn{align-items:center;background-color:rgba(0,0,0,.9);bottom:0;color:#fff;display:flex;font-size:14px;height:100%;justify-content:center;left:0;position:relative;right:0;top:0}.webinar_warn .cover_img{height:100%;position:absolute;width:100%;z-index:1}.webinar_warn .webinar_status{align-items:center;background-color:rgba(0,0,0,.6);bottom:0;display:flex;flex-direction:column;justify-content:center;left:0;position:absolute;right:0;text-align:center;top:0;z-index:2}.webinar_warn .webinar_status .status-img{display:block;margin-left:-10px;width:140rpx}.webinar_warn .webinar_status .status-text{display:block;font-size:1rem;padding-top:10px}.vhall-player-audio-cover{height:100%;left:0;position:absolute;top:0;width:100%}
+.vhall-layout-root{height:100%;transition:width .3s ease-in-out,height .3s ease-in-out;width:100%}.webinar_not_live{align-items:center;background-color:rgba(0,0,0,.9);bottom:0;color:#fff;display:flex;font-size:14px;height:100%;justify-content:center;left:0;position:relative;right:0;top:0}.webinar_not_live .cover_img{height:100%;position:absolute;width:100%;z-index:1}.webinar_not_live .webinar_status{align-items:center;background-color:rgba(0,0,0,.6);bottom:0;display:flex;flex-direction:column;justify-content:center;left:0;position:absolute;right:0;text-align:center;top:0;z-index:2}.webinar_not_live .webinar_status .status-img{display:block;margin-left:-10px;width:140rpx}.webinar_not_live .webinar_status .status-text{display:block;font-size:1rem;padding-top:10px}.vhall-player-audio-cover{height:100%;left:0;position:absolute;top:0;width:100%}.vod-poster-play{align-items:center;background:rgba(0,0,0,.45);border-radius:50%;display:flex;height:140rpx;justify-content:center;left:50%;position:absolute;top:50%;transform:translate(-50%,-50%);width:140rpx;z-index:3}.vod-poster-play .play-triangle{border-color:transparent transparent transparent #fff;border-style:solid;border-width:30rpx 0 30rpx 48rpx;height:0;margin-left:12rpx;width:0}

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

@@ -83,6 +83,13 @@ Component({
         wx.navigateTo({
           url: appendParamsToPath(product?.mini_program_config?.mini_program_path, { webinarId })
         });
+
+        this.properties.sdkInstance?.get('productServer')?.reportGoodsView({
+          goods_id: product.goods_id,
+          third_goods_id: product.third_goods_id,
+          act: 'popup_click',
+          notice_type: 'buy'
+        });
       } else if (product.buy_type === 1) {
         // 触发购买事件，由父组件显示下单弹窗
         this.triggerEvent('buyClick', product);
@@ -106,4 +113,5 @@ Component({
       });
     }
   }
-});
+});
+

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

@@ -1,45 +1,38 @@
 <view class="product-card-container">
   <block wx:for="{{products}}" wx:key="{{item.goods_id}}">
-    <view
-      class="product-card {{(item.sale_status === 0 || item.covered_status === 1) ? 'product-card-disabled' : ''}} {{products.length > 1 ? 'product-card-small' : ''}}"
-    >
+    <view class="product-card {{(item.sale_status === 0 || item.covered_status === 1) ? 'product-card-disabled' : ''}} {{products.length > 1 ? 'product-card-small' : ''}}">
       <!-- 讲解中徽章 -->
       <view class="product-card-badge">
         <image class="product-card-badge-icon" src="https://cnstatic01.e.vhall.com/common-static/saas-wap/static/img/live.b07d13f4.gif" mode="heightFix"></image>
         讲解中
       </view>
-      
       <!-- 关闭按钮 -->
-      <view class="product-card-close" bindtap="onCloseCard" data-product-id="{{item.goods_id}}">x</view>
-      
+      <view class="product-card-close" bindtap="onCloseCard" data-product-id="{{item.goods_id}}">
+        &#10005;
+      </view>
       <!-- 商品图片（点击打开详情） -->
       <view class="product-card-image" bindtap="onCardClick" data-index="{{index}}">
-        <image class="product-card-img"
-          src="{{item.cover_img || 'https://cnstatic01.e.vhall.com/common-static/images/default_avatar.png'}}" 
-          mode="aspectFill"
-        ></image>
+        <image class="product-card-img" src="{{item.cover_img || 'https://cnstatic01.e.vhall.com/common-static/images/default_avatar.png'}}" mode="aspectFill"></image>
         <!-- 已抢光遮罩层 -->
         <view wx:if="{{item.sale_status === 0}}" class="product-card-mask">
           <text class="product-card-mask-text">已抢光</text>
         </view>
       </view>
-      
       <!-- 商品信息 -->
       <view class="product-card-info">
         <!-- 商品名称（点击打开详情） -->
-        <text class="product-card-title" bindtap="onCardClick" data-index="{{index}}">{{item.name || '商品名称'}}</text>
-        
+        <view class="product-card-title" bindtap="onCardClick" data-index="{{index}}">
+          {{item.name || '商品名称'}}
+        </view>
         <!-- 价格和购买按钮 -->
         <view class="product-card-price-container" bindtap="onBuyClick" data-index="{{index}}">
-
           <block wx:if="{{item.covered_status === 1}}">
             <text class="product-card-price">¥？</text>
           </block>
           <block wx:else>
             <text class="product-card-price">¥{{item.discount_price || item.price || 0}}</text>
           </block>
-          
-          <image class="buy-icon" src="//cnstatic01.e.vhall.com/common-static/saas-wap/static/img/rob.4306d2b5.png" mode="heightFix" ></image>
+          <image class="buy-icon" src="//cnstatic01.e.vhall.com/common-static/saas-wap/static/img/rob.4306d2b5.png" mode="heightFix"></image>
         </view>
       </view>
     </view>

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{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}
+.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{align-items:center;background:rgba(0,0,0,.6);border-radius:50%;color:#fff;display:flex;font-size:24rpx;height:36rpx;justify-content:center;position:absolute;right:4rpx;top:8rpx;width:36rpx;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{-webkit-box-orient:vertical;-webkit-line-clamp:2;color:#333;display:-webkit-box;font-size:24rpx;font-weight:500;margin-bottom:12rpx;overflow:hidden}.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-detail/product-detail.js

@@ -103,6 +103,13 @@ Component({
           url: appendParamsToPath(product?.mini_program_config?.mini_program_path, { webinarId })
         });
         this.closeDetail();
+
+        this.properties.sdkInstance?.get('productServer')?.reportGoodsView({
+          goods_id: product.goods_id,
+          third_goods_id: product.third_goods_id,
+          act: 'popup_click',
+          notice_type: 'buy'
+        });
       } else if (product.buy_type === 1) {
         // 先关闭详情弹框
         this.closeDetail();
@@ -124,4 +131,5 @@ Component({
       });
     }
   }
-});
+});
+

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

@@ -14,6 +14,11 @@ Component({
     webinarId: {
       type: String,
       value: 0
+    },
+    // SDK实例
+    sdkInstance: {
+      type: Object,
+      value: null,
     }
   },
   data: {
@@ -40,6 +45,13 @@ Component({
         wx.navigateTo({
           url: appendParamsToPath(product?.mini_program_config?.mini_program_path, { webinarId })
         });
+
+        this.properties.sdkInstance?.get('productServer')?.reportGoodsView({
+          goods_id: product.goods_id,
+          third_goods_id: product.third_goods_id,
+          act: 'popup_click',
+          notice_type: 'buy'
+        });
       } else if (product.buy_type === 1) {
         // 触发购买事件，由父组件显示下单弹窗
         this.triggerEvent('buyClick', product);
@@ -53,4 +65,5 @@ Component({
       }
     }
   }
-});
+});
+

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

@@ -1 +1 @@
-.product-image{border-radius:10rpx;height:180rpx;margin-right:20rpx;overflow:hidden;position:relative;width:180rpx}.product-index{border-radius:8rpx 0 8rpx 0;color:#fff;font-size:1rem;height:40rpx;padding:0 16rpx;z-index:1}.product-index,.product-mask{align-items:center;background-color:rgba(0,0,0,.6);display:flex;justify-content:center;left:0;position:absolute;top:0}.product-mask{bottom:0;right:0;z-index:2}.product-mask-text{color:#fff;font-size:1rem}.buy-btn.disabled{cursor:not-allowed;opacity:.6}.covered-price{color:#999;font-size:1rem;margin-bottom:10rpx}.product-image image{height:100%;object-fit:cover;width:100%}.product-info{display:flex;flex:1;flex-direction:column;justify-content:space-between;width:0}.product-name{color:#333;font-size:1.12rem;line-height:1.43rem}.product-desc,.product-name{-webkit-line-clamp:2;-webkit-box-orient:vertical;display:-webkit-box;overflow:hidden;text-overflow:ellipsis}.product-desc{color:#666;font-size:.9rem}.price-container{align-items:baseline;display:flex}.product-discount-price{color:#fb2626;font-size:1.14rem}.product-original-price{color:#999;font-size:.86rem;text-decoration:line-through}.product-price{color:#fb2626;font-size:1.14rem}.buy-btn{background-color:#fb2626;border-radius:40rpx;bottom:20rpx;color:#fff;font-size:.86rem;padding:10rpx 32rpx;position:absolute;right:20rpx}.product-item{border-bottom:1rpx solid #f0f0f0;cursor:pointer;display:flex;padding:20rpx 0;position:relative}.product-item:last-child{border-bottom:none}.product-sales{color:#999;font-size:.86rem}.product-badge{align-items:center;background-color:rgba(0,0,0,.6);bottom:0;color:#fff;display:flex;font-size:.71rem;justify-content:center;left:0;padding:8rpx;position:absolute;right:0;text-align:center;z-index:5}.product-badge-text{display:inline-block}
+.product-image{border-radius:10rpx;height:180rpx;margin-right:20rpx;overflow:hidden;position:relative;width:180rpx}.product-index{border-radius:8rpx 0 8rpx 0;color:#fff;font-size:1rem;height:40rpx;padding:0 16rpx;z-index:1}.product-index,.product-mask{align-items:center;background-color:rgba(0,0,0,.6);display:flex;justify-content:center;left:0;position:absolute;top:0}.product-mask{bottom:0;right:0;z-index:2}.product-mask-text{color:#fff;font-size:1rem}.buy-btn.disabled{cursor:not-allowed;opacity:.6}.covered-price{color:#999;font-size:1rem;margin-bottom:10rpx}.product-image image{height:100%;object-fit:cover;width:100%}.product-info{display:flex;flex:1;flex-direction:column;justify-content:space-between;width:0}.product-name{color:#333;font-size:1.12rem;line-height:1.43rem}.product-desc,.product-name{-webkit-line-clamp:2;-webkit-box-orient:vertical;display:-webkit-box;overflow:hidden;text-overflow:ellipsis}.product-desc{color:#666;font-size:.9rem}.price-container{align-items:baseline;display:flex;line-height:1.8}.product-discount-price{color:#fb2626;font-size:1.14rem}.product-original-price{color:#999;font-size:.86rem;text-decoration:line-through}.product-price{color:#fb2626;font-size:1.14rem}.buy-btn{background-color:#fb2626;border-radius:40rpx;bottom:20rpx;color:#fff;font-size:.86rem;padding:10rpx 32rpx;position:absolute;right:20rpx}.product-item{border-bottom:1rpx solid #f0f0f0;cursor:pointer;display:flex;padding:20rpx 0;position:relative}.product-item:last-child{border-bottom:none}.product-sales{color:#999;font-size:.86rem}.product-badge{align-items:center;background-color:rgba(0,0,0,.6);bottom:0;color:#fff;display:flex;font-size:.71rem;justify-content:center;left:0;padding:8rpx;position:absolute;right:0;text-align:center;z-index:5}.product-badge-text{display:inline-block}

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

@@ -2,7 +2,7 @@
   <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}}" sdkInstance="{{ sdkInstance }}" bind:openDetail="openProductDetail" bind:buyClick="onBuyClick" />
     </view>
   </scroll-view>
 </view>

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

@@ -48,7 +48,7 @@ Component({
   },
   observers: {
     // 监听显示状态变化（兼容旧用法）
-    show: function(show) {
+    show: function (show) {
       if (show) {
         // 重置数量
         this.setData({
@@ -62,11 +62,11 @@ Component({
       }
     },
     // 监听数量变化
-    quantity: function(val) {
+    quantity: function (val) {
       this.updateAmount();
     },
     // 监听商品变化
-    product: function(newVal) {
+    product: function (newVal) {
       if (newVal) {
         this.updateAmount();
       }
@@ -89,7 +89,7 @@ Component({
 
       try {
         const res = await wxApi.sendGet(`/v3/goods/webinar-setting/get-info?webinar_id=${webinarId}`);
-        
+
         if (res && res.code === 200 && res.data) {
           this.setData({
             enablePhone: res.data.enable_phone || 0,
@@ -126,7 +126,7 @@ Component({
       const product = this.properties.product;
       const quantity = this.data.quantity;
       const price = parseFloat(product.discount_price || product.price || 0);
-      
+
       // 确保价格是有效数字
       const validPrice = isNaN(price) ? 0 : price;
       const subtotal = validPrice * quantity;
@@ -201,6 +201,13 @@ Component({
           url: appendParamsToPath(product?.mini_program_config?.mini_program_path, { webinarId })
         });
         this.closeOrder();
+
+        this.properties.sdkInstance?.get('productServer')?.reportGoodsView({
+          goods_id: product.goods_id,
+          third_goods_id: product.third_goods_id,
+          act: 'popup_click',
+          notice_type: 'buy'
+        });
         return;
       }
 
@@ -292,7 +299,7 @@ Component({
 
       try {
         wx.showLoading({ title: '提交中...' });
-        
+
         const res = await wxApi.sendPost('/v3/goods/order/create', params);
 
         wx.hideLoading();
@@ -330,7 +337,7 @@ Component({
         });
         return;
       }
-      
+
       let payParams;
       try {
         payParams = JSON.parse(orderInfo.ext);
@@ -346,12 +353,12 @@ Component({
 
       try {
         wx.showLoading({ title: '支付中...' });
-        
+
         // 使用 await 方式，不使用 success/fail 回调
         const result = await wx.requestPayment(payParams);
 
         wx.hideLoading();
-        
+
         if (result && result.errMsg === 'requestPayment:ok') {
           // 支付成功
           wx.showToast({
@@ -359,10 +366,10 @@ Component({
             icon: 'success',
             duration: 2000
           });
-          
+
           // 关闭订单页面
           this.closeOrder();
-          
+
           // 触发支付成功事件
           this.triggerEvent('paySuccess', {
             product: this.properties.product,
@@ -374,7 +381,7 @@ Component({
       } catch (error) {
         wx.hideLoading();
         console.error('支付失败:', error);
-        
+
         if (error && error.errMsg && error.errMsg.includes('cancel')) {
           wx.showToast({
             title: '已取消支付',
@@ -391,4 +398,4 @@ Component({
       }
     }
   }
-});
+});

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

@@ -1 +1 @@
-.order-mask{align-items:flex-end;background-color:rgba(0,0,0,.5);bottom:0;display:flex;left:0;position:fixed;right:0;top:0;z-index:1000}.order-container{background-color:#fff;border-radius:24rpx 24rpx 0 0;display:flex;flex-direction:column;max-height:80vh;width:100%}.order-header{align-items:center;border-bottom:1rpx solid #f5f5f5;display:flex;justify-content:space-between}.order-title{color:#333;font-size:1.29rem;font-weight:700}.order-close{align-items:center;display:flex;height:60rpx;justify-content:center;width:60rpx}.close-icon{color:#999;font-size:1.71rem;line-height:1}.order-content{box-sizing:border-box;flex:1;overflow-y:auto;padding:30rpx 40rpx}.product-section{margin-bottom:30rpx}.product-card{background-color:#fafafa;border-radius:16rpx;display:flex;padding:20rpx}.product-img{border-radius:12rpx;height:160rpx;margin-right:20rpx;width:160rpx}.product-detail{display:flex;flex:1;flex-direction:column;justify-content:space-between}.product-name{-webkit-line-clamp:2;-webkit-box-orient:vertical;color:#333;display:-webkit-box;font-size:1.14rem;font-weight:500;line-height:1.43rem;overflow:hidden}.product-desc{color:#999;font-size:.93rem;margin-top:8rpx}.product-price-row{align-items:baseline;display:flex;margin-top:12rpx}.product-price{color:#fb2626;font-size:1.29rem;font-weight:700}.product-discount-price{color:#fb2626;font-size:1.14rem}.product-original-price{color:#999;font-size:.86rem;margin-left:12rpx;text-decoration:line-through}.covered-price{color:#999;font-size:1rem}.quantity-section{align-items:center;border-bottom:1rpx solid #f5f5f5;display:flex;justify-content:space-between;padding:20rpx 0}.section-title{color:#333;font-size:1.07rem}.qty-btn,.quantity-control{align-items:center;display:flex}.qty-btn{background-color:#f5f5f5;border-radius:50%;height:56rpx;justify-content:center;width:56rpx}.qty-btn .qty-btn-text{color:#333;font-size:1.29rem;line-height:1}.qty-value{color:#333;font-size:1.14rem;margin:0 20rpx;min-width:60rpx;text-align:center}.amount-section{margin-top:20rpx}.amount-row{align-items:center;display:flex;justify-content:space-between;padding:16rpx 0}.amount-row.total{border-top:1rpx dashed #e0e0e0;margin-top:10rpx;padding-top:26rpx}.amount-label{color:#666;font-size:1rem}.amount-row.total .amount-label{color:#333;font-size:1.07rem}.amount-value{color:#333;font-size:1rem}.amount-row.total .amount-value{color:#fb2626;font-size:1.29rem;font-weight:700}.order-footer{align-items:center;background-color:#fff;border-top:1rpx solid #f5f5f5;display:flex;justify-content:space-between;padding:24rpx 40rpx}.footer-left{align-items:baseline;display:flex}.footer-label{color:#666;font-size:1rem}.footer-total{color:#fb2626;font-size:1.43rem;font-weight:700;margin-left:8rpx}.submit-btn{background:linear-gradient(135deg,#fb2626,#ff6b6b);border-radius:48rpx;color:#fff;font-size:1.14rem;font-weight:500;padding:24rpx 80rpx}.submit-btn:active{opacity:.8}.user-info-section{border-top:1rpx solid #f5f5f5;margin-top:30rpx;padding-top:30rpx}.input-item{align-items:center;border-bottom:1rpx solid #f5f5f5;display:flex;padding:20rpx 0}.input-item:last-child{border-bottom:none}.input-item-top{align-items:flex-start}.input-label{color:#333;font-size:1.07rem;margin-right:20rpx;text-align:right;width:138rpx}.input-value,.textarea-value{color:#333;flex:1;font-size:1.07rem}.textarea-value{min-height:100rpx}.required-mark{color:#fb2626;margin-left:4rpx}
+.order-mask{align-items:flex-end;background-color:rgba(0,0,0,.5);bottom:0;display:flex;left:0;position:fixed;right:0;top:0;z-index:1000}.order-container{background-color:#fff;border-radius:24rpx 24rpx 0 0;display:flex;flex-direction:column;max-height:80vh;width:100%}.order-header{align-items:center;border-bottom:1rpx solid #f5f5f5;display:flex;justify-content:space-between}.order-title{color:#333;font-size:1.29rem;font-weight:700}.order-close{align-items:center;display:flex;height:60rpx;justify-content:center;width:60rpx}.close-icon{color:#999;font-size:1.71rem;line-height:1}.order-content{box-sizing:border-box;flex:1;overflow-y:auto;padding:24rpx 12rpx}.product-section{margin-bottom:30rpx}.product-card{background-color:#fafafa;border-radius:16rpx;display:flex;padding:12rpx}.product-img{border-radius:12rpx;height:160rpx;margin-right:20rpx;width:160rpx}.product-detail{display:flex;flex:1;flex-direction:column;justify-content:space-between}.product-name{-webkit-line-clamp:2;-webkit-box-orient:vertical;color:#333;display:-webkit-box;font-size:1.14rem;font-weight:500;line-height:1.43rem;overflow:hidden}.product-desc{color:#999;font-size:.93rem;margin-top:8rpx}.product-price-row{align-items:baseline;display:flex;margin-top:12rpx}.product-price{color:#fb2626;font-size:1.29rem;font-weight:700}.product-discount-price{color:#fb2626;font-size:1.14rem}.product-original-price{color:#999;font-size:.86rem;margin-left:12rpx;text-decoration:line-through}.covered-price{color:#999;font-size:1rem}.quantity-section{align-items:center;border-bottom:1rpx solid #f5f5f5;display:flex;justify-content:space-between;padding:20rpx 0}.section-title{color:#333;font-size:1.07rem}.qty-btn,.quantity-control{align-items:center;display:flex}.qty-btn{background-color:#f5f5f5;border-radius:50%;height:56rpx;justify-content:center;width:56rpx}.qty-btn .qty-btn-text{color:#333;font-size:1.29rem;line-height:1}.qty-value{color:#333;font-size:1.14rem;margin:0 20rpx;min-width:60rpx;text-align:center}.amount-section{margin-top:20rpx}.amount-row{align-items:center;display:flex;justify-content:space-between;padding:16rpx 0}.amount-row.total{border-top:1rpx dashed #e0e0e0;margin-top:10rpx;padding-top:26rpx}.amount-label{color:#666;font-size:1rem}.amount-row.total .amount-label{color:#333;font-size:1.07rem}.amount-value{color:#333;font-size:1rem}.amount-row.total .amount-value{color:#fb2626;font-size:1.29rem;font-weight:700}.order-footer{align-items:center;background-color:#fff;border-top:1rpx solid #f5f5f5;display:flex;justify-content:space-between;padding:24rpx 12rpx}.footer-left{align-items:baseline;display:flex}.footer-label{color:#666;font-size:1rem}.footer-total{color:#fb2626;font-size:1.43rem;font-weight:700;margin-left:8rpx}.submit-btn{background:linear-gradient(135deg,#fb2626,#ff6b6b);border-radius:48rpx;color:#fff;font-size:32rpx;font-weight:500;padding:12rpx 20rpx}.submit-btn:active{opacity:.8}.user-info-section{border-top:1rpx solid #f5f5f5;margin-top:30rpx;padding-top:30rpx}.input-item{align-items:center;border-bottom:1rpx solid #f5f5f5;display:flex;padding:20rpx 0}.input-item:last-child{border-bottom:none}.input-item-top{align-items:flex-start}.input-label{color:#333;font-size:1.07rem;margin-right:20rpx;text-align:right;width:160rpx}.input-value,.textarea-value{color:#333;flex:1;font-size:1.07rem}.textarea-value{min-height:100rpx}.required-mark{color:#fb2626;margin-left:4rpx}

package/lib/pubComponents/countdown/countdown.wxss

@@ -1 +1 @@
-.countdown-container{gap:8rpx;justify-content:center;padding:16rpx}.countdown-container,.countdown-item{align-items:baseline;display:flex}.number{font-size:2.14rem;font-weight:600;margin:0 10rpx}.unit{font-size:.86rem}
+.countdown-container{gap:8rpx;justify-content:center}.countdown-container,.countdown-item{align-items:baseline;display:flex}.number{font-size:56rpx;font-weight:600;margin:0 10rpx}.unit{font-size:.86rem}

package/lib/pubComponents/popup/popup.js

@@ -129,6 +129,7 @@ Component({
         popupManager.unregisterZIndex(this.data.currentZIndex);
         this.setData({
           currentZIndex: null,
+          zIndex: 0,
         });
       }
     },