Merge branch 'dev' into sit

Jacob

1 天以前 106fc09e267f67bb35a279ed1bf71068a61e73c4

 pages/zone/index.vue
..
..
@@ -29,6 +29,24 @@
29
29
 			<view class="head_img">
30
30
 				<image :src="info.image"></image>
31
31
 			</view>
32
+			<view v-if="info.zoneType == 8 && info.info" class="rich-content">
33
+				<rich-text :nodes="info.info"></rich-text>
34
+			</view>
35
+			<view v-if="info.zoneType == 8 && info.uploadVideo" class="video-wrap">
36
+				<view v-show="!videoControls" style="width:100%;height:750rpx">
37
+					<video id="zoneVideo" :src='info.uploadVideo' objectFit="contain" controls
38
+						style="width:100%;height:100%" show-center-play-btn="true" show-mute-btn="true" muted="true"
39
+						show-fullscreen-btn="true" auto-pause-if-navigate :custom-cache="false"
40
+						:enable-progress-gesture="true" show-progress="false"
41
+						:poster="info.uploadVideoImg || info.image" @pause="zoneVideoPause"></video>
42
+				</view>
43
+				<view class="video-poster" v-show="videoControls">
44
+					<image class="image" :src="info.uploadVideoImg || info.image"></image>
45
+				</view>
46
+				<view class="video-stop" v-show="videoControls" @tap="bindZoneVideoPlay">
47
+					<image class="image" src="https://ossacmall.bluedeer.com.cn/app/static/images/stop.png"></image>
48
+				</view>
49
+			</view>
32
50
 			<view class="tag-wrap-container" :style="'top:' + (marTop) + 'px;'" v-if="info.zoneType == 7">
33
51
 				<view class="tag-wrap">
34
52
 					<!-- 标签列表 -->
..
..
@@ -601,6 +619,8 @@
601
619
 			isYueyangZone: false,
602
620
 			isOpen: false, // 默认收起，false收起/true展开
603
621
 			currentIndex: -1, // 默认选中第一个【全部】
622
+			videoControls: true, // 专区活动视频是否显示海报+播放按钮
623
+			zoneVideoContext: '', // 活动视频播放上下文
604
624
 			partitionList: [],
605
625
 			partitionProject: {},
606
626
 			tagList: [],
..
..
@@ -842,6 +862,17 @@
842
862
 		}
843
863
 	},
844
864
 	methods: {
865
+		/**
866
+		 * 专区活动视频：点击海报播放按钮后播放
867
+		 */
868
+		bindZoneVideoPlay() {
869
+			if (!this.zoneVideoContext) {
870
+				this.zoneVideoContext = uni.createVideoContext('zoneVideo', this);
871
+			}
872
+			this.$set(this, 'videoControls', false);
873
+			this.zoneVideoContext.play();
874
+		},
875
+		zoneVideoPause() { },
845
876
 		handleCouponRule() {
846
877
 			this.$refs.personalAndShareCouponRuleRef.show(this.info.ruleContentText)
847
878
 		},
..
..
@@ -1483,11 +1514,7 @@
1483
1514
 			console.log('专区详情入参：：', params)
1484
1515
 			getZoneDetail(that.id, params).then(res => {
1485
1516
 				that.info = res.data;
1486
-<<<<<<< Updated upstream
1487
-=======
1488
-				//that.info.zoneType=8;
1489
1517
 				that.setLotteryBannerSize(res.data);
1490
->>>>>>> Stashed changes
1491
1518
 				that.updateZoneShareMenu();
1492
1519
 				if (res.data.zoneType == 6) {
1493
1520
 					that.setYueyangZone()
..
..
@@ -1903,6 +1930,48 @@
1903
1930
 	}
1904
1931
 }
1905
1932
 
1933
+.rich-content {
1934
+	padding: 24rpx 30rpx;
1935
+	background-color: #fff;
1936
+}
1937
+
1938
+.video-wrap {
1939
+	position: relative;
1940
+	width: 100%;
1941
+	height: 750rpx;
1942
+	background-color: #000;
1943
+}
1944
+
1945
+.video-wrap .video-poster {
1946
+	position: absolute;
1947
+	top: 0;
1948
+	left: 0;
1949
+	width: 100%;
1950
+	height: 750rpx;
1951
+	z-index: 9;
1952
+}
1953
+
1954
+.video-wrap .video-poster .image {
1955
+	width: 100%;
1956
+	height: 100%;
1957
+}
1958
+
1959
+.video-wrap .video-stop {
1960
+	position: absolute;
1961
+	top: 50%;
1962
+	left: 50%;
1963
+	width: 136rpx;
1964
+	height: 136rpx;
1965
+	margin-top: -68rpx;
1966
+	margin-left: -68rpx;
1967
+	z-index: 9;
1968
+}
1969
+
1970
+.video-wrap .video-stop .image {
1971
+	width: 100%;
1972
+	height: 100%;
1973
+}
1974
+
1906
1975
 .toolbarList {
1907
1976
 	width: 750rpx;
1908
1977
 	position: -webkit-sticky;