Merge branch 'master' into sit

Jacob

2026-10-12 4a45efcec76cbe047d069aef04e315082ff0775d

Merge branch 'master' into sit

 components/yueyangZone/index.vue
..
..
@@ -9,13 +9,10 @@
9
9
 				</view>
10
10
 			</view>
11
11
 			<view class="points-right">
12
-				<image src="https://ossacmall.bluedeer.com.cn/app/static/images/yueyang_jifen.png" class="lottery-btn" mode="widthFix"
13
-				 @click="goLottery"></image>
14
-			</view>
15
-			<view class="detail-btn" @click="goDetail">
16
-				<text>消耗明细</text>
17
-			</view>
18
-		</view>
12
+						<image src="https://ossacmall.bluedeer.com.cn/app/static/images/yueyang_jifen.png" class="lottery-btn" mode="widthFix"
13
+						 @click="goLottery"></image>
14
+					</view>
15
+				</view>
19
16
 
20
17
 		<!-- 优惠券兑换区 -->
21
18
 		<view class="coupon-area">
..
..
@@ -133,11 +130,6 @@
133
130
 		},
134
131
 		onShow() {},
135
132
 		methods: {
136
-			goDetail() {
137
-				uni.navigateTo({
138
-					url: '/pages/consumption/index?zoneId=' + this.zoneInfo.id
139
-				})
140
-			},
141
133
 			goLottery() {
142
134
 				this.$emit('goLottery')
143
135
 			},
..
..
@@ -322,20 +314,7 @@
322
314
 		height: 57rpx;
323
315
 	}
324
316
 
325
-	.detail-btn {
326
-		border: 2rpx solid #fff;
327
-		/* border-radius: 10rpx; */
328
-		border-top-left-radius: 20rpx;
329
-		border-bottom-left-radius: 20rpx;
330
-		padding: 10rpx;
331
-		background-color: #daf2b2;
332
-		color: #1e984f;
333
-		width: 50rpx;
334
-		position: fixed;
335
-		top: 200rpx;
336
-		right: 0rpx;
337
-		line-height: 1rem;
338
-	}
317
+	
339
318
 
340
319
 	.coupon-area {
341
320
 		display: flex;
 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>
..
..
@@ -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 = {
..
..
@@ -1868,6 +1876,21 @@
1868
1876
 	transform: translate(0, -50%);
1869
1877
 }
1870
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
+
1871
1894
 .head_img {
1872
1895
 	width: 750rpx;
1873
1896
 	height: 422rpx;