From 3d69baf72d0b2b12f39a83552557445774d9c5ae Mon Sep 17 00:00:00 2001
From: ISFP_T <68358856@qq.com>
Date: Sat, 5 Jul 2025 11:24:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=96=87=E6=9C=AC=E6=9B=BF=E6=8D=A2?=
=?UTF-8?q?=E5=85=85=E7=94=B5=E5=AE=9D=3D>=E9=A3=8E=E6=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/user.js | 4 ++--
pages/order/return-success.vue | 2 +-
pages/order/success.vue | 20 ++++++++++----------
pages/return/index.vue | 4 ++--
utils/orderMonitor.js | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/config/user.js b/config/user.js
index f6daea0..00a48c4 100644
--- a/config/user.js
+++ b/config/user.js
@@ -115,9 +115,9 @@ export const rentPowerBank = (deviceNo, phone) => {
})
}
-//确认支付并弹出充电宝
+//确认支付并弹出风扇
export const confirmPaymentAndRent = (orderId) => {
- console.log(`确认支付并弹出充电宝, orderId: ${orderId}`)
+ console.log(`确认支付并弹出风扇, orderId: ${orderId}`)
return request({
url: `/app/device/confirmPaymentAndRent?orderId=${orderId}`,
method: 'post'
diff --git a/pages/order/return-success.vue b/pages/order/return-success.vue
index 7917067..27e78f1 100644
--- a/pages/order/return-success.vue
+++ b/pages/order/return-success.vue
@@ -4,7 +4,7 @@
归还成功
- 您的充电宝已归还，费用已从押金中扣除
+ 您的风扇已归还，费用已从押金中扣除
diff --git a/pages/order/success.vue b/pages/order/success.vue
index f565bd2..c9cb15c 100644
--- a/pages/order/success.vue
+++ b/pages/order/success.vue
@@ -97,7 +97,7 @@ export default {
// 检查订单状态
if (orderData.orderStatus === 'IN_USED') {
// 如果已经是使用中状态，可能说明开锁已经完成
- this.deviceMessage = '设备已弹出，请取走您的充电宝'
+ this.deviceMessage = '设备已弹出，请取走您的风扇'
this.isLoading = false
// 如果是第一次加载页面且设备已弹出，记录状态，避免重复弹出
@@ -123,10 +123,10 @@ export default {
}
},
- // 触发弹出充电宝
+ // 触发弹出风扇
async triggerDeviceEject() {
if (this.hasTriggeredDevice) {
- console.log('已经触发过弹出充电宝，不重复触发')
+ console.log('已经触发过弹出风扇，不重复触发')
return
}
@@ -136,26 +136,26 @@ export default {
this.deviceMessage = '正在准备您的设备，请稍候...'
try {
- console.log(`准备触发弹出充电宝，orderId: ${this.orderId}`)
+ console.log(`准备触发弹出风扇，orderId: ${this.orderId}`)
// 调用确认支付并弹出的方法
const result = await confirmPaymentAndRent(this.orderId)
- console.log('确认支付并弹出充电宝结果:', JSON.stringify(result))
+ console.log('确认支付并弹出风扇结果:', JSON.stringify(result))
if (result && result.code === 200) {
- this.deviceMessage = '设备已弹出，请取走您的充电宝'
+ this.deviceMessage = '设备已弹出，请取走您的风扇'
uni.showToast({
- title: '充电宝已弹出',
+ title: '风扇已弹出',
icon: 'success'
})
} else {
- throw new Error((result && result.msg) || '弹出充电宝失败')
+ throw new Error((result && result.msg) || '弹出风扇失败')
}
} catch (error) {
- console.error('弹出充电宝错误:', error)
+ console.error('弹出风扇错误:', error)
this.deviceMessage = '弹出设备失败，请联系客服'
uni.showToast({
- title: error.message || '弹出充电宝失败，请联系客服',
+ title: error.message || '弹出风扇失败，请联系客服',
icon: 'none'
})
} finally {
diff --git a/pages/return/index.vue b/pages/return/index.vue
index 2aaabd3..14dd01a 100644
--- a/pages/return/index.vue
+++ b/pages/return/index.vue
@@ -65,7 +65,7 @@
- 将充电宝插入原位置或空闲插口
+ 将风扇插入原位置或空闲插口
@@ -229,7 +229,7 @@ export default {
// 显示归还成功弹窗
uni.showModal({
title: '归还成功',
- content: '充电宝已归还成功，剩余押金将退还到您的账户',
+ content: '风扇已归还成功，剩余押金将退还到您的账户',
confirmText: '查看详情',
success: (res) => {
if (res.confirm) {
diff --git a/utils/orderMonitor.js b/utils/orderMonitor.js
index dd4ab12..f9e2723 100644
--- a/utils/orderMonitor.js
+++ b/utils/orderMonitor.js
@@ -157,7 +157,7 @@ class OrderMonitor {
// 显示全局通知
uni.showToast({
- title: '充电宝归还成功',
+ title: '风扇归还成功',
icon: 'success',
duration: 2000
})
@@ -174,7 +174,7 @@ class OrderMonitor {
setTimeout(() => {
uni.showModal({
title: '归还成功',
- content: '充电宝已归还成功，剩余押金将退还到您的账户',
+ content: '风扇已归还成功，剩余押金将退还到您的账户',
confirmText: '查看详情',
success: (res) => {
if (res.confirm) {