From 2a7c6c8e03ffc910fff345f86c4e5719f401e21f Mon Sep 17 00:00:00 2001 From: ISFP_T <68358856@qq.com> Date: Mon, 19 Jan 2026 09:16:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=98=BF=E9=87=8C=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/OrderItemCard.vue | 18 +-- config/api/order.js | 12 +- docs/支付宝支付接口文档.md | 207 +++++++++++++++++++++++++++++++++++ locale/en-US.js | 11 +- locale/zh-CN.js | 12 +- pages/device/detail.vue | 4 +- pages/index/index.vue | 2 +- pages/legal/agreement-en.vue | 14 +-- pages/legal/agreement-zh.vue | 12 +- pages/legal/privacy-en.vue | 8 +- pages/legal/privacy-zh.vue | 6 +- pages/order/detail.vue | 6 +- pages/return/index.vue | 30 ++--- 13 files changed, 272 insertions(+), 70 deletions(-) create mode 100644 docs/支付宝支付接口文档.md diff --git a/components/OrderItemCard.vue b/components/OrderItemCard.vue index b6aa46c..e12918f 100644 --- a/components/OrderItemCard.vue +++ b/components/OrderItemCard.vue @@ -8,22 +8,22 @@ - - + + - {{ $t('order.wxPayScore') }} + {{ $t('order.alipayScore') }} | {{ $t('order.depositFree') }} - + {{ $t('order.whitelistOrder') }} - + {{ $t('order.memberOrder') }} - {{ $t('order.wxPay') }} + {{ $t('order.alipayPay') }} | {{ $t('order.depositPay') }} @@ -272,8 +272,8 @@ border-radius: 8rpx; white-space: nowrap; - &.wx-score { - background: rgba(7, 193, 96, 0.08); + &.alipay-score { + background: rgba(0, 122, 255, 0.08); .badge-icon { width: 32rpx; @@ -283,7 +283,7 @@ .badge-text { font-size: 22rpx; - color: #07c160; + color: #007AFF; display: flex; align-items: center; diff --git a/config/api/order.js b/config/api/order.js index c00f868..a634694 100644 --- a/config/api/order.js +++ b/config/api/order.js @@ -76,21 +76,21 @@ export const getOrderByOrderNo = (orderNo) => { }) } -// 通过订单号获取支付分订单信息 +// 通过订单号创建支付宝支付订单（芝麻信用免押） export const getOrderByOrderNoScore = (orderNo) => { - console.log('通过订单号获取支付分订单信息', orderNo); + console.log('通过订单号创建支付宝支付订单（芝麻信用免押）', orderNo); return request({ - url: `/app/wx-payment/score/create/${orderNo}`, + url: `/app/ali-payment/create/${orderNo}`, method: 'get', hideLoading: true }) } -// 通过订单号获取支付分订单状态 +// 通过订单号查询支付宝订单支付状态 export const getOrderByOrderNoScorePayStatus = (orderNo) => { - console.log('通过订单号获取支付分订单状态', orderNo); + console.log('通过订单号查询支付宝订单支付状态', orderNo); return request({ - url: `/app/wx-payment/score/status/${orderNo}`, + url: `/app/ali-payment/status/${orderNo}`, method: 'get', hideLoading: true }) diff --git a/docs/支付宝支付接口文档.md b/docs/支付宝支付接口文档.md new file mode 100644 index 0000000..1c0b5bc --- /dev/null +++ b/docs/支付宝支付接口文档.md @@ -0,0 +1,207 @@ +# 支付宝支付接口文档 + +## 接口概述 +本文档描述支付宝支付相关的API接口，包括创建支付订单和查询支付状态。 + +--- + +## 1. 创建支付宝支付订单 + +### 接口描述 +创建支付宝支付订单，用于扫码预下单并返回二维码。 + +### 请求信息 + +#### 请求URL +``` +GET /app/ali-payment/create/{orderNo} +``` + +#### 请求方式 +`GET` + +#### 请求参数 + +| 参数名 | 参数类型 | 是否必填 | 参数位置 | 参数说明 | +|--------|----------|----------|----------|----------| +| orderNo | String | 是 | Path | 订单号 | + +#### 请求示例 +```http +GET /app/ali-payment/create/ORD20231223001 +``` + +### 响应信息 + +#### 响应参数 + +| 参数名 | 参数类型 | 参数说明 | +|--------|----------|----------| +| code | Integer | 响应状态码，200表示成功 | +| msg | String | 响应消息 | +| data | Object | 返回数据，包含支付宝支付相关信息 | + +#### 响应示例 + +成功响应： +```json +{ + "code": 200, + "msg": "操作成功", + "data": { + "qrCode": "https://qr.alipay.com/xxx", + "outTradeNo": "ORD20231223001", + "totalAmount": "99.00" + } +} +``` + +失败响应： +```json +{ + "code": 500, + "msg": "订单不存在或已支付" +} +``` + +### 错误码说明 + +| 错误码 | 说明 | +|--------|------| +| 200 | 创建成功 | +| 400 | 参数错误，订单号不能为空 | +| 500 | 系统错误或订单状态异常 | + +--- + +## 2. 查询订单支付状态 + +### 接口描述 +查询指定订单的支付状态。 + +### 请求信息 + +#### 请求URL +``` +GET /app/ali-payment/status/{orderNo} +``` + +#### 请求方式 +`GET` + +#### 请求参数 + +| 参数名 | 参数类型 | 是否必填 | 参数位置 | 参数说明 | +|--------|----------|----------|----------|----------| +| orderNo | String | 是 | Path | 订单号 | + +#### 请求示例 +```http +GET /app/ali-payment/status/ORD20231223001 +``` + +### 响应信息 + +#### 响应参数 + +| 参数名 | 参数类型 | 参数说明 | +|--------|----------|----------| +| code | Integer | 响应状态码，200表示成功 | +| msg | String | 响应消息 | +| data | Object | 订单支付状态信息 | +| data.tradeStatus | String | 交易状态（WAIT_BUYER_PAY-等待支付，TRADE_SUCCESS-支付成功，TRADE_CLOSED-交易关闭） | +| data.tradeNo | String | 支付宝交易号 | +| data.totalAmount | String | 订单金额 | +| data.buyerPayAmount | String | 买家实付金额 | + +#### 响应示例 + +支付成功响应： +```json +{ + "code": 200, + "msg": "操作成功", + "data": { + "tradeStatus": "TRADE_SUCCESS", + "tradeNo": "2023122322001234567890", + "outTradeNo": "ORD20231223001", + "totalAmount": "99.00", + "buyerPayAmount": "99.00", + "buyerLogonId": "158****5620" + } +} +``` + +等待支付响应： +```json +{ + "code": 200, + "msg": "操作成功", + "data": { + "tradeStatus": "WAIT_BUYER_PAY", + "outTradeNo": "ORD20231223001", + "totalAmount": "99.00" + } +} +``` + +失败响应： +```json +{ + "code": 500, + "msg": "订单不存在" +} +``` + +### 支付状态说明 + +| 状态码 | 说明 | +|--------|------| +| WAIT_BUYER_PAY | 交易创建，等待买家付款 | +| TRADE_CLOSED | 未付款交易超时关闭，或支付完成后全额退款 | +| TRADE_SUCCESS | 交易支付成功 | +| TRADE_FINISHED | 交易结束，不可退款 | + +--- + +## 公共说明 + +### 基础路径 +``` +http://your-domain.com/app/ali-payment +``` + +### 请求头 +``` +Content-Type: application/json +``` + +### 注意事项 + +1. **订单号格式**：订单号必须唯一，建议使用系统生成的订单编号 +2. **幂等性**：同一订单号多次调用创建接口，返回相同的支付信息 +3. **超时处理**：支付订单创建后，建议在15分钟内完成支付 +4. **状态查询**：建议在支付完成后通过回调通知处理业务逻辑，状态查询接口用于补充查询 +5. **安全性**：生产环境建议添加签名验证和请求频率限制 + +### 业务流程 + +``` +1. 用户发起租借 → 系统创建订单 +2. 调用创建支付接口 → 返回支付二维码 +3. 用户扫码支付 → 支付宝处理支付 +4. 支付宝回调通知 → 系统更新订单状态 +5. 前端轮询状态接口 → 确认支付结果 +6. 支付成功 → 触发开锁逻辑 +``` + +--- + +## 联系方式 + +如有问题，请联系技术支持团队。 + +**文档版本**：v1.0 +**最后更新**：2025-12-23 +**维护人员**：开发团队 + diff --git a/locale/en-US.js b/locale/en-US.js index 1b7cb3f..7b4ac63 100644 --- a/locale/en-US.js +++ b/locale/en-US.js @@ -97,7 +97,7 @@ export default { step1Title: 'Scan QR Code', step1Desc: 'Find a device and scan its QR code', step2Title: 'No Deposit', - step2Desc: 'Rent with WeChat Pay Score, no deposit needed', + step2Desc: 'Rent with Sesame Credit, no deposit needed', step3Title: 'Start Using', step3Desc: 'Device unlocks, take out the fan', step4Title: 'Return', @@ -134,7 +134,7 @@ export default { autoChargeOvertime: 'Overtime will be charged automatically by hour', useInDesignatedArea: 'Please use the device in designated area', rentDepositFree: 'Rent Deposit-free', - wxPayScoreDesc: 'WeChat Pay Score | 550+ points enjoy', + alipayScoreDesc: 'Sesame Credit | 550+ points enjoy', checking: 'Checking', deviceNoNotRecognized: 'Device number not recognized', processFailed: 'Process failed, please try again later', @@ -144,7 +144,7 @@ export default { rentSuccess: 'Rent successful', rentFailedRetry: 'Rent failed, please retry', getPayParamsFailed: 'Failed to get payment parameters', - payScoreFailedCancelled: 'Pay score call failed, order cancelled' + payScoreFailedCancelled: 'Credit payment failed, order cancelled' }, order: { @@ -190,11 +190,11 @@ export default { returnFailed: 'Return failed', confirmCancel: 'Confirm to cancel order?', confirmReturn: 'Confirm to return device?', - wxPayScore: 'WeChat Pay Score', + alipayScore: 'Sesame Credit', + alipayPay: 'Alipay', depositFree: 'Deposit-free', whitelistOrder: 'Whitelist Order', memberOrder: 'Member Order', - wxPay: 'WeChat Pay', depositPay: 'Deposit Pay', paymentInProgress: 'Payment in Progress', paymentFailedRetry: 'Payment failed, please try again', @@ -318,7 +318,6 @@ export default { payment: { paymentAmount: 'Amount', paymentMethod: 'Method', - wechatPay: 'WeChat', alipay: 'Alipay', balance: 'Balance', payNow: 'Pay', diff --git a/locale/zh-CN.js b/locale/zh-CN.js index 35c82d8..369603f 100644 --- a/locale/zh-CN.js +++ b/locale/zh-CN.js @@ -97,7 +97,7 @@ export default { step1Title: '扫码使用', step1Desc: '找到附近设备，扫描设备上的二维码', step2Title: '免押金支付', - step2Desc: '无需支付押金，使用支付分免押即可完成租借', + step2Desc: '无需支付押金，使用芝麻信用免押即可完成租借', step3Title: '开始使用', step3Desc: '设备自动解锁，风扇弹出后取出即可开始使用', step4Title: '归还设备', @@ -134,8 +134,7 @@ export default { autoChargeOvertime: '超出使用时间将自动按小时计费', useInDesignatedArea: '请在指定区域内使用设备', rentDepositFree: '免押金租借', - wxPayScoreDesc: '微信支付分 | 550分以上优享', - alipayScoreDesc: '支付宝信用免押 | 550分以上优享', + alipayScoreDesc: '芝麻信用免押 | 550分以上优享', checking: '检查中', deviceNoNotRecognized: '未识别到设备编号', processFailed: '处理失败，请稍后重试', @@ -145,7 +144,7 @@ export default { rentSuccess: '租借成功', rentFailedRetry: '租借失败，请重试', getPayParamsFailed: '获取支付参数失败', - payScoreFailedCancelled: '支付分调用失败，订单已取消' + payScoreFailedCancelled: '信用支付调用失败，订单已取消' }, order: { @@ -191,12 +190,10 @@ export default { returnFailed: '归还失败', confirmCancel: '确认取消订单？', confirmReturn: '确认归还设备？', - wxPayScore: '微信支付分', - alipayScore: '支付宝信用免押', + alipayScore: '芝麻信用免押', depositFree: '免押租借', whitelistOrder: '白名单订单', memberOrder: '会员订单', - wxPay: '微信支付', alipayPay: '支付宝支付', depositPay: '押金租借', paymentInProgress: '支付中', @@ -322,7 +319,6 @@ export default { payment: { paymentAmount: '支付金额', paymentMethod: '支付方式', - wechatPay: '微信支付', alipayPay: '支付宝支付', alipay: '支付宝', balance: '余额支付', diff --git a/pages/device/detail.vue b/pages/device/detail.vue index c06843e..5525c70 100644 --- a/pages/device/detail.vue +++ b/pages/device/detail.vue @@ -480,7 +480,7 @@ const order = rentResult.data console.log('订单信息', order); - if (payWay == 'alipay-pay' || payWay == 'wx-pay') { + if (payWay == 'alipay-pay') { // 当支付方式为押金支付时 uni.hideLoading() const res = await getOrderByOrderNo(order.orderNo); @@ -495,7 +495,7 @@ url: `/pages/order/payment?orderId=${order.orderId}&packagePrice=${packagePrice}&totalAmount=${totalAmount}&depositAmount=${deposit}${deviceInfo.value && deviceInfo.value.feeConfig ? '&feeConfig=' + encodeURIComponent(deviceInfo.value.feeConfig) : ''}` }) - } else if (payWay == 'alipay-score-pay' || payWay == 'wx-score-pay') { + } else if (payWay == 'alipay-score-pay') { // 当支付方式为支付宝信用免押支付时 uni.hideLoading() // 获取支付宝信用免押所需参数 diff --git a/pages/index/index.vue b/pages/index/index.vue index a1b7c66..618755e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -258,7 +258,7 @@ }, { title: '免押金支付', - desc: '无需支付押金，使用支付分免押即可完成租借' + desc: '无需支付押金，使用芝麻信用免押即可完成租借' }, { title: '开始使用', diff --git a/pages/legal/agreement-en.vue b/pages/legal/agreement-en.vue index 6f04523..0e6afee 100644 --- a/pages/legal/agreement-en.vue +++ b/pages/legal/agreement-en.vue @@ -11,7 +11,7 @@ Before using {{ brandName }}, please carefully read and fully understand all contents of this Agreement, especially the terms highlighted in bold (including but not limited to liability limitations, dispute resolution, applicable law, protection of minors, etc.). By clicking "Login/Use" or actually using the service, you are deemed to have read and agreed to be bound by this Agreement. II. Account and Login - 2.1 You can log in and use this service through WeChat authorization. To complete deposit-free rental and order settlement, you agree that we conduct credit assessment and post-order settlement based on WeChat Payment Score. + 2.1 You can log in and use this service through Alipay authorization. To complete deposit-free rental and order settlement, you agree that we conduct credit assessment and post-order settlement based on Sesame Credit. 2.2 You should ensure that the information provided is true, accurate, and complete, and update it in a timely manner. Any service restrictions, order abnormalities, or losses caused by untrue information or failure to update in time shall be borne by you. 2.3 You shall be responsible for all activities under the account, properly keep the device and account credentials, and shall not lend, rent, or otherwise provide them to others. @@ -20,11 +20,11 @@ 3.2 Usage specifications: Please use the device properly, avoid water ingress, dropping, unauthorized disassembly or modification; do not approach open flames and high-temperature environments; avoid outdoor use in rainy days; children should use under supervision. 3.3 Prohibited behaviors: Using the device for illegal or improper purposes; affecting the normal operation of the device or system in any way; circumventing billing or return processes through abnormal means. - IV. Billing and Settlement (Including WeChat Payment Score) - 4.1 Billing rules: Subject to the real-time billing rules displayed in the mini program, which may include duration billing, capped prices, service fees, etc. Charges will be based on this after order generation. - 4.2 WeChat Payment Score deposit-free: If you activate and pass the credit assessment, you can enjoy deposit-free rental; if the assessment fails, pre-authorization or deposit may be required. Please refer to the page prompts for details. - 4.3 Settlement and deduction: After the order ends, we will complete the settlement based on actual usage and platform rules, and deduct through WeChat Payment Score/WeChat Pay. - 4.4 Exceptions and disputes: If you have any objection to billing or settlement, please submit it through "My-Customer Service" within 48 hours after order completion; overdue submissions may affect processing results. + IV. Billing and Settlement (Including Sesame Credit) + 4.1 Billing rules: Subject to the real-time billing rules displayed in the mini program, which may include duration billing, capped prices, service fees, etc. Charges will be based on this after order generation. + 4.2 Sesame Credit deposit-free: If you activate and pass the credit assessment, you can enjoy deposit-free rental; if the assessment fails, pre-authorization or deposit may be required. Please refer to the page prompts for details. + 4.3 Settlement and deduction: After the order ends, we will complete the settlement based on actual usage and platform rules, and deduct through Sesame Credit/Alipay. + 4.4 Exceptions and disputes: If you have any objection to billing or settlement, please submit it through "My-Customer Service" within 48 hours after order completion; overdue submissions may affect processing results. V. Device Return and Overdue Handling 5.1 Return method: Return at designated outlets according to mini program instructions, or send back through the "Express Return" function. Non-designated methods may lead to order abnormalities and additional fees. @@ -49,7 +49,7 @@ 9.2 You should be responsible for your own use. Any losses caused by your violation of this Agreement or improper storage and use of equipment shall be borne by you or compensated to relevant parties. X. Privacy and Personal Information Protection - 10.1 We strictly handle your personal information in accordance with the Privacy Policy, including WeChat login information, mobile phone number (obtained after your authorization), device and order information, location and outlet information, etc. + 10.1 We strictly handle your personal information in accordance with the Privacy Policy, including Alipay login information, mobile phone number (obtained after your authorization), device and order information, location and outlet information, etc. 10.2 For details, please refer to the Privacy Policy in this mini program. XI. Service Changes and Termination diff --git a/pages/legal/agreement-zh.vue b/pages/legal/agreement-zh.vue index ba6167c..694a851 100644 --- a/pages/legal/agreement-zh.vue +++ b/pages/legal/agreement-zh.vue @@ -11,7 +11,7 @@ 在使用{{ brandName }}前，请您务必仔细阅读并充分理解本协议全部内容，尤其是以加粗方式提示的条款（包括但不限于责任限制、争议解决、适用法律、未成年人保护等）。您点击"登录/使用"或实际使用服务即视为您已阅读并同意受本协议约束。 二、账号与登录 - 2.1 您可通过微信授权登录使用本服务。为完成免押租借与订单结算，您同意我们基于微信支付分进行信用评估及订单后结等必要处理。 + 2.1 您可通过支付宝授权登录使用本服务。为完成免押租借与订单结算，您同意我们基于芝麻信用进行信用评估及订单后结等必要处理。 2.2 您应保证提供信息真实、准确、完整，并及时更新。因您提供的信息不真实或未及时更新导致的服务受限、订单异常或损失，由您自行承担。 2.3 您应对账户下的全部行为负责，妥善保管设备与账户凭证，不得转借、出租或以其他方式提供给他人使用。 @@ -20,11 +20,11 @@ 3.2 使用规范：请合理使用设备，避免进水、摔落、私自拆卸或改装；请勿靠近明火与高温环境；室外雨天请避免使用；儿童应在监护下使用。 3.3 禁止行为：将设备用于违法或不当用途；以任何方式影响设备或系统的正常运行；通过非正常手段规避计费或归还流程。 - 四、计费与结算（含微信支付分） - 4.1 计费规则：以小程序展示的实时计费规则为准，可能包含时长计费、封顶价、服务费等。订单生成后将据此计费。 - 4.2 微信支付分免押：若您开通并通过信用评估，可享受免押租借；如评估未通过，可能需预授权或押金。具体以页面提示为准。 - 4.3 结算与扣款：订单结束后，我们将基于实际使用情况与平台规则完成结算并通过微信支付分/微信支付进行扣款。 - 4.4 异常与争议：如对计费或结算有异议，请在订单完成后48小时内通过"我的-客服"提交；逾期可能影响处理结果。 + 四、计费与结算（含芝麻信用） + 4.1 计费规则：以小程序展示的实时计费规则为准，可能包含时长计费、封顶价、服务费等。订单生成后将据此计费。 + 4.2 芝麻信用免押：若您开通并通过信用评估，可享受免押租借；如评估未通过，可能需预授权或押金。具体以页面提示为准。 + 4.3 结算与扣款：订单结束后，我们将基于实际使用情况与平台规则完成结算并通过芝麻信用/支付宝支付进行扣款。 + 4.4 异常与争议：如对计费或结算有异议，请在订单完成后48小时内通过"我的-客服"提交；逾期可能影响处理结果。 五、设备归还与逾期处理 5.1 归还方式：按照小程序指引在指定网点归还，或通过"快递归还"功能寄回。非指定方式可能导致订单异常与额外费用。 diff --git a/pages/legal/privacy-en.vue b/pages/legal/privacy-en.vue index a789de1..12c3d57 100644 --- a/pages/legal/privacy-en.vue +++ b/pages/legal/privacy-en.vue @@ -16,18 +16,18 @@ II. Information We Collect - 2.1 Account information: WeChat login identifier (such as openId/unionId), nickname and avatar (with your authorization), mobile phone number (obtained through WeChat after your authorization). + 2.1 Account information: Alipay login identifier (such as userId), nickname and avatar (with your authorization), mobile phone number (obtained through Alipay after your authorization). 2.2 Order and device information: rental records, usage duration, fees, return points, device status, abnormal records, etc. 2.3 Location and outlet information: used to find nearby outlets and navigation after your authorization, and will not be obtained without authorization. 2.4 Log information: To ensure service security and stability, we may record operation logs, network requests, and error information. III. Purpose of Information Use - 3.1 Provide core functions: identity verification, deposit-free rental (WeChat Payment Score assessment), order billing and settlement, customer service and after-sales. + 3.1 Provide core functions: identity verification, deposit-free rental (Sesame Credit assessment), order billing and settlement, customer service and after-sales. 3.2 Security risk control: prevent fraud, violations and risk control; ensure system and device security. 3.3 Product optimization: statistics and analysis to improve experience (conducted after de-identification/anonymization). - IV. WeChat Payment Score and Payment - 4.1 To implement deposit-free rental, we will conduct necessary data interaction with WeChat Payment Score (such as credit assessment results and order settlement). Related data processing follows the rules of WeChat Pay and WeChat Payment Score. + IV. Sesame Credit and Payment + 4.1 To implement deposit-free rental, we will conduct necessary data interaction with Sesame Credit (such as credit assessment results and order settlement). Related data processing follows the rules of Alipay and Sesame Credit. 4.2 If you fail the assessment, pre-authorization or deposit processing may be required, subject to page prompts. V. Sharing, Transfer and Public Disclosure diff --git a/pages/legal/privacy-zh.vue b/pages/legal/privacy-zh.vue index 39ba6ed..bee5185 100644 --- a/pages/legal/privacy-zh.vue +++ b/pages/legal/privacy-zh.vue @@ -22,12 +22,12 @@ 2.4 日志信息：为保障服务安全与稳定，我们可能记录操作日志、网络请求与错误信息。 三、信息使用目的 - 3.1 提供核心功能：身份验证、免押租借（微信支付分评估）、订单计费结算、客服与售后。 + 3.1 提供核心功能：身份验证、免押租借（芝麻信用评估）、订单计费结算、客服与售后。 3.2 安全风控：防范欺诈、违规与风险控制；保障系统与设备安全。 3.3 产品优化：统计与分析以改进体验（在去标识化/匿名化后进行）。 - 四、微信支付分与支付 - 4.1 为实现免押租借，我们将与微信支付分进行必要的数据交互（如信用评估结果、订单结算）。相关数据处理遵循微信支付与微信支付分的规则。 + 四、芝麻信用与支付 + 4.1 为实现免押租借，我们将与芝麻信用进行必要的数据交互（如信用评估结果、订单结算）。相关数据处理遵循支付宝与芝麻信用的规则。 4.2 如您未通过评估，可能需进行预授权或押金处理，以页面提示为准。 五、共享、转移与公开披露 diff --git a/pages/order/detail.vue b/pages/order/detail.vue index 1fdc9ce..512a27e 100644 --- a/pages/order/detail.vue +++ b/pages/order/detail.vue @@ -230,9 +230,9 @@ // 获取支付方式文本 const getPayWayText = () => { const payWayMap = { - 'wx_score_pay': $t('order.depositFree'), - 'wx_member_pay': $t('order.memberOrder'), - 'wx_pay': $t('order.depositPay') + 'alipay_score_pay': $t('order.depositFree'), + 'alipay_member_pay': $t('order.memberOrder'), + 'alipay_pay': $t('order.depositPay') } return payWayMap[orderInfo.value.payWay] || $t('order.depositFree') } diff --git a/pages/return/index.vue b/pages/return/index.vue index 1bc050a..e426a90 100644 --- a/pages/return/index.vue +++ b/pages/return/index.vue @@ -16,23 +16,23 @@ - - - - {{ $t('order.alipayScore') }} - | - {{ $t('order.depositFree') }} - - - - - {{ $t('order.memberOrder') }} - - - - {{ $t('order.depositPay') }} + + + + {{ $t('order.alipayScore') }} + | + {{ $t('order.depositFree') }} + + + {{ $t('order.memberOrder') }} + + + + {{ $t('order.depositPay') }} + +