From 7be1e97b7c73ec415f84604d15bbecfc98f47d1d Mon Sep 17 00:00:00 2001 From: ISFP_T <68358856@qq.com> Date: Mon, 30 Jun 2025 09:09:08 +0800 Subject: [PATCH] =?UTF-8?q?style:=E6=A0=B9=E6=8D=AE=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=88=86=E5=85=8D=E6=8A=BC=E8=A7=84=E8=8C=83=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E5=8F=98=E6=9B=B4=EF=BC=88?= =?UTF-8?q?=E6=95=B4=E4=BD=93=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 61 +- config/url.js | 2 +- config/user.js | 10 + constants/orderStatus.js | 4 + manifest.json | 2 +- pages/device/detail.vue | 51 +- pages/my/index.vue | 925 +++++++++--------- pages/order/index.vue | 770 +++++++++------ pages/return/index.vue | 175 +++- unpackage/dist/build/mp-weixin/app.wxss | 2 +- .../dist/build/mp-weixin/common/assets.js | 2 +- .../dist/build/mp-weixin/common/vendor.js | 2 +- unpackage/dist/build/mp-weixin/config/http.js | 2 +- unpackage/dist/build/mp-weixin/config/url.js | 2 +- unpackage/dist/build/mp-weixin/config/user.js | 2 +- .../build/mp-weixin/constants/orderStatus.js | 1 - .../build/mp-weixin/pages/deposit/index.js | 2 +- .../build/mp-weixin/pages/deposit/index.wxml | 2 +- .../build/mp-weixin/pages/deposit/index.wxss | 2 +- .../build/mp-weixin/pages/device/detail.js | 2 +- .../build/mp-weixin/pages/device/detail.wxml | 2 +- .../build/mp-weixin/pages/device/detail.wxss | 2 +- .../build/mp-weixin/pages/feedback/index.js | 2 +- .../build/mp-weixin/pages/feedback/index.wxml | 2 +- .../build/mp-weixin/pages/feedback/index.wxss | 2 +- .../dist/build/mp-weixin/pages/index/index.js | 2 +- .../build/mp-weixin/pages/index/index.wxml | 2 +- .../build/mp-weixin/pages/index/index.wxss | 2 +- .../dist/build/mp-weixin/pages/my/index.js | 2 +- .../dist/build/mp-weixin/pages/my/index.wxml | 2 +- .../dist/build/mp-weixin/pages/my/index.wxss | 2 +- .../dist/build/mp-weixin/pages/order/index.js | 2 +- .../build/mp-weixin/pages/order/index.wxml | 2 +- .../build/mp-weixin/pages/order/index.wxss | 2 +- .../build/mp-weixin/pages/order/payment.js | 2 +- .../build/mp-weixin/pages/order/payment.wxml | 2 +- .../build/mp-weixin/pages/order/payment.wxss | 2 +- .../mp-weixin/pages/order/return-success.js | 2 +- .../mp-weixin/pages/order/return-success.wxml | 2 +- .../mp-weixin/pages/order/return-success.wxss | 2 +- .../build/mp-weixin/pages/return/index.js | 2 +- .../build/mp-weixin/pages/return/index.wxml | 2 +- .../build/mp-weixin/pages/return/index.wxss | 2 +- .../mp-weixin/pages/serve/bagCheck/index.js | 2 +- .../dist/build/mp-weixin/project.config.json | 2 +- .../mp-weixin/static/images/Electricity.svg | 1 + .../mp-weixin/static/images/location-map.svg | 1 + .../mp-weixin/static/images/wxpayflag.png | Bin 0 -> 9409 bytes .../dist/build/mp-weixin/static/logo.png | Bin 4023 -> 5371 bytes unpackage/dist/build/mp-weixin/util/index.js | 2 +- .../build/mp-weixin/utils/orderMonitor.js | 2 +- .../.sourcemap/mp-weixin/common/assets.js.map | 2 +- .../.sourcemap/mp-weixin/common/vendor.js.map | 2 +- .../.sourcemap/mp-weixin/config/url.js.map | 2 +- .../.sourcemap/mp-weixin/config/user.js.map | 2 +- .../mp-weixin/constants/orderStatus.js.map | 2 +- .../mp-weixin/pages/device/detail.js.map | 2 +- .../mp-weixin/pages/my/index.js.map | 2 +- .../mp-weixin/pages/order/index.js.map | 2 +- .../mp-weixin/pages/return/index.js.map | 2 +- .../.sourcemap/mp-weixin/util/index.js.map | 2 +- unpackage/dist/dev/mp-weixin/common/assets.js | 22 +- unpackage/dist/dev/mp-weixin/common/vendor.js | 104 +- unpackage/dist/dev/mp-weixin/config/user.js | 9 + .../dev/mp-weixin/constants/orderStatus.js | 52 - .../dist/dev/mp-weixin/pages/device/detail.js | 38 +- .../dist/dev/mp-weixin/pages/my/index.js | 136 ++- .../dist/dev/mp-weixin/pages/my/index.wxml | 2 +- .../dist/dev/mp-weixin/pages/my/index.wxss | 401 +++----- .../dist/dev/mp-weixin/pages/order/index.js | 248 +++-- .../dist/dev/mp-weixin/pages/order/index.wxml | 2 +- .../dist/dev/mp-weixin/pages/order/index.wxss | 185 ++-- .../dist/dev/mp-weixin/pages/return/index.js | 98 +- .../dev/mp-weixin/pages/return/index.wxml | 2 +- .../dev/mp-weixin/pages/return/index.wxss | 96 +- unpackage/dist/dev/mp-weixin/util/index.js | 32 + util/index.js | 37 +- 77 files changed, 2141 insertions(+), 1420 deletions(-) delete mode 100644 unpackage/dist/build/mp-weixin/constants/orderStatus.js create mode 100644 unpackage/dist/build/mp-weixin/static/images/Electricity.svg create mode 100644 unpackage/dist/build/mp-weixin/static/images/location-map.svg create mode 100644 unpackage/dist/build/mp-weixin/static/images/wxpayflag.png delete mode 100644 unpackage/dist/dev/mp-weixin/constants/orderStatus.js diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1ac928b..7bf7a46 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,4 +1,63 @@ - {} + + + + + + + + + + + + + + + + + + + + + + + + + 1751020536285 + + + + + \ No newline at end of file diff --git a/config/url.js b/config/url.js index 259f2f2..7dcfbab 100644 --- a/config/url.js +++ b/config/url.js @@ -1,4 +1,4 @@ export const URL = "https://my.gxfs123.com/api" -// export const URL = "http://192.168.10.30:8080" +// export const URL = "http://192.168.10.33:8080" export const appid = "wx2165f0be356ae7a9" \ No newline at end of file diff --git a/config/user.js b/config/user.js index c8b3ad6..f6daea0 100644 --- a/config/user.js +++ b/config/user.js @@ -162,6 +162,15 @@ export const getOrderByOrderNoScore = (orderNo) => { }) } +export const getOrderByOrderNoScorePayStatus = (orderNo) => { + console.log('通过订单号获取支付分订单状态',orderNo); + return request({ + url: `/app/wx-payment/score/status/${orderNo}`, + method: 'get', + hideLoading: true + }) +} + // 更新订单套餐信息 export const updateOrderPackage = (data) => { console.log('更新订单套餐信息：', data) @@ -180,3 +189,4 @@ export const updateUserBalance = (orderId) => { hideLoading: true }) } + diff --git a/constants/orderStatus.js b/constants/orderStatus.js index 4674974..e0a478e 100644 --- a/constants/orderStatus.js +++ b/constants/orderStatus.js @@ -29,6 +29,10 @@ export const OrderStatusMap = { used_done: { text: '已完成', class: 'status-finished' + }, + fail: { + text: '已取消', + class: 'status-cancelled' } } diff --git a/manifest.json b/manifest.json index e8d3fcc..40c4184 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "fs", - "appid" : "__UNI__4630191", + "appid" : "__UNI__A871B6B", "description" : "", "versionName" : "1.0.0", "versionCode" : "100", diff --git a/pages/device/detail.vue b/pages/device/detail.vue index 4f95d0c..98c2c28 100644 --- a/pages/device/detail.vue +++ b/pages/device/detail.vue @@ -138,8 +138,15 @@ import { getDeviceInfo, rentPowerBank, - getOrderByOrderNoScore + getOrderByOrderNoScore, + getOrderByOrderNoScorePayStatus } from '@/config/user.js' + import { + URL + } from "@/config/url.js" + import { + initiateWeChatScorePayment + } from '@/util/index.js' // 响应式状态 const deviceInfo = ref({}) @@ -278,16 +285,48 @@ // 获取后端返回的订单信息 const order = rentResult.data + + // 获取支付分所需参数 const res = await getOrderByOrderNoScore(order.orderNo); console.log(res); uni.hideLoading() - - // 跳转到订单支付页面 - // uni.redirectTo({ - // url: `/pages/order/payment?orderId=${order.orderId}&deviceId=${deviceId.value}&noDeposit=true` - // }) + if (res && res.code === 200) { + try { + // 调用微信支付分小程序 + const payResult = await initiateWeChatScorePayment(res); + + // 支付成功后的逻辑处理 - 可以根据业务需求决定是否跳转或刷新页面 + if (payResult.errCode == '0') { + const res = await getOrderByOrderNoScorePayStatus(order.orderNo); + // 用户完成了支付流程，可以查询订单状态或跳转到订单页 + uni.showToast({ + title: '设备租借成功', + icon: 'success' + }); + + setTimeout(() => { + // 延迟跳转到租用中页面或订单页 + uni.redirectTo({ + url: '/pages/order/index' + }); + }, 1500); + } + // 用户取消等其他情况，不做特殊处理 + } catch (payError) { + uni.showToast({ + title: '支付分调用失败，请重试', + icon: 'none' + }); + } + } else { + uni.showToast({ + title: res?.msg || '获取支付参数失败', + icon: 'none' + }); + } + console.log(order); } catch (error) { uni.hideLoading() diff --git a/pages/my/index.vue b/pages/my/index.vue index d2f7356..6486177 100644 --- a/pages/my/index.vue +++ b/pages/my/index.vue @@ -1,502 +1,541 @@ - \ No newline at end of file diff --git a/pages/order/index.vue b/pages/order/index.vue index 16313b4..2a4b986 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -1,313 +1,527 @@ - \ No newline at end of file diff --git a/pages/return/index.vue b/pages/return/index.vue index 76faa75..2aaabd3 100644 --- a/pages/return/index.vue +++ b/pages/return/index.vue @@ -8,8 +8,27 @@ - 共享风扇 - 设备号：{{ deviceId }} + + 共享风扇 + 设备号：{{ deviceId }} + + + + + + + + + 微信支付分 + | + 免押租借 + + + + + 押金租借 + + @@ -61,8 +80,8 @@ - - + 刷新状态 + 返回首页 @@ -83,7 +102,8 @@ export default { _rawStartTime: '', // 用于调试 usedTime: '0分钟', currentFee: '0.00', - orderStatus: 'in_used' // 默认状态为使用中 + orderStatus: 'in_used', // 默认状态为使用中 + payWay: '' // 新增支付方式字段 }, timer: null, statusCheckTimer: null, @@ -272,6 +292,11 @@ export default { this.orderInfo.orderStatus = orderData.orderStatus } + // 更新支付方式 + if (orderData.payWay) { + this.orderInfo.payWay = orderData.payWay + } + // 检查订单状态，如果已完成，显示归还成功弹窗 if (orderData.orderStatus && (orderData.orderStatus === 'used_done' || orderData.orderStatus === 'used_down')) { @@ -333,6 +358,11 @@ export default { this.orderInfo.orderStatus = orderData.orderStatus; } + // 更新支付方式 + if (orderData.payWay) { + this.orderInfo.payWay = orderData.payWay; + } + // 保存原始开始时间用于调试 this.orderInfo._rawStartTime = orderData.startTime; @@ -467,6 +497,11 @@ export default { this.orderInfo.orderStatus = inUseOrder.orderStatus } + // 如果有支付方式，更新支付方式 + if (inUseOrder.payWay) { + this.orderInfo.payWay = inUseOrder.payWay + } + // 如果有开始时间，直接更新 if (inUseOrder.startTime) { console.log('inUse API返回的开始时间:', inUseOrder.startTime) @@ -523,14 +558,14 @@ export default { ","import MiniProgramPage from 'D:/uni-fans/pages/device/detail.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","reactive","onLoad","uni","getDeviceInfo","rentPowerBank","getOrderByOrderNoScore"],"mappings":";;;;;;;AAgJC,UAAM,aAAaA,cAAG,IAAC,EAAE;AACzB,UAAM,WAAWA,cAAG,IAAC,EAAE;AACvB,UAAM,iBAAiBA,cAAG,IAAC,SAAS;AACpC,UAAM,eAAeA,cAAG,IAAC,EAAE;AAC3B,UAAM,iBAAiBA,cAAG,IAAC,KAAK;AAChC,UAAM,eAAeC,cAAAA,SAAS;AAAA,MAC7B,MAAM;AAAA,MACN,OAAO;AAAA,IACT,CAAE;AACD,UAAM,aAAaD,cAAG,IAAC,IAAI;AAC3B,UAAM,cAAcA,cAAG,IAAC,EAAE;AAG1BE,kBAAM,OAAC,CAAC,YAAY;AACnB,eAAS,QAAQ,QAAQ;AACzB,uBAAkB;AAClBC,oBAAAA,MAAY,MAAA,OAAA,kCAAA,QAAQ,QAAQ;AAC5B,sBAAiB;AAAA,IACnB,CAAE;AAGD,UAAM,kBAAkB,YAAY;AACnC,YAAM,MAAM,MAAMC,0BAAc,SAAS,KAAK;AAC9C,UAAI,IAAI,QAAQ,KAAK;AACpB,mBAAW,QAAQ,IAAI,KAAK,UAAU,CAAE;AAGxC,YAAI,WAAW,MAAM,gBAAgB;AACpC,yBAAe,QAAQ,WAAW,MAAM;AAAA,QAC5C,WAAc,IAAI,KAAK,YAAY,IAAI,KAAK,SAAS,MAAM;AACvD,yBAAe,QAAQ,IAAI,KAAK,SAAS;AAAA,QACzC;AAGD,YAAI,WAAW,MAAM,QAAQ;AAC5B,cAAI,WAAW,MAAM,WAAW,UAAU;AACzC,yBAAa,OAAO;AACpB,yBAAa,QAAQ;AAAA,UACrB,WAAU,WAAW,MAAM,WAAW,WAAW;AACjD,yBAAa,OAAO;AACpB,yBAAa,QAAQ;AAAA,UACrB;AAAA,QACD;AAAA,MACD;AAAA,IACD;AAGD,UAAM,eAAe,MAAM;AAC1BD,oBAAAA,MAAI,UAAU;AAAA,QACb,OAAO;AAAA,QACP,SAAS;AAAA,QACT,aAAa;AAAA,QACb,SAAS,CAAC,QAAQ;AACjB,cAAI,IAAI,SAAS;AAChBA,0BAAAA,MAAI,WAAW;AAAA,cACd,KAAK;AAAA,YACX,CAAM;AAAA,UACD;AAAA,QACD;AAAA,MACJ,CAAG;AAAA,IACD;AAGD,UAAM,mBAAmB,YAAY;AACpC,UAAI;AAEH,cAAM,SAAS,MAAMA,oBAAI,KAAK,iBAAkB;AAEhD,YAAI,OAAO,UAAU;AACpB,gBAAM,QAAQ,OAAO;AAGrB,cAAI,MAAM,WAAW,uBAAuB;AAE3CA,0BAAAA,MAAI,WAAW;AAAA,cACd,KAAK,gCAAgC,MAAM,OAAO,aAAa,SAAS,KAAK;AAAA,YACnF,CAAM;AAAA,UACN,WAAe,MAAM,WAAW,WAAW;AAEtCA,0BAAAA,MAAI,WAAW;AAAA,cACd,KAAK,iCAAiC,SAAS,KAAK;AAAA,YAC1D,CAAM;AAAA,UACD;AAAA,QACD;AAAA,MACD,SAAQ,OAAO;AACfA,sBAAAA,MAAI,UAAU;AAAA,UACb,OAAO;AAAA,UACP,MAAM;AAAA,QACV,CAAI;AAAA,MACD;AAAA,IACD;AAGD,UAAM,aAAa,MAAM;AACxB,UAAI,CAAC,WAAW,OAAO;AACtB,qBAAc;AACd;AAAA,MACA;AAGD,UAAI,CAAC,YAAY,OAAO;AACvBA,sBAAAA,MAAI,UAAU;AAAA,UACb,OAAO;AAAA,UACP,MAAM;AAAA,QACV,CAAI;AACD;AAAA,MACA;AAGD,UAAI,CAAC,gBAAgB,KAAK,YAAY,KAAK,GAAG;AAC7CA,sBAAAA,MAAI,UAAU;AAAA,UACb,OAAO;AAAA,UACP,MAAM;AAAA,QACV,CAAI;AACD;AAAA,MACA;AAGD,sBAAiB;AAAA,IACjB;AAGD,UAAM,kBAAkB,YAAY;AACnC,UAAI;AACHA,sBAAAA,MAAI,YAAY;AAAA,UACf,OAAO;AAAA,QACX,CAAI;AAGD,cAAM,aAAa,MAAME,YAAa,cAAC,SAAS,OAAO,YAAY,KAAK;AACxE,YAAI,WAAW,SAAS,KAAK;AAC5B,gBAAM,IAAI,MAAM,WAAW,OAAO,QAAQ;AAAA,QAC1C;AAGD,cAAM,QAAQ,WAAW;AACzB,cAAM,MAAM,MAAMC,YAAAA,uBAAuB,MAAM,OAAO;AACtDH,sBAAAA,MAAY,MAAA,OAAA,kCAAA,GAAG;AAEfA,sBAAAA,MAAI,YAAa;AAOjBA,sBAAAA,MAAA,MAAA,OAAA,kCAAY,KAAK;AAAA,MACjB,SAAQ,OAAO;AACfA,sBAAAA,MAAI,YAAa;AACjBA,sBAAAA,MAAI,UAAU;AAAA,UACb,OAAO,MAAM,WAAW;AAAA,UACxB,MAAM;AAAA,QACV,CAAI;AAAA,MACD;AAAA,IACD;;;;;;;;;;;;;;;;;;;;;;;;;ACzSF,GAAG,WAAW,eAAe;"} \ No newline at end of file +{"version":3,"file":"detail.js","sources":["pages/device/detail.vue","E:/HBuilderX.4.24.2024072208/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvZGV2aWNlL2RldGFpbC52dWU"],"sourcesContent":["\r\n\r\n\r\n\r\n","import MiniProgramPage from 'D:/uni-fans/pages/device/detail.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","reactive","onLoad","uni","getDeviceInfo","rentPowerBank","getOrderByOrderNoScore","initiateWeChatScorePayment","res","getOrderByOrderNoScorePayStatus"],"mappings":"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"} \ No newline at end of file diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map index afea53c..bbd24ec 100644 --- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sources":["pages/my/index.vue","E:/HBuilderX.4.24.2024072208/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvbXkvaW5kZXgudnVl"],"sourcesContent":["\r\n\r\n\r\n\r\n","import MiniProgramPage from 'D:/uni-fans/pages/my/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["uni","wxLogin","getUserInfo"],"mappings":";;;;AAgFC,MAAK,YAAU;AAAA,EACd,OAAO;AACN,WAAO;AAAA,MACN,UAAU,CAAE;AAAA,MACZ,SAAS;AAAA,MACT,YAAY;AAAA,MACZ,cAAc;AAAA,MACd,MAAM;AAAA,IACP;AAAA,EACA;AAAA,EACD,SAAS;AACR,SAAK,QAAO;AAAA,EACZ;AAAA,EACD,SAAS;AAAA,IACR,MAAM,UAAU;AACf,UAAI;AACH,cAAM,QAAQA,cAAAA,MAAI,eAAe,OAAO;AACxC,YAAI,CAAC,OAAO;AACX,gBAAMC,mBAAQ;AACd,eAAK,QAAQ;AACb;AAAA,QACD;AAEA,cAAM,MAAM,MAAMC,uBAAY;AAC9BF,sBAAAA,MAAA,MAAA,OAAA,6BAAY,GAAG;AACf,YAAI,IAAI,SAAS,KAAK;AAErB,gBAAM,WAAW;AAAA,YAChB,UAAU,IAAI,KAAK;AAAA,YACnB,OAAO,IAAI,KAAK;AAAA,YAChB,QAAQ,IAAI,KAAK;AAAA,YACjB,SAAS,IAAI,KAAK;AAAA,UACnB;AAEA,eAAK,WAAW;AAChBA,8BAAI,eAAe,YAAY,QAAQ;AACvC,eAAK,UAAU,IAAI,KAAK,iBAAiB;AAAA,QAC1C;AAAA,MACC,SAAO,OAAO;AACfA,sBAAAA,MAAA,MAAA,SAAA,6BAAc,aAAa,KAAK;AAChCA,sBAAAA,MAAI,UAAU;AAAA,UACb,OAAO;AAAA,UACP,MAAM;AAAA,SACN;AAAA,MACF;AAAA,IACA;AAAA,IACD,WAAW,KAAK;AACfA,oBAAAA,MAAI,WAAW;AAAA,QACd;AAAA,OACA;AAAA,IACD;AAAA,EAEF;AACD;;;;;;;;;;;;;;;;;;;;;ACpID,GAAG,WAAW,eAAe;"} \ No newline at end of file +{"version":3,"file":"index.js","sources":["pages/my/index.vue","E:/HBuilderX.4.24.2024072208/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvbXkvaW5kZXgudnVl"],"sourcesContent":["\r\n\r\n\r\n\r\n","import MiniProgramPage from 'D:/uni-fans/pages/my/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","onMounted","uni","wxLogin","getUserInfo"],"mappings":";;;;;;;;;;;AA4HC,UAAM,WAAWA,kBAAI,CAAA,CAAE;AACvB,UAAM,UAAUA,kBAAI,MAAM;AAC1B,UAAM,SAASA,kBAAI,EAAE;AACrB,UAAM,YAAYA,kBAAI,IAAI;AAC1B,UAAM,iBAAiBA,kBAAI,KAAK;AAGhCC,kBAAAA,UAAU,MAAM;AACf;IACF,CAAE;AAGD,UAAM,UAAU,YAAY;AAC3B,UAAI;AACH,cAAM,QAAQC,cAAAA,MAAI,eAAe,OAAO;AACxC,YAAI,CAAC,OAAO;AACX,gBAAMC,WAAO,QAAA;AACb;AAAA,QACA;AAED,cAAM,MAAM,MAAMC,WAAAA;AAClBF,sBAAY,MAAA,MAAA,OAAA,6BAAA,uBAAuB,GAAG;AAEtC,YAAI,IAAI,QAAQ,KAAK;AAEpB,cAAI,IAAI,KAAK,QAAQ;AACpB,mBAAO,QAAQ,IAAI,KAAK;AACxBA,0BAAG,MAAC,eAAe,UAAU,IAAI,KAAK,MAAM;AAAA,UAC5C;AAGD,mBAAS,QAAQ;AAAA,YAChB,UAAU,IAAI,KAAK;AAAA,YACnB,OAAO,IAAI,KAAK;AAAA,YAChB,QAAQ,IAAI,KAAK;AAAA,YACjB,SAAS,IAAI,KAAK;AAAA,UACvB;AAEIA,wBAAAA,MAAI,eAAe,YAAY,SAAS,KAAK;AAC7C,kBAAQ,QAAQ,IAAI,KAAK,iBAAiB;AAAA,QAC1C;AAAA,MACD,SAAQ,OAAO;AACfA,sBAAc,MAAA,MAAA,SAAA,6BAAA,aAAa,KAAK;AAChCA,sBAAAA,MAAI,UAAU;AAAA,UACb,OAAO;AAAA,UACP,MAAM;AAAA,QACV,CAAI;AAAA,MACD;AAAA,IACH;AAGC,UAAM,aAAa,CAAC,QAAQ;AAC3BA,oBAAAA,MAAI,WAAW;AAAA,QACd;AAAA,MACH,CAAG;AAAA,IACH;AAGC,UAAM,iBAAiB,MAAM;AAC5B,iBAAW,sBAAsB;AAAA,IACnC;AAGC,UAAM,yBAAyB,MAAM;AACpC,UAAI,CAAC,SAAS,OAAO;AAEpB;MAIA;AAAA,IACH;AAGC,UAAM,gBAAgB,MAAM;AAC3B,UAAI,UAAU,OAAO;AACpB,kBAAU,MAAM;AAChB,uBAAe,QAAQ;AAAA,MACvB;AAAA,IACH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AC1MA,GAAG,WAAW,eAAe;"} \ 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 926dcde..72b5d64 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\r\n\r\n\r\n","import MiniProgramPage from 'D:/uni-fans/pages/order/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["OrderStatusMap","OrderStatusTabs","queryById","uni","getOrderList"],"mappings":";;;;AAyDA,MAAK,YAAU;AAAA,EACb,OAAO;AACL,WAAO;AAAA,MACL,YAAY;AAAA,MACZ,gBAAAA,sBAAc;AAAA,MACd,iBAAAC,sBAAe;AAAA,MACf,WAAW,CAAC;AAAA,IACd;AAAA,EACD;AAAA,EACD,MAAM,OAAO,SAAS;AAEpB,QAAI,WAAW,QAAQ,SAAS;AAC9B,UAAI;AAEF,cAAM,MAAM,MAAMC,YAAAA,UAAU,QAAQ,OAAO;AAC3C,YAAI,IAAI,SAAS,OAAO,IAAI,MAAM;AAEhC,gBAAM,YAAY,IAAI;AACtBC,8BAAY,MAAA,OAAA,+BAAA,WAAW,KAAK,UAAU,SAAS,CAAC;AAChDA,wBAAA,MAAA,MAAA,OAAA,+BAAY,cAAc,UAAU,SAAS;AAC7CA,wBAAA,MAAA,MAAA,OAAA,+BAAY,cAAc,UAAU,UAAU;AAG9C,gBAAM,iBAAiB,UAAU,aAAa,UAAU,cAAc;AACtEA,wBAAA,MAAA,MAAA,OAAA,+BAAY,kBAAkB,cAAc;AAG5C,gBAAM,iBAAiB;AAAA,YACrB,SAAS,UAAU;AAAA,YACnB,QAAQ,UAAU;AAAA,YAClB,UAAU,UAAU;AAAA,YACpB,WAAW;AAAA,YACX,SAAS,UAAU,WAAW;AAAA,YAC9B,QAAQ,UAAU,aAAa,UAAU,sBAAsB;AAAA;AAIjE,eAAK,YAAY,CAAC,gBAAgB,GAAG,KAAK,SAAS;AAGnD,gBAAM,WAAW,KAAK,gBAAgB;AAAA,YAAU,SAC9C,IAAI,OAAO,SAAS,UAAU,WAAW;AAAA;AAE3C,cAAI,aAAa,IAAI;AACnB,iBAAK,UAAU,QAAQ;AAAA,UACzB;AAAA,QACF;AAAA,MACA,SAAO,OAAO;AACdA,sBAAA,MAAA,MAAA,SAAA,gCAAc,aAAa,KAAK;AAAA,MAClC;AAAA,IACF;AAGA,UAAM,KAAK;EACZ;AAAA,EACD,SAAS;AAAA,IACP,MAAM,aAAa,aAAa,IAAI;AAClC,UAAI;AACF,cAAM,MAAM,MAAMC,yBAAa,UAAU;AACzC,YAAI,IAAI,SAAS,OAAO,IAAI,QAAQ,IAAI,KAAK,SAAS;AACpDD,wBAAAA,MAAA,MAAA,OAAA,gCAAY,iBAAiB,KAAK,UAAU,IAAI,KAAK,OAAO,CAAC;AAG7D,eAAK,YAAY,IAAI,KAAK,QAAQ,IAAI,UAAQ;AAC5CA,0BAAAA,MAAY,MAAA,OAAA,gCAAA,MAAM,KAAK,OAAO,WAAW,KAAK,SAAS;AACvDA,0BAAAA,MAAY,MAAA,OAAA,gCAAA,MAAM,KAAK,OAAO,WAAW,KAAK,UAAU;AAGxD,kBAAM,iBAAiB,KAAK,aAAa,KAAK,cAAc;AAC5DA,0BAAAA,MAAA,MAAA,OAAA,gCAAY,MAAM,KAAK,OAAO,eAAe,cAAc;AAE3D,mBAAO;AAAA,cACL,SAAS,KAAK;AAAA,cACd,QAAQ,KAAK;AAAA,cACb,UAAU,KAAK;AAAA,cACf,WAAW;AAAA,cACX,SAAS,KAAK,WAAW;AAAA,cACzB,QAAQ,KAAK,aAAa,KAAK,sBAAsB;AAAA;UAEzD,CAAC;AAAA,QACH;AAAA,MACA,SAAO,OAAO;AACdA,sBAAA,MAAA,MAAA,SAAA,gCAAc,aAAa,KAAK;AAChCA,sBAAAA,MAAI,UAAU;AAAA,UACZ,OAAO;AAAA,UACP,MAAM;AAAA,QACR,CAAC;AAAA,MACH;AAAA,IACD;AAAA,IACD,MAAM,UAAU,OAAO;AACrB,WAAK,aAAa;AAElB,YAAM,aAAa,KAAK,gBAAgB,KAAK,EAAE;AAC/C,YAAM,KAAK,aAAa,UAAU;AAAA,IACpC;AAAA,EACF;AACF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACxJA,GAAG,WAAW,eAAe;"} \ 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\r\n\r\n\r\n","import MiniProgramPage from 'D:/uni-fans/pages/order/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","reactive","onLoad","queryById","uni","getOrderList","getOrderByOrderNoScorePayStatus"],"mappings":"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"} \ No newline at end of file diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/return/index.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/return/index.js.map index be6db25..8aa1bcb 100644 --- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/return/index.js.map +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/return/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sources":["pages/return/index.vue","E:/HBuilderX.4.24.2024072208/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvcmV0dXJuL2luZGV4LnZ1ZQ"],"sourcesContent":["\r\n\r\n\r\n\r\n","import MiniProgramPage from 'D:/uni-fans/pages/return/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["uni","queryById","URL"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"index.js","sources":["pages/return/index.vue","E:/HBuilderX.4.24.2024072208/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvcmV0dXJuL2luZGV4LnZ1ZQ"],"sourcesContent":["\r\n\r\n\r\n\r\n","import MiniProgramPage from 'D:/uni-fans/pages/return/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["uni","queryById","URL"],"mappings":"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"} \ No newline at end of file diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/util/index.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/util/index.js.map index de14619..f4cadf9 100644 --- a/unpackage/dist/dev/.sourcemap/mp-weixin/util/index.js.map +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/util/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sources":["util/index.js"],"sourcesContent":["import {\r\n\tlogin,\r\n\tgetMyIndexInfo\r\n} from \"../config/user\"\r\n\r\n// 微信登录方法\r\nexport const wxLogin = () => {\r\n\treturn new Promise((resolve, reject) => {\r\n\t\t// 1. 获取微信登录凭证\r\n\t\tuni.login({\r\n\t\t\tprovider: 'weixin',\r\n\t\t\tsuccess: async (loginRes) => {\r\n\r\n\t\t\t\ttry {\r\n\t\t\t\t\tif (loginRes.code) {\r\n\t\t\t\t\t\t// 2. 发送 code 到后端换取 token\r\n\t\t\t\t\t\tconst result = await login({\r\n\t\t\t\t\t\t\tcode: loginRes.code,\r\n\t\t\t\t\t\t\tappid: \"wx2165f0be356ae7a9\"\r\n\t\t\t\t\t\t})\r\n\r\n\t\t\t\t\t\tif (result.code === 200) {\r\n\t\t\t\t\t\t\t// 3. 保存token和用户信息\r\n\r\n\t\t\t\t\t\t\tuni.setStorageSync('token', result.data.LoginWxVo.access_token)\r\n\t\t\t\t\t\t\tuni.setStorageSync('client_id', result.data.LoginWxVo.client_id)\r\n\r\n\t\t\t\t\t\t\tresolve(result.data)\r\n\t\t\t\t\t\t} else {\r\n\t\t\t\t\t\t\tthrow new Error(result.message || '登录失败')\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t} else {\r\n\t\t\t\t\t\tthrow new Error('获取微信登录凭证失败')\r\n\t\t\t\t\t}\r\n\t\t\t\t} catch (error) {\r\n\r\n\t\t\t\t\tuni.showToast({\r\n\t\t\t\t\t\ttitle: error.message || '登录失败',\r\n\t\t\t\t\t\ticon: 'none'\r\n\t\t\t\t\t})\r\n\t\t\t\t\treject(error)\r\n\t\t\t\t}\r\n\t\t\t},\r\n\t\t\tfail: (error) => {\r\n\t\t\t\tuni.showToast({\r\n\t\t\t\t\ttitle: '微信登录失败',\r\n\t\t\t\t\ticon: 'none'\r\n\t\t\t\t})\r\n\t\t\t\treject(error)\r\n\t\t\t}\r\n\t\t})\r\n\t})\r\n}\r\n\r\n// 检查登录状态\r\n// export const checkLogin = () => {\r\n// const token = uni.getStorageSync('token')\r\n// return !!token\r\n// }\r\n\r\n// 获取用户信息\r\nexport const getUserInfo = () => {\r\n\r\n\r\n\r\n\treturn new Promise(async (res, rej) => {\r\n\r\n\t\tconst result = await getMyIndexInfo({\r\n\t\t\tisHide: false,\r\n\t\t})\r\n\t\tres(result)\r\n\t})\r\n}\r\n\r\n\r\n\r\nexport const getQueryString = function (url, name) {\r\n var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')\r\n var r = url.substr(1).match(reg)\r\n if (r != null) {\r\n return r[2]\r\n }\r\n return null;\r\n}"],"names":["uni","login","getMyIndexInfo"],"mappings":";;;AAMY,MAAC,UAAU,MAAM;AAC5B,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AAEvCA,kBAAAA,MAAI,MAAM;AAAA,MACT,UAAU;AAAA,MACV,SAAS,OAAO,aAAa;AAE5B,YAAI;AACH,cAAI,SAAS,MAAM;AAElB,kBAAM,SAAS,MAAMC,kBAAM;AAAA,cAC1B,MAAM,SAAS;AAAA,cACf,OAAO;AAAA,YACd,CAAO;AAED,gBAAI,OAAO,SAAS,KAAK;AAGxBD,4BAAG,MAAC,eAAe,SAAS,OAAO,KAAK,UAAU,YAAY;AAC9DA,4BAAG,MAAC,eAAe,aAAa,OAAO,KAAK,UAAU,SAAS;AAE/D,sBAAQ,OAAO,IAAI;AAAA,YAC1B,OAAa;AACN,oBAAM,IAAI,MAAM,OAAO,WAAW,MAAM;AAAA,YACxC;AAAA,UACP,OAAY;AACN,kBAAM,IAAI,MAAM,YAAY;AAAA,UAC5B;AAAA,QACD,SAAQ,OAAO;AAEfA,wBAAAA,MAAI,UAAU;AAAA,YACb,OAAO,MAAM,WAAW;AAAA,YACxB,MAAM;AAAA,UACZ,CAAM;AACD,iBAAO,KAAK;AAAA,QACZ;AAAA,MACD;AAAA,MACD,MAAM,CAAC,UAAU;AAChBA,sBAAAA,MAAI,UAAU;AAAA,UACb,OAAO;AAAA,UACP,MAAM;AAAA,QACX,CAAK;AACD,eAAO,KAAK;AAAA,MACZ;AAAA,IACJ,CAAG;AAAA,EACH,CAAE;AACF;AASY,MAAC,cAAc,MAAM;AAIhC,SAAO,IAAI,QAAQ,OAAO,KAAK,QAAQ;AAEtC,UAAM,SAAS,MAAME,2BAAe;AAAA,MACnC,QAAQ;AAAA,IACX,CAAG;AACD,QAAI,MAAM;AAAA,EACZ,CAAE;AACF;AAIY,MAAC,iBAAiB,SAAU,KAAK,MAAM;AAC/C,MAAI,MAAM,IAAI,OAAO,aAAa,OAAO,uBAAuB,GAAG;AACnE,MAAI,IAAI,IAAI,OAAO,CAAC,EAAE,MAAM,GAAG;AAC/B,MAAI,KAAK,MAAM;AACX,WAAO,EAAE,CAAC;AAAA,EACb;AACD,SAAO;AACX;;;;"} \ No newline at end of file +{"version":3,"file":"index.js","sources":["util/index.js"],"sourcesContent":["import {\r\n\tlogin,\r\n\tgetMyIndexInfo\r\n} from \"../config/user\"\r\n\r\n// 微信登录方法\r\nexport const wxLogin = () => {\r\n\treturn new Promise((resolve, reject) => {\r\n\t\t// 1. 获取微信登录凭证\r\n\t\tuni.login({\r\n\t\t\tprovider: 'weixin',\r\n\t\t\tsuccess: async (loginRes) => {\r\n\r\n\t\t\t\ttry {\r\n\t\t\t\t\tif (loginRes.code) {\r\n\t\t\t\t\t\t// 2. 发送 code 到后端换取 token\r\n\t\t\t\t\t\tconst result = await login({\r\n\t\t\t\t\t\t\tcode: loginRes.code,\r\n\t\t\t\t\t\t\tappid: \"wx2165f0be356ae7a9\"\r\n\t\t\t\t\t\t})\r\n\r\n\t\t\t\t\t\tif (result.code === 200) {\r\n\t\t\t\t\t\t\t// 3. 保存token和用户信息\r\n\r\n\t\t\t\t\t\t\tuni.setStorageSync('token', result.data.LoginWxVo.access_token)\r\n\t\t\t\t\t\t\tuni.setStorageSync('client_id', result.data.LoginWxVo.client_id)\r\n\r\n\t\t\t\t\t\t\tresolve(result.data)\r\n\t\t\t\t\t\t} else {\r\n\t\t\t\t\t\t\tthrow new Error(result.message || '登录失败')\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t} else {\r\n\t\t\t\t\t\tthrow new Error('获取微信登录凭证失败')\r\n\t\t\t\t\t}\r\n\t\t\t\t} catch (error) {\r\n\r\n\t\t\t\t\tuni.showToast({\r\n\t\t\t\t\t\ttitle: error.message || '登录失败',\r\n\t\t\t\t\t\ticon: 'none'\r\n\t\t\t\t\t})\r\n\t\t\t\t\treject(error)\r\n\t\t\t\t}\r\n\t\t\t},\r\n\t\t\tfail: (error) => {\r\n\t\t\t\tuni.showToast({\r\n\t\t\t\t\ttitle: '微信登录失败',\r\n\t\t\t\t\ticon: 'none'\r\n\t\t\t\t})\r\n\t\t\t\treject(error)\r\n\t\t\t}\r\n\t\t})\r\n\t})\r\n}\r\n\r\n// 检查登录状态\r\n// export const checkLogin = () => {\r\n// const token = uni.getStorageSync('token')\r\n// return !!token\r\n// }\r\n\r\n// 获取用户信息\r\nexport const getUserInfo = () => {\r\n\r\n\r\n\r\n\treturn new Promise(async (res, rej) => {\r\n\r\n\t\tconst result = await getMyIndexInfo({\r\n\t\t\tisHide: false,\r\n\t\t})\r\n\t\tres(result)\r\n\t})\r\n}\r\n\r\n// 调用微信支付分接口\r\nexport const initiateWeChatScorePayment = (paymentData) => {\r\n\treturn new Promise((resolve, reject) => {\r\n\t\t// 确保paymentData包含所需数据\r\n\t\tif (!paymentData || !paymentData.data || !paymentData.data.package) {\r\n\t\t\treject(new Error('支付参数不完整'));\r\n\t\t\treturn;\r\n\t\t}\r\n\t\t\r\n\t\t// 使用wx.openBusinessView打开微信支付分小程序\r\n\t\twx.openBusinessView({\r\n\t\t\tbusinessType: 'wxpayScoreUse',\r\n\t\t\textraData: {\r\n\t\t\t\tmch_id: paymentData.data.mch_id,\r\n\t\t\t\tpackage: paymentData.data.package\r\n\t\t\t},\r\n\t\t\tsuccess: (businessRes) => {\r\n\t\t\t\tconsole.log('微信支付分小程序调用成功', businessRes);\r\n\t\t\t\t// 根据返回结果判断是否完成支付\r\n\t\t\t\tif (businessRes.errMsg === 'openBusinessView:ok') {\r\n\t\t\t\t\tresolve(businessRes);\r\n\t\t\t\t} else {\r\n\t\t\t\t\treject(new Error('支付流程未完成'));\r\n\t\t\t\t}\r\n\t\t\t},\r\n\t\t\tfail: (error) => {\r\n\t\t\t\tconsole.error('微信支付分小程序调用失败', error);\r\n\t\t\t\tuni.showToast({\r\n\t\t\t\t\ttitle: error.errMsg || '支付分接口调用失败',\r\n\t\t\t\t\ticon: 'none'\r\n\t\t\t\t});\r\n\t\t\t\treject(error);\r\n\t\t\t}\r\n\t\t});\r\n\t});\r\n}\r\n\r\nexport const getQueryString = function (url, name) {\r\n var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')\r\n var r = url.substr(1).match(reg)\r\n if (r != null) {\r\n return r[2]\r\n }\r\n return null;\r\n}"],"names":["uni","login","getMyIndexInfo","wx"],"mappings":";;;AAMY,MAAC,UAAU,MAAM;AAC5B,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AAEvCA,kBAAAA,MAAI,MAAM;AAAA,MACT,UAAU;AAAA,MACV,SAAS,OAAO,aAAa;AAE5B,YAAI;AACH,cAAI,SAAS,MAAM;AAElB,kBAAM,SAAS,MAAMC,kBAAM;AAAA,cAC1B,MAAM,SAAS;AAAA,cACf,OAAO;AAAA,YACd,CAAO;AAED,gBAAI,OAAO,SAAS,KAAK;AAGxBD,4BAAG,MAAC,eAAe,SAAS,OAAO,KAAK,UAAU,YAAY;AAC9DA,4BAAG,MAAC,eAAe,aAAa,OAAO,KAAK,UAAU,SAAS;AAE/D,sBAAQ,OAAO,IAAI;AAAA,YAC1B,OAAa;AACN,oBAAM,IAAI,MAAM,OAAO,WAAW,MAAM;AAAA,YACxC;AAAA,UACP,OAAY;AACN,kBAAM,IAAI,MAAM,YAAY;AAAA,UAC5B;AAAA,QACD,SAAQ,OAAO;AAEfA,wBAAAA,MAAI,UAAU;AAAA,YACb,OAAO,MAAM,WAAW;AAAA,YACxB,MAAM;AAAA,UACZ,CAAM;AACD,iBAAO,KAAK;AAAA,QACZ;AAAA,MACD;AAAA,MACD,MAAM,CAAC,UAAU;AAChBA,sBAAAA,MAAI,UAAU;AAAA,UACb,OAAO;AAAA,UACP,MAAM;AAAA,QACX,CAAK;AACD,eAAO,KAAK;AAAA,MACZ;AAAA,IACJ,CAAG;AAAA,EACH,CAAE;AACF;AASY,MAAC,cAAc,MAAM;AAIhC,SAAO,IAAI,QAAQ,OAAO,KAAK,QAAQ;AAEtC,UAAM,SAAS,MAAME,2BAAe;AAAA,MACnC,QAAQ;AAAA,IACX,CAAG;AACD,QAAI,MAAM;AAAA,EACZ,CAAE;AACF;AAGY,MAAC,6BAA6B,CAAC,gBAAgB;AAC1D,SAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AAEvC,QAAI,CAAC,eAAe,CAAC,YAAY,QAAQ,CAAC,YAAY,KAAK,SAAS;AACnE,aAAO,IAAI,MAAM,SAAS,CAAC;AAC3B;AAAA,IACA;AAGDC,kBAAAA,KAAG,iBAAiB;AAAA,MACnB,cAAc;AAAA,MACd,WAAW;AAAA,QACV,QAAQ,YAAY,KAAK;AAAA,QACzB,SAAS,YAAY,KAAK;AAAA,MAC1B;AAAA,MACD,SAAS,CAAC,gBAAgB;AACzBH,sBAAA,MAAA,MAAA,OAAA,uBAAY,gBAAgB,WAAW;AAEvC,YAAI,YAAY,WAAW,uBAAuB;AACjD,kBAAQ,WAAW;AAAA,QACxB,OAAW;AACN,iBAAO,IAAI,MAAM,SAAS,CAAC;AAAA,QAC3B;AAAA,MACD;AAAA,MACD,MAAM,CAAC,UAAU;AAChBA,sBAAc,MAAA,MAAA,SAAA,wBAAA,gBAAgB,KAAK;AACnCA,sBAAAA,MAAI,UAAU;AAAA,UACb,OAAO,MAAM,UAAU;AAAA,UACvB,MAAM;AAAA,QACX,CAAK;AACD,eAAO,KAAK;AAAA,MACZ;AAAA,IACJ,CAAG;AAAA,EACH,CAAE;AACF;AAEY,MAAC,iBAAiB,SAAU,KAAK,MAAM;AAC/C,MAAI,MAAM,IAAI,OAAO,aAAa,OAAO,uBAAuB,GAAG;AACnE,MAAI,IAAI,IAAI,OAAO,CAAC,EAAE,MAAM,GAAG;AAC/B,MAAI,KAAK,MAAM;AACX,WAAO,EAAE,CAAC;AAAA,EACb;AACD,SAAO;AACX;;;;;"} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js index 4b828d1..1b4aedc 100644 --- a/unpackage/dist/dev/mp-weixin/common/assets.js +++ b/unpackage/dist/dev/mp-weixin/common/assets.js @@ -1,18 +1,20 @@ "use strict"; -const _imports_0$2 = "/static/logo.png"; +const _imports_0$3 = "/static/logo.png"; const _imports_1$2 = "/static/scan-icon.png"; -const _imports_0$1 = "/static/jl.png"; -const _imports_1$1 = "/static/complaint.png"; -const _imports_2$1 = "/static/hlep.png"; +const _imports_0$2 = "/static/user-active.png"; +const _imports_1$1 = "/static/jl.png"; +const _imports_2 = "/static/complaint.png"; +const _imports_3 = "/static/hlep.png"; +const _imports_0$1 = "/static/images/wxpayflag.png"; const _imports_0 = "/static/images/location-map.svg"; const _imports_1 = "/static/images/Electricity.svg"; -const _imports_2 = "/static/images/wxpayflag.png"; -exports._imports_0 = _imports_0$2; -exports._imports_0$1 = _imports_0$1; -exports._imports_0$2 = _imports_0; +exports._imports_0 = _imports_0$3; +exports._imports_0$1 = _imports_0$2; +exports._imports_0$2 = _imports_0$1; +exports._imports_0$3 = _imports_0; exports._imports_1 = _imports_1$2; exports._imports_1$1 = _imports_1$1; exports._imports_1$2 = _imports_1; -exports._imports_2 = _imports_2$1; -exports._imports_2$1 = _imports_2; +exports._imports_2 = _imports_2; +exports._imports_3 = _imports_3; //# sourceMappingURL=../../.sourcemap/mp-weixin/common/assets.js.map diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js index 4b03fd5..771379c 100644 --- a/unpackage/dist/dev/mp-weixin/common/vendor.js +++ b/unpackage/dist/dev/mp-weixin/common/vendor.js @@ -1303,6 +1303,9 @@ function isReadonly(value) { function isShallow(value) { return !!(value && value["__v_isShallow"]); } +function isProxy(value) { + return isReactive(value) || isReadonly(value); +} function toRaw(observed) { const raw = observed && observed["__v_raw"]; return raw ? toRaw(raw) : observed; @@ -2094,6 +2097,47 @@ function setCurrentRenderingInstance(instance) { instance && instance.type.__scopeId || null; return prev; } +const COMPONENTS = "components"; +function resolveComponent(name, maybeSelfReference) { + return resolveAsset(COMPONENTS, name, true, maybeSelfReference) || name; +} +function resolveAsset(type, name, warnMissing = true, maybeSelfReference = false) { + const instance = currentRenderingInstance || currentInstance; + if (instance) { + const Component2 = instance.type; + if (type === COMPONENTS) { + const selfName = getComponentName( + Component2, + false + ); + if (selfName && (selfName === name || selfName === camelize(name) || selfName === capitalize(camelize(name)))) { + return Component2; + } + } + const res = ( + // local registration + // check instance[type] first which is resolved for options API + resolve(instance[type] || Component2[type], name) || // global registration + resolve(instance.appContext[type], name) + ); + if (!res && maybeSelfReference) { + return Component2; + } + if (warnMissing && !res) { + const extra = type === COMPONENTS ? ` +If this is a native custom element, make sure to exclude it from component resolution via compilerOptions.isCustomElement.` : ``; + warn$1(`Failed to resolve ${type.slice(0, -1)}: ${name}${extra}`); + } + return res; + } else { + warn$1( + `resolve${capitalize(type.slice(0, -1))} can only be used in render() or setup().` + ); + } +} +function resolve(registry, name) { + return registry && (registry[name] || registry[camelize(name)] || registry[capitalize(camelize(name))]); +} const INITIAL_WATCHER_VALUE = {}; function watch(source, cb, options) { if (!isFunction(cb)) { @@ -3704,6 +3748,12 @@ const Static = Symbol.for("v-stc"); function isVNode(value) { return value ? value.__v_isVNode === true : false; } +const InternalObjectKey = `__vInternal`; +function guardReactiveProps(props) { + if (!props) + return null; + return isProxy(props) || InternalObjectKey in props ? extend({}, props) : props; +} const emptyAppContext = createAppContext(); let uid = 0; function createComponentInstance(vnode, parent, suspense) { @@ -4942,6 +4992,11 @@ function initApp(app) { } } const propsCaches = /* @__PURE__ */ Object.create(null); +function renderProps(props) { + const { uid: uid2, __counter } = getCurrentInstance(); + const propsId = (propsCaches[uid2] || (propsCaches[uid2] = [])).push(guardReactiveProps(props)) - 1; + return uid2 + "," + propsId + "," + __counter; +} function pruneComponentPropsCache(uid2) { delete propsCaches[uid2]; } @@ -5113,6 +5168,7 @@ const f = (source, renderItem) => vFor(source, renderItem); const e = (target, ...sources) => extend(target, ...sources); const n = (value) => normalizeClass(value); const t = (val) => toDisplayString(val); +const p = (props) => renderProps(props); function createApp$1(rootComponent, rootProps = null) { rootComponent && (rootComponent.mpType = "app"); return createVueApp(rootComponent, rootProps).use(plugin); @@ -5434,8 +5490,8 @@ function promisify$1(name, fn) { if (hasCallback(args)) { return wrapperReturnValue(name, invokeApi(name, fn, args, rest)); } - return wrapperReturnValue(name, handlePromise(new Promise((resolve, reject) => { - invokeApi(name, fn, extend(args, { success: resolve, fail: reject }), rest); + return wrapperReturnValue(name, handlePromise(new Promise((resolve2, reject) => { + invokeApi(name, fn, extend(args, { success: resolve2, fail: reject }), rest); }))); }; } @@ -5756,7 +5812,7 @@ function invokeGetPushCidCallbacks(cid2, errMsg) { getPushCidCallbacks.length = 0; } const API_GET_PUSH_CLIENT_ID = "getPushClientId"; -const getPushClientId = defineAsyncApi(API_GET_PUSH_CLIENT_ID, (_, { resolve, reject }) => { +const getPushClientId = defineAsyncApi(API_GET_PUSH_CLIENT_ID, (_, { resolve: resolve2, reject }) => { Promise.resolve().then(() => { if (typeof enabled === "undefined") { enabled = false; @@ -5765,7 +5821,7 @@ const getPushClientId = defineAsyncApi(API_GET_PUSH_CLIENT_ID, (_, { resolve, re } getPushCidCallbacks.push((cid2, errMsg) => { if (cid2) { - resolve({ cid: cid2 }); + resolve2({ cid: cid2 }); } else { reject(errMsg); } @@ -5834,9 +5890,9 @@ function promisify(name, api) { if (isFunction(options.success) || isFunction(options.fail) || isFunction(options.complete)) { return wrapperReturnValue(name, invokeApi(name, api, options, rest)); } - return wrapperReturnValue(name, handlePromise(new Promise((resolve, reject) => { + return wrapperReturnValue(name, handlePromise(new Promise((resolve2, reject) => { invokeApi(name, api, extend({}, options, { - success: resolve, + success: resolve2, fail: reject }), rest); }))); @@ -6034,7 +6090,7 @@ function populateParameters(fromRes, toRes) { let _SDKVersion = SDKVersion; const hostLanguage = (language || "").replace(/_/g, "-"); const parameters = { - appId: "__UNI__4630191", + appId: "__UNI__A871B6B", appName: "fs", appVersion: "1.0.0", appVersionCode: "100", @@ -6183,7 +6239,7 @@ const getAppBaseInfo = { hostName: _hostName, hostSDKVersion: SDKVersion, hostTheme: theme, - appId: "__UNI__4630191", + appId: "__UNI__A871B6B", appName: "fs", appVersion: "1.0.0", appVersionCode: "100", @@ -6443,13 +6499,13 @@ function initRuntimeSocket(hosts, port, id) { } const SOCKET_TIMEOUT = 500; function tryConnectSocket(host2, port, id) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { const socket = index.connectSocket({ url: `ws://${host2}:${port}/${id}`, multiple: true, // 支付宝小程序 是否开启多实例 fail() { - resolve(null); + resolve2(null); } }); const timer = setTimeout(() => { @@ -6457,19 +6513,19 @@ function tryConnectSocket(host2, port, id) { code: 1006, reason: "connect timeout" }); - resolve(null); + resolve2(null); }, SOCKET_TIMEOUT); socket.onOpen((e2) => { clearTimeout(timer); - resolve(socket); + resolve2(socket); }); socket.onClose((e2) => { clearTimeout(timer); - resolve(null); + resolve2(null); }); socket.onError((e2) => { clearTimeout(timer); - resolve(null); + resolve2(null); }); }); } @@ -6934,7 +6990,7 @@ function isConsoleWritable() { function initRuntimeSocketService() { const hosts = "192.168.10.21,127.0.0.1"; const port = "8090"; - const id = "mp-weixin_ZQiCij"; + const id = "mp-weixin_hkcpyE"; const lazy = typeof swan !== "undefined"; let restoreError = lazy ? () => { } : initOnError(); @@ -8098,7 +8154,7 @@ class Request { options.params = options.params || {}; options.header = Object.assign({}, this.config.header, options.header); options.method = options.method || this.config.method; - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { options.complete = (response) => { index.hideLoading(); clearTimeout(this.config.timer); @@ -8107,24 +8163,24 @@ class Request { if (this.interceptor.response && typeof this.interceptor.response === "function") { let resInterceptors = this.interceptor.response(response); if (resInterceptors !== false) { - resolve(resInterceptors); + resolve2(resInterceptors); } else { reject(response); } } else { - resolve(response); + resolve2(response); } } else { if (response.statusCode == 200) { if (this.interceptor.response && typeof this.interceptor.response === "function") { let resInterceptors = this.interceptor.response(response.data); if (resInterceptors !== false) { - resolve(resInterceptors); + resolve2(resInterceptors); } else { reject(response.data); } } else { - resolve(response.data); + resolve2(response.data); } } else { reject(response); @@ -8303,8 +8359,8 @@ class Router { mergeConfig.params = params; mergeConfig = index.$u.deepMerge(this.config, mergeConfig); if (typeof index.$u.routeIntercept === "function") { - const isNext = await new Promise((resolve, reject) => { - index.$u.routeIntercept(mergeConfig, resolve); + const isNext = await new Promise((resolve2, reject) => { + index.$u.routeIntercept(mergeConfig, resolve2); }); isNext && this.openPage(mergeConfig); } else { @@ -8824,7 +8880,11 @@ exports.index = index; exports.n = n; exports.o = o; exports.onLoad = onLoad; +exports.onMounted = onMounted; +exports.p = p; exports.reactive = reactive; exports.ref = ref; +exports.resolveComponent = resolveComponent; exports.t = t; +exports.wx$1 = wx$1; //# sourceMappingURL=../../.sourcemap/mp-weixin/common/vendor.js.map diff --git a/unpackage/dist/dev/mp-weixin/config/user.js b/unpackage/dist/dev/mp-weixin/config/user.js index 70bb5d9..fe8f782 100644 --- a/unpackage/dist/dev/mp-weixin/config/user.js +++ b/unpackage/dist/dev/mp-weixin/config/user.js @@ -78,6 +78,14 @@ const getOrderByOrderNoScore = (orderNo) => { hideLoading: true }); }; +const getOrderByOrderNoScorePayStatus = (orderNo) => { + common_vendor.index.__f__("log", "at config/user.js:166", "通过订单号获取支付分订单状态", orderNo); + return config_http.request({ + url: `/app/wx-payment/score/status/${orderNo}`, + method: "get", + hideLoading: true + }); +}; const updateUserBalance = (orderId) => { return config_http.request({ url: `/app/user/updateBalance/${orderId}`, @@ -90,6 +98,7 @@ exports.confirmPaymentAndRent = confirmPaymentAndRent; exports.getDeviceInfo = getDeviceInfo; exports.getMyIndexInfo = getMyIndexInfo; exports.getOrderByOrderNoScore = getOrderByOrderNoScore; +exports.getOrderByOrderNoScorePayStatus = getOrderByOrderNoScorePayStatus; exports.getOrderList = getOrderList; exports.login = login; exports.queryById = queryById; diff --git a/unpackage/dist/dev/mp-weixin/constants/orderStatus.js b/unpackage/dist/dev/mp-weixin/constants/orderStatus.js deleted file mode 100644 index a74572f..0000000 --- a/unpackage/dist/dev/mp-weixin/constants/orderStatus.js +++ /dev/null @@ -1,52 +0,0 @@ -"use strict"; -const OrderStatusMap = { - waiting_for_payment: { - text: "待支付", - class: "status-waiting" - }, - payment_in_progress: { - text: "支付中", - class: "status-progress" - }, - payment_successful: { - text: "支付成功", - class: "status-success" - }, - in_used: { - text: "使用中", - class: "status-using" - }, - payment_failed: { - text: "支付失败", - class: "status-failed" - }, - order_cancelled: { - text: "已取消", - class: "status-cancelled" - }, - used_done: { - text: "已完成", - class: "status-finished" - } -}; -const OrderStatusTabs = [ - { - text: "全部", - status: [] - }, - { - text: "待支付", - status: ["waiting_for_payment", "payment_in_progress"] - }, - { - text: "使用中", - status: ["payment_successful", "in_used"] - }, - { - text: "已完成", - status: ["used_done", "payment_failed", "order_cancelled"] - } -]; -exports.OrderStatusMap = OrderStatusMap; -exports.OrderStatusTabs = OrderStatusTabs; -//# sourceMappingURL=../../.sourcemap/mp-weixin/constants/orderStatus.js.map diff --git a/unpackage/dist/dev/mp-weixin/pages/device/detail.js b/unpackage/dist/dev/mp-weixin/pages/device/detail.js index 2762575..6bc338b 100644 --- a/unpackage/dist/dev/mp-weixin/pages/device/detail.js +++ b/unpackage/dist/dev/mp-weixin/pages/device/detail.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 util_index = require("../../util/index.js"); const _sfc_main = { __name: "detail", setup(__props) { @@ -19,7 +20,7 @@ const _sfc_main = { common_vendor.onLoad((options) => { deviceId.value = options.deviceNo; checkOrderStatus(); - common_vendor.index.__f__("log", "at pages/device/detail.vue:161", options.deviceNo); + common_vendor.index.__f__("log", "at pages/device/detail.vue:168", options.deviceNo); fetchDeviceInfo(); }); const fetchDeviceInfo = async () => { @@ -110,9 +111,36 @@ const _sfc_main = { } const order = rentResult.data; const res = await config_user.getOrderByOrderNoScore(order.orderNo); - common_vendor.index.__f__("log", "at pages/device/detail.vue:282", res); + common_vendor.index.__f__("log", "at pages/device/detail.vue:291", res); common_vendor.index.hideLoading(); - common_vendor.index.__f__("log", "at pages/device/detail.vue:291", order); + if (res && res.code === 200) { + try { + const payResult = await util_index.initiateWeChatScorePayment(res); + if (payResult.errCode == "0") { + const res2 = await config_user.getOrderByOrderNoScorePayStatus(order.orderNo); + common_vendor.index.showToast({ + title: "设备租借成功", + icon: "success" + }); + setTimeout(() => { + common_vendor.index.redirectTo({ + url: "/pages/order/index" + }); + }, 1500); + } + } catch (payError) { + common_vendor.index.showToast({ + title: "支付分调用失败，请重试", + icon: "none" + }); + } + } else { + common_vendor.index.showToast({ + title: (res == null ? void 0 : res.msg) || "获取支付参数失败", + icon: "none" + }); + } + common_vendor.index.__f__("log", "at pages/device/detail.vue:330", order); } catch (error) { common_vendor.index.hideLoading(); common_vendor.index.showToast({ @@ -126,7 +154,7 @@ const _sfc_main = { a: common_vendor.t(deviceStatus.text), b: common_vendor.n(deviceStatus.class), c: common_vendor.t(deviceId.value), - d: common_assets._imports_0$2, + d: common_assets._imports_0$3, e: common_vendor.t(deviceLocation.value), f: common_assets._imports_1$2, g: batteryLevel.value < 20 ? 1 : "", @@ -136,7 +164,7 @@ const _sfc_main = { j: phoneNumber.value, k: common_vendor.o(($event) => phoneNumber.value = $event.detail.value) } : {}, { - l: common_assets._imports_2$1, + l: common_assets._imports_0$2, m: common_vendor.t(hasActiveOrder.value ? "归还设备" : "免押金租借"), n: hasActiveOrder.value ? 1 : "", o: common_vendor.o(handleRent) diff --git a/unpackage/dist/dev/mp-weixin/pages/my/index.js b/unpackage/dist/dev/mp-weixin/pages/my/index.js index 512947f..c612ac2 100644 --- a/unpackage/dist/dev/mp-weixin/pages/my/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/my/index.js @@ -1,76 +1,120 @@ "use strict"; const common_vendor = require("../../common/vendor.js"); -const util_index = require("../../util/index.js"); const common_assets = require("../../common/assets.js"); +const util_index = require("../../util/index.js"); +if (!Array) { + const _component_uni_icons = common_vendor.resolveComponent("uni-icons"); + _component_uni_icons(); +} const _sfc_main = { - data() { - return { - userInfo: {}, - deposit: "0.00", - tempAvatar: "", - tempNickname: "", - show: false - }; - }, - onShow() { - this.getInfo(); - }, - methods: { - async getInfo() { + __name: "index", + setup(__props) { + const userInfo = common_vendor.ref({}); + const deposit = common_vendor.ref("0.00"); + const openId = common_vendor.ref(""); + const authPopup = common_vendor.ref(null); + const isPopupVisible = common_vendor.ref(false); + common_vendor.onMounted(() => { + getInfo(); + }); + const getInfo = async () => { try { const token = common_vendor.index.getStorageSync("token"); if (!token) { await util_index.wxLogin(); - this.getInfo(); return; } const res = await util_index.getUserInfo(); - common_vendor.index.__f__("log", "at pages/my/index.vue:105", res); - if (res.code === 200) { - const userInfo = { + common_vendor.index.__f__("log", "at pages/my/index.vue:146", "User info response:", res); + if (res.code == 200) { + if (res.data.openId) { + openId.value = res.data.openId; + common_vendor.index.setStorageSync("openId", res.data.openId); + } + userInfo.value = { nickName: res.data.nickname, phone: res.data.phone, avatar: res.data.iconUrl, isAdmin: res.data.isAdmin }; - this.userInfo = userInfo; - common_vendor.index.setStorageSync("userInfo", userInfo); - this.deposit = res.data.balanceAmount || "0.00"; + common_vendor.index.setStorageSync("userInfo", userInfo.value); + deposit.value = res.data.balanceAmount || "0.00"; } } catch (error) { - common_vendor.index.__f__("error", "at pages/my/index.vue:120", "获取用户信息失败：", error); + common_vendor.index.__f__("error", "at pages/my/index.vue:167", "获取用户信息失败:", error); common_vendor.index.showToast({ title: "获取用户信息失败", icon: "none" }); } - }, - navigateTo(url) { + }; + const navigateTo = (url) => { common_vendor.index.navigateTo({ url }); - } + }; + const handleWithdraw = () => { + navigateTo("/pages/deposit/index"); + }; + const handleUserProfileClick = () => { + if (!userInfo.value) { + openAuthPopup(); + } + }; + const openAuthPopup = () => { + if (authPopup.value) { + authPopup.value.open(); + isPopupVisible.value = true; + } + }; + return (_ctx, _cache) => { + return common_vendor.e({ + a: userInfo.value.avatar + }, userInfo.value.avatar ? { + b: userInfo.value.avatar + } : { + c: common_assets._imports_0$1 + }, { + d: userInfo.value.isAdmin + }, userInfo.value.isAdmin ? {} : {}, { + e: userInfo.value + }, userInfo.value ? { + f: common_vendor.t(userInfo.value.nickName), + g: common_vendor.t(userInfo.value.phone || "未绑定手机号") + } : {}, { + h: common_vendor.p({ + type: "right", + size: "16", + color: "#999" + }), + i: common_vendor.o(handleUserProfileClick), + j: common_vendor.t(deposit.value), + k: common_vendor.o(handleWithdraw), + l: common_assets._imports_1$1, + m: common_vendor.p({ + type: "right", + size: "16", + color: "#999" + }), + n: common_vendor.o(($event) => navigateTo("/pages/order/index")), + o: common_assets._imports_2, + p: common_vendor.p({ + type: "right", + size: "16", + color: "#999" + }), + q: common_vendor.o(($event) => navigateTo("/pages/feedback/index")), + r: common_assets._imports_3, + s: common_vendor.p({ + type: "right", + size: "16", + color: "#999" + }), + t: common_vendor.o(($event) => navigateTo("/pages/help/index")) + }); + }; } }; -function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { - return common_vendor.e({ - a: $data.userInfo.avatar || "/static/user.png", - b: $data.userInfo - }, $data.userInfo ? { - c: common_vendor.t($data.userInfo.nickName), - d: common_vendor.t($data.userInfo.phone || "") - } : {}, { - e: common_vendor.o((...args) => _ctx.showPopup && _ctx.showPopup(...args)), - f: common_vendor.t($data.deposit), - g: common_vendor.o(($event) => $options.navigateTo("/pages/deposit/index")), - h: common_assets._imports_0$1, - i: common_vendor.o(($event) => $options.navigateTo("/pages/order/index")), - j: common_assets._imports_1$1, - k: common_vendor.o(($event) => $options.navigateTo("/pages/feedback/index")), - l: common_assets._imports_2, - m: common_vendor.o(($event) => $options.navigateTo("/pages/help/index")) - }); -} -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-f97bc692"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-f97bc692"]]); wx.createPage(MiniProgramPage); //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/my/index.js.map diff --git a/unpackage/dist/dev/mp-weixin/pages/my/index.wxml b/unpackage/dist/dev/mp-weixin/pages/my/index.wxml index 85e9953..b9f5e23 100644 --- a/unpackage/dist/dev/mp-weixin/pages/my/index.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/my/index.wxml @@ -1 +1 @@ -押金余额¥{{f}} 提现 租借记录投诉与建议帮助中心 \ No newline at end of file +押金余额¥{{j}}提现订单中心投诉建议帮助中心 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/my/index.wxss b/unpackage/dist/dev/mp-weixin/pages/my/index.wxss index c1a9c76..d2862d1 100644 --- a/unpackage/dist/dev/mp-weixin/pages/my/index.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/my/index.wxss @@ -23,306 +23,197 @@ /* 垂直间距 */ /* 透明度 */ /* 文章场景相关 */ -.my-container.data-v-f97bc692 { - min-height: 87.5vh; - background: #f8f8f8; +.profile-container.data-v-f97bc692 { + min-height: 100vh; + background-color: #f5f7fa; padding-bottom: env(safe-area-inset-bottom); } -.my-container .user-info.data-v-f97bc692 { - height: 360rpx; - background: linear-gradient(135deg, #1976D2, #42A5F5); - position: relative; - overflow: hidden; -} -.my-container .user-info.data-v-f97bc692::before, .my-container .user-info.data-v-f97bc692::after { - content: ""; - position: absolute; - background-repeat: no-repeat; - opacity: 0.1; -} -.my-container .user-info.data-v-f97bc692::before { - width: 200rpx; - height: 200rpx; - left: -40rpx; - top: -40rpx; - background-image: radial-gradient(circle, #fff 2rpx, transparent 3rpx); - background-size: 30rpx 30rpx; - transform: rotate(30deg); -} -.my-container .user-info.data-v-f97bc692::after { - width: 300rpx; - height: 300rpx; - right: -60rpx; - bottom: -60rpx; - background: radial-gradient(circle at center, rgba(255, 255, 255, 0.2) 0%, rgba(255, 255, 255, 0.2) 30%, transparent 30.5%), radial-gradient(circle at center, rgba(255, 255, 255, 0.2) 0%, rgba(255, 255, 255, 0.2) 20%, transparent 20.5%); - background-size: 60rpx 60rpx; - background-position: 0 0, 30rpx 30rpx; - transform: rotate(-15deg); -} -.my-container .user-info .floating-dots.data-v-f97bc692 { - position: absolute; - width: 100%; - height: 100%; - top: 0; - left: 0; - pointer-events: none; -} -.my-container .user-info .floating-dots.data-v-f97bc692::before, .my-container .user-info .floating-dots.data-v-f97bc692::after { - content: ""; - position: absolute; - width: 12rpx; - height: 12rpx; - border-radius: 50%; - background: rgba(255, 255, 255, 0.3); - animation: float-f97bc692 3s infinite ease-in-out; -} -.my-container .user-info .floating-dots.data-v-f97bc692::before { - top: 20%; - right: 10%; - animation-delay: -2s; -} -.my-container .user-info .floating-dots.data-v-f97bc692::after { - top: 50%; - right: 20%; - width: 8rpx; - height: 8rpx; - animation-delay: -1s; -} -.my-container .user-info .user-info-content.data-v-f97bc692 { - position: relative; - z-index: 2; - padding: 60rpx 40rpx; - display: flex; - align-items: center; -} -.my-container .user-info .user-info-content .avatar-wrap.data-v-f97bc692 { - width: 140rpx; - height: 140rpx; - border-radius: 70rpx; - border: 6rpx solid rgba(255, 255, 255, 0.3); - overflow: hidden; - box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.1), 0 0 0 6rpx rgba(255, 255, 255, 0.1); - margin-right: 40rpx; - position: relative; -} -.my-container .user-info .user-info-content .avatar-wrap.data-v-f97bc692::after { - content: ""; - position: absolute; - top: -10%; - left: -10%; - right: -10%; - bottom: -10%; - background: linear-gradient(45deg, transparent, rgba(255, 255, 255, 0.1), transparent); - animation: shine-f97bc692 2s infinite; -} -.my-container .user-info .user-info-content .avatar-wrap .avatar.data-v-f97bc692 { - width: 100%; - height: 100%; - background: #fff; -} -.my-container .user-info .user-info-content .info-content.not-login .login-text.data-v-f97bc692 { - font-size: 40rpx; - color: #fff; - font-weight: 500; - margin-bottom: 12rpx; - display: block; -} -.my-container .user-info .user-info-content .info-content.not-login .login-desc.data-v-f97bc692 { - font-size: 28rpx; - color: rgba(255, 255, 255, 0.9); - display: block; -} -.my-container .user-info .user-info-content .info-content .text-group.data-v-f97bc692 { - display: flex; - flex-direction: column; - align-items: center; - gap: 16rpx; -} -.my-container .user-info .user-info-content .info-content .text-group .nickname.data-v-f97bc692 { - font-size: 42rpx; - color: #ffffff; - font-weight: 600; - text-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1); - letter-spacing: 2rpx; -} -.my-container .user-info .user-info-content .info-content .text-group .phone.data-v-f97bc692 { - font-size: 30rpx; - color: rgba(255, 255, 255, 0.85); - font-weight: 400; - letter-spacing: 1rpx; - position: relative; - padding: 4rpx 24rpx; - background: rgba(255, 255, 255, 0.15); - border-radius: 24rpx; - -webkit-backdrop-filter: blur(4px); - backdrop-filter: blur(4px); -} -.my-container .user-info .wave-decoration.data-v-f97bc692 { - position: absolute; - left: 0; - right: 0; - bottom: 0; - height: 120rpx; - background: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNDQwIDMyMCI+PHBhdGggZmlsbD0icmdiYSgyNTUsMjU1LDI1NSwwLjEpIiBkPSJNMCwyNjAuMjI3YzE3My42NjEsMCwzMjEuMTM3LDAsNDQyLjQyOCwwYzE4MS41MTcsMCwyODUuNjQ1LDAsMzk3LjU3MiwwQzk1Mi4zODksMjYwLjIyNywxMTQwLjI3MSwyNjAuMjI3LDE0NDAsMjYwLjIyN1YwSDBWMjYwLjIyN3oiLz48L3N2Zz4=") bottom/100% no-repeat; - opacity: 0.8; -} -@keyframes float-f97bc692 { -0%, 100% { - transform: translateY(0) scale(1); -} -50% { - transform: translateY(-20rpx) scale(1.1); -} -} -@keyframes shine-f97bc692 { -0% { - transform: translateX(-100%) rotate(45deg); -} -80%, 100% { - transform: translateX(100%) rotate(45deg); -} -} -.my-container .balance-card.data-v-f97bc692 { - margin: -60rpx 30rpx 30rpx; - background: #fff; - border-radius: 24rpx; + +/* Header Section */ +.header-section.data-v-f97bc692 { padding: 40rpx; + background: linear-gradient(135deg, #4facfe, #00f2fe); + position: relative; + border-radius: 0 0 30rpx 30rpx; + margin-bottom: 20rpx; + box-shadow: 0 10rpx 30rpx rgba(79, 172, 254, 0.2); +} +.user-profile.data-v-f97bc692 { + display: flex; + align-items: center; + padding: 20rpx 0; +} +.avatar-container.data-v-f97bc692 { + position: relative; + margin-right: 30rpx; +} +.avatar.data-v-f97bc692 { + width: 120rpx; + height: 120rpx; + border-radius: 60rpx; + border: 4rpx solid rgba(255, 255, 255, 0.6); + box-shadow: 0 8rpx 20rpx rgba(0, 0, 0, 0.1); +} +.avatar-badge.data-v-f97bc692 { + position: absolute; + bottom: 0; + right: 0; + width: 36rpx; + height: 36rpx; + border-radius: 18rpx; + background-color: #ff9500; + border: 4rpx solid white; +} +.user-details.data-v-f97bc692 { + flex: 1; +} +.username.data-v-f97bc692 { + font-size: 36rpx; + font-weight: 600; + color: white; + margin-bottom: 8rpx; +} +.user-id.data-v-f97bc692 { + font-size: 26rpx; + color: rgba(255, 255, 255, 0.8); +} +.edit-profile.data-v-f97bc692 { + background-color: rgba(255, 255, 255, 0.2); + padding: 10rpx; + border-radius: 50%; +} + +/* Balance Card */ +.balance-card.data-v-f97bc692 { + margin: 30rpx; + background: white; + border-radius: 20rpx; + padding: 30rpx; display: flex; justify-content: space-between; align-items: center; - position: relative; - z-index: 3; - box-shadow: 0 8rpx 32rpx rgba(25, 118, 210, 0.1); + box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.05); } -.my-container .balance-card .balance-content .label.data-v-f97bc692 { +.balance-label.data-v-f97bc692 { font-size: 28rpx; color: #666; - margin-bottom: 12rpx; - display: block; + margin-bottom: 10rpx; } -.my-container .balance-card .balance-content .amount.data-v-f97bc692 { - font-size: 52rpx; - color: #1976D2; - font-weight: bold; +.balance-amount.data-v-f97bc692 { + font-size: 48rpx; + font-weight: 600; + color: #4facfe; } -.my-container .balance-card .withdraw-btn.data-v-f97bc692 { - padding: 20rpx 36rpx; - background: linear-gradient(135deg, #1976D2, #42A5F5); - color: #fff; - border-radius: 36rpx; - font-size: 30rpx; +.action-button.data-v-f97bc692 { + background: linear-gradient(135deg, #4facfe, #00f2fe); + border-radius: 40rpx; + height: 80rpx; display: flex; align-items: center; - box-shadow: 0 4rpx 12rpx rgba(25, 118, 210, 0.2); + justify-content: center; + padding: 0 40rpx; + color: white; + font-weight: 500; + font-size: 30rpx; + box-shadow: 0 8rpx 16rpx rgba(79, 172, 254, 0.2); } -.my-container .balance-card .withdraw-btn.data-v-f97bc692:active { +.action-button.data-v-f97bc692:active { + opacity: 0.9; transform: scale(0.98); } -.my-container .balance-card .withdraw-btn .arrow.data-v-f97bc692 { - width: 12rpx; - height: 12rpx; - border-top: 3rpx solid #fff; - border-right: 3rpx solid #fff; - transform: rotate(45deg); - margin-left: 12rpx; +.action-button text.data-v-f97bc692 { + margin-right: 10rpx; } -.my-container .function-list.data-v-f97bc692 { - margin: 0 30rpx; - background: #fff; - border-radius: 24rpx; - padding: 10rpx 20rpx; - box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04); + +/* Function List */ +.function-list.data-v-f97bc692 { + margin: 30rpx; + background: white; + border-radius: 20rpx; + overflow: hidden; + box-shadow: 0 6rpx 16rpx rgba(0, 0, 0, 0.04); } -.my-container .function-list .function-item.data-v-f97bc692 { +.function-item.data-v-f97bc692 { display: flex; - align-items: center; justify-content: space-between; - padding: 32rpx 20rpx; - border-bottom: 1rpx solid #f5f5f5; - transition: all 0.3s; + align-items: center; + padding: 32rpx 30rpx; + border-bottom: 1rpx solid #f0f0f0; } -.my-container .function-list .function-item.data-v-f97bc692:active { - background: #f9f9f9; -} -.my-container .function-list .function-item.data-v-f97bc692:last-child { +.function-item.data-v-f97bc692:last-child { border-bottom: none; } -.my-container .function-list .function-item .item-left.data-v-f97bc692 { +.function-item.data-v-f97bc692:active { + background-color: #f9f9f9; +} +.item-left.data-v-f97bc692 { display: flex; align-items: center; } -.my-container .function-list .function-item .item-left .icon-wrap.data-v-f97bc692 { - width: 80rpx; - height: 80rpx; +.item-icon.data-v-f97bc692 { + width: 48rpx; + height: 48rpx; margin-right: 24rpx; display: flex; align-items: center; justify-content: center; - border-radius: 20rpx; - background: #F5F9FF; } -.my-container .function-list .function-item .item-left .icon-wrap .icon-image.data-v-f97bc692 { - width: 44rpx; - height: 44rpx; +.item-icon image.data-v-f97bc692 { + width: 40rpx; + height: 40rpx; } -.my-container .function-list .function-item .item-left .title.data-v-f97bc692 { - font-size: 32rpx; +.item-title.data-v-f97bc692 { + font-size: 30rpx; color: #333; font-weight: 500; } -.my-container .function-list .function-item .arrow.data-v-f97bc692 { - width: 16rpx; - height: 16rpx; - border-top: 3rpx solid #999; - border-right: 3rpx solid #999; - transform: rotate(45deg); +.item-right.data-v-f97bc692 { + display: flex; + align-items: center; } -.my-container .popup-content.data-v-f97bc692 { - background-color: #fff; - border-radius: 24rpx 24rpx 0 0; - padding: 40rpx 30rpx; + +/* Auth Popup */ +.auth-popup.data-v-f97bc692 { + background-color: white; + width: 100%; + padding: 40rpx; + border-radius: 15rpx; } -.my-container .popup-content .popup-title.data-v-f97bc692 { - font-size: 32rpx; - font-weight: 500; +.auth-title.data-v-f97bc692 { + font-size: 34rpx; + font-weight: 600; + color: #333; + text-align: center; + margin-bottom: 20rpx; +} +.auth-desc.data-v-f97bc692 { + font-size: 28rpx; + color: #666; text-align: center; margin-bottom: 40rpx; } -.my-container .popup-content .popup-body.data-v-f97bc692 { +.auth-buttons.data-v-f97bc692 { display: flex; - flex-direction: column; - gap: 30rpx; + justify-content: space-between; } -.my-container .popup-content .avatar-btn.data-v-f97bc692 { - height: 88rpx; - line-height: 88rpx; - background: #f5f5f5; - border-radius: 44rpx; +.cancel-btn.data-v-f97bc692, +.confirm-btn.data-v-f97bc692 { + width: 240rpx; + height: 80rpx; + line-height: 80rpx; + text-align: center; + border-radius: 40rpx; font-size: 28rpx; - color: #333; } -.my-container .popup-content .avatar-btn.data-v-f97bc692::after { +.cancel-btn.data-v-f97bc692::after, +.confirm-btn.data-v-f97bc692::after { border: none; } -.my-container .popup-content .avatar-btn.data-v-f97bc692:active { - opacity: 0.8; +.cancel-btn.data-v-f97bc692 { + background-color: #f0f0f0; + color: #666; } -.my-container .popup-content .nickname-input.data-v-f97bc692 { - height: 88rpx; - background: #f5f5f5; - border-radius: 44rpx; - padding: 0 30rpx; - font-size: 28rpx; -} -.my-container .popup-content .submit-btn.data-v-f97bc692 { - height: 88rpx; - line-height: 88rpx; - background: #1976D2; - color: #fff; - border-radius: 44rpx; - font-size: 30rpx; - margin-top: 20rpx; -} -.my-container .popup-content .submit-btn.data-v-f97bc692:active { - opacity: 0.9; +.confirm-btn.data-v-f97bc692 { + background: linear-gradient(135deg, #4facfe, #00f2fe); + color: white; } \ 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 d9a30e7..7fbb21e 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/order/index.js @@ -1,64 +1,111 @@ "use strict"; const common_vendor = require("../../common/vendor.js"); +const common_assets = require("../../common/assets.js"); const config_user = require("../../config/user.js"); -const constants_orderStatus = require("../../constants/orderStatus.js"); const _sfc_main = { - data() { - return { - currentTab: 0, - OrderStatusMap: constants_orderStatus.OrderStatusMap, - OrderStatusTabs: constants_orderStatus.OrderStatusTabs, - orderList: [] - }; - }, - async onLoad(options) { - if (options && options.orderId) { - try { - const res = await config_user.queryById(options.orderId); - if (res.code === 200 && res.data) { - const orderData = res.data; - common_vendor.index.__f__("log", "at pages/order/index.vue:76", "特定订单数据:", JSON.stringify(orderData)); - common_vendor.index.__f__("log", "at pages/order/index.vue:77", "特定订单的开始时间:", orderData.startTime); - common_vendor.index.__f__("log", "at pages/order/index.vue:78", "特定订单的创建时间:", orderData.createTime); - const orderStartTime = orderData.startTime || orderData.createTime || ""; - common_vendor.index.__f__("log", "at pages/order/index.vue:82", "特定订单最终显示的开始时间:", orderStartTime); - const formattedOrder = { - orderNo: orderData.orderId, - status: orderData.orderStatus, - deviceId: orderData.deviceNo, - startTime: orderStartTime, - endTime: orderData.endTime || "", - amount: orderData.payAmount || orderData.actualDeviceAmount || "0.00" - }; - this.orderList = [formattedOrder, ...this.orderList]; - const tabIndex = this.OrderStatusTabs.findIndex( - (tab) => tab.status.includes(orderData.orderStatus) - ); - if (tabIndex !== -1) { - this.switchTab(tabIndex); - } - } - } catch (error) { - common_vendor.index.__f__("error", "at pages/order/index.vue:106", "获取订单详情失败:", error); + __name: "index", + setup(__props) { + const currentTab = common_vendor.ref(0); + const orderList = common_vendor.ref([]); + const orderStatusMap = common_vendor.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" + }, + "canceled": { + text: "已取消", + class: "status-cancelled" } - } - await this.getOrderList(); - }, - methods: { - async getOrderList(statusList = []) { + }); + const orderStatusTabs = common_vendor.reactive([ + { + text: "全部", + status: [] + }, + { + text: "使用中", + status: ["1", "in_used"] + }, + { + text: "已完成", + status: ["2", "used_done"] + }, + { + text: "已取消", + status: ["3", "canceled"] + } + ]); + common_vendor.onLoad(async (options) => { + if (options && options.orderId) { + try { + const res = await config_user.queryById(options.orderId); + if (res.code === 200 && res.data) { + const orderData = res.data; + const orderStartTime = orderData.startTime || orderData.createTime || ""; + const formattedOrder = { + orderNo: orderData.orderId, + status: orderData.orderStatus, + deviceId: orderData.deviceNo, + payWay: orderData.payWay, + startTime: orderStartTime, + endTime: orderData.endTime || "", + amount: orderData.payAmount || orderData.actualDeviceAmount || "0.00" + }; + orderList.value = [formattedOrder, ...orderList.value]; + const tabIndex = orderStatusTabs.findIndex( + (tab) => tab.status.includes(orderData.orderStatus) + ); + if (tabIndex !== -1) { + switchTab(tabIndex); + } + } + } catch (error) { + common_vendor.index.__f__("error", "at pages/order/index.vue:199", "获取订单详情失败:", error); + } + } + await loadOrderList(); + }); + const switchTab = async (index) => { + currentTab.value = index; + const statusList = orderStatusTabs[index].status; + await loadOrderList(statusList); + }; + const loadOrderList = async (statusList = []) => { try { const res = await config_user.getOrderList(statusList); if (res.code === 200 && res.data && res.data.records) { - common_vendor.index.__f__("log", "at pages/order/index.vue:118", "API返回的订单列表数据:", JSON.stringify(res.data.records)); - this.orderList = res.data.records.map((item) => { - common_vendor.index.__f__("log", "at pages/order/index.vue:122", `订单 ${item.orderId} 的开始时间:`, item.startTime); - common_vendor.index.__f__("log", "at pages/order/index.vue:123", `订单 ${item.orderId} 的创建时间:`, item.createTime); + orderList.value = res.data.records.map((item) => { const orderStartTime = item.startTime || item.createTime || ""; - common_vendor.index.__f__("log", "at pages/order/index.vue:127", `订单 ${item.orderId} 最终显示的开始时间:`, orderStartTime); return { - orderNo: item.orderId, + orderNo: item.orderNo, + orderId: item.orderId, status: item.orderStatus, deviceId: item.deviceNo, + payWay: item.payWay, startTime: orderStartTime, endTime: item.endTime || "", amount: item.payAmount || item.actualDeviceAmount || "0.00" @@ -66,50 +113,77 @@ const _sfc_main = { }); } } catch (error) { - common_vendor.index.__f__("error", "at pages/order/index.vue:140", "获取订单列表失败:", error); + common_vendor.index.__f__("error", "at pages/order/index.vue:238", "获取订单列表失败:", error); common_vendor.index.showToast({ title: "获取订单列表失败", icon: "none" }); } - }, - async switchTab(index) { - this.currentTab = index; - const statusList = this.OrderStatusTabs[index].status; - await this.getOrderList(statusList); - } + }; + const getOrderStatus = async (order) => { + try { + const res = await config_user.getOrderByOrderNoScorePayStatus(order.orderNo); + if (res.code === 200) { + common_vendor.index.showToast({ + title: "状态同步成功", + icon: "success" + }); + await loadOrderList(orderStatusTabs[currentTab.value].status); + } + } catch (error) { + common_vendor.index.showToast({ + title: "同步状态失败", + icon: "none" + }); + } + }; + const navigateToReturn = (deviceId, orderId) => { + common_vendor.index.__f__("log", "at pages/order/index.vue:267", orderId); + common_vendor.index.navigateTo({ + url: `/pages/return/index?deviceId=${deviceId}&orderId=${orderId}` + }); + }; + return (_ctx, _cache) => { + return common_vendor.e({ + a: common_vendor.f(orderStatusTabs, (tab, index, i0) => { + return { + a: common_vendor.t(tab.text), + b: index, + c: currentTab.value === index ? 1 : "", + d: common_vendor.o(($event) => switchTab(index), index) + }; + }), + b: orderList.value.length === 0 + }, orderList.value.length === 0 ? {} : {}, { + c: common_vendor.f(orderList.value, (order, index, i0) => { + var _a, _b; + return common_vendor.e({ + a: common_vendor.t(order.orderNo), + b: common_vendor.t((_a = orderStatusMap[order.status]) == null ? void 0 : _a.text), + c: common_vendor.n((_b = orderStatusMap[order.status]) == null ? void 0 : _b.class), + d: common_vendor.t(order.deviceId), + e: order.payWay == "wx_score_pay" + }, order.payWay == "wx_score_pay" ? { + f: common_assets._imports_0$2 + } : {}, { + g: common_vendor.t(order.startTime), + h: common_vendor.t(order.endTime || "-"), + i: common_vendor.t(order.amount), + j: order.status == "in_used" + }, order.status == "in_used" ? { + k: common_vendor.o(($event) => navigateToReturn(order.deviceId, order.orderId), index) + } : {}, { + l: order.status === "waiting_for_payment" + }, order.status === "waiting_for_payment" ? { + m: common_vendor.o(($event) => getOrderStatus(order), index) + } : {}, { + n: index + }); + }) + }); + }; } }; -function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { - return common_vendor.e({ - a: common_vendor.f($data.OrderStatusTabs, (tab, index, i0) => { - return { - a: common_vendor.t(tab.text), - b: index, - c: $data.currentTab === index ? 1 : "", - d: common_vendor.o(($event) => $options.switchTab(index), index) - }; - }), - b: common_vendor.f($data.orderList, (order, index, i0) => { - var _a, _b; - return common_vendor.e({ - a: common_vendor.t(order.orderNo), - b: common_vendor.t((_a = $data.OrderStatusMap[order.status]) == null ? void 0 : _a.text), - c: common_vendor.n((_b = $data.OrderStatusMap[order.status]) == null ? void 0 : _b.class), - d: order.status === 1 - }, order.status === 1 ? { - e: `/pages/return/index?deviceId=${order.deviceId}&orderId=${order.orderNo}` - } : {}, { - f: common_vendor.t(order.deviceId), - g: common_vendor.t(order.startTime), - h: common_vendor.t(order.endTime || "-"), - i: common_vendor.t(order.amount), - j: index - }); - }), - c: $data.orderList.length === 0 - }, $data.orderList.length === 0 ? {} : {}); -} -const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-17a44f9d"]]); +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-17a44f9d"]]); wx.createPage(MiniProgramPage); //# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/order/index.js.map diff --git a/unpackage/dist/dev/mp-weixin/pages/order/index.wxml b/unpackage/dist/dev/mp-weixin/pages/order/index.wxml index f166f71..c660032 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/index.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/order/index.wxml @@ -1 +1 @@ -{{tab.a}}订单号：{{order.a}}{{order.b}}归还设备共享风扇设备号：{{order.f}}开始时间：{{order.g}}结束时间：{{order.h}}￥{{order.i}}暂无订单记录 \ No newline at end of file +{{tab.a}}暂无订单记录订单号：{{order.a}}{{order.b}}共享风扇设备号：{{order.d}}微信支付分|免押租借押金租借开始时间：{{order.g}}结束时间：{{order.h}}￥{{order.i}} 归还设备 同步订单状态 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/order/index.wxss b/unpackage/dist/dev/mp-weixin/pages/order/index.wxss index 8548481..d2c1547 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/index.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/order/index.wxss @@ -25,31 +25,34 @@ /* 文章场景相关 */ .order-container.data-v-17a44f9d { min-height: 100vh; - background: #f8f8f8; + background: #f7f8fa; + padding-bottom: 30rpx; } -.order-container .tab-bar.data-v-17a44f9d { +.order-container .status-tabs.data-v-17a44f9d { display: flex; background: #fff; - padding: 20rpx 0; + padding: 0 20rpx; position: -webkit-sticky; position: sticky; top: 0; - z-index: 100; + z-index: 10; box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05); } -.order-container .tab-bar .tab-item.data-v-17a44f9d { +.order-container .status-tabs .tab-item.data-v-17a44f9d { flex: 1; - text-align: center; + height: 90rpx; + display: flex; + align-items: center; + justify-content: center; font-size: 28rpx; color: #666; position: relative; - padding: 20rpx 0; } -.order-container .tab-bar .tab-item.active.data-v-17a44f9d { +.order-container .status-tabs .tab-item.active.data-v-17a44f9d { color: #1976D2; font-weight: 500; } -.order-container .tab-bar .tab-item.active.data-v-17a44f9d::after { +.order-container .status-tabs .tab-item.active.data-v-17a44f9d::after { content: ""; position: absolute; bottom: 0; @@ -65,89 +68,159 @@ } .order-container .order-list .order-item.data-v-17a44f9d { background: #fff; - border-radius: 20rpx; + border-radius: 16rpx; margin-bottom: 20rpx; - padding: 30rpx; - box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04); + overflow: hidden; + box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.04); } .order-container .order-list .order-item .order-header.data-v-17a44f9d { display: flex; justify-content: space-between; align-items: center; - padding-bottom: 20rpx; - border-bottom: 1rpx solid #f5f5f5; + padding: 24rpx; + border-bottom: 1rpx solid #f0f0f0; } -.order-container .order-list .order-item .order-header .order-no.data-v-17a44f9d { +.order-container .order-list .order-item .order-header .order-id.data-v-17a44f9d { font-size: 26rpx; color: #666; } .order-container .order-list .order-item .order-header .order-status.data-v-17a44f9d { font-size: 26rpx; + font-weight: 500; } .order-container .order-list .order-item .order-header .order-status.status-waiting.data-v-17a44f9d { color: #FF9800; } -.order-container .order-list .order-item .order-header .order-status.status-progress.data-v-17a44f9d { - color: #2196F3; -} -.order-container .order-list .order-item .order-header .order-status.status-success.data-v-17a44f9d { - color: #4CAF50; -} .order-container .order-list .order-item .order-header .order-status.status-using.data-v-17a44f9d { - color: #1976D2; -} -.order-container .order-list .order-item .order-header .order-status.status-failed.data-v-17a44f9d { - color: #F44336; -} -.order-container .order-list .order-item .order-header .order-status.status-cancelled.data-v-17a44f9d { - color: #9E9E9E; + color: #2196F3; } .order-container .order-list .order-item .order-header .order-status.status-finished.data-v-17a44f9d { color: #4CAF50; } -.order-container .order-list .order-item .order-content.data-v-17a44f9d { - padding-top: 20rpx; +.order-container .order-list .order-item .order-header .order-status.status-cancelled.data-v-17a44f9d { + color: #9E9E9E; } -.order-container .order-list .order-item .order-content .device-info.data-v-17a44f9d { +.order-container .order-list .order-item .order-body.data-v-17a44f9d { + padding: 24rpx; +} +.order-container .order-list .order-item .order-body .device-info.data-v-17a44f9d { margin-bottom: 20rpx; + display: flex; + justify-content: space-between; + align-items: flex-start; } -.order-container .order-list .order-item .order-content .device-info .device-name.data-v-17a44f9d { - font-size: 32rpx; - color: #333; - font-weight: 500; +.order-container .order-list .order-item .order-body .device-info .device-left.data-v-17a44f9d { + flex: 1; margin-right: 20rpx; } -.order-container .order-list .order-item .order-content .device-info .device-id.data-v-17a44f9d { +.order-container .order-list .order-item .order-body .device-info .device-left .device-name.data-v-17a44f9d { + 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-17a44f9d { font-size: 26rpx; color: #999; + margin-bottom: 0; } -.order-container .order-list .order-item .order-content .time-info .time-item.data-v-17a44f9d { - font-size: 26rpx; - color: #666; - margin-bottom: 10rpx; +.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.data-v-17a44f9d { + display: inline-flex; + align-items: center; + padding: 6rpx 12rpx; + border-radius: 8rpx; + white-space: nowrap; } -.order-container .order-list .order-item .order-content .time-info .time-item .label.data-v-17a44f9d { - color: #999; +.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score.data-v-17a44f9d { + background: rgba(7, 193, 96, 0.08); } -.order-container .order-list .order-item .order-content .price-info.data-v-17a44f9d { - text-align: right; - margin-top: 20rpx; +.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score .badge-icon.data-v-17a44f9d { + width: 32rpx; + height: 26rpx; + margin-right: 8rpx; } -.order-container .order-list .order-item .order-content .price-info .amount.data-v-17a44f9d { - font-size: 36rpx; - color: #FF9800; +.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score .badge-text.data-v-17a44f9d { + 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-17a44f9d { + margin: 0 6rpx; +} +.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.wx-score .badge-text .highlight.data-v-17a44f9d { font-weight: 500; } -.order-container .empty-tip.data-v-17a44f9d { +.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.deposit.data-v-17a44f9d { + background: #f5f5f5; +} +.order-container .order-list .order-item .order-body .device-info .device-right .payment-badge.deposit .badge-text.data-v-17a44f9d { + font-size: 22rpx; + color: #666; + font-weight: 500; +} +.order-container .order-list .order-item .order-body .order-times .time-row.data-v-17a44f9d { + display: flex; + font-size: 26rpx; + margin-bottom: 8rpx; +} +.order-container .order-list .order-item .order-body .order-times .time-row .time-label.data-v-17a44f9d { + color: #999; + width: 140rpx; +} +.order-container .order-list .order-item .order-body .order-times .time-row .time-value.data-v-17a44f9d { + color: #333; + flex: 1; +} +.order-container .order-list .order-item .order-footer.data-v-17a44f9d { + 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-17a44f9d { + font-size: 34rpx; + font-weight: 500; + color: #ff6b6b; +} +.order-container .order-list .order-item .order-footer .actions.data-v-17a44f9d { + display: flex; +} +.order-container .order-list .order-item .order-footer .actions .action-item.data-v-17a44f9d { + font-size: 26rpx; + padding: 10rpx 30rpx; + border-radius: 30rpx; + margin-left: 20rpx; + display: flex; + align-items: center; + justify-content: center; +} +.order-container .order-list .order-item .order-footer .actions .action-item.primary.data-v-17a44f9d { + background: #1976D2; + color: #fff; +} +.order-container .order-list .order-item .order-footer .actions .action-item.secondary.data-v-17a44f9d { + background: #f5f5f5; + color: #666; + border: 1rpx solid #e0e0e0; +} +.order-container .order-list .order-item .order-footer .actions .action-item.data-v-17a44f9d:active { + opacity: 0.8; +} +.order-container .order-list .empty-state.data-v-17a44f9d { padding: 100rpx 0; text-align: center; - color: #999; - font-size: 28rpx; } -.order-container .empty-tip .empty-icon.data-v-17a44f9d { - width: 200rpx; - height: 200rpx; - margin: 0 auto 20rpx; - background: #f0f0f0; +.order-container .order-list .empty-state .empty-icon.data-v-17a44f9d { + width: 180rpx; + height: 180rpx; + margin: 0 auto 30rpx; + background: #f5f5f5; border-radius: 50%; +} +.order-container .order-list .empty-state .empty-text.data-v-17a44f9d { + font-size: 28rpx; + color: #999; } \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/return/index.js b/unpackage/dist/dev/mp-weixin/pages/return/index.js index cee622f..e7733f2 100644 --- a/unpackage/dist/dev/mp-weixin/pages/return/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/return/index.js @@ -2,6 +2,7 @@ const common_vendor = require("../../common/vendor.js"); const config_user = require("../../config/user.js"); const config_url = require("../../config/url.js"); +const common_assets = require("../../common/assets.js"); const _sfc_main = { data() { return { @@ -13,8 +14,10 @@ const _sfc_main = { // 用于调试 usedTime: "0分钟", currentFee: "0.00", - orderStatus: "in_used" + orderStatus: "in_used", // 默认状态为使用中 + payWay: "" + // 新增支付方式字段 }, timer: null, statusCheckTimer: null, @@ -28,11 +31,11 @@ const _sfc_main = { }; }, onLoad(options) { - common_vendor.index.__f__("log", "at pages/return/index.vue:97", "Return page loaded with options:", JSON.stringify(options)); + common_vendor.index.__f__("log", "at pages/return/index.vue:117", "Return page loaded with options:", JSON.stringify(options)); this.isPageActive = true; this.orderInfo.orderId = options.orderId || ""; this.deviceId = options.deviceNo || options.deviceId || ""; - common_vendor.index.__f__("log", "at pages/return/index.vue:106", `初始化参数: orderId=${this.orderInfo.orderId}, deviceId=${this.deviceId}`); + common_vendor.index.__f__("log", "at pages/return/index.vue:126", `初始化参数: orderId=${this.orderInfo.orderId}, deviceId=${this.deviceId}`); if (!this.orderInfo.orderId && this.deviceId) { this.getOrderByDevice(); } else if (this.orderInfo.orderId) { @@ -44,12 +47,12 @@ const _sfc_main = { if (this.$orderMonitor) { this.$orderMonitor.removeOrder({ orderId: this.orderInfo.orderId }); this.$orderMonitor.addOrder({ orderId: this.orderInfo.orderId }, "return"); - common_vendor.index.__f__("log", "at pages/return/index.vue:129", "订单已添加到监控队列:", this.orderInfo.orderId); + common_vendor.index.__f__("log", "at pages/return/index.vue:149", "订单已添加到监控队列:", this.orderInfo.orderId); } else { - common_vendor.index.__f__("warn", "at pages/return/index.vue:131", "$orderMonitor 未定义，无法添加订单到监控队列"); + common_vendor.index.__f__("warn", "at pages/return/index.vue:151", "$orderMonitor 未定义，无法添加订单到监控队列"); } } catch (error) { - common_vendor.index.__f__("error", "at pages/return/index.vue:134", "添加订单到监控队列失败:", error); + common_vendor.index.__f__("error", "at pages/return/index.vue:154", "添加订单到监控队列失败:", error); } } else { common_vendor.index.showToast({ @@ -64,14 +67,14 @@ const _sfc_main = { }, // 添加onHide生命周期，处理页面隐藏时的清理工作 onHide() { - common_vendor.index.__f__("log", "at pages/return/index.vue:154", "归还页面隐藏，清理计时器资源和监控服务"); + common_vendor.index.__f__("log", "at pages/return/index.vue:174", "归还页面隐藏，清理计时器资源和监控服务"); this.isPageActive = false; this.clearTimer(); this.clearStatusCheckTimer(); this.removeFromOrderMonitor(); }, onUnload() { - common_vendor.index.__f__("log", "at pages/return/index.vue:166", "归还页面卸载，清理所有资源"); + common_vendor.index.__f__("log", "at pages/return/index.vue:186", "归还页面卸载，清理所有资源"); this.isPageActive = false; this.clearTimer(); this.clearStatusCheckTimer(); @@ -84,15 +87,15 @@ const _sfc_main = { if (this.orderInfo.orderId && this.$orderMonitor) { try { this.$orderMonitor.removeOrder({ orderId: this.orderInfo.orderId }); - common_vendor.index.__f__("log", "at pages/return/index.vue:186", "订单已从监控队列移除:", this.orderInfo.orderId); + common_vendor.index.__f__("log", "at pages/return/index.vue:206", "订单已从监控队列移除:", this.orderInfo.orderId); } catch (error) { - common_vendor.index.__f__("error", "at pages/return/index.vue:188", "从监控队列移除订单失败:", error); + common_vendor.index.__f__("error", "at pages/return/index.vue:208", "从监控队列移除订单失败:", error); } } }, // 处理订单完成事件（可由任何地方触发） handleOrderCompleted(orderData) { - common_vendor.index.__f__("log", "at pages/return/index.vue:194", "收到订单完成事件:", orderData); + common_vendor.index.__f__("log", "at pages/return/index.vue:214", "收到订单完成事件:", orderData); if (orderData.orderId === this.orderInfo.orderId || orderData.orderNo === this.orderInfo.orderNo) { this.showReturnSuccessModal(orderData); } @@ -135,35 +138,38 @@ const _sfc_main = { // 获取订单详情 async getOrderDetails() { if (!this.isPageActive) { - common_vendor.index.__f__("log", "at pages/return/index.vue:250", "页面已不活跃，跳过订单详情请求"); + common_vendor.index.__f__("log", "at pages/return/index.vue:270", "页面已不活跃，跳过订单详情请求"); return; } try { if (!this.orderInfo.orderId) { throw new Error("订单ID不能为空"); } - common_vendor.index.__f__("log", "at pages/return/index.vue:261", "请求订单详情, orderId:", this.orderInfo.orderId); + common_vendor.index.__f__("log", "at pages/return/index.vue:281", "请求订单详情, orderId:", this.orderInfo.orderId); const result = await config_user.queryById(this.orderInfo.orderId); - common_vendor.index.__f__("log", "at pages/return/index.vue:263", "订单详情结果:", JSON.stringify(result)); + common_vendor.index.__f__("log", "at pages/return/index.vue:283", "订单详情结果:", JSON.stringify(result)); if (result.code === 200 && result.data) { const orderData = result.data; - common_vendor.index.__f__("log", "at pages/return/index.vue:267", "订单原始数据:", orderData); - common_vendor.index.__f__("log", "at pages/return/index.vue:268", "开始时间字段:", orderData.startTime, typeof orderData.startTime); + common_vendor.index.__f__("log", "at pages/return/index.vue:287", "订单原始数据:", orderData); + common_vendor.index.__f__("log", "at pages/return/index.vue:288", "开始时间字段:", orderData.startTime, typeof orderData.startTime); if (orderData.orderStatus) { this.orderInfo.orderStatus = orderData.orderStatus; } + if (orderData.payWay) { + this.orderInfo.payWay = orderData.payWay; + } if (orderData.orderStatus && (orderData.orderStatus === "used_done" || orderData.orderStatus === "used_down")) { common_vendor.index.$emit("orderCompleted", orderData); this.showReturnSuccessModal(orderData); return; } this.updateOrderInfo(orderData); - common_vendor.index.__f__("log", "at pages/return/index.vue:290", "更新后的开始时间:", this.orderInfo.startTime); + common_vendor.index.__f__("log", "at pages/return/index.vue:315", "更新后的开始时间:", this.orderInfo.startTime); } else { throw new Error(result.msg || "获取订单详情失败"); } } catch (error) { - common_vendor.index.__f__("error", "at pages/return/index.vue:295", "获取订单详情错误:", error); + common_vendor.index.__f__("error", "at pages/return/index.vue:320", "获取订单详情错误:", error); common_vendor.index.showToast({ title: error.message || "获取订单信息失败", icon: "none" @@ -186,25 +192,28 @@ const _sfc_main = { }, // 使用后端返回的使用时长和费用数据 updateOrderInfo(orderData) { - common_vendor.index.__f__("log", "at pages/return/index.vue:323", "更新订单信息:", JSON.stringify(orderData)); + common_vendor.index.__f__("log", "at pages/return/index.vue:348", "更新订单信息:", JSON.stringify(orderData)); this.orderInfo.usedTime = orderData.usedTime || "0分钟"; this.orderInfo.currentFee = orderData.currentFee || orderData.actualDeviceAmount || orderData.payAmount || "0.00"; if (orderData.orderStatus) { this.orderInfo.orderStatus = orderData.orderStatus; } + if (orderData.payWay) { + this.orderInfo.payWay = orderData.payWay; + } this.orderInfo._rawStartTime = orderData.startTime; if (orderData.startTime) { try { - common_vendor.index.__f__("log", "at pages/return/index.vue:342", "API返回的开始时间:", orderData.startTime); + common_vendor.index.__f__("log", "at pages/return/index.vue:372", "API返回的开始时间:", orderData.startTime); this.orderInfo.startTime = orderData.startTime; } catch (e) { - common_vendor.index.__f__("error", "at pages/return/index.vue:346", "更新开始时间错误:", e); + common_vendor.index.__f__("error", "at pages/return/index.vue:376", "更新开始时间错误:", e); this.orderInfo.startTime = "未知"; } } else { - common_vendor.index.__f__("warn", "at pages/return/index.vue:350", "API返回的订单数据中没有startTime字段"); + common_vendor.index.__f__("warn", "at pages/return/index.vue:380", "API返回的订单数据中没有startTime字段"); if (orderData.createTime) { - common_vendor.index.__f__("log", "at pages/return/index.vue:353", "使用createTime作为备选:", orderData.createTime); + common_vendor.index.__f__("log", "at pages/return/index.vue:383", "使用createTime作为备选:", orderData.createTime); this.orderInfo.startTime = orderData.createTime; } else { this.orderInfo.startTime = "未知"; @@ -219,21 +228,21 @@ const _sfc_main = { this.clearTimer(); this.timer = setInterval(() => { if (this.isPageActive) { - common_vendor.index.__f__("log", "at pages/return/index.vue:375", "执行定时更新订单信息"); + common_vendor.index.__f__("log", "at pages/return/index.vue:405", "执行定时更新订单信息"); this.getOrderDetails(); } else { - common_vendor.index.__f__("log", "at pages/return/index.vue:378", "页面已不活跃，停止计时器"); + common_vendor.index.__f__("log", "at pages/return/index.vue:408", "页面已不活跃，停止计时器"); this.clearTimer(); } }, 6e4); - common_vendor.index.__f__("log", "at pages/return/index.vue:383", "已启动使用时长更新计时器"); + common_vendor.index.__f__("log", "at pages/return/index.vue:413", "已启动使用时长更新计时器"); }, // 清除定时器 clearTimer() { if (this.timer) { clearInterval(this.timer); this.timer = null; - common_vendor.index.__f__("log", "at pages/return/index.vue:391", "已清除使用时长更新计时器"); + common_vendor.index.__f__("log", "at pages/return/index.vue:421", "已清除使用时长更新计时器"); } }, // 清除状态检查定时器 @@ -241,7 +250,7 @@ const _sfc_main = { if (this.statusCheckTimer) { clearInterval(this.statusCheckTimer); this.statusCheckTimer = null; - common_vendor.index.__f__("log", "at pages/return/index.vue:400", "已清除归还状态检查计时器"); + common_vendor.index.__f__("log", "at pages/return/index.vue:430", "已清除归还状态检查计时器"); } }, // 开始状态检查定时器 @@ -251,7 +260,7 @@ const _sfc_main = { this.statusCheckTimer = setInterval(() => { if (this.isPageActive) { this.currentStatusChecks++; - common_vendor.index.__f__("log", "at pages/return/index.vue:414", `执行归还状态检查 (${this.currentStatusChecks}/${this.maxStatusChecks})`); + common_vendor.index.__f__("log", "at pages/return/index.vue:444", `执行归还状态检查 (${this.currentStatusChecks}/${this.maxStatusChecks})`); this.checkReturnStatus(); if (this.currentStatusChecks >= this.maxStatusChecks) { this.clearStatusCheckTimer(); @@ -262,11 +271,11 @@ const _sfc_main = { }); } } else { - common_vendor.index.__f__("log", "at pages/return/index.vue:429", "页面已不活跃，停止状态检查计时器"); + common_vendor.index.__f__("log", "at pages/return/index.vue:459", "页面已不活跃，停止状态检查计时器"); this.clearStatusCheckTimer(); } }, this.statusCheckInterval); - common_vendor.index.__f__("log", "at pages/return/index.vue:434", "已启动归还状态检查计时器"); + common_vendor.index.__f__("log", "at pages/return/index.vue:464", "已启动归还状态检查计时器"); }, // 通过设备号查询使用中的订单 async getOrderByDevice() { @@ -282,16 +291,19 @@ const _sfc_main = { "Clientid": common_vendor.index.getStorageSync("client_id") } }); - common_vendor.index.__f__("log", "at pages/return/index.vue:456", "通过设备号查询订单结果:", JSON.stringify(inUseRes)); + common_vendor.index.__f__("log", "at pages/return/index.vue:486", "通过设备号查询订单结果:", JSON.stringify(inUseRes)); if (inUseRes.statusCode === 200 && inUseRes.data.code === 200 && inUseRes.data.data) { const inUseOrder = inUseRes.data.data; - common_vendor.index.__f__("log", "at pages/return/index.vue:460", "使用中的订单:", inUseOrder); + common_vendor.index.__f__("log", "at pages/return/index.vue:490", "使用中的订单:", inUseOrder); this.orderInfo.orderId = inUseOrder.orderId; if (inUseOrder.orderStatus) { this.orderInfo.orderStatus = inUseOrder.orderStatus; } + if (inUseOrder.payWay) { + this.orderInfo.payWay = inUseOrder.payWay; + } if (inUseOrder.startTime) { - common_vendor.index.__f__("log", "at pages/return/index.vue:472", "inUse API返回的开始时间:", inUseOrder.startTime); + common_vendor.index.__f__("log", "at pages/return/index.vue:507", "inUse API返回的开始时间:", inUseOrder.startTime); this.orderInfo.startTime = inUseOrder.startTime; } this.getOrderDetails(); @@ -301,7 +313,7 @@ const _sfc_main = { throw new Error("未找到使用中的订单"); } } catch (error) { - common_vendor.index.__f__("error", "at pages/return/index.vue:486", "通过设备号查询订单失败:", error); + common_vendor.index.__f__("error", "at pages/return/index.vue:521", "通过设备号查询订单失败:", error); common_vendor.index.showToast({ title: error.message || "获取订单信息失败", icon: "none" @@ -320,7 +332,7 @@ const _sfc_main = { await this.getOrderDetails(); } } catch (error) { - common_vendor.index.__f__("error", "at pages/return/index.vue:509", "检查归还状态失败:", error); + common_vendor.index.__f__("error", "at pages/return/index.vue:544", "检查归还状态失败:", error); } }, // 返回首页 @@ -336,12 +348,16 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { a: common_vendor.t($options.getOrderStatusText()), b: common_vendor.t($data.orderInfo.orderId), c: common_vendor.t($data.deviceId), - d: common_vendor.t($data.orderInfo.startTime), - e: common_vendor.t($data.orderInfo.usedTime), - f: common_vendor.t($data.orderInfo.currentFee) + d: $data.orderInfo.payWay == "wx_score_pay" + }, $data.orderInfo.payWay == "wx_score_pay" ? { + e: common_assets._imports_0$2 + } : {}, { + f: common_vendor.t($data.orderInfo.startTime), + g: common_vendor.t($data.orderInfo.usedTime), + h: common_vendor.t($data.orderInfo.currentFee) }, {}, { - j: common_vendor.o((...args) => $options.checkReturnStatus && $options.checkReturnStatus(...args)), - k: common_vendor.o((...args) => $options.goToHome && $options.goToHome(...args)) + l: common_vendor.o((...args) => $options.checkReturnStatus && $options.checkReturnStatus(...args)), + m: common_vendor.o((...args) => $options.goToHome && $options.goToHome(...args)) }); } const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-6d22bdf8"]]); diff --git a/unpackage/dist/dev/mp-weixin/pages/return/index.wxml b/unpackage/dist/dev/mp-weixin/pages/return/index.wxml index e9cee0a..50cd1ed 100644 --- a/unpackage/dist/dev/mp-weixin/pages/return/index.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/return/index.wxml @@ -1 +1 @@ -{{a}}订单号：{{b}}共享风扇设备号：{{c}}开始时间{{d}}已使用时长{{e}}当前费用￥{{f}}调试信息原始开始时间: {{g}}处理后开始时间: {{h}}订单状态: {{i}}归还说明请确保设备完好无损将充电宝插入原位置或空闲插口系统将自动检测归还并处理退款归还成功后将自动跳转到成功页面 \ No newline at end of file +{{a}}订单号：{{b}}共享风扇设备号：{{c}}微信支付分|免押租借押金租借开始时间{{f}}已使用时长{{g}}当前费用￥{{h}}调试信息原始开始时间: {{i}}处理后开始时间: {{j}}订单状态: {{k}}归还说明请确保设备完好无损将充电宝插入原位置或空闲插口系统将自动检测归还并处理退款归还成功后将自动跳转到成功页面刷新状态返回首页 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/return/index.wxss b/unpackage/dist/dev/mp-weixin/pages/return/index.wxss index 5071ea6..6c2ce5b 100644 --- a/unpackage/dist/dev/mp-weixin/pages/return/index.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/return/index.wxss @@ -25,14 +25,14 @@ /* 文章场景相关 */ .return-container.data-v-6d22bdf8 { min-height: 100vh; - background: #f8f8f8; + background: #f7f8fa; padding: 30rpx; padding-bottom: 180rpx; box-sizing: border-box; } .return-container .order-card.data-v-6d22bdf8 { background: #fff; - border-radius: 24rpx; + border-radius: 20rpx; padding: 30rpx; margin-bottom: 30rpx; box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04); @@ -41,10 +41,12 @@ display: flex; justify-content: space-between; align-items: center; - margin-bottom: 30rpx; + margin-bottom: 20rpx; + padding-bottom: 16rpx; + border-bottom: 1rpx solid #f0f0f0; } .return-container .order-card .order-header .title.data-v-6d22bdf8 { - font-size: 32rpx; + font-size: 30rpx; font-weight: bold; color: #333; } @@ -53,17 +55,60 @@ color: #999; } .return-container .order-card .device-info.data-v-6d22bdf8 { - margin-bottom: 30rpx; + margin-bottom: 24rpx; + display: flex; + justify-content: space-between; + align-items: flex-start; } -.return-container .order-card .device-info .device-name.data-v-6d22bdf8 { - font-size: 28rpx; +.return-container .order-card .device-info .device-left.data-v-6d22bdf8 { + flex: 1; + margin-right: 20rpx; +} +.return-container .order-card .device-info .device-left .device-name.data-v-6d22bdf8 { + font-size: 32rpx; + font-weight: 500; color: #333; - display: block; - margin-bottom: 10rpx; + margin-bottom: 8rpx; } -.return-container .order-card .device-info .device-id.data-v-6d22bdf8 { - font-size: 24rpx; +.return-container .order-card .device-info .device-left .device-id.data-v-6d22bdf8 { + font-size: 26rpx; + color: #999; + margin-bottom: 0; +} +.return-container .order-card .device-info .device-right .payment-badge.data-v-6d22bdf8 { + 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-6d22bdf8 { + background: rgba(7, 193, 96, 0.08); +} +.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-icon.data-v-6d22bdf8 { + width: 32rpx; + height: 26rpx; + margin-right: 8rpx; +} +.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text.data-v-6d22bdf8 { + 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-6d22bdf8 { + margin: 0 6rpx; +} +.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text .highlight.data-v-6d22bdf8 { + font-weight: 500; +} +.return-container .order-card .device-info .device-right .payment-badge.deposit.data-v-6d22bdf8 { + background: #f5f5f5; +} +.return-container .order-card .device-info .device-right .payment-badge.deposit .badge-text.data-v-6d22bdf8 { + font-size: 22rpx; color: #666; + font-weight: 500; } .return-container .order-card .time-info.data-v-6d22bdf8 { background: #f9f9f9; @@ -88,18 +133,18 @@ color: #333; } .return-container .order-card .time-info .time-item .value.highlight.data-v-6d22bdf8 { - color: #ff6b00; + color: #ff6b6b; font-weight: bold; } .return-container .notice-card.data-v-6d22bdf8 { background: #fff; - border-radius: 24rpx; + border-radius: 20rpx; padding: 30rpx; margin-bottom: 30rpx; box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04); } .return-container .notice-card .notice-title.data-v-6d22bdf8 { - font-size: 28rpx; + font-size: 30rpx; font-weight: bold; color: #333; margin-bottom: 20rpx; @@ -131,7 +176,8 @@ left: 0; right: 0; bottom: 0; - padding: 30rpx; + padding: 20rpx 30rpx; + padding-bottom: calc(20rpx + env(safe-area-inset-bottom)); background: #fff; box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.04); z-index: 10; @@ -139,25 +185,27 @@ justify-content: space-between; gap: 20rpx; } -.return-container .bottom-bar .primary-btn.data-v-6d22bdf8, .return-container .bottom-bar .secondary-btn.data-v-6d22bdf8 { +.return-container .bottom-bar .action-item.data-v-6d22bdf8 { height: 88rpx; - line-height: 88rpx; - font-size: 32rpx; + display: flex; + align-items: center; + justify-content: center; + font-size: 30rpx; border-radius: 44rpx; - text-align: center; flex: 1; } -.return-container .bottom-bar .primary-btn.data-v-6d22bdf8 { +.return-container .bottom-bar .action-item.primary.data-v-6d22bdf8 { background: #07c160; color: #fff; } -.return-container .bottom-bar .primary-btn.data-v-6d22bdf8:active { +.return-container .bottom-bar .action-item.primary.data-v-6d22bdf8:active { opacity: 0.8; } -.return-container .bottom-bar .secondary-btn.data-v-6d22bdf8 { - background: #f0f0f0; +.return-container .bottom-bar .action-item.secondary.data-v-6d22bdf8 { + background: #f5f5f5; color: #333; + border: 1rpx solid #e0e0e0; } -.return-container .bottom-bar .secondary-btn.data-v-6d22bdf8:active { +.return-container .bottom-bar .action-item.secondary.data-v-6d22bdf8:active { opacity: 0.8; } \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/util/index.js b/unpackage/dist/dev/mp-weixin/util/index.js index d0777cc..558b471 100644 --- a/unpackage/dist/dev/mp-weixin/util/index.js +++ b/unpackage/dist/dev/mp-weixin/util/index.js @@ -48,6 +48,37 @@ const getUserInfo = () => { res(result); }); }; +const initiateWeChatScorePayment = (paymentData) => { + return new Promise((resolve, reject) => { + if (!paymentData || !paymentData.data || !paymentData.data.package) { + reject(new Error("支付参数不完整")); + return; + } + common_vendor.wx$1.openBusinessView({ + businessType: "wxpayScoreUse", + extraData: { + mch_id: paymentData.data.mch_id, + package: paymentData.data.package + }, + success: (businessRes) => { + common_vendor.index.__f__("log", "at util/index.js:92", "微信支付分小程序调用成功", businessRes); + if (businessRes.errMsg === "openBusinessView:ok") { + resolve(businessRes); + } else { + reject(new Error("支付流程未完成")); + } + }, + fail: (error) => { + common_vendor.index.__f__("error", "at util/index.js:101", "微信支付分小程序调用失败", error); + common_vendor.index.showToast({ + title: error.errMsg || "支付分接口调用失败", + icon: "none" + }); + reject(error); + } + }); + }); +}; const getQueryString = function(url, name) { var reg = new RegExp("(^|&|/?)" + name + "=([^&|/?]*)(&|/?|$)", "i"); var r = url.substr(1).match(reg); @@ -58,5 +89,6 @@ const getQueryString = function(url, name) { }; exports.getQueryString = getQueryString; exports.getUserInfo = getUserInfo; +exports.initiateWeChatScorePayment = initiateWeChatScorePayment; exports.wxLogin = wxLogin; //# sourceMappingURL=../../.sourcemap/mp-weixin/util/index.js.map diff --git a/util/index.js b/util/index.js index 617773e..b3d2343 100644 --- a/util/index.js +++ b/util/index.js @@ -72,7 +72,42 @@ export const getUserInfo = () => { }) } - +// 调用微信支付分接口 +export const initiateWeChatScorePayment = (paymentData) => { + return new Promise((resolve, reject) => { + // 确保paymentData包含所需数据 + if (!paymentData || !paymentData.data || !paymentData.data.package) { + reject(new Error('支付参数不完整')); + return; + } + + // 使用wx.openBusinessView打开微信支付分小程序 + wx.openBusinessView({ + businessType: 'wxpayScoreUse', + extraData: { + mch_id: paymentData.data.mch_id, + package: paymentData.data.package + }, + success: (businessRes) => { + console.log('微信支付分小程序调用成功', businessRes); + // 根据返回结果判断是否完成支付 + if (businessRes.errMsg === 'openBusinessView:ok') { + resolve(businessRes); + } else { + reject(new Error('支付流程未完成')); + } + }, + fail: (error) => { + console.error('微信支付分小程序调用失败', error); + uni.showToast({ + title: error.errMsg || '支付分接口调用失败', + icon: 'none' + }); + reject(error); + } + }); + }); +} export const getQueryString = function (url, name) { var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')