Merge branch 'dev' into sit

Jacob

9 天以前 74bd629e27bb16b8e07ceecc8960083d2d0748c7

 pages/zone/index.vue
..
..
@@ -14,6 +14,9 @@
14
14
 		<view :style="{ height: marTop + 'px' }"></view>
15
15
 		<yueyangZone ref=yueyangZoneRef v-if="isYueyangZone" :zoneInfo="info" :careBeanRate="careBeanRate"
16
16
 			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>
17
20
 		<view v-else>
18
21
 			<view class="expireTime" v-if="expireTime && expireTime.length">
19
22
 				<text>专区将在</text>
..
..
@@ -85,9 +88,8 @@
85
88
 					</view>
86
89
 				</view>
87
90
 			</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">
91
+			<view @click="goLottery" class="lottery_banner" v-if="info && info.isLottery && info.lotteryBanner">
92
+				<image class="lottery_bannerImg" :src="info.lotteryBanner" mode="widthFix">
91
93
 				</image>
92
94
 			</view>
93
95
 			<view class="tag-img-container" v-if="info.zoneType == 7">
..
..
@@ -1226,6 +1228,11 @@
1226
1228
 				// that.myCareBean = res2.data.totalCareBeans;
1227
1229
 			});
1228
1230
 		},
1231
+		goDetail() {
1232
+			uni.navigateTo({
1233
+				url: '/pages/consumption/index?zoneId=' + this.info.id
1234
+			})
1235
+		},
1229
1236
 		goLottery() {
1230
1237
 			let that = this;
1231
1238
 			var data = {
..
..
@@ -1661,13 +1668,11 @@
1661
1668
 .lottery_banner {
1662
1669
 	margin: 15rpx auto;
1663
1670
 	width: 690rpx;
1664
-	height: 120rpx;
1665
1671
 	text-align: center;
1666
1672
 }
1667
1673
 
1668
1674
 .lottery_bannerImg {
1669
1675
 	width: 690rpx;
1670
-	height: 120rpx;
1671
1676
 }
1672
1677
 
1673
1678
 .tag-wrap-container {
..
..
@@ -1868,6 +1873,21 @@
1868
1873
 	transform: translate(0, -50%);
1869
1874
 }
1870
1875
 
1876
+.detail-btn {
1877
+	border: 2rpx solid #fff;
1878
+	border-top-left-radius: 20rpx;
1879
+	border-bottom-left-radius: 20rpx;
1880
+	padding: 10rpx;
1881
+	background-color: #daf2b2;
1882
+	color: #1e984f;
1883
+	width: 50rpx;
1884
+	position: fixed;
1885
+	top: 200rpx;
1886
+	right: 0rpx;
1887
+	line-height: 1rem;
1888
+	z-index: 99;
1889
+}
1890
+
1871
1891
 .head_img {
1872
1892
 	width: 750rpx;
1873
1893
 	height: 422rpx;