From bc45124a42739eb0549b91838ba737b1fca5975d Mon Sep 17 00:00:00 2001
From: ISFP_T <68358856@qq.com>
Date: Mon, 14 Jul 2025 14:35:52 +0800
Subject: [PATCH] =?UTF-8?q?style:=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98?=
=?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=B1=95=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/details.vue | 70 ++++++++++++++++++-
.../build/mp-weixin/pages/order/details.js | 2 +-
.../build/mp-weixin/pages/order/details.wxml | 2 +-
.../build/mp-weixin/pages/order/details.wxss | 2 +-
.../mp-weixin/pages/order/details.js.map | 2 +-
unpackage/dist/dev/mp-weixin/app.json | 5 ++
unpackage/dist/dev/mp-weixin/common/vendor.js | 2 +-
.../dist/dev/mp-weixin/pages/order/details.js | 42 ++++++-----
.../dev/mp-weixin/pages/order/details.wxml | 2 +-
.../dev/mp-weixin/pages/order/details.wxss | 40 +++++++++++
10 files changed, 142 insertions(+), 27 deletions(-)
diff --git a/pages/order/details.vue b/pages/order/details.vue
index cd5b636..e5376ff 100644
--- a/pages/order/details.vue
+++ b/pages/order/details.vue
@@ -19,9 +19,26 @@
{{ orderInfo.deviceNo || '-' }}
- 支付方式
- {{ paymentMethod }}
+ 租借方式
+
+
+
+
+
+
+
+ 微信支付分
+ |
+ 免押租借
+
+
+
+
+ 押金租借
+
+
+
创建时间
{{ orderInfo.createTime || '-' }}
@@ -378,6 +395,55 @@ const navigateToReturn = () => {
word-break: break-all;
text-align: right;
max-width: 70%;
+
+ &.payment-method {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-end;
+
+ .payment-badge {
+ margin-top: 8rpx;
+ display: flex;
+ align-items: center;
+ padding: 4rpx 10rpx;
+ border-radius: 8rpx;
+
+ &.wx-score {
+ background: rgba(7, 193, 96, 0.08);
+
+ .badge-icon {
+ width: 32rpx;
+ height: 26rpx;
+ margin-right: 8rpx;
+ }
+
+ .badge-text {
+ font-size: 22rpx;
+ color: #07c160;
+ display: flex;
+ align-items: center;
+
+ .divider {
+ margin: 0 6rpx;
+ }
+
+ .highlight {
+ font-weight: 500;
+ }
+ }
+ }
+
+ &.deposit {
+ background: #f5f5f5;
+
+ .badge-text {
+ font-size: 22rpx;
+ color: #666;
+ font-weight: 500;
+ }
+ }
+ }
+ }
}
&.total {
diff --git a/unpackage/dist/build/mp-weixin/pages/order/details.js b/unpackage/dist/build/mp-weixin/pages/order/details.js
index e8f280c..cddcf78 100644
--- a/unpackage/dist/build/mp-weixin/pages/order/details.js
+++ b/unpackage/dist/build/mp-weixin/pages/order/details.js
@@ -1 +1 @@
-"use strict";const e=require("../../common/vendor.js"),t=require("../../config/user.js"),a={__name:"details",setup(a){const n=e.ref(""),r=e.ref({}),i=e.computed((()=>{switch(r.value.orderStatus){case"waiting_for_payment":return"等待支付";case"in_used":return"使用中";case"used_done":return"已完成";case"order_cancelled":return"已取消";default:return"未知状态"}})),o=e.computed((()=>{switch(r.value.orderStatus){case"waiting_for_payment":return"status-waiting";case"in_used":return"status-using";case"used_done":return"status-finished";case"order_cancelled":return"status-cancelled";default:return""}})),u=e.computed((()=>{switch(r.value.orderStatus){case"waiting_for_payment":return"请在15分钟内完成支付";case"in_used":return"设备正在使用中";case"used_done":return"感谢您的使用";case"order_cancelled":return"该订单已取消";default:return""}})),d=e.computed((()=>{const e=r.value.payWay;return"wx_score_pay"===e?"微信支付分 (免押金)":"wx_pay"===e?"微信支付":"押金支付"}));e.onLoad((async t=>{t&&t.orderId?(n.value=t.orderId,await s()):(e.index.showToast({title:"订单信息不存在",icon:"none"}),setTimeout((()=>{e.index.navigateBack()}),1500))}));const s=async()=>{try{e.index.showLoading({title:"加载中"});const a=await t.queryById(n.value);if(200!==a.code||!a.data)throw new Error("获取订单详情失败");r.value=a.data,r.value.createTime&&(r.value.createTime=c(new Date(r.value.createTime))),r.value.startTime&&(r.value.startTime=c(new Date(r.value.startTime))),r.value.endTime&&(r.value.endTime=c(new Date(r.value.endTime))),e.index.hideLoading()}catch(a){e.index.hideLoading(),e.index.showToast({title:a.message||"获取订单详情失败",icon:"none"})}},c=e=>`${e.getFullYear()}-${(e.getMonth()+1).toString().padStart(2,"0")}-${e.getDate().toString().padStart(2,"0")} ${e.getHours().toString().padStart(2,"0")}:${e.getMinutes().toString().padStart(2,"0")}`,l=e=>{if(!e)return"";const t=parseInt(e);if(t<60)return`${t}分钟`;{const e=Math.floor(t/60),a=t%60;return a>0?`${e}小时${a}分钟`:`${e}小时`}},v=()=>{e.index.showModal({title:"确认取消",content:"确定要取消此订单吗？",success:async a=>{if(a.confirm)try{e.index.showLoading({title:"处理中"});const a=await t.cancelOrder({orderId:n.value});if(200!==a.code)throw new Error(a.msg||"取消订单失败");e.index.hideLoading(),e.index.showToast({title:"订单已取消",icon:"success"}),await s()}catch(r){e.index.hideLoading(),e.index.showToast({title:r.message||"取消订单失败",icon:"none"})}}})},m=async()=>{try{e.index.showLoading({title:"处理中"});const a=await t.confirmPaymentAndRent(n.value);if(200!==a.code)throw new Error(a.msg||"支付失败");e.index.hideLoading(),e.index.showToast({title:"支付成功",icon:"success"}),await s()}catch(a){e.index.hideLoading(),e.index.showToast({title:a.message||"支付失败",icon:"none"})}},g=()=>{e.index.navigateTo({url:`/pages/return/index?deviceId=${r.value.deviceNo}&orderId=${n.value}`})};return(t,a)=>e.e({a:e.n(o.value),b:e.t(i.value),c:e.t(u.value),d:e.t(r.value.orderNo||"-"),e:e.t(r.value.deviceNo||"-"),f:e.t(d.value),g:e.t(r.value.createTime||"-"),h:e.t(r.value.startTime||"-"),i:r.value.endTime},r.value.endTime?{j:e.t(r.value.endTime)}:{},{k:r.value.phone},r.value.phone?{l:e.t(r.value.phone)}:{},{m:r.value.depositAmount},r.value.depositAmount?{n:e.t(r.value.depositAmount)}:{},{o:r.value.packageTime&&r.value.packagePrice},r.value.packageTime&&r.value.packagePrice?{p:e.t(r.value.packagePrice),q:e.t(l(r.value.packageTime))}:{},{r:e.t(r.value.payAmount||0),s:"waiting_for_payment"===r.value.orderStatus},"waiting_for_payment"===r.value.orderStatus?{t:e.o(v),v:e.o(m)}:"in_used"===r.value.orderStatus?{x:e.o(g)}:{},{w:"in_used"===r.value.orderStatus})}},n=e._export_sfc(a,[["__scopeId","data-v-dc707034"]]);wx.createPage(n);
+"use strict";const e=require("../../common/vendor.js"),a=require("../../common/assets.js"),t=require("../../config/user.js"),n={__name:"details",setup(n){const r=e.ref(""),i=e.ref({}),o=e.computed((()=>{switch(i.value.orderStatus){case"waiting_for_payment":return"等待支付";case"in_used":return"使用中";case"used_done":return"已完成";case"order_cancelled":return"已取消";default:return"未知状态"}})),s=e.computed((()=>{switch(i.value.orderStatus){case"waiting_for_payment":return"status-waiting";case"in_used":return"status-using";case"used_done":return"status-finished";case"order_cancelled":return"status-cancelled";default:return""}})),u=e.computed((()=>{switch(i.value.orderStatus){case"waiting_for_payment":return"请在15分钟内完成支付";case"in_used":return"设备正在使用中";case"used_done":return"感谢您的使用";case"order_cancelled":return"该订单已取消";default:return""}}));e.computed((()=>{const e=i.value.payWay;return"wx_score_pay"===e?"微信支付分 (免押金)":"wx_pay"===e?"微信支付":"押金支付"})),e.onLoad((async a=>{a&&a.orderId?(r.value=a.orderId,await d()):(e.index.showToast({title:"订单信息不存在",icon:"none"}),setTimeout((()=>{e.index.navigateBack()}),1500))}));const d=async()=>{try{e.index.showLoading({title:"加载中"});const a=await t.queryById(r.value);if(200!==a.code||!a.data)throw new Error("获取订单详情失败");i.value=a.data,i.value.createTime&&(i.value.createTime=c(new Date(i.value.createTime))),i.value.startTime&&(i.value.startTime=c(new Date(i.value.startTime))),i.value.endTime&&(i.value.endTime=c(new Date(i.value.endTime))),e.index.hideLoading()}catch(a){e.index.hideLoading(),e.index.showToast({title:a.message||"获取订单详情失败",icon:"none"})}},c=e=>`${e.getFullYear()}-${(e.getMonth()+1).toString().padStart(2,"0")}-${e.getDate().toString().padStart(2,"0")} ${e.getHours().toString().padStart(2,"0")}:${e.getMinutes().toString().padStart(2,"0")}`,l=e=>{if(!e)return"";const a=parseInt(e);if(a<60)return`${a}分钟`;{const e=Math.floor(a/60),t=a%60;return t>0?`${e}小时${t}分钟`:`${e}小时`}},v=()=>{e.index.showModal({title:"确认取消",content:"确定要取消此订单吗？",success:async a=>{if(a.confirm)try{e.index.showLoading({title:"处理中"});const a=await t.cancelOrder({orderId:r.value});if(200!==a.code)throw new Error(a.msg||"取消订单失败");e.index.hideLoading(),e.index.showToast({title:"订单已取消",icon:"success"}),await d()}catch(n){e.index.hideLoading(),e.index.showToast({title:n.message||"取消订单失败",icon:"none"})}}})},m=async()=>{try{e.index.showLoading({title:"处理中"});const a=await t.confirmPaymentAndRent(r.value);if(200!==a.code)throw new Error(a.msg||"支付失败");e.index.hideLoading(),e.index.showToast({title:"支付成功",icon:"success"}),await d()}catch(a){e.index.hideLoading(),e.index.showToast({title:a.message||"支付失败",icon:"none"})}},g=()=>{e.index.navigateTo({url:`/pages/return/index?deviceId=${i.value.deviceNo}&orderId=${r.value}`})};return(t,n)=>e.e({a:e.n(s.value),b:e.t(o.value),c:e.t(u.value),d:e.t(i.value.orderNo||"-"),e:e.t(i.value.deviceNo||"-"),f:"wx_score_pay"===i.value.payWay},"wx_score_pay"===i.value.payWay?{g:a._imports_0$2}:{},{h:e.t(i.value.createTime||"-"),i:e.t(i.value.startTime||"-"),j:i.value.endTime},i.value.endTime?{k:e.t(i.value.endTime)}:{},{l:i.value.phone},i.value.phone?{m:e.t(i.value.phone)}:{},{n:i.value.depositAmount},i.value.depositAmount?{o:e.t(i.value.depositAmount)}:{},{p:i.value.packageTime&&i.value.packagePrice},i.value.packageTime&&i.value.packagePrice?{q:e.t(i.value.packagePrice),r:e.t(l(i.value.packageTime))}:{},{s:e.t(i.value.payAmount||0),t:"waiting_for_payment"===i.value.orderStatus},"waiting_for_payment"===i.value.orderStatus?{v:e.o(v),w:e.o(m)}:"in_used"===i.value.orderStatus?{y:e.o(g)}:{},{x:"in_used"===i.value.orderStatus})}},r=e._export_sfc(n,[["__scopeId","data-v-e8875514"]]);wx.createPage(r);
diff --git a/unpackage/dist/build/mp-weixin/pages/order/details.wxml b/unpackage/dist/build/mp-weixin/pages/order/details.wxml
index 6892d63..8494170 100644
--- a/unpackage/dist/build/mp-weixin/pages/order/details.wxml
+++ b/unpackage/dist/build/mp-weixin/pages/order/details.wxml
@@ -1 +1 @@
-{{b}}{{c}}订单信息订单号{{d}}设备号{{e}}支付方式{{f}}创建时间{{g}}开始时间{{h}}结束时间{{j}}联系电话{{l}}费用信息押金￥{{n}}套餐￥{{p}}元 / {{q}}合计￥{{r}}取消订单立即支付归还设备
\ No newline at end of file
+{{b}}{{c}}订单信息订单号{{d}}设备号{{e}}租借方式微信支付分|免押租借押金租借创建时间{{h}}开始时间{{i}}结束时间{{k}}联系电话{{m}}费用信息押金￥{{o}}套餐￥{{q}}元 / {{r}}合计￥{{s}}取消订单立即支付归还设备
\ No newline at end of file
diff --git a/unpackage/dist/build/mp-weixin/pages/order/details.wxss b/unpackage/dist/build/mp-weixin/pages/order/details.wxss
index fe36669..1b7a31c 100644
--- a/unpackage/dist/build/mp-weixin/pages/order/details.wxss
+++ b/unpackage/dist/build/mp-weixin/pages/order/details.wxss
@@ -1 +1 @@
-.details-container.data-v-dc707034{min-height:100vh;background:#f7f8fa;padding:30rpx 30rpx 100rpx;box-sizing:border-box}.details-container .status-card.data-v-dc707034{background:#fff;border-radius:20rpx;padding:40rpx;display:flex;flex-direction:column;align-items:center;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.details-container .status-card .status-icon.data-v-dc707034{width:120rpx;height:120rpx;border-radius:50%;margin-bottom:20rpx}.details-container .status-card .status-icon.status-waiting.data-v-dc707034{background:#fff9c4}.details-container .status-card .status-icon.status-using.data-v-dc707034{background:#e8f5e9}.details-container .status-card .status-icon.status-finished.data-v-dc707034{background:#e3f2fd}.details-container .status-card .status-icon.status-cancelled.data-v-dc707034{background:#ffebee}.details-container .status-card .status-text.data-v-dc707034{font-size:36rpx;font-weight:600;color:#333;margin-bottom:10rpx}.details-container .status-card .status-desc.data-v-dc707034{font-size:28rpx;color:#999}.details-container .info-card.data-v-dc707034{background:#fff;border-radius:20rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.details-container .info-card .card-title.data-v-dc707034{font-size:32rpx;font-weight:600;color:#333;margin-bottom:20rpx;position:relative;padding-left:20rpx}.details-container .info-card .card-title.data-v-dc707034:before{content:"";position:absolute;left:0;top:50%;transform:translateY(-50%);width:8rpx;height:32rpx;background:#1976d2;border-radius:4rpx}.details-container .info-card .info-item.data-v-dc707034{display:flex;justify-content:space-between;align-items:center;padding:20rpx 0;border-bottom:1px solid #f5f5f5}.details-container .info-card .info-item.data-v-dc707034:last-child{border-bottom:none}.details-container .info-card .info-item .label.data-v-dc707034{font-size:28rpx;color:#666}.details-container .info-card .info-item .value.data-v-dc707034{font-size:28rpx;color:#333;word-break:break-all;text-align:right;max-width:70%}.details-container .info-card .info-item.total.data-v-dc707034{margin-top:10rpx;padding-top:30rpx;border-top:1px solid #f5f5f5}.details-container .info-card .info-item.total .label.data-v-dc707034,.details-container .info-card .info-item.total .value.data-v-dc707034{font-size:32rpx;font-weight:600;color:#333}.details-container .info-card .info-item.total .value.data-v-dc707034{color:#ff5722}.details-container .action-buttons.data-v-dc707034{display:flex;justify-content:space-between;padding:30rpx 0}.details-container .action-buttons .btn.data-v-dc707034{flex:1;height:88rpx;display:flex;align-items:center;justify-content:center;font-size:32rpx;font-weight:500;border-radius:44rpx}.details-container .action-buttons .btn.cancel.data-v-dc707034{background:#f5f5f5;color:#666;margin-right:20rpx}.details-container .action-buttons .btn.primary.data-v-dc707034{background:#1976d2;color:#fff}.details-container .action-buttons .btn.data-v-dc707034:active{opacity:.9}
+.details-container.data-v-e8875514{min-height:100vh;background:#f7f8fa;padding:30rpx 30rpx 100rpx;box-sizing:border-box}.details-container .status-card.data-v-e8875514{background:#fff;border-radius:20rpx;padding:40rpx;display:flex;flex-direction:column;align-items:center;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.details-container .status-card .status-icon.data-v-e8875514{width:120rpx;height:120rpx;border-radius:50%;margin-bottom:20rpx}.details-container .status-card .status-icon.status-waiting.data-v-e8875514{background:#fff9c4}.details-container .status-card .status-icon.status-using.data-v-e8875514{background:#e8f5e9}.details-container .status-card .status-icon.status-finished.data-v-e8875514{background:#e3f2fd}.details-container .status-card .status-icon.status-cancelled.data-v-e8875514{background:#ffebee}.details-container .status-card .status-text.data-v-e8875514{font-size:36rpx;font-weight:600;color:#333;margin-bottom:10rpx}.details-container .status-card .status-desc.data-v-e8875514{font-size:28rpx;color:#999}.details-container .info-card.data-v-e8875514{background:#fff;border-radius:20rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.details-container .info-card .card-title.data-v-e8875514{font-size:32rpx;font-weight:600;color:#333;margin-bottom:20rpx;position:relative;padding-left:20rpx}.details-container .info-card .card-title.data-v-e8875514:before{content:"";position:absolute;left:0;top:50%;transform:translateY(-50%);width:8rpx;height:32rpx;background:#1976d2;border-radius:4rpx}.details-container .info-card .info-item.data-v-e8875514{display:flex;justify-content:space-between;align-items:center;padding:20rpx 0;border-bottom:1px solid #f5f5f5}.details-container .info-card .info-item.data-v-e8875514:last-child{border-bottom:none}.details-container .info-card .info-item .label.data-v-e8875514{font-size:28rpx;color:#666}.details-container .info-card .info-item .value.data-v-e8875514{font-size:28rpx;color:#333;word-break:break-all;text-align:right;max-width:70%}.details-container .info-card .info-item .value.payment-method.data-v-e8875514{display:flex;flex-direction:column;align-items:flex-end}.details-container .info-card .info-item .value.payment-method .payment-badge.data-v-e8875514{margin-top:8rpx;display:flex;align-items:center;padding:4rpx 10rpx;border-radius:8rpx}.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score.data-v-e8875514{background:rgba(7,193,96,.08)}.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score .badge-icon.data-v-e8875514{width:32rpx;height:26rpx;margin-right:8rpx}.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score .badge-text.data-v-e8875514{font-size:22rpx;color:#07c160;display:flex;align-items:center}.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score .badge-text .divider.data-v-e8875514{margin:0 6rpx}.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score .badge-text .highlight.data-v-e8875514{font-weight:500}.details-container .info-card .info-item .value.payment-method .payment-badge.deposit.data-v-e8875514{background:#f5f5f5}.details-container .info-card .info-item .value.payment-method .payment-badge.deposit .badge-text.data-v-e8875514{font-size:22rpx;color:#666;font-weight:500}.details-container .info-card .info-item.total.data-v-e8875514{margin-top:10rpx;padding-top:30rpx;border-top:1px solid #f5f5f5}.details-container .info-card .info-item.total .label.data-v-e8875514,.details-container .info-card .info-item.total .value.data-v-e8875514{font-size:32rpx;font-weight:600;color:#333}.details-container .info-card .info-item.total .value.data-v-e8875514{color:#ff5722}.details-container .action-buttons.data-v-e8875514{display:flex;justify-content:space-between;padding:30rpx 0}.details-container .action-buttons .btn.data-v-e8875514{flex:1;height:88rpx;display:flex;align-items:center;justify-content:center;font-size:32rpx;font-weight:500;border-radius:44rpx}.details-container .action-buttons .btn.cancel.data-v-e8875514{background:#f5f5f5;color:#666;margin-right:20rpx}.details-container .action-buttons .btn.primary.data-v-e8875514{background:#1976d2;color:#fff}.details-container .action-buttons .btn.data-v-e8875514:active{opacity:.9}
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/details.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/details.js.map
index e16391a..cb03f96 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/details.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/details.js.map
@@ -1 +1 @@
-{"version":3,"file":"details.js","sources":["pages/order/details.vue","E:/HBuilderX.4.24.2024072208/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvb3JkZXIvZGV0YWlscy52dWU"],"sourcesContent":["\r\n \r\n \r\n \r\n \r\n {{ orderStatusText }}\r\n {{ orderStatusDesc }}\r\n \r\n \r\n \r\n \r\n 订单信息\r\n \r\n 订单号\r\n {{ orderInfo.orderNo || '-' }}\r\n \r\n \r\n 设备号\r\n {{ orderInfo.deviceNo || '-' }}\r\n \r\n \r\n 支付方式\r\n {{ paymentMethod }}\r\n \r\n \r\n 创建时间\r\n {{ orderInfo.createTime || '-' }}\r\n \r\n \r\n 开始时间\r\n {{ orderInfo.startTime || '-' }}\r\n \r\n \r\n 结束时间\r\n {{ orderInfo.endTime }}\r\n \r\n \r\n 联系电话\r\n {{ orderInfo.phone }}\r\n \r\n \r\n \r\n \r\n \r\n 费用信息\r\n \r\n 押金\r\n ￥{{ orderInfo.depositAmount }}\r\n \r\n \r\n 套餐\r\n ￥{{ orderInfo.packagePrice }}元 / {{ formatTime(orderInfo.packageTime) }}\r\n \r\n \r\n 合计\r\n ￥{{ orderInfo.payAmount || 0 }}\r\n \r\n \r\n \r\n \r\n \r\n 取消订单\r\n 立即支付\r\n \r\n \r\n \r\n 归还设备\r\n \r\n \r\n\r\n\r\n\r\n\r\n ","import MiniProgramPage from 'D:/uni-fans-score/pages/order/details.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","computed","onLoad","uni","queryById","cancelOrder","confirmPaymentAndRent"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"details.js","sources":["pages/order/details.vue","E:/HBuilderX.4.24.2024072208/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvb3JkZXIvZGV0YWlscy52dWU"],"sourcesContent":["\r\n \r\n \r\n \r\n \r\n {{ orderStatusText }}\r\n {{ orderStatusDesc }}\r\n \r\n \r\n \r\n \r\n 订单信息\r\n \r\n 订单号\r\n {{ orderInfo.orderNo || '-' }}\r\n \r\n \r\n 设备号\r\n {{ orderInfo.deviceNo || '-' }}\r\n \r\n \r\n 租借方式\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n 微信支付分\r\n |\r\n 免押租借\r\n \r\n \r\n \r\n \r\n 押金租借\r\n \r\n \r\n \r\n \r\n \r\n 创建时间\r\n {{ orderInfo.createTime || '-' }}\r\n \r\n \r\n 开始时间\r\n {{ orderInfo.startTime || '-' }}\r\n \r\n \r\n 结束时间\r\n {{ orderInfo.endTime }}\r\n \r\n \r\n 联系电话\r\n {{ orderInfo.phone }}\r\n \r\n \r\n \r\n \r\n \r\n 费用信息\r\n \r\n 押金\r\n ￥{{ orderInfo.depositAmount }}\r\n \r\n \r\n 套餐\r\n ￥{{ orderInfo.packagePrice }}元 / {{ formatTime(orderInfo.packageTime) }}\r\n \r\n \r\n 合计\r\n ￥{{ orderInfo.payAmount || 0 }}\r\n \r\n \r\n \r\n \r\n \r\n 取消订单\r\n 立即支付\r\n \r\n \r\n \r\n 归还设备\r\n \r\n \r\n\r\n\r\n\r\n\r\n ","import MiniProgramPage from 'D:/uni-fans-score/pages/order/details.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","computed","onLoad","uni","queryById","cancelOrder","confirmPaymentAndRent"],"mappings":"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"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index 9888174..a54a622 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -39,5 +39,10 @@
}
]
},
+ "permission": {
+ "scope.getPhoneNumber": {
+ "desc": "您的手机号将用于登录和订单服务"
+ }
+ },
"usingComponents": {}
}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js
index f100e6f..5f40a5e 100644
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -6990,7 +6990,7 @@ function isConsoleWritable() {
function initRuntimeSocketService() {
const hosts = "192.168.10.59,127.0.0.1";
const port = "8090";
- const id = "mp-weixin_1_bom0";
+ const id = "mp-weixin_eQjgTz";
const lazy = typeof swan !== "undefined";
let restoreError = lazy ? () => {
} : initOnError();
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/details.js b/unpackage/dist/dev/mp-weixin/pages/order/details.js
index a07b019..19f16b3 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/details.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/details.js
@@ -1,5 +1,6 @@
"use strict";
const common_vendor = require("../../common/vendor.js");
+const common_assets = require("../../common/assets.js");
const config_user = require("../../config/user.js");
const _sfc_main = {
__name: "details",
@@ -51,7 +52,7 @@ const _sfc_main = {
return "";
}
});
- const paymentMethod = common_vendor.computed(() => {
+ common_vendor.computed(() => {
const payWay = orderInfo.value.payWay;
if (payWay === "wx_score_pay") {
return "微信支付分 (免押金)";
@@ -192,35 +193,38 @@ const _sfc_main = {
c: common_vendor.t(orderStatusDesc.value),
d: common_vendor.t(orderInfo.value.orderNo || "-"),
e: common_vendor.t(orderInfo.value.deviceNo || "-"),
- f: common_vendor.t(paymentMethod.value),
- g: common_vendor.t(orderInfo.value.createTime || "-"),
- h: common_vendor.t(orderInfo.value.startTime || "-"),
- i: orderInfo.value.endTime
+ f: orderInfo.value.payWay === "wx_score_pay"
+ }, orderInfo.value.payWay === "wx_score_pay" ? {
+ g: common_assets._imports_0$2
+ } : {}, {
+ h: common_vendor.t(orderInfo.value.createTime || "-"),
+ i: common_vendor.t(orderInfo.value.startTime || "-"),
+ j: orderInfo.value.endTime
}, orderInfo.value.endTime ? {
- j: common_vendor.t(orderInfo.value.endTime)
+ k: common_vendor.t(orderInfo.value.endTime)
} : {}, {
- k: orderInfo.value.phone
+ l: orderInfo.value.phone
}, orderInfo.value.phone ? {
- l: common_vendor.t(orderInfo.value.phone)
+ m: common_vendor.t(orderInfo.value.phone)
} : {}, {
- m: orderInfo.value.depositAmount
+ n: orderInfo.value.depositAmount
}, orderInfo.value.depositAmount ? {
- n: common_vendor.t(orderInfo.value.depositAmount)
+ o: common_vendor.t(orderInfo.value.depositAmount)
} : {}, {
- o: orderInfo.value.packageTime && orderInfo.value.packagePrice
+ p: orderInfo.value.packageTime && orderInfo.value.packagePrice
}, orderInfo.value.packageTime && orderInfo.value.packagePrice ? {
- p: common_vendor.t(orderInfo.value.packagePrice),
- q: common_vendor.t(formatTime(orderInfo.value.packageTime))
+ q: common_vendor.t(orderInfo.value.packagePrice),
+ r: common_vendor.t(formatTime(orderInfo.value.packageTime))
} : {}, {
- r: common_vendor.t(orderInfo.value.payAmount || 0),
- s: orderInfo.value.orderStatus === "waiting_for_payment"
+ s: common_vendor.t(orderInfo.value.payAmount || 0),
+ t: orderInfo.value.orderStatus === "waiting_for_payment"
}, orderInfo.value.orderStatus === "waiting_for_payment" ? {
- t: common_vendor.o(handleCancelOrder),
- v: common_vendor.o(handlePayment)
+ v: common_vendor.o(handleCancelOrder),
+ w: common_vendor.o(handlePayment)
} : orderInfo.value.orderStatus === "in_used" ? {
- x: common_vendor.o(navigateToReturn)
+ y: common_vendor.o(navigateToReturn)
} : {}, {
- w: orderInfo.value.orderStatus === "in_used"
+ x: orderInfo.value.orderStatus === "in_used"
});
};
}
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/details.wxml b/unpackage/dist/dev/mp-weixin/pages/order/details.wxml
index 2c331a5..c703ffd 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/details.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/order/details.wxml
@@ -1 +1 @@
-{{b}}{{c}}订单信息订单号{{d}}设备号{{e}}支付方式{{f}}创建时间{{g}}开始时间{{h}}结束时间{{j}}联系电话{{l}}费用信息押金￥{{n}}套餐￥{{p}}元 / {{q}}合计￥{{r}}取消订单立即支付归还设备
\ No newline at end of file
+{{b}}{{c}}订单信息订单号{{d}}设备号{{e}}租借方式微信支付分|免押租借押金租借创建时间{{h}}开始时间{{i}}结束时间{{k}}联系电话{{m}}费用信息押金￥{{o}}套餐￥{{q}}元 / {{r}}合计￥{{s}}取消订单立即支付归还设备
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/details.wxss b/unpackage/dist/dev/mp-weixin/pages/order/details.wxss
index 630e0ab..fc8cadc 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/details.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/order/details.wxss
@@ -115,6 +115,46 @@
text-align: right;
max-width: 70%;
}
+.details-container .info-card .info-item .value.payment-method.data-v-2b5cbeae {
+ display: flex;
+ flex-direction: column;
+ align-items: flex-end;
+}
+.details-container .info-card .info-item .value.payment-method .payment-badge.data-v-2b5cbeae {
+ margin-top: 8rpx;
+ display: flex;
+ align-items: center;
+ padding: 4rpx 10rpx;
+ border-radius: 8rpx;
+}
+.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score.data-v-2b5cbeae {
+ background: rgba(7, 193, 96, 0.08);
+}
+.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score .badge-icon.data-v-2b5cbeae {
+ width: 32rpx;
+ height: 26rpx;
+ margin-right: 8rpx;
+}
+.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score .badge-text.data-v-2b5cbeae {
+ font-size: 22rpx;
+ color: #07c160;
+ display: flex;
+ align-items: center;
+}
+.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score .badge-text .divider.data-v-2b5cbeae {
+ margin: 0 6rpx;
+}
+.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score .badge-text .highlight.data-v-2b5cbeae {
+ font-weight: 500;
+}
+.details-container .info-card .info-item .value.payment-method .payment-badge.deposit.data-v-2b5cbeae {
+ background: #f5f5f5;
+}
+.details-container .info-card .info-item .value.payment-method .payment-badge.deposit .badge-text.data-v-2b5cbeae {
+ font-size: 22rpx;
+ color: #666;
+ font-weight: 500;
+}
.details-container .info-card .info-item.total.data-v-2b5cbeae {
margin-top: 10rpx;
padding-top: 30rpx;