Merge branch 'dev' into sit

Jacob

9 天以前 74bd629e27bb16b8e07ceecc8960083d2d0748c7

Merge branch 'dev' into sit

 pages/zone/index.vue
..
..
@@ -88,9 +88,8 @@
88
88
 					</view>
89
89
 				</view>
90
90
 			</view>
91
-			<view @click="goLottery" class="lottery_banner" v-if="info && info.isLottery">
92
-				<image class="lottery_bannerImg"
93
-					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">
94
93
 				</image>
95
94
 			</view>
96
95
 			<view class="tag-img-container" v-if="info.zoneType == 7">
..
..
@@ -1669,13 +1668,11 @@
1669
1668
 .lottery_banner {
1670
1669
 	margin: 15rpx auto;
1671
1670
 	width: 690rpx;
1672
-	height: 120rpx;
1673
1671
 	text-align: center;
1674
1672
 }
1675
1673
 
1676
1674
 .lottery_bannerImg {
1677
1675
 	width: 690rpx;
1678
-	height: 120rpx;
1679
1676
 }
1680
1677
 
1681
1678
 .tag-wrap-container {