fix:会员订单新增对应标识
This commit is contained in:
+1
-1
File diff suppressed because one or more lines are too long
+1
-1
@@ -1 +1 @@
|
||||
"use strict";exports.URL="https://fansdev.gxfs123.com/api",exports.appid="wx2165f0be356ae7a9";
|
||||
"use strict";exports.URL="https://my.gxfs123.com/api",exports.appid="wx2165f0be356ae7a9";
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
"use strict";const e=require("../../common/vendor.js"),a=require("../../common/assets.js"),t=require("../../config/user.js"),r={__name:"details",setup(r){const n=e.ref(""),o=e.ref({}),i=e.computed((()=>{switch(o.value.orderStatus){case"waiting_for_payment":return"待支付";case"in_used":default:return"使用中";case"used_done":return"已完成";case"order_cancelled":return"已取消"}}));e.onLoad((async a=>{a&&a.orderId?(n.value=a.orderId,await u()):(e.index.showToast({title:"订单信息不存在",icon:"none"}),setTimeout((()=>{e.index.navigateBack()}),1500))}));const u=async()=>{try{e.index.showLoading({title:"加载中"});const a=await t.queryById(n.value);if(200!==a.code||!a.data)throw new Error("获取订单详情失败");o.value=a.data,o.value.createTime&&(o.value.createTime=s(new Date(o.value.createTime))),o.value.startTime&&(o.value.startTime=s(new Date(o.value.startTime))),o.value.endTime&&(o.value.endTime=s(new Date(o.value.endTime))),e.index.hideLoading()}catch(a){e.index.hideLoading(),e.index.showToast({title:a.message||"获取订单详情失败",icon:"none"})}},s=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")}`,d=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}小时`}};return(t,r)=>e.e({a:e.t(i.value),b:e.t(o.value.orderNo||"-"),c:e.t(o.value.deviceNo||"-"),d:"wx_score_pay"===o.value.payWay},"wx_score_pay"===o.value.payWay?{e:a._imports_0$3}:{},{f:e.t(o.value.startTime||"-"),g:o.value.endTime},o.value.endTime?{h:e.t(o.value.endTime)}:{},{i:o.value.phone},o.value.phone?{j:e.t(o.value.phone)}:{},{k:o.value.depositAmount},o.value.depositAmount?{l:e.t(o.value.depositAmount)}:{},{m:o.value.packageTime&&o.value.packagePrice},o.value.packageTime&&o.value.packagePrice?{n:e.t(o.value.packagePrice),o:e.t(d(o.value.packageTime))}:{},{p:e.t(o.value.payAmount||0)})}},n=e._export_sfc(r,[["__scopeId","data-v-f9b4f795"]]);wx.createPage(n);
|
||||
"use strict";const e=require("../../common/vendor.js"),a=require("../../common/assets.js"),t=require("../../config/user.js"),r={__name:"details",setup(r){const n=e.ref(""),u=e.ref({}),o=e.computed((()=>{switch(u.value.orderStatus){case"waiting_for_payment":return"待支付";case"in_used":default:return"使用中";case"used_done":return"已完成";case"order_cancelled":return"已取消"}}));e.onLoad((async a=>{a&&a.orderId?(n.value=a.orderId,await i()):(e.index.showToast({title:"订单信息不存在",icon:"none"}),setTimeout((()=>{e.index.navigateBack()}),1500))}));const i=async()=>{try{e.index.showLoading({title:"加载中"});const a=await t.queryById(n.value);if(200!==a.code||!a.data)throw new Error("获取订单详情失败");u.value=a.data,u.value.createTime&&(u.value.createTime=d(new Date(u.value.createTime))),u.value.startTime&&(u.value.startTime=d(new Date(u.value.startTime))),u.value.endTime&&(u.value.endTime=d(new Date(u.value.endTime))),e.index.hideLoading()}catch(a){e.index.hideLoading(),e.index.showToast({title:a.message||"获取订单详情失败",icon:"none"})}},d=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}小时`}};return(t,r)=>e.e({a:e.t(o.value),b:e.t(u.value.orderNo||"-"),c:e.t(u.value.deviceNo||"-"),d:"wx_score_pay"===u.value.payWay},"wx_score_pay"===u.value.payWay?{e:a._imports_0$3}:("wx_member_pay"===u.value.payWay||u.value.payWay,{}),{f:"wx_member_pay"===u.value.payWay,g:"wx_pay"===u.value.payWay,h:e.t(u.value.startTime||"-"),i:u.value.endTime},u.value.endTime?{j:e.t(u.value.endTime)}:{},{k:u.value.phone},u.value.phone?{l:e.t(u.value.phone)}:{},{m:u.value.depositAmount},u.value.depositAmount?{n:e.t(u.value.depositAmount)}:{},{o:u.value.packageTime&&u.value.packagePrice},u.value.packageTime&&u.value.packagePrice?{p:e.t(u.value.packagePrice),q:e.t(l(u.value.packageTime))}:{},{r:e.t(u.value.payAmount||0)})}},n=e._export_sfc(r,[["__scopeId","data-v-d8a382d6"]]);wx.createPage(n);
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
<view class="return-container data-v-f9b4f795"><view class="order-card data-v-f9b4f795"><view class="order-header data-v-f9b4f795"><text class="title data-v-f9b4f795">{{a}}</text><text class="order-no data-v-f9b4f795">订单号：{{b}}</text></view><view class="device-info data-v-f9b4f795"><view class="device-left data-v-f9b4f795"><view class="device-name data-v-f9b4f795">共享风扇</view><view class="device-id data-v-f9b4f795">设备号：{{c}}</view></view><view class="device-right data-v-f9b4f795"><view wx:if="{{d}}" class="payment-badge wx-score data-v-f9b4f795"><image src="{{e}}" mode="aspectFit" class="badge-icon data-v-f9b4f795"></image><view class="badge-text data-v-f9b4f795"><text class="data-v-f9b4f795">微信支付分</text><text class="divider data-v-f9b4f795">|</text><text class="highlight data-v-f9b4f795">免押租借</text></view></view><view wx:else class="payment-badge deposit data-v-f9b4f795"><text class="badge-text data-v-f9b4f795">押金租借</text></view></view></view><view class="time-info data-v-f9b4f795"><view class="time-item data-v-f9b4f795"><text class="label data-v-f9b4f795">开始时间</text><text class="value data-v-f9b4f795">{{f}}</text></view><view wx:if="{{g}}" class="time-item data-v-f9b4f795"><text class="label data-v-f9b4f795">结束时间</text><text class="value data-v-f9b4f795">{{h}}</text></view><view wx:if="{{i}}" class="time-item data-v-f9b4f795"><text class="label data-v-f9b4f795">联系电话</text><text class="value data-v-f9b4f795">{{j}}</text></view></view></view><view class="notice-card data-v-f9b4f795"><view class="notice-title data-v-f9b4f795">费用信息</view><view class="notice-list data-v-f9b4f795"><view wx:if="{{k}}" class="notice-item data-v-f9b4f795"><view class="dot data-v-f9b4f795"></view><text class="data-v-f9b4f795">押金：￥{{l}}</text></view><view wx:if="{{m}}" class="notice-item data-v-f9b4f795"><view class="dot data-v-f9b4f795"></view><text class="data-v-f9b4f795">套餐：￥{{n}}元 / {{o}}</text></view><view class="notice-item data-v-f9b4f795"><view class="dot data-v-f9b4f795"></view><text class="data-v-f9b4f795">合计：￥{{p}}</text></view></view></view></view>
|
||||
<view class="return-container data-v-d8a382d6"><view class="order-card data-v-d8a382d6"><view class="order-header data-v-d8a382d6"><text class="title data-v-d8a382d6">{{a}}</text><text class="order-no data-v-d8a382d6">订单号：{{b}}</text></view><view class="device-info data-v-d8a382d6"><view class="device-left data-v-d8a382d6"><view class="device-name data-v-d8a382d6">共享风扇</view><view class="device-id data-v-d8a382d6">设备号：{{c}}</view></view><view class="device-right data-v-d8a382d6"><view wx:if="{{d}}" class="payment-badge wx-score data-v-d8a382d6"><image src="{{e}}" mode="aspectFit" class="badge-icon data-v-d8a382d6"></image><view class="badge-text data-v-d8a382d6"><text class="data-v-d8a382d6">微信支付分</text><text class="divider data-v-d8a382d6">|</text><text class="highlight data-v-d8a382d6">免押租借</text></view></view><view wx:elif="{{f}}" class="payment-badge member data-v-d8a382d6"><text class="badge-text data-v-d8a382d6">会员订单</text></view><view wx:elif="{{g}}" class="payment-badge deposit data-v-d8a382d6"><text class="badge-text data-v-d8a382d6">押金租借</text></view></view></view><view class="time-info data-v-d8a382d6"><view class="time-item data-v-d8a382d6"><text class="label data-v-d8a382d6">开始时间</text><text class="value data-v-d8a382d6">{{h}}</text></view><view wx:if="{{i}}" class="time-item data-v-d8a382d6"><text class="label data-v-d8a382d6">结束时间</text><text class="value data-v-d8a382d6">{{j}}</text></view><view wx:if="{{k}}" class="time-item data-v-d8a382d6"><text class="label data-v-d8a382d6">联系电话</text><text class="value data-v-d8a382d6">{{l}}</text></view></view></view><view class="notice-card data-v-d8a382d6"><view class="notice-title data-v-d8a382d6">费用信息</view><view class="notice-list data-v-d8a382d6"><view wx:if="{{m}}" class="notice-item data-v-d8a382d6"><view class="dot data-v-d8a382d6"></view><text class="data-v-d8a382d6">押金：￥{{n}}</text></view><view wx:if="{{o}}" class="notice-item data-v-d8a382d6"><view class="dot data-v-d8a382d6"></view><text class="data-v-d8a382d6">套餐：￥{{p}}元 / {{q}}</text></view><view class="notice-item data-v-d8a382d6"><view class="dot data-v-d8a382d6"></view><text class="data-v-d8a382d6">合计：￥{{r}}</text></view></view></view></view>
|
||||
+1
-1
@@ -1 +1 @@
|
||||
.return-container.data-v-f9b4f795{min-height:100vh;background:#f7f8fa;padding:30rpx 30rpx 180rpx;box-sizing:border-box}.return-container .order-card.data-v-f9b4f795{background:#fff;border-radius:20rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.return-container .order-card .order-header.data-v-f9b4f795{display:flex;justify-content:space-between;align-items:center;margin-bottom:20rpx;padding-bottom:16rpx;border-bottom:1rpx solid #f0f0f0}.return-container .order-card .order-header .title.data-v-f9b4f795{font-size:30rpx;font-weight:700;color:#333}.return-container .order-card .order-header .order-no.data-v-f9b4f795{font-size:24rpx;color:#999}.return-container .order-card .device-info.data-v-f9b4f795{margin-bottom:24rpx;display:flex;justify-content:space-between;align-items:flex-start}.return-container .order-card .device-info .device-left.data-v-f9b4f795{flex:1;margin-right:20rpx}.return-container .order-card .device-info .device-left .device-name.data-v-f9b4f795{font-size:32rpx;font-weight:500;color:#333;margin-bottom:8rpx}.return-container .order-card .device-info .device-left .device-id.data-v-f9b4f795{font-size:26rpx;color:#999;margin-bottom:0}.return-container .order-card .device-info .device-right .payment-badge.data-v-f9b4f795{display:inline-flex;align-items:center;padding:6rpx 12rpx;border-radius:8rpx;white-space:nowrap}.return-container .order-card .device-info .device-right .payment-badge.wx-score.data-v-f9b4f795{background:rgba(7,193,96,.08)}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-icon.data-v-f9b4f795{width:32rpx;height:26rpx;margin-right:8rpx}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text.data-v-f9b4f795{font-size:22rpx;color:#07c160;display:flex;align-items:center}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text .divider.data-v-f9b4f795{margin:0 6rpx}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text .highlight.data-v-f9b4f795{font-weight:500}.return-container .order-card .device-info .device-right .payment-badge.deposit.data-v-f9b4f795{background:#f5f5f5}.return-container .order-card .device-info .device-right .payment-badge.deposit .badge-text.data-v-f9b4f795{font-size:22rpx;color:#666;font-weight:500}.return-container .order-card .time-info.data-v-f9b4f795{background:#f9f9f9;border-radius:16rpx;padding:20rpx}.return-container .order-card .time-info .time-item.data-v-f9b4f795{display:flex;justify-content:space-between;align-items:center;margin-bottom:16rpx}.return-container .order-card .time-info .time-item.data-v-f9b4f795:last-child{margin-bottom:0}.return-container .order-card .time-info .time-item .label.data-v-f9b4f795{font-size:26rpx;color:#666}.return-container .order-card .time-info .time-item .value.data-v-f9b4f795{font-size:26rpx;color:#333}.return-container .order-card .time-info .time-item .value.highlight.data-v-f9b4f795{color:#ff6b6b;font-weight:700}.return-container .notice-card.data-v-f9b4f795{background:#fff;border-radius:20rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.return-container .notice-card .notice-title.data-v-f9b4f795{font-size:30rpx;font-weight:700;color:#333;margin-bottom:20rpx}.return-container .notice-card .notice-list .notice-item.data-v-f9b4f795{display:flex;align-items:flex-start;margin-bottom:16rpx}.return-container .notice-card .notice-list .notice-item.data-v-f9b4f795:last-child{margin-bottom:0}.return-container .notice-card .notice-list .notice-item .dot.data-v-f9b4f795{width:12rpx;height:12rpx;background:#07c160;border-radius:50%;margin-top:10rpx;margin-right:16rpx;flex-shrink:0}.return-container .notice-card .notice-list .notice-item text.data-v-f9b4f795{font-size:26rpx;color:#666;line-height:1.5}.return-container .bottom-bar.data-v-f9b4f795{position:fixed;left:0;right:0;bottom:0;padding:20rpx 30rpx;padding-bottom:calc(20rpx + env(safe-area-inset-bottom));background:#fff;box-shadow:0 -4rpx 16rpx rgba(0,0,0,.04);z-index:10;display:flex;justify-content:space-between;gap:20rpx}.return-container .bottom-bar .action-item.data-v-f9b4f795{height:88rpx;display:flex;align-items:center;justify-content:center;font-size:30rpx;border-radius:44rpx;flex:1}.return-container .bottom-bar .action-item.primary.data-v-f9b4f795{background:#07c160;color:#fff}.return-container .bottom-bar .action-item.primary.data-v-f9b4f795:active{opacity:.8}.return-container .bottom-bar .action-item.secondary.data-v-f9b4f795{background:#f5f5f5;color:#333;border:1rpx solid #e0e0e0}.return-container .bottom-bar .action-item.secondary.data-v-f9b4f795:active{opacity:.8}
|
||||
.return-container.data-v-d8a382d6{min-height:100vh;background:#f7f8fa;padding:30rpx 30rpx 180rpx;box-sizing:border-box}.return-container .order-card.data-v-d8a382d6{background:#fff;border-radius:20rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.return-container .order-card .order-header.data-v-d8a382d6{display:flex;justify-content:space-between;align-items:center;margin-bottom:20rpx;padding-bottom:16rpx;border-bottom:1rpx solid #f0f0f0}.return-container .order-card .order-header .title.data-v-d8a382d6{font-size:30rpx;font-weight:700;color:#333}.return-container .order-card .order-header .order-no.data-v-d8a382d6{font-size:24rpx;color:#999}.return-container .order-card .device-info.data-v-d8a382d6{margin-bottom:24rpx;display:flex;justify-content:space-between;align-items:flex-start}.return-container .order-card .device-info .device-left.data-v-d8a382d6{flex:1;margin-right:20rpx}.return-container .order-card .device-info .device-left .device-name.data-v-d8a382d6{font-size:32rpx;font-weight:500;color:#333;margin-bottom:8rpx}.return-container .order-card .device-info .device-left .device-id.data-v-d8a382d6{font-size:26rpx;color:#999;margin-bottom:0}.return-container .order-card .device-info .device-right .payment-badge.data-v-d8a382d6{display:inline-flex;align-items:center;padding:6rpx 12rpx;border-radius:8rpx;white-space:nowrap}.return-container .order-card .device-info .device-right .payment-badge.wx-score.data-v-d8a382d6{background:rgba(7,193,96,.08)}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-icon.data-v-d8a382d6{width:32rpx;height:26rpx;margin-right:8rpx}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text.data-v-d8a382d6{font-size:22rpx;color:#07c160;display:flex;align-items:center}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text .divider.data-v-d8a382d6{margin:0 6rpx}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text .highlight.data-v-d8a382d6{font-weight:500}.return-container .order-card .device-info .device-right .payment-badge.member.data-v-d8a382d6{background:rgba(25,118,210,.08)}.return-container .order-card .device-info .device-right .payment-badge.member .badge-text.data-v-d8a382d6{font-size:22rpx;color:#1976d2;font-weight:500}.return-container .order-card .device-info .device-right .payment-badge.deposit.data-v-d8a382d6{background:#f5f5f5}.return-container .order-card .device-info .device-right .payment-badge.deposit .badge-text.data-v-d8a382d6{font-size:22rpx;color:#666;font-weight:500}.return-container .order-card .time-info.data-v-d8a382d6{background:#f9f9f9;border-radius:16rpx;padding:20rpx}.return-container .order-card .time-info .time-item.data-v-d8a382d6{display:flex;justify-content:space-between;align-items:center;margin-bottom:16rpx}.return-container .order-card .time-info .time-item.data-v-d8a382d6:last-child{margin-bottom:0}.return-container .order-card .time-info .time-item .label.data-v-d8a382d6{font-size:26rpx;color:#666}.return-container .order-card .time-info .time-item .value.data-v-d8a382d6{font-size:26rpx;color:#333}.return-container .order-card .time-info .time-item .value.highlight.data-v-d8a382d6{color:#ff6b6b;font-weight:700}.return-container .notice-card.data-v-d8a382d6{background:#fff;border-radius:20rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.return-container .notice-card .notice-title.data-v-d8a382d6{font-size:30rpx;font-weight:700;color:#333;margin-bottom:20rpx}.return-container .notice-card .notice-list .notice-item.data-v-d8a382d6{display:flex;align-items:flex-start;margin-bottom:16rpx}.return-container .notice-card .notice-list .notice-item.data-v-d8a382d6:last-child{margin-bottom:0}.return-container .notice-card .notice-list .notice-item .dot.data-v-d8a382d6{width:12rpx;height:12rpx;background:#07c160;border-radius:50%;margin-top:10rpx;margin-right:16rpx;flex-shrink:0}.return-container .notice-card .notice-list .notice-item text.data-v-d8a382d6{font-size:26rpx;color:#666;line-height:1.5}.return-container .bottom-bar.data-v-d8a382d6{position:fixed;left:0;right:0;bottom:0;padding:20rpx 30rpx;padding-bottom:calc(20rpx + env(safe-area-inset-bottom));background:#fff;box-shadow:0 -4rpx 16rpx rgba(0,0,0,.04);z-index:10;display:flex;justify-content:space-between;gap:20rpx}.return-container .bottom-bar .action-item.data-v-d8a382d6{height:88rpx;display:flex;align-items:center;justify-content:center;font-size:30rpx;border-radius:44rpx;flex:1}.return-container .bottom-bar .action-item.primary.data-v-d8a382d6{background:#07c160;color:#fff}.return-container .bottom-bar .action-item.primary.data-v-d8a382d6:active{opacity:.8}.return-container .bottom-bar .action-item.secondary.data-v-d8a382d6{background:#f5f5f5;color:#333;border:1rpx solid #e0e0e0}.return-container .bottom-bar .action-item.secondary.data-v-d8a382d6:active{opacity:.8}
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
"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$3}:{},{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);
|
||||
"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,y;return e.e({a:e.t(r.orderNo),b:e.t(null==(l=d[r.orderStatus])?void 0:l.text),c:e.n(null==(y=d[r.orderStatus])?void 0:y.class),d:e.t(r.deviceId),e:"wx_score_pay"==r.payWay},"wx_score_pay"==r.payWay?{f:t._imports_0$3}:("wx_member_pay"==r.payWay||r.payWay,{}),{g:"wx_member_pay"==r.payWay,h:"wx_pay"==r.payWay,i:e.t(r.startTime),j:e.t(r.endTime||"-"),k:e.t(r.amount),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.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)}:{},{n:"waiting_for_payment"===r.status||"waiting_for_payment"===r.orderStatus},"waiting_for_payment"===r.status||"waiting_for_payment"===r.orderStatus?{o: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)}:{},{p:"in_used"==r.status||"in_used"==r.orderStatus},"in_used"==r.status||"in_used"==r.orderStatus?{q: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)}:{},{r:e.o((t=>(t=>{e.index.navigateTo({url:`/pages/order/details?orderId=${t.orderId||t.orderNo}`})})(r)),n),s:n})}))})}},o=e._export_sfc(r,[["__scopeId","data-v-ccb8ba5b"]]);wx.createPage(o);
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
<view class="order-container data-v-57aa6fd9"><view class="status-tabs data-v-57aa6fd9"><view wx:for="{{a}}" wx:for-item="tab" wx:key="b" class="{{['tab-item', 'data-v-57aa6fd9', tab.c && 'active']}}" bindtap="{{tab.d}}">{{tab.a}}</view></view><view class="order-list data-v-57aa6fd9"><view wx:if="{{b}}" class="empty-state data-v-57aa6fd9"><view class="empty-icon data-v-57aa6fd9"></view><text class="empty-text data-v-57aa6fd9">暂无订单记录</text></view><view wx:for="{{c}}" wx:for-item="order" wx:key="q" class="order-item data-v-57aa6fd9"><view class="order-header data-v-57aa6fd9"><view class="order-id data-v-57aa6fd9"><text class="data-v-57aa6fd9">订单号：{{order.a}}</text></view><view class="{{['order-status', 'data-v-57aa6fd9', order.c]}}">{{order.b}}</view></view><view class="order-body data-v-57aa6fd9"><view class="device-info data-v-57aa6fd9"><view class="device-left data-v-57aa6fd9"><view class="device-name data-v-57aa6fd9">共享风扇</view><view class="device-id data-v-57aa6fd9">设备号：{{order.d}}</view></view><view class="device-right data-v-57aa6fd9"><view wx:if="{{order.e}}" class="payment-badge wx-score data-v-57aa6fd9"><image src="{{order.f}}" mode="aspectFit" class="badge-icon data-v-57aa6fd9"></image><view class="badge-text data-v-57aa6fd9"><text class="data-v-57aa6fd9">微信支付分</text><text class="divider data-v-57aa6fd9">|</text><text class="highlight data-v-57aa6fd9">免押租借</text></view></view><view wx:else class="payment-badge deposit data-v-57aa6fd9"><text class="badge-text data-v-57aa6fd9">押金租借</text></view></view></view><view class="order-times data-v-57aa6fd9"><view class="time-row data-v-57aa6fd9"><text class="time-label data-v-57aa6fd9">开始时间：</text><text class="time-value data-v-57aa6fd9">{{order.g}}</text></view><view class="time-row data-v-57aa6fd9"><text class="time-label data-v-57aa6fd9">结束时间：</text><text class="time-value data-v-57aa6fd9">{{order.h}}</text></view></view></view><view class="order-footer data-v-57aa6fd9"><view class="price data-v-57aa6fd9">￥{{order.i}}</view><view class="actions data-v-57aa6fd9"><view wx:if="{{order.j}}" class="action-item primary data-v-57aa6fd9" bindtap="{{order.k}}"> 立即支付 </view><view wx:if="{{order.l}}" class="action-item secondary data-v-57aa6fd9" bindtap="{{order.m}}"> 取消订单 </view><view wx:if="{{order.n}}" class="action-item primary data-v-57aa6fd9" bindtap="{{order.o}}"> 归还设备 </view><view class="action-item secondary data-v-57aa6fd9" bindtap="{{order.p}}"> 查看详情 </view></view></view></view></view></view>
|
||||
<view class="order-container data-v-ccb8ba5b"><view class="status-tabs data-v-ccb8ba5b"><view wx:for="{{a}}" wx:for-item="tab" wx:key="b" class="{{['tab-item', 'data-v-ccb8ba5b', tab.c && 'active']}}" bindtap="{{tab.d}}">{{tab.a}}</view></view><view class="order-list data-v-ccb8ba5b"><view wx:if="{{b}}" class="empty-state data-v-ccb8ba5b"><view class="empty-icon data-v-ccb8ba5b"></view><text class="empty-text data-v-ccb8ba5b">暂无订单记录</text></view><view wx:for="{{c}}" wx:for-item="order" wx:key="s" class="order-item data-v-ccb8ba5b"><view class="order-header data-v-ccb8ba5b"><view class="order-id data-v-ccb8ba5b"><text class="data-v-ccb8ba5b">订单号：{{order.a}}</text></view><view class="{{['order-status', 'data-v-ccb8ba5b', order.c]}}">{{order.b}}</view></view><view class="order-body data-v-ccb8ba5b"><view class="device-info data-v-ccb8ba5b"><view class="device-left data-v-ccb8ba5b"><view class="device-name data-v-ccb8ba5b">共享风扇</view><view class="device-id data-v-ccb8ba5b">设备号：{{order.d}}</view></view><view class="device-right data-v-ccb8ba5b"><view wx:if="{{order.e}}" class="payment-badge wx-score data-v-ccb8ba5b"><image src="{{order.f}}" mode="aspectFit" class="badge-icon data-v-ccb8ba5b"></image><view class="badge-text data-v-ccb8ba5b"><text class="data-v-ccb8ba5b">微信支付分</text><text class="divider data-v-ccb8ba5b">|</text><text class="highlight data-v-ccb8ba5b">免押租借</text></view></view><view wx:elif="{{order.g}}" class="payment-badge member data-v-ccb8ba5b"><text class="badge-text data-v-ccb8ba5b">会员订单</text></view><view wx:elif="{{order.h}}" class="payment-badge deposit data-v-ccb8ba5b"><text class="badge-text data-v-ccb8ba5b">押金租借</text></view></view></view><view class="order-times data-v-ccb8ba5b"><view class="time-row data-v-ccb8ba5b"><text class="time-label data-v-ccb8ba5b">开始时间：</text><text class="time-value data-v-ccb8ba5b">{{order.i}}</text></view><view class="time-row data-v-ccb8ba5b"><text class="time-label data-v-ccb8ba5b">结束时间：</text><text class="time-value data-v-ccb8ba5b">{{order.j}}</text></view></view></view><view class="order-footer data-v-ccb8ba5b"><view class="price data-v-ccb8ba5b">￥{{order.k}}</view><view class="actions data-v-ccb8ba5b"><view wx:if="{{order.l}}" class="action-item primary data-v-ccb8ba5b" bindtap="{{order.m}}"> 立即支付 </view><view wx:if="{{order.n}}" class="action-item secondary data-v-ccb8ba5b" bindtap="{{order.o}}"> 取消订单 </view><view wx:if="{{order.p}}" class="action-item primary data-v-ccb8ba5b" bindtap="{{order.q}}"> 归还设备 </view><view class="action-item secondary data-v-ccb8ba5b" bindtap="{{order.r}}"> 查看详情 </view></view></view></view></view></view>
|
||||
+1
-1
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user