From f96ff2b030b91ddfe5e79328a7beec29f05c3101 Mon Sep 17 00:00:00 2001 From: 8vd8 <1936002261@qq.com> Date: Fri, 11 Apr 2025 18:03:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=BD=92=E8=BF=98?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E9=A1=B5=E9=9D=A2=E5=8F=8A=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在 `pages.json` 中新增归还成功页面的配置，并在 `order/success.vue` 中实现设备状态提示和加载动画。同时，更新了订单支付逻辑，确保在支付成功后能够正确弹出充电宝。优化了订单状态查询和处理逻辑，提升用户体验。 --- config/user.js | 28 ++ pages.json | 8 + pages/index/index.vue | 21 +- pages/order/index.vue | 39 +- pages/order/payment.vue | 199 +++++----- pages/order/return-success.vue | 298 ++++++++++++++ pages/order/success.vue | 125 +++++- pages/return/index.vue | 362 +++++++++++------- .../dist/dev/.sourcemap/mp-weixin/app.js.map | 2 +- .../.sourcemap/mp-weixin/config/user.js.map | 2 +- .../mp-weixin/pages/index/index.js.map | 2 +- .../mp-weixin/pages/order/index.js.map | 2 +- .../mp-weixin/pages/order/payment.js.map | 2 +- .../pages/order/return-success.js.map | 1 + .../mp-weixin/pages/order/success.js.map | 2 +- .../mp-weixin/pages/return/index.js.map | 2 +- unpackage/dist/dev/mp-weixin/app.js | 1 + unpackage/dist/dev/mp-weixin/app.json | 3 +- unpackage/dist/dev/mp-weixin/common/vendor.js | 4 +- unpackage/dist/dev/mp-weixin/config/user.js | 28 +- .../dist/dev/mp-weixin/pages/index/index.js | 26 +- .../dist/dev/mp-weixin/pages/order/index.js | 36 +- .../dist/dev/mp-weixin/pages/order/payment.js | 165 ++++---- .../mp-weixin/pages/order/return-success.js | 108 ++++++ .../mp-weixin/pages/order/return-success.json | 6 + .../mp-weixin/pages/order/return-success.wxml | 1 + .../mp-weixin/pages/order/return-success.wxss | 139 +++++++ .../dist/dev/mp-weixin/pages/order/success.js | 75 +++- .../dev/mp-weixin/pages/order/success.wxml | 2 +- .../dev/mp-weixin/pages/order/success.wxss | 34 ++ .../dist/dev/mp-weixin/pages/return/index.js | 229 ++++++----- .../dev/mp-weixin/pages/return/index.wxml | 2 +- .../dev/mp-weixin/pages/return/index.wxss | 87 +++-- 33 files changed, 1505 insertions(+), 536 deletions(-) create mode 100644 pages/order/return-success.vue create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/return-success.js.map create mode 100644 unpackage/dist/dev/mp-weixin/pages/order/return-success.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/order/return-success.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/order/return-success.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/order/return-success.wxss diff --git a/config/user.js b/config/user.js index bb3d6a0..adbc6ff 100644 --- a/config/user.js +++ b/config/user.js @@ -56,9 +56,11 @@ export const createOrder = (data) => { //查询订单 export const queryById = (id) => { + console.log(`查询订单详情, orderId: ${id}`) return request({ url: `/app/order/${id}`, method: 'get', + hideLoading: true }) } @@ -91,6 +93,23 @@ export const rentPowerBank = (deviceNo, phone) => { }) } +//确认支付并弹出充电宝 +export const confirmPaymentAndRent = (orderId) => { + console.log(`确认支付并弹出充电宝, orderId: ${orderId}`) + return request({ + url: `/app/device/confirmPaymentAndRent?orderId=${orderId}`, + method: 'post' + }) +} + +//备用方法：直接发送租借指令 +export const sendRentCommand = (orderId) => { + console.log(`直接发送租借指令, orderId: ${orderId}`) + return request({ + url: `/app/device/sendRentCommand?orderId=${orderId}`, + method: 'post' + }) +} //投诉反馈 export const addUserFeedback = (data) => { @@ -100,3 +119,12 @@ export const addUserFeedback = (data) => { data, }) } + +//强制打开空格子 +export const forcefOpenEmptyGrid = (deviceNo) => { + console.log(`强制打开空格子, deviceNo: ${deviceNo}`) + return request({ + url: `/app/device/forcef/${deviceNo}`, + method: 'post' + }) +} diff --git a/pages.json b/pages.json index 0dc0761..417a27c 100644 --- a/pages.json +++ b/pages.json @@ -76,6 +76,14 @@ "navigationBarBackgroundColor": "#ffffff", "navigationBarTextStyle": "black" } + }, + { + "path": "pages/order/return-success", + "style": { + "navigationBarTitleText": "归还成功", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black" + } } ], "globalStyle": { diff --git a/pages/index/index.vue b/pages/index/index.vue index e6a7498..07b368e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -48,7 +48,7 @@ + + \ No newline at end of file diff --git a/pages/order/success.vue b/pages/order/success.vue index 8643481..ddf3539 100644 --- a/pages/order/success.vue +++ b/pages/order/success.vue @@ -28,6 +28,14 @@ + + + {{ deviceMessage }} + + + + + @@ -37,19 +45,28 @@ \r\n\r\n"],"names":["uni","wxLogin"],"mappings":";;;;;;;;;;;;;;;;;AAOC,MAAK,YAAU;AAAA,EACd,UAAU,WAAW;AACpBA,kBAAAA,MAAA,MAAA,OAAA,iBAAY,YAAY;AAAA,EAExB;AAAA,EACD,QAAQ,iBAAiB;AACxBA,kBAAAA,MAAY,MAAA,OAAA,iBAAA,UAAU;AACtB,UAAM,KAAK,UAAU;AAAA,EAErB;AAAA,EACD,QAAQ,WAAW;AAClBA,kBAAAA,MAAY,MAAA,OAAA,iBAAA,UAAU;AAAA,EACtB;AAAA,EAID,SAAS;AAAA,IACR,MAAM,YAAY;AACjB,UAAI;AACH,cAAM,cAAc,MAAMC,mBAAQ;AAClCD,sBAAAA,MAAY,MAAA,OAAA,iBAAA,WAAW,WAAW;AAAA,MAEjC,SAAO,OAAO;AACfA,sBAAAA,sCAAc,WAAW,KAAK;AAAA,MAG/B;AAAA,IACD;AAAA,EACD;AACD;;;;;;;;;"} \ No newline at end of file +{"version":3,"file":"app.js","sources":["App.vue"],"sourcesContent":["\r\n\r\n"],"names":["uni","wxLogin"],"mappings":";;;;;;;;;;;;;;;;;;AAOC,MAAK,YAAU;AAAA,EACd,UAAU,WAAW;AACpBA,kBAAAA,MAAA,MAAA,OAAA,iBAAY,YAAY;AAAA,EAExB;AAAA,EACD,QAAQ,iBAAiB;AACxBA,kBAAAA,MAAY,MAAA,OAAA,iBAAA,UAAU;AACtB,UAAM,KAAK,UAAU;AAAA,EAErB;AAAA,EACD,QAAQ,WAAW;AAClBA,kBAAAA,MAAY,MAAA,OAAA,iBAAA,UAAU;AAAA,EACtB;AAAA,EAID,SAAS;AAAA,IACR,MAAM,YAAY;AACjB,UAAI;AACH,cAAM,cAAc,MAAMC,mBAAQ;AAClCD,sBAAAA,MAAY,MAAA,OAAA,iBAAA,WAAW,WAAW;AAAA,MAEjC,SAAO,OAAO;AACfA,sBAAAA,sCAAc,WAAW,KAAK;AAAA,MAG/B;AAAA,IACD;AAAA,EACD;AACD;;;;;;;;;"} \ No newline at end of file diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/config/user.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/config/user.js.map index 4bbd045..2ffc8c6 100644 --- a/unpackage/dist/dev/.sourcemap/mp-weixin/config/user.js.map +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/config/user.js.map @@ -1 +1 @@ -{"version":3,"file":"user.js","sources":["config/user.js"],"sourcesContent":["import request from './http'\r\n\r\n\r\nexport const login = (data) => {\r\n return request({\r\n url: '/app/user/login',\r\n method: 'get',\r\n data\r\n })\r\n}\r\n\r\n\r\nexport const getMyIndexInfo = (data) => {\r\n return request({\r\n url: '/app/user/userInfo',\r\n method: 'get',\r\n data,\r\n })\r\n}\r\n\r\n//获取所有全部订单\r\nexport const getOrderList = (data) => {\r\n return request({\r\n url: '/app/order/list',\r\n method: 'get',\r\n data,\r\n hideLoading:true\r\n })\r\n}\r\n\r\n//查询是否有订单\r\nexport const queryHasOrder = (deviceNo) => {\r\n return request({\r\n url: `/app/order/list?deviceNo=${deviceNo}&orderStatus=in_used`,\r\n method: 'get',\r\n })\r\n}\r\n\r\n//设备查询\r\nexport const getDeviceInfo = (deviceNo) => {\r\n return request({\r\n url: `/app/device/${deviceNo}`,\r\n method: 'get',\r\n })\r\n}\r\n\r\n\r\n//创建订单\r\nexport const createOrder = (data) => {\r\n return request({\r\n url: '/app/order/add',\r\n method: 'post',\r\n data,\r\n })\r\n}\r\n\r\n//查询订单\r\nexport const queryById = (id) => {\r\n return request({\r\n url: `/app/order/${id}`,\r\n method: 'get',\r\n })\r\n}\r\n\r\n\r\n//取消订单\r\nexport const cancelOrder = (data) => {\r\n return request({\r\n url: '/orderInfo/cancelOrder',\r\n method: 'get',\r\n data,\r\n })\r\n}\r\n\r\n\r\n//结束订单\r\nexport const overOrderById = (orderId) => {\r\n console.log(`调用结束订单API, orderId: ${orderId}`)\r\n return request({\r\n url: `/app/order/close/${orderId}`,\r\n method: 'get',\r\n })\r\n}\r\n\r\n//立即租借\r\nexport const rentPowerBank = (deviceNo, phone) => {\r\n return request({\r\n url: '/app/device/rentPowerBank',\r\n method: 'post',\r\n data: { deviceNo, phone }\r\n })\r\n}\r\n\r\n\r\n//投诉反馈\r\nexport const addUserFeedback = (data) => {\r\n return request({\r\n url: '/app/feedback/add',\r\n method: 'post',\r\n data,\r\n })\r\n}\r\n"],"names":["request","uni"],"mappings":";;;AAGY,MAAC,QAAQ,CAAC,SAAS;AAC3B,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACR,CAAK;AACL;AAGY,MAAC,iBAAiB,CAAC,SAAS;AACpC,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACR,CAAK;AACL;AAGY,MAAC,eAAe,CAAC,SAAS;AAClC,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,IACA,aAAY;AAAA,EACpB,CAAK;AACL;AAGY,MAAC,gBAAgB,CAAC,aAAa;AACvC,SAAOA,oBAAQ;AAAA,IACX,KAAK,4BAA4B,QAAQ;AAAA,IACzC,QAAQ;AAAA,EAChB,CAAK;AACL;AAGY,MAAC,gBAAgB,CAAC,aAAa;AACvC,SAAOA,oBAAQ;AAAA,IACX,KAAK,eAAe,QAAQ;AAAA,IAC5B,QAAQ;AAAA,EAChB,CAAK;AACL;AAaY,MAAC,YAAY,CAAC,OAAO;AAC7B,SAAOA,oBAAQ;AAAA,IACX,KAAK,cAAc,EAAE;AAAA,IACrB,QAAQ;AAAA,EAChB,CAAK;AACL;AAcY,MAAC,gBAAgB,CAAC,YAAY;AACtCC,gBAAY,MAAA,MAAA,OAAA,wBAAA,uBAAuB,OAAO,EAAE;AAC5C,SAAOD,oBAAQ;AAAA,IACX,KAAK,oBAAoB,OAAO;AAAA,IAChC,QAAQ;AAAA,EAChB,CAAK;AACL;AAGY,MAAC,gBAAgB,CAAC,UAAU,UAAU;AAC9C,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR,MAAM,EAAE,UAAU,MAAO;AAAA,EACjC,CAAK;AACL;;;;;;;;;"} \ No newline at end of file +{"version":3,"file":"user.js","sources":["config/user.js"],"sourcesContent":["import request from './http'\n\n\nexport const login = (data) => {\n return request({\n url: '/app/user/login',\n method: 'get',\n data\n })\n}\n\n\nexport const getMyIndexInfo = (data) => {\n return request({\n url: '/app/user/userInfo',\n method: 'get',\n data,\n })\n}\n\n//获取所有全部订单\nexport const getOrderList = (data) => {\n return request({\n url: '/app/order/list',\n method: 'get',\n data,\n hideLoading:true\n })\n}\n\n//查询是否有订单\nexport const queryHasOrder = (deviceNo) => {\n return request({\n url: `/app/order/list?deviceNo=${deviceNo}&orderStatus=in_used`,\n method: 'get',\n })\n}\n\n//设备查询\nexport const getDeviceInfo = (deviceNo) => {\n return request({\n url: `/app/device/${deviceNo}`,\n method: 'get',\n })\n}\n\n\n//创建订单\nexport const createOrder = (data) => {\n return request({\n url: '/app/order/add',\n method: 'post',\n data,\n })\n}\n\n//查询订单\nexport const queryById = (id) => {\n console.log(`查询订单详情, orderId: ${id}`)\n return request({\n url: `/app/order/${id}`,\n method: 'get',\n hideLoading: true\n })\n}\n\n\n//取消订单\nexport const cancelOrder = (data) => {\n return request({\n url: '/orderInfo/cancelOrder',\n method: 'get',\n data,\n })\n}\n\n\n//结束订单\nexport const overOrderById = (orderId) => {\n console.log(`调用结束订单API, orderId: ${orderId}`)\n return request({\n url: `/app/order/close/${orderId}`,\n method: 'get',\n })\n}\n\n//立即租借\nexport const rentPowerBank = (deviceNo, phone) => {\n return request({\n url: '/app/device/rentPowerBank',\n method: 'post',\n data: { deviceNo, phone }\n })\n}\n\n//确认支付并弹出充电宝\nexport const confirmPaymentAndRent = (orderId) => {\n console.log(`确认支付并弹出充电宝, orderId: ${orderId}`)\n return request({\n url: `/app/device/confirmPaymentAndRent?orderId=${orderId}`,\n method: 'post'\n })\n}\n\n//备用方法：直接发送租借指令\nexport const sendRentCommand = (orderId) => {\n console.log(`直接发送租借指令, orderId: ${orderId}`)\n return request({\n url: `/app/device/sendRentCommand?orderId=${orderId}`,\n method: 'post'\n })\n}\n\n//投诉反馈\nexport const addUserFeedback = (data) => {\n return request({\n url: '/app/feedback/add',\n method: 'post',\n data,\n })\n}\n\n//强制打开空格子\nexport const forcefOpenEmptyGrid = (deviceNo) => {\n console.log(`强制打开空格子, deviceNo: ${deviceNo}`)\n return request({\n url: `/app/device/forcef/${deviceNo}`,\n method: 'post'\n })\n}\n"],"names":["request","uni"],"mappings":";;;AAGY,MAAC,QAAQ,CAAC,SAAS;AAC3B,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACR,CAAK;AACL;AAGY,MAAC,iBAAiB,CAAC,SAAS;AACpC,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACR,CAAK;AACL;AAGY,MAAC,eAAe,CAAC,SAAS;AAClC,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,IACA,aAAY;AAAA,EACpB,CAAK;AACL;AAGY,MAAC,gBAAgB,CAAC,aAAa;AACvC,SAAOA,oBAAQ;AAAA,IACX,KAAK,4BAA4B,QAAQ;AAAA,IACzC,QAAQ;AAAA,EAChB,CAAK;AACL;AAGY,MAAC,gBAAgB,CAAC,aAAa;AACvC,SAAOA,oBAAQ;AAAA,IACX,KAAK,eAAe,QAAQ;AAAA,IAC5B,QAAQ;AAAA,EAChB,CAAK;AACL;AAaY,MAAC,YAAY,CAAC,OAAO;AAC7BC,gBAAA,MAAA,MAAA,OAAA,wBAAY,oBAAoB,EAAE,EAAE;AACpC,SAAOD,oBAAQ;AAAA,IACX,KAAK,cAAc,EAAE;AAAA,IACrB,QAAQ;AAAA,IACR,aAAa;AAAA,EACrB,CAAK;AACL;AAuBY,MAAC,gBAAgB,CAAC,UAAU,UAAU;AAC9C,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR,MAAM,EAAE,UAAU,MAAO;AAAA,EACjC,CAAK;AACL;AAGY,MAAC,wBAAwB,CAAC,YAAY;AAC9CC,gBAAY,MAAA,MAAA,OAAA,wBAAA,wBAAwB,OAAO,EAAE;AAC7C,SAAOD,oBAAQ;AAAA,IACX,KAAK,6CAA6C,OAAO;AAAA,IACzD,QAAQ;AAAA,EAChB,CAAK;AACL;AAGY,MAAC,kBAAkB,CAAC,YAAY;AACxCC,gBAAA,MAAA,MAAA,OAAA,yBAAY,sBAAsB,OAAO,EAAE;AAC3C,SAAOD,oBAAQ;AAAA,IACX,KAAK,uCAAuC,OAAO;AAAA,IACnD,QAAQ;AAAA,EAChB,CAAK;AACL;;;;;;;;;;"} \ No newline at end of file diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map index 95259c2..02bfb02 100644 --- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvaW5kZXgvaW5kZXgudnVl"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/index/index.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"} \ No newline at end of file +{"version":3,"file":"index.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvaW5kZXgvaW5kZXgudnVl"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/index/index.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,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 2e30ddc..19e34df 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":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvb3JkZXIvaW5kZXgudnVl"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/order/index.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"} \ No newline at end of file +{"version":3,"file":"index.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvb3JkZXIvaW5kZXgudnVl"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/order/index.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"} \ No newline at end of file diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/payment.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/payment.js.map index b35cb9b..a3aca58 100644 --- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/payment.js.map +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/payment.js.map @@ -1 +1 @@ -{"version":3,"file":"payment.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvb3JkZXIvcGF5bWVudC52dWU"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/order/payment.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"} \ No newline at end of file +{"version":3,"file":"payment.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvb3JkZXIvcGF5bWVudC52dWU"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/order/payment.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"} \ No newline at end of file diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/return-success.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/return-success.js.map new file mode 100644 index 0000000..72cf303 --- /dev/null +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/return-success.js.map @@ -0,0 +1 @@ +{"version":3,"file":"return-success.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvb3JkZXIvcmV0dXJuLXN1Y2Nlc3MudnVl"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/order/return-success.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"} \ No newline at end of file diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/success.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/success.js.map index ab4d79a..1adb22a 100644 --- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/success.js.map +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/success.js.map @@ -1 +1 @@ -{"version":3,"file":"success.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvb3JkZXIvc3VjY2Vzcy52dWU"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/order/success.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"} \ No newline at end of file +{"version":3,"file":"success.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvb3JkZXIvc3VjY2Vzcy52dWU"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/order/success.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"} \ 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 1042ad6..1bf9be4 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":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvcmV0dXJuL2luZGV4LnZ1ZQ"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/return/index.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"} \ No newline at end of file +{"version":3,"file":"index.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvcmV0dXJuL2luZGV4LnZ1ZQ"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/return/index.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js index f883f0d..904a26c 100644 --- a/unpackage/dist/dev/mp-weixin/app.js +++ b/unpackage/dist/dev/mp-weixin/app.js @@ -14,6 +14,7 @@ if (!Math) { "./pages/serve/bagCheck/index.js"; "./pages/return/index.js"; "./pages/order/success.js"; + "./pages/order/return-success.js"; } const _sfc_main = { onLaunch: function() { diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json index e86f0fc..0a54f7f 100644 --- a/unpackage/dist/dev/mp-weixin/app.json +++ b/unpackage/dist/dev/mp-weixin/app.json @@ -10,7 +10,8 @@ "pages/device/detail", "pages/serve/bagCheck/index", "pages/return/index", - "pages/order/success" + "pages/order/success", + "pages/order/return-success" ], "window": { "navigationBarTextStyle": "black", diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js index 09aabd0..0485fac 100644 --- a/unpackage/dist/dev/mp-weixin/common/vendor.js +++ b/unpackage/dist/dev/mp-weixin/common/vendor.js @@ -6874,9 +6874,9 @@ function initOnError() { }; } function initRuntimeSocketService() { - const hosts = "10.8.0.5,192.168.1.15,127.0.0.1"; + const hosts = "192.168.1.15,127.0.0.1"; const port = "8090"; - const id = "mp-weixin_07I937"; + const id = "mp-weixin_JcUW_t"; const lazy = typeof swan !== "undefined"; let restoreError = lazy ? () => { } : initOnError(); diff --git a/unpackage/dist/dev/mp-weixin/config/user.js b/unpackage/dist/dev/mp-weixin/config/user.js index ea492ae..0bad267 100644 --- a/unpackage/dist/dev/mp-weixin/config/user.js +++ b/unpackage/dist/dev/mp-weixin/config/user.js @@ -36,16 +36,11 @@ const getDeviceInfo = (deviceNo) => { }); }; const queryById = (id) => { + common_vendor.index.__f__("log", "at config/user.js:59", `查询订单详情, orderId: ${id}`); return config_http.request({ url: `/app/order/${id}`, - method: "get" - }); -}; -const overOrderById = (orderId) => { - common_vendor.index.__f__("log", "at config/user.js:78", `调用结束订单API, orderId: ${orderId}`); - return config_http.request({ - url: `/app/order/close/${orderId}`, - method: "get" + method: "get", + hideLoading: true }); }; const rentPowerBank = (deviceNo, phone) => { @@ -55,12 +50,27 @@ const rentPowerBank = (deviceNo, phone) => { data: { deviceNo, phone } }); }; +const confirmPaymentAndRent = (orderId) => { + common_vendor.index.__f__("log", "at config/user.js:98", `确认支付并弹出充电宝, orderId: ${orderId}`); + return config_http.request({ + url: `/app/device/confirmPaymentAndRent?orderId=${orderId}`, + method: "post" + }); +}; +const sendRentCommand = (orderId) => { + common_vendor.index.__f__("log", "at config/user.js:107", `直接发送租借指令, orderId: ${orderId}`); + return config_http.request({ + url: `/app/device/sendRentCommand?orderId=${orderId}`, + method: "post" + }); +}; +exports.confirmPaymentAndRent = confirmPaymentAndRent; exports.getDeviceInfo = getDeviceInfo; exports.getMyIndexInfo = getMyIndexInfo; exports.getOrderList = getOrderList; exports.login = login; -exports.overOrderById = overOrderById; exports.queryById = queryById; exports.queryHasOrder = queryHasOrder; exports.rentPowerBank = rentPowerBank; +exports.sendRentCommand = sendRentCommand; //# sourceMappingURL=../../.sourcemap/mp-weixin/config/user.js.map diff --git a/unpackage/dist/dev/mp-weixin/pages/index/index.js b/unpackage/dist/dev/mp-weixin/pages/index/index.js index 0971ef9..8ed3da1 100644 --- a/unpackage/dist/dev/mp-weixin/pages/index/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/index/index.js @@ -15,6 +15,16 @@ const _sfc_main = { let deviceNo = util_index.getQueryString(scanResult.path, "deviceNo"); common_vendor.index.__f__("log", "at pages/index/index.vue:64", "扫码路径:", scanResult.path); common_vendor.index.__f__("log", "at pages/index/index.vue:65", "解析到的设备号:", deviceNo); + if (!deviceNo) { + common_vendor.index.showToast({ + title: "无效的设备二维码", + icon: "none" + }); + return; + } + if (!common_vendor.index.getStorageSync("token")) { + await util_index.wxLogin(); + } const inUseRes = await common_vendor.index.request({ url: `${common_vendor.index.getStorageSync("baseUrl") || "http://127.0.0.1:8080"}/app/order/inUse`, method: "GET", @@ -23,14 +33,14 @@ const _sfc_main = { "Clientid": common_vendor.index.getStorageSync("client_id") } }); - common_vendor.index.__f__("log", "at pages/index/index.vue:77", "使用中订单检查结果:", JSON.stringify(inUseRes)); + common_vendor.index.__f__("log", "at pages/index/index.vue:90", "使用中订单检查结果:", 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/index/index.vue:82", "检测到使用中订单，准备跳转:", inUseOrder); + common_vendor.index.__f__("log", "at pages/index/index.vue:95", "检测到使用中订单，准备跳转:", inUseOrder); common_vendor.index.reLaunch({ url: `/pages/return/index?orderId=${inUseOrder.orderId}&deviceId=${deviceNo || inUseOrder.deviceNo}` }); - common_vendor.index.__f__("log", "at pages/index/index.vue:88", "已发起页面跳转"); + common_vendor.index.__f__("log", "at pages/index/index.vue:101", "已发起页面跳转"); return; } const orderRes = await common_vendor.index.request({ @@ -41,21 +51,21 @@ const _sfc_main = { "Clientid": common_vendor.index.getStorageSync("client_id") } }); - common_vendor.index.__f__("log", "at pages/index/index.vue:102", "待支付订单检查结果:", JSON.stringify(orderRes)); + common_vendor.index.__f__("log", "at pages/index/index.vue:115", "待支付订单检查结果:", JSON.stringify(orderRes)); if (orderRes.statusCode === 200 && orderRes.data.code === 200 && orderRes.data.data) { const unpaidOrder = orderRes.data.data; - common_vendor.index.__f__("log", "at pages/index/index.vue:107", "检测到待支付订单，准备跳转:", unpaidOrder); + common_vendor.index.__f__("log", "at pages/index/index.vue:120", "检测到待支付订单，准备跳转:", unpaidOrder); common_vendor.index.navigateTo({ url: `/pages/order/payment?orderId=${unpaidOrder.orderId}` }); } else { - common_vendor.index.__f__("log", "at pages/index/index.vue:113", "无待支付订单，跳转到设备检查页面, deviceNo:", deviceNo); + common_vendor.index.__f__("log", "at pages/index/index.vue:126", "无待支付订单，直接跳转到设备详情页面, deviceNo:", deviceNo); common_vendor.index.navigateTo({ - url: `/pages/serve/bagCheck/index?deviceNo=${deviceNo}` + url: `/pages/device/detail?deviceNo=${deviceNo}` }); } } catch (error) { - common_vendor.index.__f__("error", "at pages/index/index.vue:119", "扫码处理失败:", error); + common_vendor.index.__f__("error", "at pages/index/index.vue:132", "扫码处理失败:", error); common_vendor.index.showToast({ title: "扫码失败", icon: "none" diff --git a/unpackage/dist/dev/mp-weixin/pages/order/index.js b/unpackage/dist/dev/mp-weixin/pages/order/index.js index c1075bd..d9a30e7 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/order/index.js @@ -17,13 +17,18 @@ const _sfc_main = { 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: orderData.createTime, + startTime: orderStartTime, endTime: orderData.endTime || "", - amount: orderData.amount || "0.00" + amount: orderData.payAmount || orderData.actualDeviceAmount || "0.00" }; this.orderList = [formattedOrder, ...this.orderList]; const tabIndex = this.OrderStatusTabs.findIndex( @@ -34,7 +39,7 @@ const _sfc_main = { } } } catch (error) { - common_vendor.index.__f__("error", "at pages/order/index.vue:98", "获取订单详情失败:", error); + common_vendor.index.__f__("error", "at pages/order/index.vue:106", "获取订单详情失败:", error); } } await this.getOrderList(); @@ -44,17 +49,24 @@ const _sfc_main = { try { const res = await config_user.getOrderList(statusList); if (res.code === 200 && res.data && res.data.records) { - this.orderList = res.data.records.map((item) => ({ - orderNo: item.orderId, - status: item.orderStatus, - deviceId: item.deviceNo, - startTime: item.createTime, - endTime: item.endTime || "", - amount: item.amount || "0.00" - })); + 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); + const orderStartTime = item.startTime || item.createTime || ""; + common_vendor.index.__f__("log", "at pages/order/index.vue:127", `订单 ${item.orderId} 最终显示的开始时间:`, orderStartTime); + return { + orderNo: item.orderId, + status: item.orderStatus, + deviceId: item.deviceNo, + startTime: orderStartTime, + endTime: item.endTime || "", + amount: item.payAmount || item.actualDeviceAmount || "0.00" + }; + }); } } catch (error) { - common_vendor.index.__f__("error", "at pages/order/index.vue:121", "获取订单列表失败:", error); + common_vendor.index.__f__("error", "at pages/order/index.vue:140", "获取订单列表失败:", error); common_vendor.index.showToast({ title: "获取订单列表失败", icon: "none" diff --git a/unpackage/dist/dev/mp-weixin/pages/order/payment.js b/unpackage/dist/dev/mp-weixin/pages/order/payment.js index 607daee..4c9ab8c 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/payment.js +++ b/unpackage/dist/dev/mp-weixin/pages/order/payment.js @@ -98,27 +98,62 @@ const _sfc_main = { }, // 处理支付 async handlePayment() { + var _a; try { common_vendor.index.showLoading({ title: "处理中" }); + common_vendor.index.__f__("log", "at pages/order/payment.vue:206", "开始处理支付，订单号:", this.orderId); const res = await common_vendor.index.request({ - url: `${common_vendor.index.getStorageSync("baseUrl") || "http://127.0.0.1:8080"}/app/wx-payment/create/${this.orderInfo.orderNo}`, + url: `${common_vendor.index.getStorageSync("baseUrl") || "http://127.0.0.1:8080"}/app/payment/${this.orderInfo.orderNo}`, method: "GET", header: { "Authorization": "Bearer " + common_vendor.index.getStorageSync("token"), "Clientid": common_vendor.index.getStorageSync("client_id") } }); + common_vendor.index.__f__("log", "at pages/order/payment.vue:218", "支付API返回结果:", res.data); if (res.statusCode === 200 && res.data.code === 200) { - common_vendor.index.hideLoading(); - common_vendor.index.redirectTo({ - url: `/pages/order/success?orderId=${this.orderId}` + const payParams = res.data.data; + common_vendor.index.__f__("log", "at pages/order/payment.vue:224", "准备调用微信支付，参数:", payParams); + if (!payParams.timeStamp || !payParams.nonceStr || !payParams.packageValue || !payParams.paySign) { + common_vendor.index.__f__("error", "at pages/order/payment.vue:229", "支付参数不完整:", payParams); + throw new Error("支付参数不完整，请联系客服"); + } + common_vendor.index.requestPayment({ + provider: "wxpay", + timeStamp: payParams.timeStamp, + nonceStr: payParams.nonceStr, + package: payParams.packageValue, + // 后端返回的是packageValue字段 + signType: payParams.signType || "MD5", + paySign: payParams.paySign, + success: (payRes) => { + common_vendor.index.__f__("log", "at pages/order/payment.vue:242", "支付成功:", payRes); + common_vendor.index.hideLoading(); + this.pollOrderStatus(); + }, + fail: (err) => { + common_vendor.index.__f__("error", "at pages/order/payment.vue:248", "支付失败:", err); + common_vendor.index.hideLoading(); + if (err.errMsg === "requestPayment:fail cancel") { + common_vendor.index.__f__("log", "at pages/order/payment.vue:252", "用户取消了支付"); + return; + } + common_vendor.index.showToast({ + title: err.errMsg || "支付失败", + icon: "none" + }); + }, + complete: () => { + common_vendor.index.__f__("log", "at pages/order/payment.vue:261", "支付流程结束"); + } }); } else { - throw new Error(res.data.msg || "支付失败"); + throw new Error(((_a = res.data) == null ? void 0 : _a.msg) || "支付请求失败"); } } catch (error) { + common_vendor.index.__f__("error", "at pages/order/payment.vue:268", "支付处理错误:", error); common_vendor.index.hideLoading(); common_vendor.index.showToast({ title: error.message || "支付失败", @@ -126,92 +161,23 @@ const _sfc_main = { }); } }, - // 发送租借指令 - async sendRentCommand() { - try { - common_vendor.index.showLoading({ - title: "处理中" - }); - const res = await this.sendRentRequest(); - if (res.code === 200) { - common_vendor.index.hideLoading(); - common_vendor.index.showToast({ - title: "租借成功", - icon: "success" - }); - setTimeout(() => { - common_vendor.index.redirectTo({ - url: `/pages/order/index?orderId=${this.orderId}` - }); - }, 1500); - } else { - throw new Error(res.msg || "租借失败"); - } - } catch (error) { - common_vendor.index.hideLoading(); - common_vendor.index.showToast({ - title: error.message || "租借失败", - icon: "none" - }); - } - }, - // 发送租借请求 - sendRentRequest() { - return new Promise((resolve, reject) => { - common_vendor.index.request({ - url: `${common_vendor.index.getStorageSync("baseUrl") || "http://127.0.0.1:8080"}/app/device/sendRentCommand`, - method: "POST", - data: { - orderId: this.orderId - }, - header: { - "Content-Type": "application/x-www-form-urlencoded", - "Authorization": "Bearer " + common_vendor.index.getStorageSync("token"), - "Clientid": common_vendor.index.getStorageSync("client_id") - }, - success(res) { - if (res.statusCode === 200) { - resolve(res.data); - } else { - reject(new Error("请求失败")); - } - }, - fail(err) { - reject(err); - } - }); - }); - }, - // 格式化时间 - formatTime(date) { - const year = date.getFullYear(); - const month = (date.getMonth() + 1).toString().padStart(2, "0"); - const day = date.getDate().toString().padStart(2, "0"); - const hour = date.getHours().toString().padStart(2, "0"); - const minute = date.getMinutes().toString().padStart(2, "0"); - return `${year}-${month}-${day} ${hour}:${minute}`; - }, // 轮询订单状态 async pollOrderStatus() { let retryCount = 0; - const maxRetries = 10; - const interval = 1e3; + const maxRetries = 30; + const interval = 2e3; const checkStatus = async () => { try { - const res = await common_vendor.index.request({ - url: `${common_vendor.index.getStorageSync("baseUrl") || "http://127.0.0.1:8080"}/app/payment/status/${this.orderInfo.orderNo}`, - method: "GET", - header: { - "Authorization": "Bearer " + common_vendor.index.getStorageSync("token"), - "Clientid": common_vendor.index.getStorageSync("client_id") - } - }); - if (res.statusCode === 200 && res.data.code === 200) { - const orderData = res.data.data; - if (orderData.orderStatus === "IN_USED") { + const res = await config_user.queryById(this.orderId); + common_vendor.index.__f__("log", "at pages/order/payment.vue:287", "轮询订单状态结果:", res); + if (res.code === 200 && res.data) { + const orderData = res.data; + if (orderData.orderStatus === "IN_USED" || orderData.orderStatus === "PAYMENT_SUCCESSFUL") { + common_vendor.index.__f__("log", "at pages/order/payment.vue:294", "支付成功，订单状态:", orderData.orderStatus); common_vendor.index.showToast({ - title: "支付成功", - icon: "success" + title: "支付成功，充电宝已弹出", + icon: "success", + duration: 2e3 }); setTimeout(() => { common_vendor.index.redirectTo({ @@ -223,15 +189,34 @@ const _sfc_main = { } if (retryCount < maxRetries) { retryCount++; + common_vendor.index.__f__("log", "at pages/order/payment.vue:314", `第${retryCount}次轮询，等待订单状态更新...`); setTimeout(checkStatus, interval); } else { - throw new Error("订单状态查询超时"); + common_vendor.index.__f__("error", "at pages/order/payment.vue:317", "轮询订单状态超时"); + common_vendor.index.showModal({ + title: "提示", + content: '订单状态查询超时，请在"我的订单"中查看订单状态', + showCancel: false, + success: function(res2) { + if (res2.confirm) { + common_vendor.index.redirectTo({ + url: "/pages/order/index" + }); + } + } + }); } } catch (error) { - common_vendor.index.showToast({ - title: error.message || "查询订单状态失败", - icon: "none" - }); + common_vendor.index.__f__("error", "at pages/order/payment.vue:332", "查询订单状态失败:", error); + if (retryCount < maxRetries) { + retryCount++; + setTimeout(checkStatus, interval); + } else { + common_vendor.index.showToast({ + title: "查询订单状态失败", + icon: "none" + }); + } } }; checkStatus(); diff --git a/unpackage/dist/dev/mp-weixin/pages/order/return-success.js b/unpackage/dist/dev/mp-weixin/pages/order/return-success.js new file mode 100644 index 0000000..0dbe3f9 --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/order/return-success.js @@ -0,0 +1,108 @@ +"use strict"; +const common_vendor = require("../../common/vendor.js"); +const config_user = require("../../config/user.js"); +const _sfc_main = { + data() { + return { + orderId: "", + orderInfo: { + orderNo: "", + deviceNo: "", + startTime: "", + usedTime: "", + currentFee: "0.00", + deposit: "99.00", + refundAmount: "99.00", + endTime: "" + } + }; + }, + onLoad(options) { + if (options && options.orderId) { + this.orderId = options.orderId; + this.loadOrderInfo(); + } else { + common_vendor.index.showToast({ + title: "订单信息不存在", + icon: "none" + }); + setTimeout(() => { + this.goToHome(); + }, 1500); + } + }, + methods: { + async loadOrderInfo() { + try { + common_vendor.index.showLoading({ + title: "加载中" + }); + const res = await config_user.queryById(this.orderId); + common_vendor.index.__f__("log", "at pages/order/return-success.vue:101", "归还成功页面获取的订单数据:", JSON.stringify(res.data)); + if (res.code === 200 && res.data) { + const orderData = res.data; + common_vendor.index.__f__("log", "at pages/order/return-success.vue:105", "订单的开始时间:", orderData.startTime); + common_vendor.index.__f__("log", "at pages/order/return-success.vue:106", "订单的创建时间:", orderData.createTime); + const deposit = 99; + const fee = parseFloat(orderData.currentFee || orderData.actualDeviceAmount || orderData.payAmount || "0"); + const refundAmount = (deposit - fee).toFixed(2); + this.orderInfo = { + orderNo: orderData.orderNo || orderData.orderId, + deviceNo: orderData.deviceNo, + startTime: orderData.startTime || orderData.createTime || "-", + usedTime: orderData.usedTime || "-", + currentFee: orderData.currentFee || orderData.actualDeviceAmount || orderData.payAmount || "0.00", + deposit: deposit.toFixed(2), + refundAmount, + endTime: orderData.endTime || this.formatTime(/* @__PURE__ */ new Date()) + }; + common_vendor.index.__f__("log", "at pages/order/return-success.vue:124", "处理后的订单信息:", JSON.stringify(this.orderInfo)); + } else { + throw new Error("获取订单信息失败"); + } + common_vendor.index.hideLoading(); + } catch (error) { + common_vendor.index.hideLoading(); + common_vendor.index.showToast({ + title: error.message || "获取订单信息失败", + icon: "none" + }); + } + }, + formatTime(date) { + const year = date.getFullYear(); + const month = (date.getMonth() + 1).toString().padStart(2, "0"); + const day = date.getDate().toString().padStart(2, "0"); + const hour = date.getHours().toString().padStart(2, "0"); + const minute = date.getMinutes().toString().padStart(2, "0"); + const second = date.getSeconds().toString().padStart(2, "0"); + return `${year}-${month}-${day} ${hour}:${minute}:${second}`; + }, + goToHome() { + common_vendor.index.switchTab({ + url: "/pages/index/index" + }); + }, + goToOrderList() { + common_vendor.index.redirectTo({ + url: "/pages/order/index" + }); + } + } +}; +function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { + return { + a: common_vendor.t($data.orderInfo.orderNo || "-"), + b: common_vendor.t($data.orderInfo.deviceNo || "-"), + c: common_vendor.t($data.orderInfo.usedTime || "-"), + d: common_vendor.t($data.orderInfo.currentFee || "0.00"), + e: common_vendor.t($data.orderInfo.endTime || "-"), + f: common_vendor.t($data.orderInfo.deposit || "99.00"), + g: common_vendor.t($data.orderInfo.refundAmount || "99.00"), + h: common_vendor.o((...args) => $options.goToHome && $options.goToHome(...args)), + i: common_vendor.o((...args) => $options.goToOrderList && $options.goToOrderList(...args)) + }; +} +const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-eb1f1ee2"]]); +wx.createPage(MiniProgramPage); +//# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/order/return-success.js.map diff --git a/unpackage/dist/dev/mp-weixin/pages/order/return-success.json b/unpackage/dist/dev/mp-weixin/pages/order/return-success.json new file mode 100644 index 0000000..0bd5924 --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/order/return-success.json @@ -0,0 +1,6 @@ +{ + "navigationBarTitleText": "归还成功", + "navigationBarBackgroundColor": "#ffffff", + "navigationBarTextStyle": "black", + "usingComponents": {} +} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/order/return-success.wxml b/unpackage/dist/dev/mp-weixin/pages/order/return-success.wxml new file mode 100644 index 0000000..b7f5cdf --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/order/return-success.wxml @@ -0,0 +1 @@ +归还成功您的充电宝已归还，押金已退回订单信息订单号{{a}}设备号{{b}}使用时长{{c}}费用￥{{d}}归还时间{{e}}退还信息押金￥{{f}}退还金额￥{{g}}退还状态已退还 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/order/return-success.wxss b/unpackage/dist/dev/mp-weixin/pages/order/return-success.wxss new file mode 100644 index 0000000..a7fc30c --- /dev/null +++ b/unpackage/dist/dev/mp-weixin/pages/order/return-success.wxss @@ -0,0 +1,139 @@ +/** + * 这里是uni-app内置的常用样式变量 + * + * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量 + * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App + * + */ +/** + * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能 + * + * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件 + */ +/* 颜色变量 */ +/* 行为相关颜色 */ +/* 文字基本颜色 */ +/* 背景颜色 */ +/* 边框颜色 */ +/* 尺寸变量 */ +/* 文字尺寸 */ +/* 图片尺寸 */ +/* Border Radius */ +/* 水平间距 */ +/* 垂直间距 */ +/* 透明度 */ +/* 文章场景相关 */ +.success-container.data-v-eb1f1ee2 { + padding: 20px; + background-color: #f8f8f8; + min-height: 100vh; +} +.status-card.data-v-eb1f1ee2 { + background-color: #fff; + border-radius: 12px; + padding: 30px; + text-align: center; + margin-bottom: 20px; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04); +} +.status-card .status-icon.data-v-eb1f1ee2 { + width: 60px; + height: 60px; + margin: 0 auto 16px; +} +.status-card .status-icon.success.data-v-eb1f1ee2 { + background-color: #07c160; + border-radius: 50%; + position: relative; +} +.status-card .status-icon.success.data-v-eb1f1ee2::after { + content: ""; + position: absolute; + left: 50%; + top: 50%; + width: 30px; + height: 20px; + border: 3px solid #fff; + border-top: none; + border-right: none; + transform-origin: center; + transform: translate(-50%, -70%) rotate(-45deg); +} +.status-card .status-text.data-v-eb1f1ee2 { + font-size: 24px; + font-weight: bold; + color: #07c160; + margin-bottom: 8px; +} +.status-card .status-desc.data-v-eb1f1ee2 { + font-size: 14px; + color: #666; +} +.order-card.data-v-eb1f1ee2, .refund-card.data-v-eb1f1ee2 { + background-color: #fff; + border-radius: 12px; + padding: 20px; + margin-bottom: 20px; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04); +} +.order-card .card-title.data-v-eb1f1ee2, .refund-card .card-title.data-v-eb1f1ee2 { + font-size: 16px; + font-weight: bold; + margin-bottom: 16px; + color: #333; + border-bottom: 1px solid #f0f0f0; + padding-bottom: 10px; +} +.order-card .info-item.data-v-eb1f1ee2, .refund-card .info-item.data-v-eb1f1ee2 { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 12px; +} +.order-card .info-item.data-v-eb1f1ee2:last-child, .refund-card .info-item.data-v-eb1f1ee2:last-child { + margin-bottom: 0; +} +.order-card .info-item .label.data-v-eb1f1ee2, .refund-card .info-item .label.data-v-eb1f1ee2 { + color: #666; + font-size: 14px; +} +.order-card .info-item .value.data-v-eb1f1ee2, .refund-card .info-item .value.data-v-eb1f1ee2 { + color: #333; + font-size: 14px; +} +.order-card .info-item .value.highlight.data-v-eb1f1ee2, .refund-card .info-item .value.highlight.data-v-eb1f1ee2 { + color: #ff6b00; + font-weight: bold; + font-size: 16px; +} +.order-card .info-item .value.success.data-v-eb1f1ee2, .refund-card .info-item .value.success.data-v-eb1f1ee2 { + color: #07c160; +} +.button-group.data-v-eb1f1ee2 { + margin-top: 30px; + display: flex; + flex-direction: column; + gap: 16px; +} +.button-group .primary-btn.data-v-eb1f1ee2 { + background-color: #07c160; + color: #fff; + border: none; + border-radius: 24px; + padding: 12px; + font-size: 16px; +} +.button-group .primary-btn.data-v-eb1f1ee2:active { + opacity: 0.8; +} +.button-group .secondary-btn.data-v-eb1f1ee2 { + background-color: #fff; + color: #07c160; + border: 1px solid #07c160; + border-radius: 24px; + padding: 12px; + font-size: 16px; +} +.button-group .secondary-btn.data-v-eb1f1ee2:active { + background-color: #f5f5f5; +} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/order/success.js b/unpackage/dist/dev/mp-weixin/pages/order/success.js index 7ea6aba..f05e875 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/success.js +++ b/unpackage/dist/dev/mp-weixin/pages/order/success.js @@ -5,13 +5,20 @@ const _sfc_main = { data() { return { orderId: "", - orderInfo: {} + orderInfo: {}, + isLoading: true, + deviceMessage: "正在准备您的设备，请稍候...", + hasTriggeredDevice: false }; }, onLoad(options) { if (options && options.orderId) { this.orderId = options.orderId; this.loadOrderInfo(); + common_vendor.index.$once("orderSuccess:" + this.orderId, () => { + common_vendor.index.__f__("log", "at pages/order/success.vue:67", "已经触发过弹出逻辑，不再重复触发"); + this.hasTriggeredDevice = true; + }); } else { common_vendor.index.showToast({ title: "订单信息不存在", @@ -34,9 +41,19 @@ const _sfc_main = { this.orderInfo = { orderNo: orderData.orderNo || orderData.orderId, deviceNo: orderData.deviceNo, - amount: orderData.amount, - payTime: this.formatTime(/* @__PURE__ */ new Date()) + amount: orderData.payAmount || orderData.amount, + payTime: orderData.payTime || this.formatTime(/* @__PURE__ */ new Date()) }; + if (orderData.orderStatus === "IN_USED") { + this.deviceMessage = "设备已弹出，请取走您的充电宝"; + this.isLoading = false; + if (!this.hasTriggeredDevice) { + common_vendor.index.$emit("orderSuccess:" + this.orderId); + this.hasTriggeredDevice = true; + } + } else { + this.triggerDeviceEject(); + } } else { throw new Error("获取订单信息失败"); } @@ -49,6 +66,47 @@ const _sfc_main = { }); } }, + // 触发弹出充电宝 + async triggerDeviceEject() { + if (this.hasTriggeredDevice) { + common_vendor.index.__f__("log", "at pages/order/success.vue:129", "已经触发过弹出充电宝，不重复触发"); + return; + } + this.hasTriggeredDevice = true; + common_vendor.index.$emit("orderSuccess:" + this.orderId); + this.isLoading = true; + this.deviceMessage = "正在准备您的设备，请稍候..."; + try { + common_vendor.index.__f__("log", "at pages/order/success.vue:139", `准备触发弹出充电宝，orderId: ${this.orderId}`); + let result; + try { + result = await config_user.confirmPaymentAndRent(this.orderId); + common_vendor.index.__f__("log", "at pages/order/success.vue:145", "确认支付并弹出充电宝结果:", JSON.stringify(result)); + } catch (error) { + common_vendor.index.__f__("error", "at pages/order/success.vue:147", "确认支付并弹出失败，尝试备用方法:", error); + result = await config_user.sendRentCommand(this.orderId); + common_vendor.index.__f__("log", "at pages/order/success.vue:150", "发送租借指令结果:", JSON.stringify(result)); + } + if (result && result.code === 200) { + this.deviceMessage = "设备已弹出，请取走您的充电宝"; + common_vendor.index.showToast({ + title: "充电宝已弹出", + icon: "success" + }); + } else { + throw new Error(result && result.msg || "弹出充电宝失败"); + } + } catch (error) { + common_vendor.index.__f__("error", "at pages/order/success.vue:163", "弹出充电宝错误:", error); + this.deviceMessage = "弹出设备失败，请联系客服"; + common_vendor.index.showToast({ + title: error.message || "弹出充电宝失败，请联系客服", + icon: "none" + }); + } finally { + this.isLoading = false; + } + }, formatTime(date) { const year = date.getFullYear(); const month = (date.getMonth() + 1).toString().padStart(2, "0"); @@ -71,14 +129,17 @@ const _sfc_main = { } }; function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { - return { + return common_vendor.e({ a: common_vendor.t($data.orderInfo.orderNo || "-"), b: common_vendor.t($data.orderInfo.deviceNo || "-"), c: common_vendor.t($data.orderInfo.amount || "0.00"), d: common_vendor.t($data.orderInfo.payTime || "-"), - e: common_vendor.o((...args) => $options.goToHome && $options.goToHome(...args)), - f: common_vendor.o((...args) => $options.goToOrderList && $options.goToOrderList(...args)) - }; + e: common_vendor.t($data.deviceMessage), + f: $data.isLoading + }, $data.isLoading ? {} : {}, { + g: common_vendor.o((...args) => $options.goToHome && $options.goToHome(...args)), + h: common_vendor.o((...args) => $options.goToOrderList && $options.goToOrderList(...args)) + }); } const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-2795c576"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/order/success.wxml b/unpackage/dist/dev/mp-weixin/pages/order/success.wxml index 8221df9..5f0f785 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/success.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/order/success.wxml @@ -1 +1 @@ -支付成功您的订单已支付成功订单信息订单号{{a}}设备号{{b}}支付金额￥{{c}}支付时间{{d}} \ No newline at end of file +支付成功您的订单已支付成功订单信息订单号{{a}}设备号{{b}}支付金额￥{{c}}支付时间{{d}}{{e}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/order/success.wxss b/unpackage/dist/dev/mp-weixin/pages/order/success.wxss index b65872a..ab42c95 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/success.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/order/success.wxss @@ -93,6 +93,40 @@ color: #333; font-size: 14px; } +.device-status.data-v-2795c576 { + background-color: #fff; + border-radius: 12px; + padding: 20px; + margin-bottom: 20px; + text-align: center; +} +.device-status .status-message.data-v-2795c576 { + font-size: 16px; + color: #333; + margin-bottom: 12px; +} +.device-status .loading-animation.data-v-2795c576 { + display: flex; + justify-content: center; + align-items: center; + height: 40px; +} +.device-status .loading-animation .loading-circle.data-v-2795c576 { + width: 30px; + height: 30px; + border-radius: 50%; + border: 3px solid #f0f0f0; + border-top-color: #07c160; + animation: spin-2795c576 1s linear infinite; +} +@keyframes spin-2795c576 { +0% { + transform: rotate(0deg); +} +100% { + transform: rotate(360deg); +} +} .button-group.data-v-2795c576 { margin-top: 30px; display: flex; diff --git a/unpackage/dist/dev/mp-weixin/pages/return/index.js b/unpackage/dist/dev/mp-weixin/pages/return/index.js index ad07764..c634427 100644 --- a/unpackage/dist/dev/mp-weixin/pages/return/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/return/index.js @@ -8,39 +8,62 @@ const _sfc_main = { orderInfo: { orderId: "", startTime: "", + _rawStartTime: "", + // 用于调试 usedTime: "0分钟", - currentFee: "0.00" + currentFee: "0.00", + orderStatus: "in_used" + // 默认状态为使用中 }, - unlocking: false, - timer: null + timer: null, + statusCheckTimer: null, + maxStatusChecks: 30, + // 最多检查30次 + currentStatusChecks: 0, + statusCheckInterval: 5e3 + // 5秒检查一次 }; }, onLoad(options) { - common_vendor.index.__f__("log", "at pages/return/index.vue:77", "Return page loaded with options:", JSON.stringify(options)); + common_vendor.index.__f__("log", "at pages/return/index.vue:93", "Return page loaded with options:", JSON.stringify(options)); this.orderInfo.orderId = options.orderId || ""; - this.deviceId = options.deviceId || ""; - common_vendor.index.__f__("log", "at pages/return/index.vue:83", `初始化参数: orderId=${this.orderInfo.orderId}, deviceId=${this.deviceId}`); + this.deviceId = options.deviceNo || options.deviceId || ""; + common_vendor.index.__f__("log", "at pages/return/index.vue:99", `初始化参数: orderId=${this.orderInfo.orderId}, deviceId=${this.deviceId}`); if (!this.orderInfo.orderId && this.deviceId) { this.getOrderByDevice(); } else if (this.orderInfo.orderId) { this.getOrderDetails(); this.startTimer(); + this.startStatusCheckTimer(); } else { common_vendor.index.showToast({ title: "缺少订单信息", icon: "none" }); setTimeout(() => { - common_vendor.index.reLaunch({ - url: "/pages/index/index" - }); + this.goToHome(); }, 1500); } }, onUnload() { this.clearTimer(); + this.clearStatusCheckTimer(); }, methods: { + // 根据订单状态获取对应的文字显示 + getOrderStatusText() { + const statusMap = { + "waiting_for_payment": "待支付", + "payment_in_progress": "支付中", + "payment_successful": "支付成功", + "in_used": "使用中", + "payment_failed": "支付失败", + "order_cancelled": "订单取消", + "used_done": "订单完成", + "used_down": "订单完成" + }; + return statusMap[this.orderInfo.orderStatus] || "使用中"; + }, // 获取订单详情 async getOrderDetails() { try { @@ -48,43 +71,38 @@ const _sfc_main = { if (!this.orderInfo.orderId) { throw new Error("订单ID不能为空"); } - common_vendor.index.__f__("log", "at pages/return/index.vue:122", "请求订单详情, orderId:", this.orderInfo.orderId); + common_vendor.index.__f__("log", "at pages/return/index.vue:155", "请求订单详情, orderId:", this.orderInfo.orderId); const result = await config_user.queryById(this.orderInfo.orderId); - common_vendor.index.__f__("log", "at pages/return/index.vue:124", "订单详情结果:", JSON.stringify(result)); + common_vendor.index.__f__("log", "at pages/return/index.vue:157", "订单详情结果:", JSON.stringify(result)); if (result.code === 200 && result.data) { const orderData = result.data; - common_vendor.index.__f__("log", "at pages/return/index.vue:128", "订单数据:", JSON.stringify(orderData)); - this.updateOrderInfo(orderData); - const rawTime = orderData.startTime; - common_vendor.index.__f__("log", "at pages/return/index.vue:135", "开始时间:", rawTime); - if (rawTime) { - try { - const date = new Date(rawTime.replace(" ", "T")); - if (!isNaN(date.getTime())) { - this.orderInfo.startTime = this.formatTime(date); - } else { - this.orderInfo.startTime = rawTime; - } - } catch (e) { - common_vendor.index.__f__("error", "at pages/return/index.vue:148", "时间格式化错误:", e); - this.orderInfo.startTime = rawTime; - } - } else { - this.orderInfo.startTime = "未知"; + common_vendor.index.__f__("log", "at pages/return/index.vue:161", "订单原始数据:", orderData); + common_vendor.index.__f__("log", "at pages/return/index.vue:162", "开始时间字段:", orderData.startTime, typeof orderData.startTime); + if (orderData.orderStatus) { + this.orderInfo.orderStatus = orderData.orderStatus; } + if (orderData.orderStatus && orderData.orderStatus === "used_down") { + this.clearTimer(); + this.clearStatusCheckTimer(); + common_vendor.index.__f__("log", "at pages/return/index.vue:176", "订单已完成，准备跳转到归还成功页面"); + common_vendor.index.redirectTo({ + url: `/pages/order/return-success?orderId=${this.orderInfo.orderId}` + }); + return; + } + this.updateOrderInfo(orderData); + common_vendor.index.__f__("log", "at pages/return/index.vue:187", "更新后的开始时间:", this.orderInfo.startTime); } else { throw new Error(result.msg || "获取订单详情失败"); } } catch (error) { - common_vendor.index.__f__("error", "at pages/return/index.vue:158", "获取订单详情错误:", error); + common_vendor.index.__f__("error", "at pages/return/index.vue:192", "获取订单详情错误:", error); common_vendor.index.showToast({ title: error.message || "获取订单信息失败", icon: "none" }); setTimeout(() => { - common_vendor.index.reLaunch({ - url: "/pages/index/index" - }); + this.goToHome(); }, 1500); } finally { common_vendor.index.hideLoading(); @@ -101,9 +119,30 @@ const _sfc_main = { }, // 使用后端返回的使用时长和费用数据 updateOrderInfo(orderData) { - common_vendor.index.__f__("log", "at pages/return/index.vue:188", "更新订单信息:", JSON.stringify(orderData)); + common_vendor.index.__f__("log", "at pages/return/index.vue:220", "更新订单信息:", JSON.stringify(orderData)); this.orderInfo.usedTime = orderData.usedTime || "0分钟"; - this.orderInfo.currentFee = orderData.currentFee || "0.00"; + this.orderInfo.currentFee = orderData.currentFee || orderData.actualDeviceAmount || orderData.payAmount || "0.00"; + if (orderData.orderStatus) { + this.orderInfo.orderStatus = orderData.orderStatus; + } + this.orderInfo._rawStartTime = orderData.startTime; + if (orderData.startTime) { + try { + common_vendor.index.__f__("log", "at pages/return/index.vue:239", "API返回的开始时间:", orderData.startTime); + this.orderInfo.startTime = orderData.startTime; + } catch (e) { + common_vendor.index.__f__("error", "at pages/return/index.vue:243", "更新开始时间错误:", e); + this.orderInfo.startTime = "未知"; + } + } else { + common_vendor.index.__f__("warn", "at pages/return/index.vue:247", "API返回的订单数据中没有startTime字段"); + if (orderData.createTime) { + common_vendor.index.__f__("log", "at pages/return/index.vue:250", "使用createTime作为备选:", orderData.createTime); + this.orderInfo.startTime = orderData.createTime; + } else { + this.orderInfo.startTime = "未知"; + } + } if (orderData.deviceNo && !this.deviceId) { this.deviceId = orderData.deviceNo; } @@ -121,54 +160,30 @@ const _sfc_main = { this.timer = null; } }, - // 处理开锁归还 - async handleUnlock() { - if (this.unlocking) - return; - try { - this.unlocking = true; - common_vendor.index.showLoading({ title: "开锁中" }); - const confirmResult = await new Promise((resolve) => { - common_vendor.index.showModal({ - title: "确认归还", - content: "确定要归还设备吗？", - success: (res) => { - resolve(res.confirm); - } - }); - }); - if (!confirmResult) { - this.unlocking = false; - common_vendor.index.hideLoading(); - return; - } - common_vendor.index.__f__("log", "at pages/return/index.vue:239", `准备结束订单, orderId: ${this.orderInfo.orderId}`); - const result = await config_user.overOrderById(this.orderInfo.orderId); - common_vendor.index.__f__("log", "at pages/return/index.vue:244", "结束订单结果:", JSON.stringify(result)); - if (result.code === 200) { - common_vendor.index.showToast({ - title: "归还成功", - icon: "success" - }); - setTimeout(() => { - common_vendor.index.reLaunch({ - url: "/pages/index/index" - }); - }, 1500); - } else { - throw new Error(result.msg || "归还失败"); - } - } catch (error) { - common_vendor.index.__f__("error", "at pages/return/index.vue:262", "归还操作错误:", error); - common_vendor.index.showToast({ - title: error.message || "归还失败，请重试", - icon: "none" - }); - } finally { - this.unlocking = false; - common_vendor.index.hideLoading(); + // 清除状态检查定时器 + clearStatusCheckTimer() { + if (this.statusCheckTimer) { + clearInterval(this.statusCheckTimer); + this.statusCheckTimer = null; } }, + // 开始状态检查定时器 + startStatusCheckTimer() { + this.currentStatusChecks = 0; + this.clearStatusCheckTimer(); + this.statusCheckTimer = setInterval(() => { + this.currentStatusChecks++; + this.checkReturnStatus(); + if (this.currentStatusChecks >= this.maxStatusChecks) { + this.clearStatusCheckTimer(); + common_vendor.index.showToast({ + title: "请手动刷新查看归还状态", + icon: "none", + duration: 3e3 + }); + } + }, this.statusCheckInterval); + }, // 通过设备号查询使用中的订单 async getOrderByDevice() { try { @@ -184,43 +199,65 @@ const _sfc_main = { "Clientid": common_vendor.index.getStorageSync("client_id") } }); - common_vendor.index.__f__("log", "at pages/return/index.vue:292", "通过设备号查询订单结果:", JSON.stringify(inUseRes)); + common_vendor.index.__f__("log", "at pages/return/index.vue:329", "通过设备号查询订单结果:", 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:333", "使用中的订单:", inUseOrder); this.orderInfo.orderId = inUseOrder.orderId; + if (inUseOrder.orderStatus) { + this.orderInfo.orderStatus = inUseOrder.orderStatus; + } + if (inUseOrder.startTime) { + common_vendor.index.__f__("log", "at pages/return/index.vue:345", "inUse API返回的开始时间:", inUseOrder.startTime); + this.orderInfo.startTime = inUseOrder.startTime; + } this.getOrderDetails(); this.startTimer(); + this.startStatusCheckTimer(); } else { throw new Error("未找到使用中的订单"); } } catch (error) { - common_vendor.index.__f__("error", "at pages/return/index.vue:307", "通过设备号查询订单失败:", error); + common_vendor.index.__f__("error", "at pages/return/index.vue:359", "通过设备号查询订单失败:", error); common_vendor.index.showToast({ title: error.message || "获取订单信息失败", icon: "none" }); setTimeout(() => { - common_vendor.index.reLaunch({ - url: "/pages/index/index" - }); + this.goToHome(); }, 1500); } finally { common_vendor.index.hideLoading(); } + }, + // 检查归还状态 + async checkReturnStatus() { + try { + await this.getOrderDetails(); + } catch (error) { + common_vendor.index.__f__("error", "at pages/return/index.vue:379", "检查归还状态失败:", error); + } + }, + // 返回首页 + goToHome() { + common_vendor.index.reLaunch({ + url: "/pages/index/index" + }); } } }; function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { - return { - a: common_vendor.t($data.orderInfo.orderId), - b: common_vendor.t($data.deviceId), - c: common_vendor.t($data.orderInfo.startTime), - d: common_vendor.t($data.orderInfo.usedTime), - e: common_vendor.t($data.orderInfo.currentFee), - f: common_vendor.t($data.unlocking ? "开锁中..." : "开锁归还"), - g: common_vendor.o((...args) => $options.handleUnlock && $options.handleUnlock(...args)), - h: $data.unlocking - }; + return common_vendor.e({ + 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) + }, {}, { + j: common_vendor.o((...args) => $options.checkReturnStatus && $options.checkReturnStatus(...args)), + k: 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"]]); wx.createPage(MiniProgramPage); diff --git a/unpackage/dist/dev/mp-weixin/pages/return/index.wxml b/unpackage/dist/dev/mp-weixin/pages/return/index.wxml index a67b208..e9cee0a 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}}归还说明请确保设备完好无损请在指定区域内归还设备归还后押金将自动退还 \ No newline at end of file +{{a}}订单号：{{b}}共享风扇设备号：{{c}}开始时间{{d}}已使用时长{{e}}当前费用￥{{f}}调试信息原始开始时间: {{g}}处理后开始时间: {{h}}订单状态: {{i}}归还说明请确保设备完好无损将充电宝插入原位置或空闲插口系统将自动检测归还并处理退款归还成功后将自动跳转到成功页面 \ 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 08c0c70..5071ea6 100644 --- a/unpackage/dist/dev/mp-weixin/pages/return/index.wxss +++ b/unpackage/dist/dev/mp-weixin/pages/return/index.wxss @@ -44,46 +44,52 @@ margin-bottom: 30rpx; } .return-container .order-card .order-header .title.data-v-6d22bdf8 { - font-size: 36rpx; - font-weight: 600; - color: #1976D2; + font-size: 32rpx; + font-weight: bold; + color: #333; } .return-container .order-card .order-header .order-no.data-v-6d22bdf8 { font-size: 24rpx; color: #999; } .return-container .order-card .device-info.data-v-6d22bdf8 { - margin-bottom: 20rpx; + margin-bottom: 30rpx; } .return-container .order-card .device-info .device-name.data-v-6d22bdf8 { - font-size: 32rpx; - font-weight: 500; + font-size: 28rpx; color: #333; - margin-right: 20rpx; + display: block; + margin-bottom: 10rpx; } .return-container .order-card .device-info .device-id.data-v-6d22bdf8 { font-size: 24rpx; color: #666; } +.return-container .order-card .time-info.data-v-6d22bdf8 { + background: #f9f9f9; + border-radius: 16rpx; + padding: 20rpx; +} .return-container .order-card .time-info .time-item.data-v-6d22bdf8 { display: flex; justify-content: space-between; + align-items: center; margin-bottom: 16rpx; } .return-container .order-card .time-info .time-item.data-v-6d22bdf8:last-child { margin-bottom: 0; } .return-container .order-card .time-info .time-item .label.data-v-6d22bdf8 { - font-size: 28rpx; + font-size: 26rpx; color: #666; } .return-container .order-card .time-info .time-item .value.data-v-6d22bdf8 { - font-size: 28rpx; + font-size: 26rpx; color: #333; } .return-container .order-card .time-info .time-item .value.highlight.data-v-6d22bdf8 { - color: #1976D2; - font-weight: 500; + color: #ff6b00; + font-weight: bold; } .return-container .notice-card.data-v-6d22bdf8 { background: #fff; @@ -93,14 +99,14 @@ box-shadow: 0 4rpx 16rpx rgba(0, 0, 0, 0.04); } .return-container .notice-card .notice-title.data-v-6d22bdf8 { - font-size: 32rpx; - font-weight: 600; + font-size: 28rpx; + font-weight: bold; color: #333; - margin-bottom: 24rpx; + margin-bottom: 20rpx; } .return-container .notice-card .notice-list .notice-item.data-v-6d22bdf8 { display: flex; - align-items: center; + align-items: flex-start; margin-bottom: 16rpx; } .return-container .notice-card .notice-list .notice-item.data-v-6d22bdf8:last-child { @@ -109,12 +115,14 @@ .return-container .notice-card .notice-list .notice-item .dot.data-v-6d22bdf8 { width: 12rpx; height: 12rpx; - background: #1976D2; + background: #07c160; border-radius: 50%; + margin-top: 10rpx; margin-right: 16rpx; + flex-shrink: 0; } .return-container .notice-card .notice-list .notice-item text.data-v-6d22bdf8 { - font-size: 28rpx; + font-size: 26rpx; color: #666; line-height: 1.5; } @@ -123,30 +131,33 @@ left: 0; right: 0; bottom: 0; + padding: 30rpx; background: #fff; - padding: 20rpx 30rpx; - padding-bottom: calc(20rpx + env(safe-area-inset-bottom)); - display: flex; - align-items: center; - justify-content: center; box-shadow: 0 -4rpx 16rpx rgba(0, 0, 0, 0.04); -} -.return-container .bottom-bar .unlock-btn.data-v-6d22bdf8 { - width: 100%; - height: 88rpx; - border-radius: 44rpx; - background: linear-gradient(135deg, #FF9800, #FFB74D); - color: #fff; - font-size: 32rpx; - font-weight: 600; + z-index: 10; display: flex; - align-items: center; - justify-content: center; - border: none; + justify-content: space-between; + gap: 20rpx; } -.return-container .bottom-bar .unlock-btn.data-v-6d22bdf8:active { - transform: scale(0.98); +.return-container .bottom-bar .primary-btn.data-v-6d22bdf8, .return-container .bottom-bar .secondary-btn.data-v-6d22bdf8 { + height: 88rpx; + line-height: 88rpx; + font-size: 32rpx; + border-radius: 44rpx; + text-align: center; + flex: 1; } -.return-container .bottom-bar .unlock-btn.data-v-6d22bdf8:disabled { - opacity: 0.7; +.return-container .bottom-bar .primary-btn.data-v-6d22bdf8 { + background: #07c160; + color: #fff; +} +.return-container .bottom-bar .primary-btn.data-v-6d22bdf8:active { + opacity: 0.8; +} +.return-container .bottom-bar .secondary-btn.data-v-6d22bdf8 { + background: #f0f0f0; + color: #333; +} +.return-container .bottom-bar .secondary-btn.data-v-6d22bdf8:active { + opacity: 0.8; } \ No newline at end of file