Merge branch 'master' of git.quantgroup.cn:ui/mini-program-wepy into feature/raffle

src/components/custom/loading.wpy

@@ -15,7 +15,7 @@
   	position: absolute;
   	width: 100%;
   	height: 100%;
-  	background: #000;
+  	background:rgba(0,0,0,0.7);
   	display: flex;
   	justify-content: center;
   	align-items: center;

src/components/custom/videolist.wpy

 <style lang="less">
-  .container{
+  .container,.video-swiper{
     width:100%;
-    height:100%
-  }
-  .video-swiper{
-    width:100%;
-    height:100%
+    height:100%;
   }
   .video_item{
     height:100%;
@@ -13,21 +9,13 @@
     position: absolute;
     z-index: 1;
   }
-  .content{
-    position: absolute;
-    z-index: 9;
-    bottom: 405rpx;
-    width: 100%;
-    min-height:120rpx;
-    color: white;
-    clear: both;
-  }
   .rightcont {
     font-size: 24rpx;
-    display:inline-block;
-    float: right;
+    position: absolute;
+    z-index: 9;
+    bottom: 415rpx;
     width:30%;
-    margin-right: 30rpx;
+    right: 30rpx;
     color: #fff;
     .info {
       line-height: 40rpx;
@@ -73,16 +61,6 @@
       <!-- curQueue 循环会导致video重新插入，objectFit 不可变更 -->
       <swiper-item wx:for="{{curQueue}}" wx:key="index">
         <view class="video-wrapper">
-          <cover-view class="content">
-            <cover-view class="rightcont">
-              <cover-view class="info">奖品库存: 1/8</cover-view>
-              <cover-view class="info">中奖概率: {{item.id}}/3000</cover-view>
-              <cover-view class="progress">
-                <cover-view class="text">{{progress}}%</cover-view>
-                <cover-view class="orange" style="{{progressStyle}}"></cover-view>
-              </cover-view>
-            </cover-view>
-          </cover-view>
           <video
             id="video_{{index}}"
             class="video_item"
@@ -101,6 +79,14 @@
           >
             <video-pause :pause="pause"></video-pause>
           </video>
+          <view class="rightcont">
+            <view class="info">奖品库存: 1/8</view>
+            <view class="info">中奖概率: {{item.id}}/3000</view>
+            <view class="progress">
+              <view class="text">{{progress}}%</view>
+              <view class="orange" style="{{progressStyle}}"></view>
+            </view>
+          </view>
           <video-loading v-if="item.time === 0"/>
         </view>
       </swiper-item>
@@ -246,6 +232,11 @@
       playCurrent(current) {
         this._videoContexts.forEach((ctx, index) => {
 //          console.log('playCurrent', current, index);
+          if (index !== current) {
+            ctx.pause();
+          } else {
+            ctx.play();
+          }
         });
       },
       trigger(e, type) {