blame | 历史 | 补丁 | 提交 | 提交对比
zhuxiuying
9 天以前 bf266f25cf258bc533eadf0f0377d76b7bc1f11a 
 pages/zone/index.vue
....@@ -14,6 +14,9 @@
1414 		<view :style="{ height: marTop + 'px' }"></view>
1515 		<yueyangZone ref=yueyangZoneRef v-if="isYueyangZone" :zoneInfo="info" :careBeanRate="careBeanRate"
1616 			style="position: relative;z-index: 2;" @goLottery="goLottery" :relationKey="relationKey"></yueyangZone>
17
+		<view v-if="isYueyangZone" class="detail-btn" @click="goDetail">
18
+			<text>消耗明细</text>
19
+		</view>
1720 		<view v-else>
1821 			<view class="expireTime" v-if="expireTime && expireTime.length">
1922 				<text>专区将在</text>
....@@ -24,24 +27,6 @@
2427 			</view>
2528 			<view class="head_img">
2629 				<image :src="info.image"></image>
27
-			</view>
28
-			<view v-if="info.zoneType == 8 && info.info" class="rich-content">
29
-				<rich-text :nodes="info.info"></rich-text>
30
-			</view>
31
-			<view v-if="info.zoneType == 8 && info.uploadVideo" class="video-wrap">
32
-				<view v-show="!videoControls" style="width:100%;height:750rpx">
33
-					<video id="zoneVideo" :src='info.uploadVideo' objectFit="contain" controls
34
-						style="width:100%;height:100%" show-center-play-btn="true" show-mute-btn="true" muted="true"
35
-						show-fullscreen-btn="true" auto-pause-if-navigate :custom-cache="false"
36
-						:enable-progress-gesture="true" show-progress="false"
37
-						:poster="info.uploadVideoImg || info.image" @pause="zoneVideoPause"></video>
38
-				</view>
39
-				<view class="video-poster" v-show="videoControls">
40
-					<image class="image" :src="info.uploadVideoImg || info.image"></image>
41
-				</view>
42
-				<view class="video-stop" v-show="videoControls" @tap="bindZoneVideoPlay">
43
-					<image class="image" src="https://ossacmall.bluedeer.com.cn/app/static/images/stop.png"></image>
44
-				</view>
4530 			</view>
4631 			<view class="tag-wrap-container" :style="'top:' + (marTop) + 'px;'" v-if="info.zoneType == 7">
4732 				<view class="tag-wrap">
....@@ -85,9 +70,8 @@
8570 					</view>
8671 				</view>
8772 			</view>
88
-			<view @click="goLottery" class="lottery_banner" v-if="info && info.isLottery">
89
-				<image class="lottery_bannerImg"
90
-					src="https://ossacmall.bluedeer.com.cn/app/static/images/zone_lotteryBanner.gif" mode="widthFix">
73
+			<view @click="goLottery" class="lottery_banner" v-if="info && info.isLottery && info.lotteryBanner">
74
+				<image class="lottery_bannerImg" :src="info.lotteryBanner" mode="widthFix">
9175 				</image>
9276 			</view>
9377 			<view class="tag-img-container" v-if="info.zoneType == 7">
....@@ -513,7 +497,7 @@
513497 
514498 <script>
515499 import {
516
-	HTTP_REQUEST_URL
500
+	WEB_ACTIVITY_BASE
517501 } from '@/config/app';
518502 import {
519503 	mapGetters
....@@ -614,8 +598,6 @@
614598 			isYueyangZone: false,
615599 			isOpen: false, // 默认收起，false收起/true展开
616600 			currentIndex: -1, // 默认选中第一个【全部】
617
-			videoControls: true, // 专区活动视频是否显示海报+播放按钮
618
-			zoneVideoContext: '', // 活动视频播放上下文
619601 			partitionList: [],
620602 			partitionProject: {},
621603 			tagList: [],
....@@ -855,17 +837,6 @@
855837 		}
856838 	},
857839 	methods: {
858
-		/**
859
-		 * 专区活动视频：点击海报播放按钮后播放
860
-		 */
861
-		bindZoneVideoPlay() {
862
-			if (!this.zoneVideoContext) {
863
-				this.zoneVideoContext = uni.createVideoContext('zoneVideo', this);
864
-			}
865
-			this.$set(this, 'videoControls', false);
866
-			this.zoneVideoContext.play();
867
-		},
868
-		zoneVideoPause() { },
869840 		handleCouponRule() {
870841 			this.$refs.personalAndShareCouponRuleRef.show(this.info.ruleContentText)
871842 		},
....@@ -1226,6 +1197,11 @@
12261197 				// that.myCareBean = res2.data.totalCareBeans;
12271198 			});
12281199 		},
1200
+		goDetail() {
1201
+			uni.navigateTo({
1202
+				url: '/pages/consumption/index?zoneId=' + this.info.id
1203
+			})
1204
+		},
12291205 		goLottery() {
12301206 			let that = this;
12311207 			var data = {
....@@ -1237,11 +1213,7 @@
12371213 			this.addTrack('yy_marketPageClick', data);
12381214 
12391215 			function go() {
1240
-				let webUrl = 'https://ossacmall.bluedeer.com.cn/acmall_lottery/index.html'
1241
-				if (HTTP_REQUEST_URL.indexOf('tohours') > 0) {
1242
-					webUrl = webUrl.replace('https://ossacmall.bluedeer.com.cn',
1243
-						'https://sit.tohours.com/crmeb_web')
1244
-				}
1216
+				let webUrl = `${WEB_ACTIVITY_BASE}/acmall_lottery/index.html`
12451217 				webUrl += '?token=' +
12461218 					that.$store.getters.token + '&unionId=' + that.$store.getters.unionId + '&mdayId=' + that.info
12471219 						.mdayId
....@@ -1480,7 +1452,6 @@
14801452 			console.log('专区详情入参：：', params)
14811453 			getZoneDetail(that.id, params).then(res => {
14821454 				that.info = res.data;
1483
-				//that.info.zoneType=8;
14841455 				that.updateZoneShareMenu();
14851456 				if (res.data.zoneType == 6) {
14861457 					that.setYueyangZone()
....@@ -1665,13 +1636,11 @@
16651636 .lottery_banner {
16661637 	margin: 15rpx auto;
16671638 	width: 690rpx;
1668
-	height: 120rpx;
16691639 	text-align: center;
16701640 }
16711641 
16721642 .lottery_bannerImg {
16731643 	width: 690rpx;
1674
-	height: 120rpx;
16751644 }
16761645 
16771646 .tag-wrap-container {
....@@ -1872,6 +1841,21 @@
18721841 	transform: translate(0, -50%);
18731842 }
18741843 
1844
+.detail-btn {
1845
+	border: 2rpx solid #fff;
1846
+	border-top-left-radius: 20rpx;
1847
+	border-bottom-left-radius: 20rpx;
1848
+	padding: 10rpx;
1849
+	background-color: #daf2b2;
1850
+	color: #1e984f;
1851
+	width: 50rpx;
1852
+	position: fixed;
1853
+	top: 200rpx;
1854
+	right: 0rpx;
1855
+	line-height: 1rem;
1856
+	z-index: 99;
1857
+}
1858
+
18751859 .head_img {
18761860 	width: 750rpx;
18771861 	height: 422rpx;
....@@ -1880,48 +1864,6 @@
18801864 		width: 750rpx;
18811865 		height: 422rpx;
18821866 	}
1883
-}
1884
-
1885
-.rich-content {
1886
-	padding: 24rpx 30rpx;
1887
-	background-color: #fff;
1888
-}
1889
-
1890
-.video-wrap {
1891
-	position: relative;
1892
-	width: 100%;
1893
-	height: 750rpx;
1894
-	background-color: #000;
1895
-}
1896
-
1897
-.video-wrap .video-poster {
1898
-	position: absolute;
1899
-	top: 0;
1900
-	left: 0;
1901
-	width: 100%;
1902
-	height: 750rpx;
1903
-	z-index: 9;
1904
-}
1905
-
1906
-.video-wrap .video-poster .image {
1907
-	width: 100%;
1908
-	height: 100%;
1909
-}
1910
-
1911
-.video-wrap .video-stop {
1912
-	position: absolute;
1913
-	top: 50%;
1914
-	left: 50%;
1915
-	width: 136rpx;
1916
-	height: 136rpx;
1917
-	margin-top: -68rpx;
1918
-	margin-left: -68rpx;
1919
-	z-index: 9;
1920
-}
1921
-
1922
-.video-wrap .video-stop .image {
1923
-	width: 100%;
1924
-	height: 100%;
19251867 }
19261868 
19271869 .toolbarList {