vhall-mini-sdk 0.3.0 → 0.4.0

package/lib/components/lottery/lottery-shake/lottery-shake.js

@@ -1,11 +1,10 @@
 Component({
   properties: {
     remark: { type: String, value: '' },
-    // 抽奖 ID：用于区分不同抽奖的缓存 key
     lotteryId: { type: String, value: '' },
+    lotteryType: { type: Number, value: 0 },
     autoplay: { type: Boolean, value: false },
     loop: { type: Boolean, value: false },
-    // 外部控制：true 开始摇晃，false 平滑停止（与转盘/老虎机一致）
     running: {
       type: Boolean,
       value: false,
@@ -85,7 +84,7 @@ Component({
     },
 
     // 开始摇晃动画
-    spin() {
+    spin(triggerDraw = false) {
       // 进行中或减速停止阶段，忽略重复点击，避免动画重复执行 / 重复上报抽奖
       if (this.data.spinning || this.data.stopping) return;
       this._clearTimers();
@@ -107,7 +106,9 @@ Component({
       this._applyShake();
       // 物理弹跳模拟
       this._animFrame();
-      this.triggerEvent('draw');
+      if (triggerDraw) {
+        this.triggerEvent('draw');
+      }
     },
 
     // 每帧更新球位置（物理碰撞 + 持续滚动 / 停止落定）
@@ -322,7 +323,7 @@ Component({
 
     onDrawBtnTap() {
       if (this.data.spinning) return;
-      this.spin();
+      this.spin(true);
     },
   },
 });

package/lib/components/lottery/lottery-shake/lottery-shake.wxml

@@ -41,7 +41,12 @@
     <!-- 抽奖按钮 -->
     <view class="shake-btn-wrap">
       <view class="shake-draw-btn {{spinning?'shaking':''}} {{stopped?'btn-done':''}}" bindtap="onDrawBtnTap">
-        <text class="draw-btn-text">{{stopped ? '开奖完成' : (spinning ? '摇奖中...' : '点我抽奖')}}</text>
+        <block wx:if="{{lotteryType === 8}}">
+          <text class="draw-btn-text">发送口令</text>
+        </block>
+        <block wx:else>
+          <text class="draw-btn-text">{{stopped ? '开奖完成' : (spinning ? '摇奖中...' : '点我抽奖')}}</text>
+        </block>
       </view>
     </view>
   </view>

package/lib/components/lottery/lottery-slot/lottery-slot.js

@@ -4,11 +4,14 @@ Component({
       type: String,
       value: '2',
     },
-    // 抽奖 ID：用于区分不同抽奖的缓存 key
     lotteryId: {
       type: String,
       value: '',
     },
+    lotteryType: {
+      type: Number,
+      value: 0,
+    },
     remark: {
       type: String,
       value: '抽奖进行中...',
@@ -21,7 +24,6 @@ Component({
       type: Boolean,
       value: false,
     },
-    // 外部控制：true 开始转，false 停止
     running: {
       type: Boolean,
       value: false,
@@ -122,7 +124,7 @@ Component({
     },
 
     // 开始连续滚动：位移持续递减，显示值对周期取模（内容已重复，取模无缝）
-    spin() {
+    spin(triggerDraw = false) {
       // 进行中或减速停止阶段，忽略重复点击，避免动画重复执行 / 重复上报抽奖
       if (this.data.spinning || this.data.stopping) return;
       this._clearTimers();
@@ -154,7 +156,9 @@ Component({
         this.setData(next);
       }, 30);
 
-      this.triggerEvent('draw');
+      if (triggerDraw) {
+        this.triggerEvent('draw');
+      }
     },
 
     // 把某轴平滑停止到目标项 T(0~5)，加减速过渡；返回最终位移
@@ -224,7 +228,7 @@ Component({
     },
 
     onDrawTap() {
-      this.spin();
+      this.spin(true);
     },
   },
 });

package/lib/components/lottery/lottery-slot/lottery-slot.wxml

@@ -55,7 +55,12 @@
             </view>
             <!-- 抽奖按钮 -->
             <view class="slot-draw-btn" bindtap="onDrawTap">
-                <text class="slot-btn-text">点我抽奖</text>
+                <block wx:if="{{lotteryType === 8}}">
+                    <text class="slot-btn-text">发送口令</text>
+                </block>
+                <block wx:else>
+                    <text class="slot-btn-text">点我抽奖</text>
+                </block>
             </view>
         </view>
     </view>

package/lib/components/lottery/lottery-wheel/lottery-wheel.js

@@ -4,11 +4,14 @@ Component({
       type: String,
       value: 1,
     },
-    // 抽奖 ID：用于区分不同抽奖的缓存 key
     lotteryId: {
       type: String,
       value: '',
     },
+    lotteryType: {
+      type: Number,
+      value: 0,
+    },
     width: {
       type: String,
       value: '100%',
@@ -21,7 +24,6 @@ Component({
       type: String,
       value: '抽奖进行中...',
     },
-    // 兼容原 lottie 版的属性透传，避免未知属性告警
     autoplay: {
       type: Boolean,
       value: false,
@@ -30,7 +32,6 @@ Component({
       type: Boolean,
       value: false,
     },
-    // 外部"消息"控制：true 开始无限转，false 平滑停止
     running: {
       type: Boolean,
       value: false,
@@ -45,23 +46,20 @@ Component({
   },
 
   data: {
-    spinning: false, // 是否处于无限旋转状态
-    stopping: false, // 是否处于减速停止过渡
-    angle: 0, // 当前旋转角度（deg），由 JS 驱动
+    spinning: false,
+    stopping: false,
+    angle: 0,
   },
 
   lifetimes: {
     attached() {
       if (this.data.running) {
-        // running 初始为 true 时直接开始
         this.playSegment();
       } else if (this._hasSpinCache()) {
-        // 刷新前抽奖仍在进行（有缓存），进入页面后自动恢复旋转动画
         this.playSegment();
       }
     },
     detached() {
-      // 注意：不在此清除缓存，保证刷新后仍能恢复动画
       this._clearTimer();
     },
   },
@@ -92,21 +90,23 @@ Component({
       wx.removeStorageSync(this._cacheKey());
     },
 
-    // 点击中心按钮：开始无限循环旋转，并通知父组件"用户发起抽奖"
-    playSegment() {
-      // 进行中或减速过渡阶段，忽略重复点击，避免动画重复执行 / 重复上报抽奖
+    playSegment(triggerDraw = false) {
       if (this.data.spinning || this.data.stopping) return;
       this._clearTimer();
       this.setData({ spinning: true, stopping: false });
-      // 记录缓存：抽奖进行中，刷新后可据此恢复动画
       this._setSpinCache();
-      // 每帧递增角度，约 360deg/s，纯 CSS 旋转由 transform 驱动
       this._timer = setInterval(() => {
         this.data.angle += 6;
         this.setData({ angle: this.data.angle });
       }, 16);
-      // 透传给父组件，便于其触发服务端抽奖
-      this.triggerEvent('draw');
+      if (triggerDraw) {
+        this.triggerEvent('draw');
+      }
+    },
+
+    // 手动点击开始旋转（会触发 draw 事件）
+    onPlaySegment() {
+      this.playSegment(true);
     },
 
     // 兼容旧接口：开始旋转

package/lib/components/lottery/lottery-wheel/lottery-wheel.wxml

@@ -77,10 +77,16 @@
             <view class="lottery-pointer-inner"></view>
         </view>
 
-        <!-- 中心按钮：点我抽奖（不随盘面旋转，独立无限缩放） -->
-        <view class="lottery-center-btn" bindtap="playSegment">
-            <text class="lottery-center-btn-text">点我</text>
-            <text class="lottery-center-btn-text">抽奖</text>
+        <!-- 中心按钮 -->
+        <view class="lottery-center-btn" bindtap="onPlaySegment">
+            <block wx:if="{{lotteryType === 8}}">
+                <text class="lottery-center-btn-text">发送</text>
+                <text class="lottery-center-btn-text">口令</text>
+            </block>
+            <block wx:else>
+                <text class="lottery-center-btn-text">点我</text>
+                <text class="lottery-center-btn-text">抽奖</text>
+            </block>
         </view>
 
         <!-- 状态文案：常显 -->

package/lib/components/lottery/lottery-wheel/lottery-wheel.wxss

@@ -1 +1 @@
-.lottery-wheel-container{align-items:center;display:flex;flex-direction:column;justify-content:center}.lottery-wheel-wrapper{height:720rpx;position:relative;width:750rpx}.lottery-base{background:linear-gradient(180deg,#e63e30,#c41a0d);border-radius:20rpx 20rpx 60rpx 60rpx;bottom:0;box-shadow:0 10rpx 30rpx rgba(198,26,13,.5),inset 0 4rpx 0 hsla(0,0%,100%,.2);height:120rpx;width:360rpx;z-index:16}.lottery-base,.lottery-base:after{left:50%;position:absolute;transform:translateX(-50%)}.lottery-base:after{background:rgba(0,0,0,.15);border-radius:20rpx;content:"";height:40rpx;top:20rpx;width:320rpx}.lottery-wheel-disc{background:transparent;border-radius:50%;box-shadow:0 8rpx 30rpx rgba(0,0,0,.25);height:440rpx;left:50%;margin-left:-220rpx;margin-top:-200rpx;overflow:hidden;position:absolute;top:50%;width:440rpx;z-index:10}.lottery-wheel-disc:after{border:8rpx solid rgba(230,62,48,.7);border-radius:50%;z-index:6}.lottery-wheel-disc:after,.lottery-wheel-disc:before{content:"";inset:0;pointer-events:none;position:absolute}.lottery-wheel-disc:before{background:repeating-conic-gradient(from 22.5deg,transparent 0deg 44deg,rgba(200,60,40,.45) 44deg 45deg);border-radius:50%;z-index:5}.lottery-wheel-disc.stopping{transition:transform 4s cubic-bezier(.17,.67,.12,.99)}.lottery-segment{height:100%;left:0;position:absolute;top:0;transform:rotate(calc(var(--rot)));transform-origin:center center;width:100%}.lottery-segment .lottery-segment-content{align-items:center;display:flex;flex-direction:column;justify-content:center;left:50%;position:absolute;text-align:center;top:50%;transform:translate(-50%,-50%) translateY(-145rpx);width:150rpx}.lottery-segment .lottery-segment-text{font-size:24rpx;font-weight:700;white-space:nowrap}.lottery-segment .lottery-segment-emoji{font-size:36rpx;line-height:1.2}.lottery-segment-even{background:conic-gradient(from -22.5deg,#ff8c42 0deg 45deg,transparent 45deg 1turn)}.lottery-segment-even .lottery-segment-text{color:#fff;text-shadow:0 2rpx 4rpx rgba(0,0,0,.25)}.lottery-segment-odd{background:conic-gradient(from -22.5deg,#fff1d6 0deg 45deg,transparent 45deg 1turn)}.lottery-segment-odd .lottery-segment-text{color:#c41a0d}.lottery-lights{border-radius:50%;height:440rpx;left:50%;margin-left:-220rpx;margin-top:-200rpx;pointer-events:none;position:absolute;top:50%;width:440rpx;z-index:15}.lottery-lights.stopping{transition:transform 4s cubic-bezier(.17,.67,.12,.99)}.lottery-lights .lottery-light{animation:lottery-light-blink .8s ease-in-out infinite alternate;background:radial-gradient(circle at 35% 35%,#fff 0,#ffd93d 50%,#fa0 100%);border-radius:50%;box-shadow:0 0 12rpx 4rpx rgba(255,217,61,.8);height:20rpx;left:50%;margin-left:-10rpx;margin-top:-10rpx;position:absolute;top:50%;transform-origin:center;width:20rpx}.lottery-lights .lottery-light:first-child{transform:rotate(0deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(2){transform:rotate(30deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(3){transform:rotate(60deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(4){transform:rotate(90deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(5){transform:rotate(120deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(6){transform:rotate(150deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(7){transform:rotate(180deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(8){transform:rotate(210deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(9){transform:rotate(240deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(10){transform:rotate(270deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(11){transform:rotate(300deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(12){transform:rotate(330deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(2n){animation-delay:.4s}@keyframes lottery-light-blink{0%{box-shadow:0 0 12rpx 4rpx rgba(255,217,61,.9);opacity:1}to{box-shadow:0 0 6rpx 2rpx rgba(255,217,61,.4);opacity:.5}}.lottery-center-btn{align-items:center;animation:lottery-btn-zoom .8s ease-in-out infinite alternate;background:linear-gradient(145deg,#ff6b5b,#e63e30);border:3rpx solid #ffd93d;border-radius:50%;box-shadow:0 4rpx 16rpx rgba(198,26,13,.5),inset 0 2rpx 4rpx hsla(0,0%,100%,.3);color:#fff;display:flex;flex-direction:column;height:100rpx;justify-content:center;left:50%;margin-left:-50rpx;margin-top:-30rpx;position:absolute;top:50%;width:100rpx;z-index:20}.lottery-center-btn:active{opacity:.85}.lottery-center-btn .lottery-center-btn-text{font-size:20rpx;font-weight:700;line-height:1.2;text-shadow:0 2rpx 4rpx rgba(0,0,0,.2)}.lottery-pointer{background:#ffd93d;-webkit-filter:drop-shadow(0 3rpx 6rpx rgba(0,0,0,.25));filter:drop-shadow(0 3rpx 6rpx rgba(0,0,0,.25));height:40rpx;left:50%;top:290rpx;transform:translateX(-50%);width:44rpx;z-index:18}.lottery-pointer,.lottery-pointer-inner{-webkit-clip-path:polygon(50% 0,0 100%,100% 100%);clip-path:polygon(50% 0,0 100%,100% 100%);position:absolute}.lottery-pointer-inner{background:linear-gradient(90deg,#ff7a6a,#ff7a6a 50%,#d62f23 0,#d62f23);bottom:0;left:4rpx;right:4rpx;top:4rpx}@keyframes lottery-btn-zoom{0%{transform:scale(1)}to{transform:scale(1.12)}}.lotterying{bottom:60rpx;color:#fff;font-size:28rpx;left:50%;margin-left:-150rpx;overflow:hidden;position:absolute;width:300rpx;z-index:999}.lotterying .lotterying-text{animation:marquee 3s linear infinite;display:inline-block;padding-left:100%;white-space:nowrap}@keyframes marquee{0%{transform:translateX(0)}to{transform:translateX(-100%)}}
+.lottery-wheel-container{align-items:center;display:flex;flex-direction:column;justify-content:center}.lottery-wheel-wrapper{height:720rpx;position:relative;width:750rpx}.lottery-base{background:linear-gradient(180deg,#e63e30,#c41a0d);border-radius:20rpx 20rpx 60rpx 60rpx;bottom:0;box-shadow:0 10rpx 30rpx rgba(198,26,13,.5),inset 0 4rpx 0 hsla(0,0%,100%,.2);height:120rpx;width:360rpx;z-index:16}.lottery-base,.lottery-base:after{left:50%;position:absolute;transform:translateX(-50%)}.lottery-base:after{background:rgba(0,0,0,.15);border-radius:20rpx;content:"";height:40rpx;top:20rpx;width:320rpx}.lottery-wheel-disc{background:transparent;border-radius:50%;box-shadow:0 8rpx 30rpx rgba(0,0,0,.25);height:440rpx;left:50%;margin-left:-220rpx;margin-top:-200rpx;overflow:hidden;position:absolute;top:50%;width:440rpx;z-index:10}.lottery-wheel-disc:after{border:8rpx solid rgba(230,62,48,.7);border-radius:50%;z-index:6}.lottery-wheel-disc:after,.lottery-wheel-disc:before{content:"";inset:0;pointer-events:none;position:absolute}.lottery-wheel-disc:before{background:repeating-conic-gradient(from 22.5deg,transparent 0deg 44deg,rgba(200,60,40,.45) 44deg 45deg);border-radius:50%;z-index:5}.lottery-wheel-disc.stopping{transition:transform 4s cubic-bezier(.17,.67,.12,.99)}.lottery-segment{height:100%;left:0;position:absolute;top:0;transform:rotate(calc(var(--rot)));transform-origin:center center;width:100%}.lottery-segment .lottery-segment-content{align-items:center;display:flex;flex-direction:column;justify-content:center;left:50%;position:absolute;text-align:center;top:50%;transform:translate(-50%,-50%) translateY(-145rpx);width:150rpx}.lottery-segment .lottery-segment-text{font-size:24rpx;font-weight:700;white-space:nowrap}.lottery-segment .lottery-segment-emoji{font-size:36rpx;line-height:1.2}.lottery-segment-even{background:conic-gradient(from -22.5deg,#ff8c42 0deg 45deg,transparent 45deg 1turn)}.lottery-segment-even .lottery-segment-text{color:#fff;text-shadow:0 2rpx 4rpx rgba(0,0,0,.25)}.lottery-segment-odd{background:conic-gradient(from -22.5deg,#fff1d6 0deg 45deg,transparent 45deg 1turn)}.lottery-segment-odd .lottery-segment-text{color:#c41a0d}.lottery-lights{border-radius:50%;height:440rpx;left:50%;margin-left:-220rpx;margin-top:-200rpx;pointer-events:none;position:absolute;top:50%;width:440rpx;z-index:15}.lottery-lights.stopping{transition:transform 4s cubic-bezier(.17,.67,.12,.99)}.lottery-lights .lottery-light{animation:lottery-light-blink .8s ease-in-out infinite alternate;background:radial-gradient(circle at 35% 35%,#fff 0,#ffd93d 50%,#fa0 100%);border-radius:50%;box-shadow:0 0 12rpx 4rpx rgba(255,217,61,.8);height:20rpx;left:50%;margin-left:-10rpx;margin-top:-10rpx;position:absolute;top:50%;transform-origin:center;width:20rpx}.lottery-lights .lottery-light:first-child{transform:rotate(0deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(2){transform:rotate(30deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(3){transform:rotate(60deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(4){transform:rotate(90deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(5){transform:rotate(120deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(6){transform:rotate(150deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(7){transform:rotate(180deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(8){transform:rotate(210deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(9){transform:rotate(240deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(10){transform:rotate(270deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(11){transform:rotate(300deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(12){transform:rotate(330deg) translateX(235rpx)}.lottery-lights .lottery-light:nth-child(2n){animation-delay:.4s}@keyframes lottery-light-blink{0%{box-shadow:0 0 12rpx 4rpx rgba(255,217,61,.9);opacity:1}to{box-shadow:0 0 6rpx 2rpx rgba(255,217,61,.4);opacity:.5}}.lottery-center-btn{align-items:center;animation:lottery-btn-zoom .8s ease-in-out infinite alternate;background:linear-gradient(145deg,#ff6b5b,#e63e30);border:3rpx solid #ffd93d;border-radius:50%;box-shadow:0 4rpx 16rpx rgba(198,26,13,.5),inset 0 2rpx 4rpx hsla(0,0%,100%,.3);color:#fff;display:flex;flex-direction:column;height:100rpx;justify-content:center;left:50%;margin-left:-50rpx;margin-top:-30rpx;position:absolute;top:50%;width:100rpx;z-index:20}.lottery-center-btn:active{opacity:.85}.lottery-center-btn .lottery-center-btn-text{font-size:24rpx;font-weight:700;line-height:1.2;text-shadow:0 2rpx 4rpx rgba(0,0,0,.2)}.lottery-pointer{background:#ffd93d;-webkit-filter:drop-shadow(0 3rpx 6rpx rgba(0,0,0,.25));filter:drop-shadow(0 3rpx 6rpx rgba(0,0,0,.25));height:40rpx;left:50%;top:290rpx;transform:translateX(-50%);width:44rpx;z-index:18}.lottery-pointer,.lottery-pointer-inner{-webkit-clip-path:polygon(50% 0,0 100%,100% 100%);clip-path:polygon(50% 0,0 100%,100% 100%);position:absolute}.lottery-pointer-inner{background:linear-gradient(90deg,#ff7a6a,#ff7a6a 50%,#d62f23 0,#d62f23);bottom:0;left:4rpx;right:4rpx;top:4rpx}@keyframes lottery-btn-zoom{0%{transform:scale(1)}to{transform:scale(1.12)}}.lotterying{bottom:60rpx;color:#fff;font-size:28rpx;left:50%;margin-left:-150rpx;overflow:hidden;position:absolute;width:300rpx;z-index:999}.lotterying .lotterying-text{animation:marquee 3s linear infinite;display:inline-block;padding-left:100%;white-space:nowrap}@keyframes marquee{0%{transform:translateX(0)}to{transform:translateX(-100%)}}

package/lib/components/lottery/lottery.js

@@ -1,3 +1,5 @@
+import { debounce } from '../../shared/utils';
+
 Component({
   properties: {
     sdkInstance: {
@@ -203,26 +205,44 @@ Component({
       });
     },
 
-    // 用户点击转盘中心按钮触发的抽奖意图（透传，可在此接入服务端抽奖）
-    onWheelDraw() {
-      // 当前抽奖由 SDK 的 LOTTERY_START/LOTTERY_END 驱动，点击仅作为动画开始信号；
-      // 若需要点击即发起服务端抽奖，可在此调用对应接口。
-    },
-
-    // 转盘减速停止完成回调（结果已在 LOTTERY_END 中延时展示，这里可做兜底）
-    onWheelStopped() {},
+    onDraw: debounce(function () {
+      const currentLottery = this.data.currentLottery;
+      if (currentLottery && currentLottery.lottery_type === 8) {
+        this._handleCommandLottery();
+      }
+    }, 5000),
 
-    // 老虎机用户点击抽奖
-    onSlotDraw() {},
+    async _handleCommandLottery() {
+      const lotteryServer = this.sdkInstance.get('lotteryServer');
+      if (!lotteryServer) return;
+      const user = this.sdkInstance.store.get('user') || {};
+      const { interact } = this.sdkInstance.store.get('') || {};
+      const currentLottery = this.data.currentLottery;
+      const lotteryId = currentLottery.lottery_id || currentLottery.id;
 
-    // 老虎机停止回调
-    onSlotStopped() {},
+      if (!this._participatedLotteryIds) {
+        this._participatedLotteryIds = new Set();
+      }
+      if (this._participatedLotteryIds.has(lotteryId)) return;
+
+      try {
+        const res = await lotteryServer.participateLottery({
+          nickname: user.nickname || '',
+          avatar: user.avatar || '',
+          lottery_id: lotteryId,
+          room_id: interact?.room_id || '',
+        });
 
-    // 摇奖机用户点击抽奖
-    onShakeDraw() {},
+        if (res.code == 200 && currentLottery.command) {
+          this._participatedLotteryIds.add(lotteryId);
+          this.sdkInstance.sendChat({ data: currentLottery.command });
+        }
+      } catch (err) {
+        console.error('口令抽奖参与失败:', err);
+      }
+    },
 
-    // 摇奖机停止回调
-    onShakeStopped() {},
+    onStopped() {},
 
     onClose() {
       this.closeAllModals();

package/lib/components/lottery/lottery.wxml

@@ -3,13 +3,14 @@
     <view class="lottery-modal">
         <!-- 抽奖进行中 -->
         <view wx:if="{{lotteryStatus==0}}" class="lottery-content">
+            <view class="lottery-command" wx:if="{{!!currentLottery.command}}">发送口令"{{currentLottery.command}}"参与抽奖吧</view>
             <!-- 抽奖形式由 img_order 决定：1=转盘，2=老虎机，3=摇奖机 -->
             <!-- 摇奖机模式 (img_order == 3) -->
-            <lottery-shake wx:if="{{currentLottery.img_order == 3}}" id="lotteryShake" lotteryId="{{currentLottery.lottery_id || currentLottery.id}}" remark="{{currentLottery.remark}}" autoplay loop bind:draw="onShakeDraw" bind:stopped="onShakeStopped" />
+            <lottery-shake wx:if="{{currentLottery.img_order == 3}}" id="lotteryShake" lotteryId="{{currentLottery.lottery_id || currentLottery.id}}" lotteryType="{{currentLottery.lottery_type}}" remark="{{currentLottery.remark}}" autoplay loop bind:draw="onDraw" bind:stopped="onStopped" />
             <!-- 老虎机模式 (img_order == 2) -->
-            <lottery-slot wx:elif="{{currentLottery.img_order == 2}}" id="lotterySlot" lotteryId="{{currentLottery.lottery_id || currentLottery.id}}" remark="{{currentLottery.remark}}" autoplay loop bind:draw="onSlotDraw" bind:stopped="onSlotStopped" />
-            <!-- 转盘模式（默认回退：img_order == 1 或其它未识别值都走转盘） -->
-            <lottery-wheel wx:else id="lotteryWheel" type="{{currentLottery.img_order || 1}}" lotteryId="{{currentLottery.lottery_id || currentLottery.id}}" autoplay loop remark="{{currentLottery.remark}}" bind:draw="onWheelDraw" bind:stopped="onWheelStopped" />
+            <lottery-slot wx:elif="{{currentLottery.img_order == 2}}" id="lotterySlot" lotteryId="{{currentLottery.lottery_id || currentLottery.id}}" lotteryType="{{currentLottery.lottery_type}}" remark="{{currentLottery.remark}}" autoplay loop bind:draw="onDraw" bind:stopped="onStopped" />
+            <!-- 转盘模式 (img_order == 1 或其他) -->
+            <lottery-wheel wx:else id="lotteryWheel" type="{{currentLottery.img_order || 1}}" lotteryId="{{currentLottery.lottery_id || currentLottery.id}}" lotteryType="{{currentLottery.lottery_type}}" autoplay loop remark="{{currentLottery.remark}}" bind:draw="onDraw" bind:stopped="onStopped" />
             <!-- 新增形式：在对应位置插入 wx:elif="{{currentLottery.img_order == N}}" 分支即可 -->
             <view wx:if="{{currentLottery && currentLottery.can_look_award_pool == 1}}" class="lottery-award-pool-btn" bindtap="showAwardPool">
                 <text class="lottery-award-pool-text">查看奖池 ></text>

package/lib/components/lottery/lottery.wxss

@@ -1 +1 @@
-.lottery-container{align-items:center;background:rgba(0,0,0,.7);display:flex;height:100%;justify-content:center;left:0;position:fixed;top:0;width:100%;z-index:10000}.lottery-container.display-1{background:url(https://s1.e.vhall.com/common-static/saas-wap/static/img/popupBg.35704976.png) no-repeat top;background-size:100% 100%;bottom:0;height:auto;top:56.25vw}.lottery-container.display-1 .lottery-close-btn{border-radius:50%;height:60rpx;position:absolute;right:20rpx;top:20rpx;width:60rpx}.lottery-overlay{background:rgba(0,0,0,.7);height:100%;left:0;position:absolute;top:0;width:100%}.lottery-modal{border-radius:24rpx;box-sizing:border-box;flex-direction:column;height:100%;position:relative;width:100%}.lottery-close,.lottery-modal{display:flex;justify-content:center}.lottery-close{align-items:center;height:50rpx;position:absolute;right:20rpx;top:20rpx;width:50rpx}.lottery-close .lottery-close-icon{height:40rpx;width:40rpx}.lottery-header{margin-bottom:30rpx;text-align:center}.lottery-title{color:#fff;font-size:36rpx;font-weight:700;text-shadow:0 2rpx 4rpx rgba(0,0,0,.3)}.lottery-content{align-items:center;display:flex;flex-direction:column;justify-content:center;margin-bottom:30rpx}.svga-canvas{height:400rpx;width:400rpx}.lottery-footer{margin-bottom:20rpx;text-align:center}.lottery-join-btn{animation:bounce .6s ease-in-out infinite;background:linear-gradient(135deg,#ffd32a,#ff9f1a);border:none;border-radius:50rpx;box-shadow:0 6rpx 20rpx rgba(255,159,26,.5);color:#d63031;display:inline-block;font-size:32rpx;font-weight:700;padding:20rpx 60rpx}.lottery-join-btn:after{border:none}.lottery-hint{animation:pulse 1s ease-in-out infinite;color:#fff;display:block;font-size:28rpx}@keyframes pulse{0%,to{opacity:1}50%{opacity:.5}}.lottery-winners{background:hsla(0,0%,100%,.95);border-radius:16rpx;max-height:200rpx;padding:20rpx}.lottery-winners-title{color:#d63031;font-size:26rpx;font-weight:700;margin-bottom:15rpx;text-align:center}.lottery-winners-list{max-height:150rpx}.lottery-winner-item{align-items:center;display:flex;padding:10rpx 0}.lottery-winner-item:not(:last-child){border-bottom:1rpx solid #f0f0f0}.lottery-winner-avatar{border-radius:50%;height:50rpx;margin-right:15rpx;width:50rpx}.lottery-winner-name{color:#333;font-size:24rpx}.lottery-close-btn{border-radius:50%;height:80rpx;margin:0rpx auto;width:80rpx}.lottery-close-btn,.lottery-result{align-items:center;display:flex;justify-content:center}.lottery-result{flex-direction:column;padding:40rpx;text-align:center}.lottery-win-title{margin-bottom:20rpx}.stroked-text{color:#fff;font-size:48rpx;font-weight:700;letter-spacing:5px;transform:matrix(.99,0,-.15,1,0,0)}.stroked-text:after,.stroked-text:before{content:attr(data-text);left:0;position:absolute;top:0}.stroked-text:before{-webkit-text-stroke:5px #fb2626;z-index:-1}.stroked-text:after{-webkit-text-stroke:8px #ffecb7;z-index:-2}.lottery-win-nickname{background:linear-gradient(270deg,rgba(255,107,38,0) 5.07%,#ff6b26 25.41%,#f52c03);border-radius:50rpx 0 0 50rpx;color:#fff;display:inline-block;margin-bottom:20rpx;max-width:340rpx;padding:6rpx 40rpx 6rpx 20rpx}.lottery-prize{background:linear-gradient(135deg,#ffd32a,#ff9f1a);border-radius:40rpx;color:#fff;font-size:36rpx;font-weight:700;padding:20rpx 40rpx}.lottery-lose-content{align-items:center;background:url(https://cnstatic01.e.vhall.com/common-static/saas-wap/static/img/lottery-miss.5a1292bf.png) no-repeat 50%;background-size:contain;display:flex;flex-direction:row;height:420rpx;justify-content:center;width:420rpx}@keyframes bounce{0%,to{transform:scale(1)}50%{transform:scale(1.2)}}.lottery-animation{padding:40rpx}.lottery-animation,.lottery-spinner{align-items:center;display:flex;justify-content:center}.lottery-spinner{animation:spin 2s linear infinite;background:linear-gradient(135deg,#ffd32a,#ff9f1a);border-radius:50%;box-shadow:0 10rpx 30rpx rgba(255,159,26,.5);height:200rpx;width:200rpx}.lottery-ball{animation:bounce .6s ease-in-out infinite;background:#fff;border-radius:50%;height:60rpx;width:60rpx}@keyframes spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.lottery-result{background:url(https://cnstatic01.e.vhall.com/common-static/saas-wap/static/img/lottery-win-gold-coin.1bcfdf22.png) no-repeat 50%;background-size:contain}.lottery-win{align-items:center;display:flex;flex-direction:column;padding:40rpx}.win-icon{animation:bounce .5s ease;font-size:100rpx;margin-bottom:20rpx}.prize-card{align-items:center;background:url(https://cnstatic01.e.vhall.com/common-static/saas-wap/static/img/lottery-win-annulus.ec2c80bd.png) no-repeat 50%;background-size:contain;display:flex;flex-direction:column;margin-top:-100rpx;padding:160rpx}.prize-image{border-radius:140rpx;height:280rpx;width:280rpx}.prize-name{background:linear-gradient(270deg,rgba(255,226,73,0) 2.54%,#ffeb32 32.61%,#ffeb32 59.83%,rgba(255,215,73,0) 94.2%);color:#d63031;display:block;font-size:32rpx;line-height:60rpx;margin-top:-140rpx;width:100%}.lottery-win-hint{color:hsla(0,0%,100%,.8);font-size:26rpx;margin-top:10rpx}.lottery-success-btn,.receive-btn{background:#fb2626;border-radius:50rpx;color:#fff;margin-top:30rpx;padding:20rpx 60rpx}.lottery-success-btn .receive-btn-text,.receive-btn .receive-btn-text{color:#fff;font-size:32rpx}.lottery-history-icon{align-items:center;border-radius:50%;bottom:200rpx;display:flex;justify-content:center;position:fixed;right:40rpx;z-index:500}.lottery-history-icon .history-icon-img{height:70rpx;width:70rpx}.lottery-history-icon .history-badge{background-color:#fb2626;border:4rpx solid #fff;border-radius:50%;height:24rpx;position:absolute;right:-4rpx;top:-4rpx;width:24rpx}.lottery-award-pool-btn .lottery-award-pool-text{color:#fce09e;font-size:32rpx}.award-pool-modal{bottom:0;display:flex;flex-direction:column;justify-content:flex-end;left:0;position:fixed;right:0;top:0;z-index:10001}.award-pool-mask{background:rgba(0,0,0,.5);bottom:0;left:0;position:absolute;right:0;top:0}.award-pool-content{background:linear-gradient(37.94deg,#fffbe8 3.86%,#fbf0e6 84.36%);border-radius:32rpx 32rpx 0 0;max-height:70vh;overflow:hidden;padding:0 40rpx 80rpx;position:relative}.award-pool-title{border-bottom:2rpx solid #f0f0f0;color:#333;font-size:38rpx;font-weight:600;height:100rpx;line-height:100rpx;text-align:center}.award-pool-wrap-container{padding-right:4rpx}.award-pool-wrap{max-height:432rpx;min-height:128rpx}.award-pool-item-wrapper{margin-bottom:24rpx}.award-pool-item{align-items:center;background:#fff;border-radius:24rpx;display:flex;flex-direction:row;padding:28rpx 32rpx}.award-pool-item__img{border:2rpx solid #d9d9d9;border-radius:24rpx;flex-shrink:0;height:160rpx;width:160rpx}.award-pool-item__content{display:flex;flex:1;flex-direction:column;height:100%;justify-content:center;margin-left:30rpx;width:0}.award-pool-item-name{color:#262626;font-size:32rpx;font-weight:500;line-height:48rpx;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.award-pool-item-desc{color:#8c8c8c;font-size:28rpx;line-height:36rpx;margin-top:8rpx}
+.lottery-container{align-items:center;background:rgba(0,0,0,.7);display:flex;height:100%;justify-content:center;left:0;position:fixed;top:0;width:100%;z-index:10000}.lottery-container.display-1{background:url(https://s1.e.vhall.com/common-static/saas-wap/static/img/popupBg.35704976.png) no-repeat top;background-size:100% 100%;bottom:0;height:auto;top:56.25vw}.lottery-container.display-1 .lottery-close-btn{border-radius:50%;height:60rpx;position:absolute;right:20rpx;top:20rpx;width:60rpx}.lottery-overlay{background:rgba(0,0,0,.7);height:100%;left:0;position:absolute;top:0;width:100%}.lottery-modal{border-radius:24rpx;box-sizing:border-box;flex-direction:column;height:100%;position:relative;width:100%}.lottery-close,.lottery-modal{display:flex;justify-content:center}.lottery-close{align-items:center;height:50rpx;position:absolute;right:20rpx;top:20rpx;width:50rpx}.lottery-close .lottery-close-icon{height:40rpx;width:40rpx}.lottery-header{margin-bottom:30rpx;text-align:center}.lottery-title{color:#fff;font-size:36rpx;font-weight:700;text-shadow:0 2rpx 4rpx rgba(0,0,0,.3)}.lottery-content{align-items:center;display:flex;flex-direction:column;justify-content:center;margin-bottom:30rpx}.svga-canvas{height:400rpx;width:400rpx}.lottery-footer{margin-bottom:20rpx;text-align:center}.lottery-join-btn{animation:bounce .6s ease-in-out infinite;background:linear-gradient(135deg,#ffd32a,#ff9f1a);border:none;border-radius:50rpx;box-shadow:0 6rpx 20rpx rgba(255,159,26,.5);color:#d63031;display:inline-block;font-size:32rpx;font-weight:700;padding:20rpx 60rpx}.lottery-join-btn:after{border:none}.lottery-hint{animation:pulse 1s ease-in-out infinite;color:#fff;display:block;font-size:28rpx}@keyframes pulse{0%,to{opacity:1}50%{opacity:.5}}.lottery-winners{background:hsla(0,0%,100%,.95);border-radius:16rpx;max-height:200rpx;padding:20rpx}.lottery-winners-title{color:#d63031;font-size:26rpx;font-weight:700;margin-bottom:15rpx;text-align:center}.lottery-winners-list{max-height:150rpx}.lottery-winner-item{align-items:center;display:flex;padding:10rpx 0}.lottery-winner-item:not(:last-child){border-bottom:1rpx solid #f0f0f0}.lottery-winner-avatar{border-radius:50%;height:50rpx;margin-right:15rpx;width:50rpx}.lottery-winner-name{color:#333;font-size:24rpx}.lottery-close-btn{border-radius:50%;height:80rpx;margin:0rpx auto;width:80rpx}.lottery-close-btn,.lottery-result{align-items:center;display:flex;justify-content:center}.lottery-result{flex-direction:column;padding:40rpx;text-align:center}.lottery-win-title{margin-bottom:20rpx}.stroked-text{color:#fff;font-size:48rpx;font-weight:700;letter-spacing:5px;transform:matrix(.99,0,-.15,1,0,0)}.stroked-text:after,.stroked-text:before{content:attr(data-text);left:0;position:absolute;top:0}.stroked-text:before{-webkit-text-stroke:5px #fb2626;z-index:-1}.stroked-text:after{-webkit-text-stroke:8px #ffecb7;z-index:-2}.lottery-win-nickname{background:linear-gradient(270deg,rgba(255,107,38,0) 5.07%,#ff6b26 25.41%,#f52c03);border-radius:50rpx 0 0 50rpx;color:#fff;display:inline-block;margin-bottom:20rpx;max-width:340rpx;padding:6rpx 40rpx 6rpx 20rpx}.lottery-prize{background:linear-gradient(135deg,#ffd32a,#ff9f1a);border-radius:40rpx;color:#fff;font-size:36rpx;font-weight:700;padding:20rpx 40rpx}.lottery-lose-content{align-items:center;background:url(https://cnstatic01.e.vhall.com/common-static/saas-wap/static/img/lottery-miss.5a1292bf.png) no-repeat 50%;background-size:contain;display:flex;flex-direction:row;height:420rpx;justify-content:center;width:420rpx}@keyframes bounce{0%,to{transform:scale(1)}50%{transform:scale(1.2)}}.lottery-animation{padding:40rpx}.lottery-animation,.lottery-spinner{align-items:center;display:flex;justify-content:center}.lottery-spinner{animation:spin 2s linear infinite;background:linear-gradient(135deg,#ffd32a,#ff9f1a);border-radius:50%;box-shadow:0 10rpx 30rpx rgba(255,159,26,.5);height:200rpx;width:200rpx}.lottery-ball{animation:bounce .6s ease-in-out infinite;background:#fff;border-radius:50%;height:60rpx;width:60rpx}@keyframes spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.lottery-result{background:url(https://cnstatic01.e.vhall.com/common-static/saas-wap/static/img/lottery-win-gold-coin.1bcfdf22.png) no-repeat 50%;background-size:contain}.lottery-win{align-items:center;display:flex;flex-direction:column;padding:40rpx}.win-icon{animation:bounce .5s ease;font-size:100rpx;margin-bottom:20rpx}.prize-card{align-items:center;background:url(https://cnstatic01.e.vhall.com/common-static/saas-wap/static/img/lottery-win-annulus.ec2c80bd.png) no-repeat 50%;background-size:contain;display:flex;flex-direction:column;margin-top:-100rpx;padding:160rpx}.prize-image{border-radius:140rpx;height:280rpx;width:280rpx}.prize-name{background:linear-gradient(270deg,rgba(255,226,73,0) 2.54%,#ffeb32 32.61%,#ffeb32 59.83%,rgba(255,215,73,0) 94.2%);color:#d63031;display:block;font-size:32rpx;line-height:60rpx;margin-top:-140rpx;width:100%}.lottery-win-hint{color:hsla(0,0%,100%,.8);font-size:26rpx;margin-top:10rpx}.lottery-success-btn,.receive-btn{background:#fb2626;border-radius:50rpx;color:#fff;margin-top:30rpx;padding:20rpx 60rpx}.lottery-success-btn .receive-btn-text,.receive-btn .receive-btn-text{color:#fff;font-size:32rpx}.lottery-history-icon{align-items:center;border-radius:50%;bottom:200rpx;display:flex;justify-content:center;position:fixed;right:40rpx;z-index:500}.lottery-history-icon .history-icon-img{height:70rpx;width:70rpx}.lottery-history-icon .history-badge{background-color:#fb2626;border:4rpx solid #fff;border-radius:50%;height:24rpx;position:absolute;right:-4rpx;top:-4rpx;width:24rpx}.lottery-award-pool-btn .lottery-award-pool-text{color:#fce09e;font-size:32rpx}.award-pool-modal{bottom:0;display:flex;flex-direction:column;justify-content:flex-end;left:0;position:fixed;right:0;top:0;z-index:10001}.award-pool-mask{background:rgba(0,0,0,.5);bottom:0;left:0;position:absolute;right:0;top:0}.award-pool-content{background:linear-gradient(37.94deg,#fffbe8 3.86%,#fbf0e6 84.36%);border-radius:32rpx 32rpx 0 0;max-height:70vh;overflow:hidden;padding:0 40rpx 80rpx;position:relative}.award-pool-title{border-bottom:2rpx solid #f0f0f0;color:#333;font-size:38rpx;font-weight:600;height:100rpx;line-height:100rpx;text-align:center}.award-pool-wrap-container{padding-right:4rpx}.award-pool-wrap{max-height:432rpx;min-height:128rpx}.award-pool-item-wrapper{margin-bottom:24rpx}.award-pool-item{align-items:center;background:#fff;border-radius:24rpx;display:flex;flex-direction:row;padding:28rpx 32rpx}.award-pool-item__img{border:2rpx solid #d9d9d9;border-radius:24rpx;flex-shrink:0;height:160rpx;width:160rpx}.award-pool-item__content{display:flex;flex:1;flex-direction:column;height:100%;justify-content:center;margin-left:30rpx;width:0}.award-pool-item-name{color:#262626;font-size:32rpx;font-weight:500;line-height:48rpx;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.award-pool-item-desc{color:#8c8c8c;font-size:28rpx;line-height:36rpx;margin-top:8rpx}.lottery-command{background:linear-gradient(270deg,rgba(255,237,144,0),rgba(254,238,89,.8) 21.42%,#ffd600);border-radius:36rpx 0 0 36rpx;color:#fb2626;margin-bottom:-80rpx;padding:4rpx 40rpx 4rpx 20rpx}

package/lib/components/player/components/main/index.wxml

@@ -1,7 +1,7 @@
-<live-player wx:if="{{type=='live'}}" id='{{id}}' class='vhall-player' src='{{src}}' mode='{{mode}}' autoplay='{{true||autoplay}}' muted='{{muted}}' orientation='{{orientation}}' object-fit='{{livePlayerObjectFit}}' min-cache='{{minCache}}' max-cache='{{maxCache}}' sound-mode='{{soundMode}}' auto-pause-if-navigate='{{autoPauseIfNavigate}}' auto-pause-if-open-native='{{autoPauseIfOpenNative}}' picture-in-picture-mode='{{pictureInPictureMode}}' picture-in-picture-init-position='{{pictureInPictureInitPosition}}' enable-auto-rotation='{{enableAutoRotation}}' referrer-policy='{{referrerPolicy}}' enable-casting='{{enableCasting}}' enable-recv-message bindstatechange='onStateChange' bindfullscreenchange='onFullScreenChange' bindnetstatus='onNetStatus' bindaudiovolumenotify='onAudioVolumeNotify' bindenterpictureinpicture='onEnterPictureInPicture' bindleavepictureinpicture='onLeavePictureInPicture'>
+<live-player wx:if="{{type=='live'}}" id='{{id}}' class='vhall-player' src='{{src}}' mode='{{mode}}' autoplay='{{autoplay}}' muted='{{muted}}' orientation='{{orientation}}' object-fit='{{livePlayerObjectFit}}' min-cache='{{minCache}}' max-cache='{{maxCache}}' sound-mode='{{soundMode}}' auto-pause-if-navigate='{{autoPauseIfNavigate}}' auto-pause-if-open-native='{{autoPauseIfOpenNative}}' picture-in-picture-mode='{{pictureInPictureMode}}' picture-in-picture-init-position='{{pictureInPictureInitPosition}}' enable-auto-rotation='{{enableAutoRotation}}' referrer-policy='{{referrerPolicy}}' enable-casting='{{enableCasting}}' enable-recv-message bindstatechange='onStateChange' bindfullscreenchange='onFullScreenChange' bindnetstatus='onNetStatus' bindaudiovolumenotify='onAudioVolumeNotify' bindenterpictureinpicture='onEnterPictureInPicture' bindleavepictureinpicture='onLeavePictureInPicture'>
   <slot />
 </live-player>
-<video wx:elif="{{type=='vod'}}" id='{{id}}' class='vhall-player' src='{{src}}' duration='{{duration}}' controls='{{controls}}' danmu-list='{{danmuList}}' danmu-btn='{{danmuBtn}}' enable-danmu='{{enableDanmu}}' autoplay='{{true||autoplay}}' loop='{{loop}}' muted='{{muted}}' initial-time='{{initialSeekTime}}' page-gesture='{{pageGesture}}' direction='{{direction}}' show-progress='{{showProgress}}' show-fullscreen-btn='{{showFullscreenBtn}}' show-play-btn='{{showPlayBtn}}' show-center-play-btn='{{showCenterPlayBtn}}' enable-progress-gesture='{{enableProgressGesture}}' object-fit='{{videoObjectFit}}' poster='{{poster}}' show-mute-btn='{{showMuteBtn}}' title='{{title}}' play-btn-position='{{playBtnPosition}}' enable-play-gesture='{{enablePlayGesture}}' auto-pause-if-navigate='{{autoPauseIfNavigate}}' auto-pause-if-open-native='{{autoPauseIfOpenNative}}' vslide-gesture='{{vslideGesture}}' vslide-gesture-in-fullscreen='{{vslideGestureInFullscreen}}' show-bottom-progress='{{showBottomProgress}}' show-casting-button='{{showCastingButton}}' show-background-playback-button="{{true}}" picture-in-picture-mode='{{[]}}' picture-in-picture-init-position='{{pictureInPictureInitPosition}}' picture-in-picture-show-progress='{{pictureInPictureShowProgress}}' enable-auto-rotation='{{enableAutoRotation}}' show-screen-lock-button='{{showScreenLockButton}}' show-snapshot-button='{{showSnapshotButton}}' bindplay="onPlay" bindpause="onPause" bindended="onEnded" bindloadedmetadata="onLoadedMetadata" binderror="onError" bindtimeupdate="onTimeupdate" bindfullscreenchange="onFullScreenChange" bindwaiting="onWaiting" bindprogress="onProgress" bindcontrolstoggle="onControlsToggle" bindenterpictureinpicture="onEnterPictureInPicture" bindleavepictureinpicture="onLeavePictureInPicture" bindseekcomplete="onSeekComplete">
+<video wx:elif="{{type=='vod'}}" id='{{id}}' class='vhall-player' src='{{src}}' duration='{{duration}}' controls='{{controls}}' danmu-list='{{danmuList}}' danmu-btn='{{danmuBtn}}' enable-danmu='{{enableDanmu}}' autoplay='{{autoplay}}' loop='{{loop}}' muted='{{muted}}' initial-time='{{initialSeekTime}}' page-gesture='{{pageGesture}}' direction='{{direction}}' show-progress='{{showProgress}}' show-fullscreen-btn='{{showFullscreenBtn}}' show-play-btn='{{showPlayBtn}}' show-center-play-btn='{{showCenterPlayBtn}}' enable-progress-gesture='{{enableProgressGesture}}' object-fit='{{videoObjectFit}}' poster='{{poster}}' show-mute-btn='{{showMuteBtn}}' title='{{title}}' play-btn-position='{{playBtnPosition}}' enable-play-gesture='{{enablePlayGesture}}' auto-pause-if-navigate='{{autoPauseIfNavigate}}' auto-pause-if-open-native='{{autoPauseIfOpenNative}}' vslide-gesture='{{vslideGesture}}' vslide-gesture-in-fullscreen='{{vslideGestureInFullscreen}}' show-bottom-progress='{{showBottomProgress}}' show-casting-button='{{showCastingButton}}' show-background-playback-button="{{true}}" picture-in-picture-mode='{{[]}}' picture-in-picture-init-position='{{pictureInPictureInitPosition}}' picture-in-picture-show-progress='{{pictureInPictureShowProgress}}' enable-auto-rotation='{{enableAutoRotation}}' show-screen-lock-button='{{showScreenLockButton}}' show-snapshot-button='{{showSnapshotButton}}' bindplay="onPlay" bindpause="onPause" bindended="onEnded" bindloadedmetadata="onLoadedMetadata" binderror="onError" bindtimeupdate="onTimeupdate" bindfullscreenchange="onFullScreenChange" bindwaiting="onWaiting" bindprogress="onProgress" bindcontrolstoggle="onControlsToggle" bindenterpictureinpicture="onEnterPictureInPicture" bindleavepictureinpicture="onLeavePictureInPicture" bindseekcomplete="onSeekComplete">
   <slot />
 </video>
 

package/lib/components/player/components/poster/poster.wxml

@@ -1,5 +1,5 @@
 <image 
   class='vhall-player-poster' 
-  mode='scaleToFill'
+  mode='aspectFill'
   src='{{url}}'
 />

package/lib/components/player/components/poster/poster.wxss

@@ -1 +1 @@
-.vhall-player-poster{height:100%;left:0;position:absolute;top:0;width:100%}
+.vhall-player-poster{height:100%;left:0;position:absolute;top:0;width:100%;z-index:2}

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

@@ -10,6 +10,7 @@ export function createData() {
     prefix,
     showAudioCover: false,
     showPoster: false,
+    showBigPlay: false, // 是否显示中间自定义的大播放按钮
     posterUrl: '',
     showLoading: false,
     showError: false,
@@ -49,6 +50,7 @@ export function createData() {
     webinarType: undefined,
     webinarTypeStr: undefined,
     webinarSubject: undefined,
+    webinarStatus: undefined,
     webinarStatusMap: {
       1: '直播中',
       2: '预约',
@@ -58,6 +60,14 @@ export function createData() {
     },
     recordWatchExpireObj: {},
 
-
+    // 暖场视频连续播放
+    // isWarmVideo 由 packages/sdk/player/index.js 计算（webinar_type==2 且配置了 warmup_paas_record_id），
+    // 经 initVhallPlayer 的 setData 注入；此处默认值仅作首次渲染兜底，避免 undefined
+    isWarmVideo: false, // 是否暖场视频
+    warmVideoIds: [], // 暖场视频 id 列表
+    warmVideoIndex: 0, // 当前播放索引
+    warmupPlayerType: 0, // 1-单次播放，2-循环播放
+    advancePlayTime: 0, // 提前观看限制（秒）：0-开播前随时可看；>0-开播前 N 秒才可观看
+    webinarStartTime: '', // 活动开播时间（用于计算可观看时间）
   };
 }

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) {