Merge branch 'master' into sit

Jacob

2026-10-13 a4ffccdccbf8b67a5fa34098c83a7d2013b41209

 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>
..
..
@@ -513,7 +516,7 @@
513
516
 
514
517
 <script>
515
518
 import {
516
-	HTTP_REQUEST_URL
519
+	WEB_ACTIVITY_BASE
517
520
 } from '@/config/app';
518
521
 import {
519
522
 	mapGetters
..
..
@@ -1226,6 +1229,11 @@
1226
1229
 				// that.myCareBean = res2.data.totalCareBeans;
1227
1230
 			});
1228
1231
 		},
1232
+		goDetail() {
1233
+			uni.navigateTo({
1234
+				url: '/pages/consumption/index?zoneId=' + this.info.id
1235
+			})
1236
+		},
1229
1237
 		goLottery() {
1230
1238
 			let that = this;
1231
1239
 			var data = {
..
..
@@ -1237,11 +1245,7 @@
1237
1245
 			this.addTrack('yy_marketPageClick', data);
1238
1246
 
1239
1247
 			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
-				}
1248
+				let webUrl = `${WEB_ACTIVITY_BASE}/acmall_lottery/index.html`
1245
1249
 				webUrl += '?token=' +
1246
1250
 					that.$store.getters.token + '&unionId=' + that.$store.getters.unionId + '&mdayId=' + that.info
1247
1251
 						.mdayId
..
..
@@ -1872,6 +1876,21 @@
1872
1876
 	transform: translate(0, -50%);
1873
1877
 }
1874
1878
 
1879
+.detail-btn {
1880
+	border: 2rpx solid #fff;
1881
+	border-top-left-radius: 20rpx;
1882
+	border-bottom-left-radius: 20rpx;
1883
+	padding: 10rpx;
1884
+	background-color: #daf2b2;
1885
+	color: #1e984f;
1886
+	width: 50rpx;
1887
+	position: fixed;
1888
+	top: 200rpx;
1889
+	right: 0rpx;
1890
+	line-height: 1rem;
1891
+	z-index: 99;
1892
+}
1893
+
1875
1894
 .head_img {
1876
1895
 	width: 750rpx;
1877
1896
 	height: 422rpx;