diff --git a/src/components/door-panel/door-panel.vue b/src/components/door-panel/door-panel.vue index 43a7078..9f6c26b 100644 --- a/src/components/door-panel/door-panel.vue +++ b/src/components/door-panel/door-panel.vue @@ -109,6 +109,7 @@ 加载订单信息... + 查看订单详情 返回首页 @@ -232,6 +233,12 @@ export default { } }, + // 跳转订单详情 + goOrderDetail() { + const orderId = this.orderInfo.order_id || this.orderInfo.order_no; + uni.navigateTo({ url: `/pages/order/detail?order_id=${orderId}` }); + }, + // 关闭遮罩 handleClose() { this.step = ''; @@ -534,9 +541,21 @@ export default { padding: 16rpx 0; } +/* ====== 查看订单详情按钮 ====== */ +.door-btn-detail { + margin-top: 32rpx; + font-size: 30rpx; + color: #fff; + padding: 24rpx 80rpx; + background: linear-gradient(135deg, #2979ff, #1e60e0); + border-radius: 48rpx; + letter-spacing: 2rpx; + box-shadow: 0 8rpx 24rpx rgba(41, 121, 255, 0.35); +} + /* ====== 关闭按钮 ====== */ .door-btn-close { - margin-top: 48rpx; + margin-top: 24rpx; font-size: 30rpx; color: rgba(255, 255, 255, 0.85); padding: 24rpx 100rpx; diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 8352464..6387c39 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -500,11 +500,7 @@ export default { uni.clearStorageSync(); uni.showToast({ title: '已退出登录', icon: 'success' }); setTimeout(() => { - // 跳转到干净的URL,去掉code/state参数,避免重复使用旧code - const url = new URL(window.location.href); - url.searchParams.delete('code'); - url.searchParams.delete('state'); - window.location.href = url.toString(); + uni.reLaunch({ url: '/pages/index/scan' }); }, 1000); }, onVConsoleChange(e) {