From f564a64d3c99b4d300e54e038446227a440bba48 Mon Sep 17 00:00:00 2001
From: Jacob <hlnie@tohours.com>
Date: 星期二, 20 十月 2026 15:18:54 +0800
Subject: [PATCH] Merge branch 'dev' into sit
---
pages/zone/index.vue | 93 ++++++++++++++++++++++++++--------------------
1 files changed, 53 insertions(+), 40 deletions(-)
diff --git a/pages/zone/index.vue b/pages/zone/index.vue
index df47626..c264c79 100644
--- a/pages/zone/index.vue
+++ b/pages/zone/index.vue
@@ -20,8 +20,9 @@
<view v-else>
<view class="expireTime" v-if="expireTime && expireTime.length">
<text>涓撳尯灏嗗湪</text>
- <text v-for="(val, index) in expireTime" :key="index">
- <text class="num">{{ val }}</text>{{ expireTimeUnit[index] }}
+ <text v-for="(item, index) in expireTime" :key="index">
+ <text class="num"><text v-for="(char, ci) in item.digits" :key="ci"
+ class="digit">{{ char }}</text></text>{{ item.unit }}
</text>
<text>{{ startOrEnd }}</text>
</view>
@@ -88,9 +89,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">
@@ -607,7 +607,7 @@
showMenu: false,
selectedMenuArr: [],
expireTime: [],
- expireTimeUnit: [],
+ countdownToken: 0,
isPageShow: false,
loginBackFn: null,
errText: '',
@@ -1327,6 +1327,9 @@
})
},
validAlert(data) {
+ // 姣忔閲嶆柊璁＄畻鍓嶄綔搴熸棫鐨勫�掕鏃堕摼锛岄伩鍏嶅鏉″畾鏃跺櫒鍚屾椂鍒锋柊瀵艰嚧鏁板瓧璺冲姩
+ this.countdownToken++
+ const token = this.countdownToken
const {
startTime,
expireTime
@@ -1345,17 +1348,17 @@
let minutes = startTimetamp.getMinutes()
minutes = minutes < 10 ? '0' + minutes : minutes;
- this.countdownTimer(startTime.split('-').join('/'), 'start')
+ this.countdownTimer(startTime.split('-').join('/'), 'start', token)
this.startOrEnd = "鍚庡紑鍚�"
return
- }
- }
- if (expireTime) {
- const expireTimetamp = new Date(expireTime.split('-').join('/')).getTime();
- if (expireTimetamp < nowTimestamp) {
+ }
+ }
+ if (expireTime) {
+ const expireTimetamp = new Date(expireTime.split('-').join('/')).getTime();
+ if (expireTimetamp < nowTimestamp) {
return
- }
- this.countdownTimer(expireTime.split('-').join('/'), 'end')
+ }
+ this.countdownTimer(expireTime.split('-').join('/'), 'end', token)
this.startOrEnd = "鍚庣粨鏉�"
}
},
@@ -1494,7 +1497,7 @@
that.homeTop = that.getHomeTop(0.4)
}
that.expireTime = [];
- that.expireTimeUnit = [];
+ that.countdownToken++;
that.where.page = 1;
that.getGoodList()
that.validAlert(res.data)
@@ -1520,8 +1523,9 @@
}
});
},
- countdownTimer(expireTime, type) {
+ countdownTimer(expireTime, type, token) {
if (!expireTime) return
+ if (token !== undefined && token !== this.countdownToken) return
let that = this;
// 缁撴潫鏃堕棿鐨勬椂闂存埑锛堥渶浼犲叆涓�涓湁鏁堢殑鏃ユ湡瀵硅薄鎴栨椂闂存埑锛�
const endTimestamp = new Date(expireTime).getTime();
@@ -1533,56 +1537,56 @@
if (type == 'end') {
if (diff <= 0) {
this.expireTime = []
- this.expireTimeUnit = []
return
} else { }
} else if (type == 'start') {
if (diff <= 0) {
this.expireTime = []
- this.expireTimeUnit = []
const expireTime2 = that.info.expireTime
if (expireTime2) {
const expireTimetamp = new Date(expireTime2.split('-').join('/')).getTime();
if (expireTimetamp < nowTimestamp) {
return
}
- this.countdownTimer(expireTime2.split('-').join('/'), 'end')
+ this.countdownTimer(expireTime2.split('-').join('/'), 'end', token)
this.startOrEnd = "鍚庣粨鏉�"
}
return
}
}
+ const pad = num => (num < 10 ? '0' + num : String(num))
const res = []
- const unit = []
const days = Math.floor(diff / (1000 * 60 * 60 * 24))
diff %= (1000 * 60 * 60 * 24)
- if (days > 0) {
- res.push(days);
- unit.push('鏃�')
- }
// 杞崲涓哄皬鏃躲�佸垎閽熴�佺
const hours = Math.floor(diff / (1000 * 60 * 60));
diff %= (1000 * 60 * 60); // 鍓╀綑姣鏁�
- if (hours > 0) {
- res.push(hours < 10 ? '0' + hours : hours);
- unit.push('鏃�')
- }
const minutes = Math.floor(diff / (1000 * 60));
- if (minutes > 0) {
- res.push(minutes < 10 ? '0' + minutes : minutes);
- unit.push('鍒�')
- }
diff %= (1000 * 60); // 鍓╀綑姣鏁�
const seconds = Math.floor(diff / 1000);
- if (seconds > 0) {
- res.push(seconds < 10 ? '0' + seconds : seconds);
- unit.push('绉�')
+ // 澶╂暟涓� 0 鏃朵笉灞曠ず锛屾椂/鍒�/绉掑缁堝睍绀猴紙琛� 0锛夛紝淇濊瘉鍊掕鏃堕暱搴︾ǔ瀹�
+ if (days > 0) {
+ res.push({
+ digits: pad(days).split(''),
+ unit: '鏃�'
+ })
}
+ res.push({
+ digits: pad(hours).split(''),
+ unit: '鏃�'
+ })
+ res.push({
+ digits: pad(minutes).split(''),
+ unit: '鍒�'
+ })
+ res.push({
+ digits: pad(seconds).split(''),
+ unit: '绉�'
+ })
this.expireTime = res
- this.expireTimeUnit = unit
if (this.isPageShow) {
setTimeout(() => {
- that.countdownTimer(expireTime, type)
+ that.countdownTimer(expireTime, type, token)
}, 1000)
}
},
@@ -1669,13 +1673,11 @@
.lottery_banner {
margin: 15rpx auto;
width: 690rpx;
- height: 120rpx;
text-align: center;
}
.lottery_bannerImg {
width: 690rpx;
- height: 120rpx;
}
.tag-wrap-container {
@@ -2159,11 +2161,22 @@
padding: 15rpx;
padding-left: 30rpx;
color: #979797;
+ font-size: 26rpx;
.num {
+ display: inline-block;
color: #000000;
background: #FFE20E;
- padding: 0 10rpx;
+ padding: 0 6rpx;
+ margin: 0 4rpx;
+ vertical-align: middle;
+ }
+
+ /* 姣忎釜鏁板瓧鍥哄畾瀹藉害锛岄伩鍏嶅�掕鏃惰烦鍔ㄦ椂瀹藉害蹇介暱蹇界煭 */
+ .digit {
+ display: inline-block;
+ width: 19rpx;
+ text-align: center;
}
}
</style>
\ No newline at end of file
--
Gitblit v1.4.0