From 609a1931953b2298016bd2b0d6b410666b5ad7b9 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1
---
bicycle/pages/success/success.vue | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/bicycle/pages/success/success.vue b/bicycle/pages/success/success.vue
index 07aa642..ce55aff 100644
--- a/bicycle/pages/success/success.vue
+++ b/bicycle/pages/success/success.vue
@@ -13,7 +13,7 @@
<view class="info-label">鍒哥爜淇℃伅锛�</view>
<view class="coupon-card">
<view class="coupon-name">{{ couponInfo.name }}</view>
- <view class="coupon-desc">{{ couponInfo.desc }}</view>
+ <view class="coupon-desc">姣忔棩楠戣闄愬埗鏃堕棿锛歿{ couponInfo.limitTimeText }}</view>
<view class="coupon-divider"></view>
<view class="coupon-date">鏈夋晥鏈燂細{{ couponInfo.period }}</view>
</view>
@@ -23,10 +23,12 @@
</template>
<script>
+ const VERIFY_PACKAGE_INFO_KEY = 'verifyPackageInfo'
+
const defaultCouponInfo = {
- name: '閫氱敤楠戣3澶╀綋楠屽崱',
- desc: '姣忓ぉ鍏嶈垂楠戣120鍒嗛挓',
- period: '2026-05-01 鑷� 2026-05-03'
+ name: '',
+ limitTimeText: '--',
+ period: '--'
}
export default {
@@ -37,23 +39,36 @@
}
}
},
- onLoad(options) {
+ onLoad() {
+ const packageInfo = uni.getStorageSync(VERIFY_PACKAGE_INFO_KEY)
+ uni.removeStorageSync(VERIFY_PACKAGE_INFO_KEY)
+
+ if (!packageInfo) {
+ return
+ }
+
this.couponInfo = {
- name: options.name || defaultCouponInfo.name,
- desc: options.desc || defaultCouponInfo.desc,
- period: options.period || defaultCouponInfo.period
+ name: packageInfo.name,
+ limitTimeText: `${packageInfo.limitTime ? packageInfo.limitTime + '鍒嗛挓' : '涓嶉檺鍒�'}`,
+ period: this.formatPeriod(packageInfo.useStartDate, packageInfo.useEndDate)
}
},
methods: {
+ formatPeriod(useStartDate, useEndDate) {
+ if (useStartDate && useEndDate) {
+ return `${useStartDate} 鑷� ${useEndDate}`
+ }
+
+ return useStartDate || useEndDate || defaultCouponInfo.period
+ },
goHome() {
uni.reLaunch({
url: '/pages/index/index'
})
},
goScanRide() {
- uni.reLaunch({
- url: '/pages/index/index'
- })
+ uni.$emit('sweep')
+ uni.navigateBack({ delta: 2 });
}
}
}
@@ -149,6 +164,9 @@
font-weight: 600;
line-height: 56rpx;
color: #222222;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.coupon-desc {
--
Gitblit v1.9.3