diff --git a/config/url.js b/config/url.js
index a59f049..64212cb 100644
--- a/config/url.js
+++ b/config/url.js
@@ -1,5 +1,5 @@
// export const URL = "https://my.gxfs123.com/api" //正式服务器
export const URL = "https://unifans.gxfs123.com/api" //测试服务器
-// export const URL = "http://192.168.10.60:8080" //本地调试
+// export const URL = "http://192.168.10.70:8080" //本地调试
export const appid = "wx2165f0be356ae7a9" //小程序appid
\ No newline at end of file
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 4514553..1480a8e 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -115,8 +115,12 @@
queryById,
getOrderByOrderNoScorePayStatus,
cancelOrder,
- confirmPaymentAndRent
+ confirmPaymentAndRent,
+ updateUserBalance
} from '../../config/user.js';
+ import {
+ URL
+ } from '../../config/url.js';
// 初始化状态
const currentTab = ref(0);
@@ -312,19 +316,48 @@
title: '处理中'
});
- const res = await confirmPaymentAndRent(order.orderNo);
- if (res.code === 200) {
- uni.hideLoading();
- uni.showToast({
- title: '支付成功',
- icon: 'success'
- });
+ // 调用后端创建微信支付订单接口
+ const res = await uni.request({
+ url: `${URL || 'http://127.0.0.1:8080'}/app/wx-payment/create/${order.orderNo}`,
+ method: 'GET',
+ header: {
+ 'Authorization': "Bearer " + uni.getStorageSync('token'),
+ 'Clientid': uni.getStorageSync('client_id')
+ }
+ });
+
+ if (res.statusCode === 200 && res.data.code === 200) {
+ const payParams = res.data.data;
- // 刷新订单列表
- await loadOrderList(orderStatusTabs[currentTab.value].status);
+ // 调用微信支付
+ await uni.requestPayment({
+ ...payParams,
+ success: async () => {
+ uni.showToast({
+ title: '支付成功',
+ icon: 'success'
+ });
+
+ // 更新用户余额
+ try {
+ await updateUserBalance(order.orderId || order.orderNo);
+ } catch (error) {
+ console.warn('更新用户余额失败:', error);
+ }
+
+ // 刷新订单列表
+ await loadOrderList(orderStatusTabs[currentTab.value].status);
+ },
+ fail: (err) => {
+ console.error('支付失败:', err);
+ throw new Error('支付失败，请重试');
+ }
+ });
} else {
- throw new Error(res.msg || '支付失败');
+ throw new Error(res.data.msg || '创建支付订单失败');
}
+
+ uni.hideLoading();
} catch (error) {
uni.hideLoading();
uni.showToast({
diff --git a/unpackage/dist/build/mp-weixin/pages/order/index.js b/unpackage/dist/build/mp-weixin/pages/order/index.js
index a5fd079..094354b 100644
--- a/unpackage/dist/build/mp-weixin/pages/order/index.js
+++ b/unpackage/dist/build/mp-weixin/pages/order/index.js
@@ -1 +1 @@
-"use strict";const t=require("../../common/vendor.js"),e=require("../../common/assets.js"),a=require("../../config/user.js"),s={__name:"index",setup(s){const o=t.ref(0),r=t.ref([]),n=t.reactive({0:{text:"待支付",class:"status-waiting"},1:{text:"使用中",class:"status-using"},2:{text:"已完成",class:"status-finished"},3:{text:"已取消",class:"status-cancelled"},waiting_for_payment:{text:"待支付",class:"status-waiting"},in_used:{text:"使用中",class:"status-using"},used_done:{text:"已完成",class:"status-finished"},order_cancelled:{text:"已取消",class:"status-cancelled"}}),d=t.reactive([{text:"全部",status:[]},{text:"待付款",status:["waiting_for_payment"]},{text:"使用中",status:["in_used"]},{text:"已完成",status:["used_done"]},{text:"已取消",status:["order_cancelled"]}]);t.onLoad((async t=>{if(t&&t.orderId)try{const e=await a.queryById(t.orderId);if(200===e.code&&e.data){const t=e.data,a=t.startTime||t.createTime||"",s={orderNo:t.orderId,status:t.orderStatus,deviceId:t.deviceNo,payWay:t.payWay,startTime:a,endTime:t.endTime||"",amount:t.payAmount||t.actualDeviceAmount||"0.00"};r.value=[s,...r.value];const o=d.findIndex((e=>e.status.includes(t.orderStatus)));-1!==o&&i(o)}}catch(e){console.error("获取订单详情失败:",e)}await c()}));const i=async t=>{o.value=t;const e=d[t].status[0];await c(e)},c=async e=>{try{null!=e&&(e={orderStatus:e});const t=await a.getOrderList(e);200===t.code&&t.data&&t.data.records&&(r.value=t.data.records.map((t=>{const e=t.startTime||t.createTime||"";return{orderNo:t.orderNo,orderId:t.orderId,orderStatus:t.orderStatus,deviceId:t.deviceNo,payWay:t.payWay,startTime:e,endTime:t.endTime||"",amount:t.payAmount||t.actualDeviceAmount||"0.00"}})))}catch(s){console.error("获取订单列表失败:",s),t.index.showToast({title:"获取订单列表失败",icon:"none"})}};return(s,u)=>t.e({a:t.f(d,((e,a,s)=>({a:t.t(e.text),b:a,c:o.value===a?1:"",d:t.o((t=>i(a)),a)}))),b:0===r.value.length},(r.value.length,{}),{c:t.f(r.value,((s,r,i)=>{var u,l;return t.e({a:t.t(s.orderNo),b:t.t(null==(u=n[s.orderStatus])?void 0:u.text),c:t.n(null==(l=n[s.orderStatus])?void 0:l.class),d:t.t(s.deviceId),e:"wx_score_pay"==s.payWay},"wx_score_pay"==s.payWay?{f:e._imports_0$2}:{},{g:t.t(s.startTime),h:t.t(s.endTime||"-"),i:t.t(s.amount),j:"waiting_for_payment"===s.status||"waiting_for_payment"===s.orderStatus},"waiting_for_payment"===s.status||"waiting_for_payment"===s.orderStatus?{k:t.o((e=>(async e=>{try{t.index.showLoading({title:"处理中"});const s=await a.confirmPaymentAndRent(e.orderNo);if(200!==s.code)throw new Error(s.msg||"支付失败");t.index.hideLoading(),t.index.showToast({title:"支付成功",icon:"success"}),await c(d[o.value].status)}catch(s){t.index.hideLoading(),t.index.showToast({title:s.message||"支付失败",icon:"none"})}})(s)),r)}:{},{l:"waiting_for_payment"===s.status||"waiting_for_payment"===s.orderStatus},"waiting_for_payment"===s.status||"waiting_for_payment"===s.orderStatus?{m:t.o((e=>(async e=>{try{t.index.showModal({title:"确认取消",content:"确定要取消此订单吗？",success:async s=>{if(s.confirm){t.index.showLoading({title:"处理中"});const s=await a.cancelOrder({orderId:e.orderNo});if(!s)throw new Error(s.msg||"取消订单失败");t.index.hideLoading(),t.index.showToast({title:"订单已取消",icon:"success"}),await c()}}})}catch(s){t.index.hideLoading(),t.index.showToast({title:s.message||"取消订单失败",icon:"none"})}})(s)),r)}:{},{n:"in_used"==s.status||"in_used"==s.orderStatus},"in_used"==s.status||"in_used"==s.orderStatus?{o:t.o((e=>{return a=s.deviceId,o=s.orderId,console.log(o),void t.index.navigateTo({url:`/pages/return/index?deviceId=${a}&orderId=${o}`});var a,o}),r)}:{},{p:t.o((e=>(e=>{t.index.navigateTo({url:`/pages/order/details?orderId=${e.orderId||e.orderNo}`})})(s)),r),q:r})}))})}},o=t._export_sfc(s,[["__scopeId","data-v-2998ff8e"]]);wx.createPage(o);
+"use strict";const e=require("../../common/vendor.js"),t=require("../../common/assets.js"),a=require("../../config/user.js"),s=require("../../config/url.js"),r={__name:"index",setup(r){const o=e.ref(0),n=e.ref([]),d=e.reactive({0:{text:"待支付",class:"status-waiting"},1:{text:"使用中",class:"status-using"},2:{text:"已完成",class:"status-finished"},3:{text:"已取消",class:"status-cancelled"},waiting_for_payment:{text:"待支付",class:"status-waiting"},in_used:{text:"使用中",class:"status-using"},used_done:{text:"已完成",class:"status-finished"},order_cancelled:{text:"已取消",class:"status-cancelled"}}),i=e.reactive([{text:"全部",status:[]},{text:"待付款",status:["waiting_for_payment"]},{text:"使用中",status:["in_used"]},{text:"已完成",status:["used_done"]},{text:"已取消",status:["order_cancelled"]}]);e.onLoad((async e=>{if(e&&e.orderId)try{const t=await a.queryById(e.orderId);if(200===t.code&&t.data){const e=t.data,a=e.startTime||e.createTime||"",s={orderNo:e.orderId,status:e.orderStatus,deviceId:e.deviceNo,payWay:e.payWay,startTime:a,endTime:e.endTime||"",amount:e.payAmount||e.actualDeviceAmount||"0.00"};n.value=[s,...n.value];const r=i.findIndex((t=>t.status.includes(e.orderStatus)));-1!==r&&c(r)}}catch(t){console.error("获取订单详情失败:",t)}await u()}));const c=async e=>{o.value=e;const t=i[e].status[0];await u(t)},u=async t=>{try{null!=t&&(t={orderStatus:t});const e=await a.getOrderList(t);200===e.code&&e.data&&e.data.records&&(n.value=e.data.records.map((e=>{const t=e.startTime||e.createTime||"";return{orderNo:e.orderNo,orderId:e.orderId,orderStatus:e.orderStatus,deviceId:e.deviceNo,payWay:e.payWay,startTime:t,endTime:e.endTime||"",amount:e.payAmount||e.actualDeviceAmount||"0.00"}})))}catch(s){console.error("获取订单列表失败:",s),e.index.showToast({title:"获取订单列表失败",icon:"none"})}};return(r,l)=>e.e({a:e.f(i,((t,a,s)=>({a:e.t(t.text),b:a,c:o.value===a?1:"",d:e.o((e=>c(a)),a)}))),b:0===n.value.length},(n.value.length,{}),{c:e.f(n.value,((r,n,c)=>{var l,m;return e.e({a:e.t(r.orderNo),b:e.t(null==(l=d[r.orderStatus])?void 0:l.text),c:e.n(null==(m=d[r.orderStatus])?void 0:m.class),d:e.t(r.deviceId),e:"wx_score_pay"==r.payWay},"wx_score_pay"==r.payWay?{f:t._imports_0$2}:{},{g:e.t(r.startTime),h:e.t(r.endTime||"-"),i:e.t(r.amount),j:"waiting_for_payment"===r.status||"waiting_for_payment"===r.orderStatus},"waiting_for_payment"===r.status||"waiting_for_payment"===r.orderStatus?{k:e.o((t=>(async t=>{try{e.index.showLoading({title:"处理中"});const r=await e.index.request({url:`${s.URL||"http://127.0.0.1:8080"}/app/wx-payment/create/${t.orderNo}`,method:"GET",header:{Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")}});if(200!==r.statusCode||200!==r.data.code)throw new Error(r.data.msg||"创建支付订单失败");{const s=r.data.data;await e.index.requestPayment({...s,success:async()=>{e.index.showToast({title:"支付成功",icon:"success"});try{await a.updateUserBalance(t.orderId||t.orderNo)}catch(s){console.warn("更新用户余额失败:",s)}await u(i[o.value].status)},fail:e=>{throw console.error("支付失败:",e),new Error("支付失败，请重试")}})}e.index.hideLoading()}catch(r){e.index.hideLoading(),e.index.showToast({title:r.message||"支付失败",icon:"none"})}})(r)),n)}:{},{l:"waiting_for_payment"===r.status||"waiting_for_payment"===r.orderStatus},"waiting_for_payment"===r.status||"waiting_for_payment"===r.orderStatus?{m:e.o((t=>(async t=>{try{e.index.showModal({title:"确认取消",content:"确定要取消此订单吗？",success:async s=>{if(s.confirm){e.index.showLoading({title:"处理中"});const s=await a.cancelOrder({orderId:t.orderNo});if(!s)throw new Error(s.msg||"取消订单失败");e.index.hideLoading(),e.index.showToast({title:"订单已取消",icon:"success"}),await u()}}})}catch(s){e.index.hideLoading(),e.index.showToast({title:s.message||"取消订单失败",icon:"none"})}})(r)),n)}:{},{n:"in_used"==r.status||"in_used"==r.orderStatus},"in_used"==r.status||"in_used"==r.orderStatus?{o:e.o((t=>{return a=r.deviceId,s=r.orderId,console.log(s),void e.index.navigateTo({url:`/pages/return/index?deviceId=${a}&orderId=${s}`});var a,s}),n)}:{},{p:e.o((t=>(t=>{e.index.navigateTo({url:`/pages/order/details?orderId=${t.orderId||t.orderNo}`})})(r)),n),q:n})}))})}},o=e._export_sfc(r,[["__scopeId","data-v-57aa6fd9"]]);wx.createPage(o);
diff --git a/unpackage/dist/build/mp-weixin/pages/order/index.wxml b/unpackage/dist/build/mp-weixin/pages/order/index.wxml
index cf53bd4..4c7aeb7 100644
--- a/unpackage/dist/build/mp-weixin/pages/order/index.wxml
+++ b/unpackage/dist/build/mp-weixin/pages/order/index.wxml
@@ -1 +1 @@
-{{tab.a}}暂无订单记录共享风扇设备号：{{order.d}}微信支付分|免押租借押金租借开始时间：{{order.g}}结束时间：{{order.h}}
\ No newline at end of file
+{{tab.a}}暂无订单记录共享风扇设备号：{{order.d}}微信支付分|免押租借押金租借开始时间：{{order.g}}结束时间：{{order.h}}
\ No newline at end of file
diff --git a/unpackage/dist/build/mp-weixin/pages/order/index.wxss b/unpackage/dist/build/mp-weixin/pages/order/index.wxss
index 7933dc0..a8ad502 100644
--- a/unpackage/dist/build/mp-weixin/pages/order/index.wxss
+++ b/unpackage/dist/build/mp-weixin/pages/order/index.wxss
@@ -1 +1 @@
-.order-container.data-v-2998ff8e{min-height:100vh;background:#f7f8fa;padding-bottom:30rpx}.order-container .status-tabs.data-v-2998ff8e{display:flex;background:#fff;padding:0 20rpx;position:-webkit-sticky;position:sticky;top:0;z-index:10;box-shadow:0 2rpx 10rpx rgba(0,0,0,.05)}.order-container .status-tabs .tab-item.data-v-2998ff8e{flex:1;height:90rpx;display:flex;align-items:center;justify-content:center;font-size:28rpx;color:#666;position:relative}.order-container .status-tabs .tab-item.active.data-v-2998ff8e{color:#1976d2;font-weight:500}.order-container .status-tabs .tab-item.active.data-v-2998ff8e:after{content:"";position:absolute;bottom:0;left:50%;transform:translate(-50%);width:40rpx;height:4rpx;background:#1976d2;border-radius:2rpx}.order-container .order-list.data-v-2998ff8e{padding:20rpx}.order-container .order-list .order-item.data-v-2998ff8e{background:#fff;border-radius:16rpx;margin-bottom:20rpx;overflow:hidden;box-shadow:0 2rpx 12rpx rgba(0,0,0,.04)}.order-container .order-list .order-item .order-header.data-v-2998ff8e{display:flex;justify-content:space-between;align-items:center;padding:24rpx;border-bottom:1rpx solid #f0f0f0}.order-container .order-list .order-item .order-header .order-id.data-v-2998ff8e{font-size:26rpx;color:#666}.order-container .order-list .order-item .order-header .order-status.data-v-2998ff8e{font-size:26rpx;font-weight:500}.order-container .order-list .order-item .order-header .order-status.status-waiting.data-v-2998ff8e{color:#ff9800}.order-container .order-list .order-item .order-header .order-status.status-using.data-v-2998ff8e{color:#2196f3}.order-container .order-list .order-item .order-header .order-status.status-finished.data-v-2998ff8e{color:#4caf50}.order-container .order-list .order-item .order-header .order-status.status-cancelled.data-v-2998ff8e{color:#9e9e9e}.order-container .order-list .order-item .order-body.data-v-2998ff8e{padding:24rpx}.order-container .order-list .order-item .order-body .device-info.data-v-2998ff8e{margin-bottom:20rpx;display:flex;justify-content:space-between;align-items:flex-start}.order-container .order-list .order-item .order-body .device-info .device-left.data-v-2998ff8e{flex:1;margin-right:20rpx}.order-container .order-list .order-item .order-body .device-info .device-left .device-name.data-v-2998ff8e{font-size:32rpx;font-weight:500;color:#333;margin-bottom:6rpx}.order-container .order-list .order-item .order-body .device-info .device-left .device-id.data-v-2998ff8e{font-size:26rpx;color:#999;margin-bottom:0}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.data-v-2998ff8e{display:inline-flex;align-items:center;padding:6rpx 12rpx;border-radius:8rpx;white-space:nowrap}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score.data-v-2998ff8e{background:rgba(7,193,96,.08)}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score .badge-icon.data-v-2998ff8e{width:32rpx;height:26rpx;margin-right:8rpx}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score .badge-text.data-v-2998ff8e{font-size:22rpx;color:#07c160;display:flex;align-items:center}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score .badge-text .divider.data-v-2998ff8e{margin:0 6rpx}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score .badge-text .highlight.data-v-2998ff8e{font-weight:500}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.deposit.data-v-2998ff8e{background:#f5f5f5}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.deposit .badge-text.data-v-2998ff8e{font-size:22rpx;color:#666;font-weight:500}.order-container .order-list .order-item .order-body .order-times .time-row.data-v-2998ff8e{display:flex;font-size:26rpx;margin-bottom:8rpx}.order-container .order-list .order-item .order-body .order-times .time-row .time-label.data-v-2998ff8e{color:#999;width:140rpx}.order-container .order-list .order-item .order-body .order-times .time-row .time-value.data-v-2998ff8e{color:#333;flex:1}.order-container .order-list .order-item .order-footer.data-v-2998ff8e{display:flex;justify-content:space-between;align-items:center;padding:20rpx 24rpx;background:#fafafa;border-top:1rpx solid #f0f0f0}.order-container .order-list .order-item .order-footer .price.data-v-2998ff8e{font-size:34rpx;font-weight:500;color:#ff6b6b}.order-container .order-list .order-item .order-footer .actions.data-v-2998ff8e{display:flex;flex-wrap:wrap;justify-content:flex-end}.order-container .order-list .order-item .order-footer .actions .action-item.data-v-2998ff8e{font-size:26rpx;padding:10rpx 30rpx;border-radius:30rpx;margin-left:20rpx;display:flex;align-items:center;justify-content:center;margin-bottom:10rpx}.order-container .order-list .order-item .order-footer .actions .action-item.primary.data-v-2998ff8e{background:#1976d2;color:#fff}.order-container .order-list .order-item .order-footer .actions .action-item.secondary.data-v-2998ff8e{background:#f5f5f5;color:#666;border:1rpx solid #e0e0e0}.order-container .order-list .order-item .order-footer .actions .action-item.data-v-2998ff8e:active{opacity:.8}.order-container .order-list .empty-state.data-v-2998ff8e{padding:100rpx 0;text-align:center}.order-container .order-list .empty-state .empty-icon.data-v-2998ff8e{width:180rpx;height:180rpx;margin:0 auto 30rpx;background:#f5f5f5;border-radius:50%}.order-container .order-list .empty-state .empty-text.data-v-2998ff8e{font-size:28rpx;color:#999}
+.order-container.data-v-57aa6fd9{min-height:100vh;background:#f7f8fa;padding-bottom:30rpx}.order-container .status-tabs.data-v-57aa6fd9{display:flex;background:#fff;padding:0 20rpx;position:-webkit-sticky;position:sticky;top:0;z-index:10;box-shadow:0 2rpx 10rpx rgba(0,0,0,.05)}.order-container .status-tabs .tab-item.data-v-57aa6fd9{flex:1;height:90rpx;display:flex;align-items:center;justify-content:center;font-size:28rpx;color:#666;position:relative}.order-container .status-tabs .tab-item.active.data-v-57aa6fd9{color:#1976d2;font-weight:500}.order-container .status-tabs .tab-item.active.data-v-57aa6fd9:after{content:"";position:absolute;bottom:0;left:50%;transform:translate(-50%);width:40rpx;height:4rpx;background:#1976d2;border-radius:2rpx}.order-container .order-list.data-v-57aa6fd9{padding:20rpx}.order-container .order-list .order-item.data-v-57aa6fd9{background:#fff;border-radius:16rpx;margin-bottom:20rpx;overflow:hidden;box-shadow:0 2rpx 12rpx rgba(0,0,0,.04)}.order-container .order-list .order-item .order-header.data-v-57aa6fd9{display:flex;justify-content:space-between;align-items:center;padding:24rpx;border-bottom:1rpx solid #f0f0f0}.order-container .order-list .order-item .order-header .order-id.data-v-57aa6fd9{font-size:26rpx;color:#666}.order-container .order-list .order-item .order-header .order-status.data-v-57aa6fd9{font-size:26rpx;font-weight:500}.order-container .order-list .order-item .order-header .order-status.status-waiting.data-v-57aa6fd9{color:#ff9800}.order-container .order-list .order-item .order-header .order-status.status-using.data-v-57aa6fd9{color:#2196f3}.order-container .order-list .order-item .order-header .order-status.status-finished.data-v-57aa6fd9{color:#4caf50}.order-container .order-list .order-item .order-header .order-status.status-cancelled.data-v-57aa6fd9{color:#9e9e9e}.order-container .order-list .order-item .order-body.data-v-57aa6fd9{padding:24rpx}.order-container .order-list .order-item .order-body .device-info.data-v-57aa6fd9{margin-bottom:20rpx;display:flex;justify-content:space-between;align-items:flex-start}.order-container .order-list .order-item .order-body .device-info .device-left.data-v-57aa6fd9{flex:1;margin-right:20rpx}.order-container .order-list .order-item .order-body .device-info .device-left .device-name.data-v-57aa6fd9{font-size:32rpx;font-weight:500;color:#333;margin-bottom:6rpx}.order-container .order-list .order-item .order-body .device-info .device-left .device-id.data-v-57aa6fd9{font-size:26rpx;color:#999;margin-bottom:0}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.data-v-57aa6fd9{display:inline-flex;align-items:center;padding:6rpx 12rpx;border-radius:8rpx;white-space:nowrap}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score.data-v-57aa6fd9{background:rgba(7,193,96,.08)}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score .badge-icon.data-v-57aa6fd9{width:32rpx;height:26rpx;margin-right:8rpx}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score .badge-text.data-v-57aa6fd9{font-size:22rpx;color:#07c160;display:flex;align-items:center}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score .badge-text .divider.data-v-57aa6fd9{margin:0 6rpx}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score .badge-text .highlight.data-v-57aa6fd9{font-weight:500}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.deposit.data-v-57aa6fd9{background:#f5f5f5}.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.deposit .badge-text.data-v-57aa6fd9{font-size:22rpx;color:#666;font-weight:500}.order-container .order-list .order-item .order-body .order-times .time-row.data-v-57aa6fd9{display:flex;font-size:26rpx;margin-bottom:8rpx}.order-container .order-list .order-item .order-body .order-times .time-row .time-label.data-v-57aa6fd9{color:#999;width:140rpx}.order-container .order-list .order-item .order-body .order-times .time-row .time-value.data-v-57aa6fd9{color:#333;flex:1}.order-container .order-list .order-item .order-footer.data-v-57aa6fd9{display:flex;justify-content:space-between;align-items:center;padding:20rpx 24rpx;background:#fafafa;border-top:1rpx solid #f0f0f0}.order-container .order-list .order-item .order-footer .price.data-v-57aa6fd9{font-size:34rpx;font-weight:500;color:#ff6b6b}.order-container .order-list .order-item .order-footer .actions.data-v-57aa6fd9{display:flex;flex-wrap:wrap;justify-content:flex-end}.order-container .order-list .order-item .order-footer .actions .action-item.data-v-57aa6fd9{font-size:26rpx;padding:10rpx 30rpx;border-radius:30rpx;margin-left:20rpx;display:flex;align-items:center;justify-content:center;margin-bottom:10rpx}.order-container .order-list .order-item .order-footer .actions .action-item.primary.data-v-57aa6fd9{background:#1976d2;color:#fff}.order-container .order-list .order-item .order-footer .actions .action-item.secondary.data-v-57aa6fd9{background:#f5f5f5;color:#666;border:1rpx solid #e0e0e0}.order-container .order-list .order-item .order-footer .actions .action-item.data-v-57aa6fd9:active{opacity:.8}.order-container .order-list .empty-state.data-v-57aa6fd9{padding:100rpx 0;text-align:center}.order-container .order-list .empty-state .empty-icon.data-v-57aa6fd9{width:180rpx;height:180rpx;margin:0 auto 30rpx;background:#f5f5f5;border-radius:50%}.order-container .order-list .empty-state .empty-text.data-v-57aa6fd9{font-size:28rpx;color:#999}
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/config/url.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/config/url.js.map
index 33172a2..b15fffa 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/config/url.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/config/url.js.map
@@ -1 +1 @@
-{"version":3,"file":"url.js","sources":["config/url.js"],"sourcesContent":["// export const URL = \"https://my.gxfs123.com/api\" //正式服务器\r\nexport const URL = \"https://unifans.gxfs123.com/api\" //测试服务器\r\n// export const URL = \"http://192.168.10.60:8080\" \t\t//本地调试\r\n\r\nexport const appid = \"wx2165f0be356ae7a9\" //小程序appid"],"names":[],"mappings":";AACY,MAAC,MAAM;AAGP,MAAC,QAAQ;;;"}
\ No newline at end of file
+{"version":3,"file":"url.js","sources":["config/url.js"],"sourcesContent":["// export const URL = \"https://my.gxfs123.com/api\" //正式服务器\r\nexport const URL = \"https://unifans.gxfs123.com/api\" //测试服务器\r\n// export const URL = \"http://192.168.10.70:8080\" \t\t//本地调试\r\n\r\nexport const appid = \"wx2165f0be356ae7a9\" //小程序appid"],"names":[],"mappings":";AACY,MAAC,MAAM;AAGP,MAAC,QAAQ;;;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map
index f6e18b2..4d7b983 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map
@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["pages/order/index.vue","E:/HBuilderX.4.24.2024072208/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvb3JkZXIvaW5kZXgudnVl"],"sourcesContent":["\r\n\t\r\n\t\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\t{{ tab.text }}\r\n\t\t\t\r\n\t\t\r\n\r\n\t\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t暂无订单记录\r\n\t\t\t\r\n\r\n\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\t\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t共享风扇\r\n\t\t\t\t\t\t\t设备号：{{ order.deviceId }}\r\n\t\t\t\t\t\t\r\n\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\t\t微信支付分\r\n\t\t\t\t\t\t\t\t\t|\r\n\t\t\t\t\t\t\t\t\t免押租借\r\n\t\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\t押金租借\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\r\n\r\n\t\t\t\t\t\r\n\t\t\t\t\t\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t开始时间：\r\n\t\t\t\t\t\t\t{{ order.startTime }}\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t结束时间：\r\n\t\t\t\t\t\t\t{{ order.endTime || '-' }}\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\r\n\t\t\t\t\r\n\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\r\n\r\n\r\n\r\n\r\n","import MiniProgramPage from 'D:/uni-fans-score/pages/order/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","reactive","onLoad","queryById","uni","getOrderList","confirmPaymentAndRent","cancelOrder"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"index.js","sources":["pages/order/index.vue","E:/HBuilderX.4.24.2024072208/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvb3JkZXIvaW5kZXgudnVl"],"sourcesContent":["\r\n\t\r\n\t\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\t{{ tab.text }}\r\n\t\t\t\r\n\t\t\r\n\r\n\t\t\r\n\t\t\r\n\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t暂无订单记录\r\n\t\t\t\r\n\r\n\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\r\n\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\t\t\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t共享风扇\r\n\t\t\t\t\t\t\t设备号：{{ order.deviceId }}\r\n\t\t\t\t\t\t\r\n\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\t\t微信支付分\r\n\t\t\t\t\t\t\t\t\t|\r\n\t\t\t\t\t\t\t\t\t免押租借\r\n\t\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\t押金租借\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\r\n\r\n\t\t\t\t\t\r\n\t\t\t\t\t\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t开始时间：\r\n\t\t\t\t\t\t\t{{ order.startTime }}\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t结束时间：\r\n\t\t\t\t\t\t\t{{ order.endTime || '-' }}\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\r\n\t\t\t\t\r\n\r\n\t\t\t\t\r\n\t\t\t\t\r\n\t\t\t\r\n\t\t\r\n\t\r\n\r\n\r\n\r\n\r\n","import MiniProgramPage from 'D:/uni-fans-score/pages/order/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","reactive","onLoad","queryById","uni","getOrderList","URL","updateUserBalance","cancelOrder"],"mappings":"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"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/index.js b/unpackage/dist/dev/mp-weixin/pages/order/index.js
index ed250aa..3b69f80 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/index.js
@@ -2,6 +2,7 @@
const common_vendor = require("../../common/vendor.js");
const common_assets = require("../../common/assets.js");
const config_user = require("../../config/user.js");
+const config_url = require("../../config/url.js");
const _sfc_main = {
__name: "index",
setup(__props) {
@@ -88,7 +89,7 @@ const _sfc_main = {
}
}
} catch (error) {
- common_vendor.index.__f__("error", "at pages/order/index.vue:222", "获取订单详情失败:", error);
+ common_vendor.index.__f__("error", "at pages/order/index.vue:226", "获取订单详情失败:", error);
}
}
await loadOrderList();
@@ -122,7 +123,7 @@ const _sfc_main = {
});
}
} catch (error) {
- common_vendor.index.__f__("error", "at pages/order/index.vue:266", "获取订单列表失败:", error);
+ common_vendor.index.__f__("error", "at pages/order/index.vue:270", "获取订单列表失败:", error);
common_vendor.index.showToast({
title: "获取订单列表失败",
icon: "none"
@@ -130,7 +131,7 @@ const _sfc_main = {
}
};
const navigateToReturn = (deviceId, orderId) => {
- common_vendor.index.__f__("log", "at pages/order/index.vue:295", orderId);
+ common_vendor.index.__f__("log", "at pages/order/index.vue:299", orderId);
common_vendor.index.navigateTo({
url: `/pages/return/index?deviceId=${deviceId}&orderId=${orderId}`
});
@@ -145,17 +146,39 @@ const _sfc_main = {
common_vendor.index.showLoading({
title: "处理中"
});
- const res = await config_user.confirmPaymentAndRent(order.orderNo);
- if (res.code === 200) {
- common_vendor.index.hideLoading();
- common_vendor.index.showToast({
- title: "支付成功",
- icon: "success"
+ const res = await common_vendor.index.request({
+ url: `${config_url.URL || "http://127.0.0.1:8080"}/app/wx-payment/create/${order.orderNo}`,
+ method: "GET",
+ header: {
+ "Authorization": "Bearer " + common_vendor.index.getStorageSync("token"),
+ "Clientid": common_vendor.index.getStorageSync("client_id")
+ }
+ });
+ if (res.statusCode === 200 && res.data.code === 200) {
+ const payParams = res.data.data;
+ await common_vendor.index.requestPayment({
+ ...payParams,
+ success: async () => {
+ common_vendor.index.showToast({
+ title: "支付成功",
+ icon: "success"
+ });
+ try {
+ await config_user.updateUserBalance(order.orderId || order.orderNo);
+ } catch (error) {
+ common_vendor.index.__f__("warn", "at pages/order/index.vue:345", "更新用户余额失败:", error);
+ }
+ await loadOrderList(orderStatusTabs[currentTab.value].status);
+ },
+ fail: (err) => {
+ common_vendor.index.__f__("error", "at pages/order/index.vue:352", "支付失败:", err);
+ throw new Error("支付失败，请重试");
+ }
});
- await loadOrderList(orderStatusTabs[currentTab.value].status);
} else {
- throw new Error(res.msg || "支付失败");
+ throw new Error(res.data.msg || "创建支付订单失败");
}
+ common_vendor.index.hideLoading();
} catch (error) {
common_vendor.index.hideLoading();
common_vendor.index.showToast({