Merge branch 'dev' into sit

Jacob

9 天以前 74bd629e27bb16b8e07ceecc8960083d2d0748c7

 pages/zone/index.vue
..
..
@@ -28,6 +28,24 @@
28
28
 			<view class="head_img">
29
29
 				<image :src="info.image"></image>
30
30
 			</view>
31
+			<view v-if="info.zoneType == 8 && info.info" class="rich-content">
32
+				<rich-text :nodes="info.info"></rich-text>
33
+			</view>
34
+			<view v-if="info.zoneType == 8 && info.uploadVideo" class="video-wrap">
35
+				<view v-show="!videoControls" style="width:100%;height:750rpx">
36
+					<video id="zoneVideo" :src='info.uploadVideo' objectFit="contain" controls
37
+						style="width:100%;height:100%" show-center-play-btn="true" show-mute-btn="true" muted="true"
38
+						show-fullscreen-btn="true" auto-pause-if-navigate :custom-cache="false"
39
+						:enable-progress-gesture="true" show-progress="false"
40
+						:poster="info.uploadVideoImg || info.image" @pause="zoneVideoPause"></video>
41
+				</view>
42
+				<view class="video-poster" v-show="videoControls">
43
+					<image class="image" :src="info.uploadVideoImg || info.image"></image>
44
+				</view>
45
+				<view class="video-stop" v-show="videoControls" @tap="bindZoneVideoPlay">
46
+					<image class="image" src="https://ossacmall.bluedeer.com.cn/app/static/images/stop.png"></image>
47
+				</view>
48
+			</view>
31
49
 			<view class="tag-wrap-container" :style="'top:' + (marTop) + 'px;'" v-if="info.zoneType == 7">
32
50
 				<view class="tag-wrap">
33
51
 					<!-- 标签列表 -->
..
..
@@ -70,9 +88,8 @@
70
88
 					</view>
71
89
 				</view>
72
90
 			</view>
73
-			<view @click="goLottery" class="lottery_banner" v-if="info && info.isLottery">
74
-				<image class="lottery_bannerImg"
75
-					src="https://ossacmall.bluedeer.com.cn/app/static/images/zone_lotteryBanner.gif" mode="widthFix">
91
+			<view @click="goLottery" class="lottery_banner" v-if="info && info.isLottery && info.lotteryBanner">
92
+				<image class="lottery_bannerImg" :src="info.lotteryBanner" mode="widthFix">
76
93
 				</image>
77
94
 			</view>
78
95
 			<view class="tag-img-container" v-if="info.zoneType == 7">
..
..
@@ -599,6 +616,8 @@
599
616
 			isYueyangZone: false,
600
617
 			isOpen: false, // 默认收起，false收起/true展开
601
618
 			currentIndex: -1, // 默认选中第一个【全部】
619
+			videoControls: true, // 专区活动视频是否显示海报+播放按钮
620
+			zoneVideoContext: '', // 活动视频播放上下文
602
621
 			partitionList: [],
603
622
 			partitionProject: {},
604
623
 			tagList: [],
..
..
@@ -838,6 +857,17 @@
838
857
 		}
839
858
 	},
840
859
 	methods: {
860
+		/**
861
+		 * 专区活动视频：点击海报播放按钮后播放
862
+		 */
863
+		bindZoneVideoPlay() {
864
+			if (!this.zoneVideoContext) {
865
+				this.zoneVideoContext = uni.createVideoContext('zoneVideo', this);
866
+			}
867
+			this.$set(this, 'videoControls', false);
868
+			this.zoneVideoContext.play();
869
+		},
870
+		zoneVideoPause() { },
841
871
 		handleCouponRule() {
842
872
 			this.$refs.personalAndShareCouponRuleRef.show(this.info.ruleContentText)
843
873
 		},
..
..
@@ -1453,6 +1483,7 @@
1453
1483
 			console.log('专区详情入参：：', params)
1454
1484
 			getZoneDetail(that.id, params).then(res => {
1455
1485
 				that.info = res.data;
1486
+				//that.info.zoneType=8;
1456
1487
 				that.updateZoneShareMenu();
1457
1488
 				if (res.data.zoneType == 6) {
1458
1489
 					that.setYueyangZone()
..
..
@@ -1637,13 +1668,11 @@
1637
1668
 .lottery_banner {
1638
1669
 	margin: 15rpx auto;
1639
1670
 	width: 690rpx;
1640
-	height: 120rpx;
1641
1671
 	text-align: center;
1642
1672
 }
1643
1673
 
1644
1674
 .lottery_bannerImg {
1645
1675
 	width: 690rpx;
1646
-	height: 120rpx;
1647
1676
 }
1648
1677
 
1649
1678
 .tag-wrap-container {
..
..
@@ -1869,6 +1898,48 @@
1869
1898
 	}
1870
1899
 }
1871
1900
 
1901
+.rich-content {
1902
+	padding: 24rpx 30rpx;
1903
+	background-color: #fff;
1904
+}
1905
+
1906
+.video-wrap {
1907
+	position: relative;
1908
+	width: 100%;
1909
+	height: 750rpx;
1910
+	background-color: #000;
1911
+}
1912
+
1913
+.video-wrap .video-poster {
1914
+	position: absolute;
1915
+	top: 0;
1916
+	left: 0;
1917
+	width: 100%;
1918
+	height: 750rpx;
1919
+	z-index: 9;
1920
+}
1921
+
1922
+.video-wrap .video-poster .image {
1923
+	width: 100%;
1924
+	height: 100%;
1925
+}
1926
+
1927
+.video-wrap .video-stop {
1928
+	position: absolute;
1929
+	top: 50%;
1930
+	left: 50%;
1931
+	width: 136rpx;
1932
+	height: 136rpx;
1933
+	margin-top: -68rpx;
1934
+	margin-left: -68rpx;
1935
+	z-index: 9;
1936
+}
1937
+
1938
+.video-wrap .video-stop .image {
1939
+	width: 100%;
1940
+	height: 100%;
1941
+}
1942
+
1872
1943
 .toolbarList {
1873
1944
 	width: 750rpx;
1874
1945
 	position: -webkit-sticky;