diff --git a/config/url.js b/config/url.js index 49e687f..62a5ac5 100644 --- a/config/url.js +++ b/config/url.js @@ -1,5 +1,6 @@ export const URL = "https://my.gxfs123.com/api" //正式服务器 // export const URL = "https://fansdev.gxfs123.com/api" //测试服务器 // export const URL = "http://192.168.5.22:8080" //本地调试 +// export const URL = "http://127.0.0.1:8080" //本地调试 export const appid = "wx2165f0be356ae7a9" //小程序appid \ No newline at end of file diff --git a/config/user.js b/config/user.js index 4cc8a34..e9e36bb 100644 --- a/config/user.js +++ b/config/user.js @@ -194,7 +194,6 @@ export const updateUserBalance = (orderId) => { } /* - * *弃用 */ export const getPotionsDetail = (data) => { diff --git a/pages/device/detail.vue b/pages/device/detail.vue index b34c31d..97944a6 100644 --- a/pages/device/detail.vue +++ b/pages/device/detail.vue @@ -195,13 +195,13 @@ const showPhoneAuthPopup = ref(false) // 生命周期 onLoad 钩子 - onLoad(async(options) => { + onLoad(async (options) => { if (options.deviceNo != uni.getStorageSync('deviceId') || !uni.getStorageSync('deviceId')) { deviceId.value = options.deviceNo uni.setStorageSync('deviceId', options.deviceNo) } else { deviceId.value = uni.getStorageSync('deviceId') - // uni.removeStorageSync('deviceId') + // uni.removeStorageSync('deviceId') } await checkOrderStatus() await fetchDeviceInfo() @@ -209,6 +209,7 @@ onMounted(async () => { await checkUserPhone() + await fetchDeviceInfo() }) // onShow(async () => { @@ -344,9 +345,15 @@ deviceStatus.class = 'offline' } } - console.log('feeconfig', deviceInfo.value.feeConfig); + if (deviceInfo.value.feeConfig) { + deviceFeeConfig.value = JSON.parse(deviceInfo.value.feeConfig)[0] || {} + } else { + deviceFeeConfig.value = { + maxHourPrice: '5.00', + } + discount.value = '99.00' + } - deviceFeeConfig.value = JSON.parse(deviceInfo.value.feeConfig)[0] || {} } } @@ -434,33 +441,34 @@ // 获取后端返回的订单信息 const order = rentResult.data + console.log('订单信息',order); - // --- 统一：先更新订单套餐信息 --- - try { - let packageTimeMinutes = 0; - if (selectedPkg.time.includes('小时')) { - packageTimeMinutes = parseInt(selectedPkg.time) * 60; - } else if (selectedPkg.time.includes('分钟')) { - packageTimeMinutes = parseInt(selectedPkg.time); - } else { - packageTimeMinutes = parseInt(selectedPkg.time) * 60; // 默认按小时处理 - } + // // --- 统一：先更新订单套餐信息 --- + // try { + // let packageTimeMinutes = 0; + // if (selectedPkg.time.includes('小时')) { + // packageTimeMinutes = parseInt(selectedPkg.time) * 60; + // } else if (selectedPkg.time.includes('分钟')) { + // packageTimeMinutes = parseInt(selectedPkg.time); + // } else { + // packageTimeMinutes = parseInt(selectedPkg.time) * 60; // 默认按小时处理 + // } - const updateRes = await updateOrderPackage({ - orderId: order.orderId, - packageTime: packageTimeMinutes, - packagePrice: parseFloat(selectedPkg.price) - }); - if (updateRes.code !== 200) { - console.warn("更新订单套餐信息失败:", updateRes.msg); - // 这里可以选择是否提示用户或阻止流程，当前不阻止 - } else { - console.log("订单套餐信息已提前更新"); - } - } catch (updateError) { - console.error("更新订单套餐信息时出错:", updateError); - // 即使更新失败，也继续流程 - } + // const updateRes = await updateOrderPackage({ + // orderId: order.orderId, + // packageTime: packageTimeMinutes, + // packagePrice: parseFloat(selectedPkg.price) + // }); + // if (updateRes.code !== 200) { + // console.warn("更新订单套餐信息失败:", updateRes.msg); + // // 这里可以选择是否提示用户或阻止流程，当前不阻止 + // } else { + // console.log("订单套餐信息已提前更新"); + // } + // } catch (updateError) { + // console.error("更新订单套餐信息时出错:", updateError); + // // 即使更新失败，也继续流程 + // } // --- 套餐信息更新结束 --- if (payWay == 'wx-pay') { @@ -469,16 +477,16 @@ const res = await getOrderByOrderNo(order.orderNo); console.log(res); // --- 新增：计算总金额 --- - const deposit = parseFloat(deviceInfo.value.depositAmount); - const packagePrice = parseFloat(selectedPkg.price); - const totalAmount = (deposit + packagePrice).toFixed(2); + const deposit = parseFloat(order.depositAmount); + const packagePrice = parseFloat(order.unitPrice); + const totalAmount = deposit.toFixed(2); // --- 计算结束 --- uni.hideLoading() // 跳转到订单支付页面，传递订单ID、套餐信息和总金额 uni.redirectTo({ - url: `/pages/order/payment?orderId=${order.orderId}&packageTimeHours=${selectedPkg.time.replace('小时', '')}&packagePrice=${selectedPkg.price}&totalAmount=${totalAmount}&depositAmount=${depositAmount.value}${deviceInfo.value && deviceInfo.value.feeConfig ? '&feeConfig=' + encodeURIComponent(deviceInfo.value.feeConfig) : ''}` + url: `/pages/order/payment?orderId=${order.orderId}&packageTimeHours=${selectedPkg.time.replace('小时', '')}&packagePrice=${packagePrice}&totalAmount=${totalAmount}&depositAmount=${depositAmount.value}${deviceInfo.value && deviceInfo.value.feeConfig ? '&feeConfig=' + encodeURIComponent(deviceInfo.value.feeConfig) : ''}` }) } else if (payWay == 'wx-score-pay') { diff --git a/pages/feedback/index.vue b/pages/feedback/index.vue index d8d5477..351390b 100644 --- a/pages/feedback/index.vue +++ b/pages/feedback/index.vue @@ -1,50 +1,52 @@