From 74bd629e27bb16b8e07ceecc8960083d2d0748c7 Mon Sep 17 00:00:00 2001
From: Jacob <hlnie@tohours.com>
Date: 星期四, 15 十月 2026 17:58:09 +0800
Subject: [PATCH] Merge branch 'dev' into sit
---
pages/zone/index.vue | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/pages/zone/index.vue b/pages/zone/index.vue
index 08f9ea7..2c78942 100644
--- a/pages/zone/index.vue
+++ b/pages/zone/index.vue
@@ -14,6 +14,9 @@
<view :style="{ height: marTop + 'px' }"></view>
<yueyangZone ref=yueyangZoneRef v-if="isYueyangZone" :zoneInfo="info" :careBeanRate="careBeanRate"
style="position: relative;z-index: 2;" @goLottery="goLottery" :relationKey="relationKey"></yueyangZone>
+ <view v-if="isYueyangZone" class="detail-btn" @click="goDetail">
+ <text>娑堣�楁槑缁�</text>
+ </view>
<view v-else>
<view class="expireTime" v-if="expireTime && expireTime.length">
<text>涓撳尯灏嗗湪</text>
@@ -85,9 +88,8 @@
</view>
</view>
</view>
- <view @click="goLottery" class="lottery_banner" v-if="info && info.isLottery">
- <image class="lottery_bannerImg"
- src="https://ossacmall.bluedeer.com.cn/app/static/images/zone_lotteryBanner.gif" mode="widthFix">
+ <view @click="goLottery" class="lottery_banner" v-if="info && info.isLottery && info.lotteryBanner">
+ <image class="lottery_bannerImg" :src="info.lotteryBanner" mode="widthFix">
</image>
</view>
<view class="tag-img-container" v-if="info.zoneType == 7">
@@ -1226,6 +1228,11 @@
// that.myCareBean = res2.data.totalCareBeans;
});
},
+ goDetail() {
+ uni.navigateTo({
+ url: '/pages/consumption/index?zoneId=' + this.info.id
+ })
+ },
goLottery() {
let that = this;
var data = {
@@ -1661,13 +1668,11 @@
.lottery_banner {
margin: 15rpx auto;
width: 690rpx;
- height: 120rpx;
text-align: center;
}
.lottery_bannerImg {
width: 690rpx;
- height: 120rpx;
}
.tag-wrap-container {
@@ -1868,6 +1873,21 @@
transform: translate(0, -50%);
}
+.detail-btn {
+ border: 2rpx solid #fff;
+ border-top-left-radius: 20rpx;
+ border-bottom-left-radius: 20rpx;
+ padding: 10rpx;
+ background-color: #daf2b2;
+ color: #1e984f;
+ width: 50rpx;
+ position: fixed;
+ top: 200rpx;
+ right: 0rpx;
+ line-height: 1rem;
+ z-index: 99;
+}
+
.head_img {
width: 750rpx;
height: 422rpx;
--
Gitblit v1.4.0