From 7ec4fe0c83ea8797ad9e1bfae8aa90e55cfc37c5 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Tue, 18 Mar 2025 14:28:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E6=8C=82=E5=8D=95=E6=96=87=E5=AD=97=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E6=8C=82=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/classification/config/config.ts | 2 +- src/views/inventory/supplier/config/config.ts | 2 +- src/views/order/index/components/orderEnum.js | 166 +++++++++--------- .../system-setting/pay-types/config/config.ts | 2 +- 4 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/views/inventory/classification/config/config.ts b/src/views/inventory/classification/config/config.ts index b788d68..927ba20 100644 --- a/src/views/inventory/classification/config/config.ts +++ b/src/views/inventory/classification/config/config.ts @@ -14,7 +14,7 @@ const options: optionObject = { { label: "会员支付", value: "member-account" }, { label: "支付宝", value: "alipay" }, { label: "刷卡", value: "deposit" }, - { label: "挂单", value: "arrears" }, + { label: "挂账", value: "arrears" }, { label: "刷卡", value: "deposit" }, { label: "储值", value: "member-account" }, { label: "自定义", value: "virtual" }, diff --git a/src/views/inventory/supplier/config/config.ts b/src/views/inventory/supplier/config/config.ts index b788d68..927ba20 100644 --- a/src/views/inventory/supplier/config/config.ts +++ b/src/views/inventory/supplier/config/config.ts @@ -14,7 +14,7 @@ const options: optionObject = { { label: "会员支付", value: "member-account" }, { label: "支付宝", value: "alipay" }, { label: "刷卡", value: "deposit" }, - { label: "挂单", value: "arrears" }, + { label: "挂账", value: "arrears" }, { label: "刷卡", value: "deposit" }, { label: "储值", value: "member-account" }, { label: "自定义", value: "virtual" }, diff --git a/src/views/order/index/components/orderEnum.js b/src/views/order/index/components/orderEnum.js index c472261..6724cf7 100644 --- a/src/views/order/index/components/orderEnum.js +++ b/src/views/order/index/components/orderEnum.js @@ -1,84 +1,84 @@ export default { - status: [ - { - key: 'unpaid', - label: '待支付' - }, - { - key: 'unsend', - label: '待发货' - }, - { - key: 'closed', - label: '订单完成' - }, - { - key: 'send', - label: '已发' - }, - { - key: 'refunding', - label: '申请退单' - }, - { - key: 'refund', - label: '退单' - }, - { - key: 'cancelled', - label: '取消订单' - }, - { - key: 'merge', - label: '合台' - }, - { - key: 'pending', - label: '挂单' - }, - { - key: 'activate', - label: '激活' - }, - { - key: 'paying', - label: '支付中' - } - ], - sendType: [ - { - key: 'post', - label: '快递' - }, - { - key: 'takeaway', - label: '外卖' - }, - { - key: 'takeself', - label: '自提' - }, - { - key: 'table', - label: '堂食' - } - ], - orderType: [ - { - key: 'cash', - label: '收银' - }, - { - key: 'miniapp', - label: '小程序' - }, - { - key: 'offline', - label: '线下' - }, - { - key: 'return', - label: '退单' - } - ] -} \ No newline at end of file + status: [ + { + key: "unpaid", + label: "待支付", + }, + { + key: "unsend", + label: "待发货", + }, + { + key: "closed", + label: "订单完成", + }, + { + key: "send", + label: "已发", + }, + { + key: "refunding", + label: "申请退单", + }, + { + key: "refund", + label: "退单", + }, + { + key: "cancelled", + label: "取消订单", + }, + { + key: "merge", + label: "合台", + }, + { + key: "pending", + label: "挂单", + }, + { + key: "activate", + label: "激活", + }, + { + key: "paying", + label: "支付中", + }, + ], + sendType: [ + { + key: "post", + label: "快递", + }, + { + key: "takeaway", + label: "外卖", + }, + { + key: "takeself", + label: "自提", + }, + { + key: "table", + label: "堂食", + }, + ], + orderType: [ + { + key: "cash", + label: "收银", + }, + { + key: "miniapp", + label: "小程序", + }, + { + key: "offline", + label: "线下", + }, + { + key: "return", + label: "退单", + }, + ], +}; diff --git a/src/views/system-setting/pay-types/config/config.ts b/src/views/system-setting/pay-types/config/config.ts index 2d3661d..40a228d 100644 --- a/src/views/system-setting/pay-types/config/config.ts +++ b/src/views/system-setting/pay-types/config/config.ts @@ -14,7 +14,7 @@ const options: optionObject = { { label: "会员支付", value: "member-account" }, { label: "支付宝", value: "alipay" }, // { label: "刷卡", value: "deposit" }, - { label: "挂单", value: "arrears" }, + { label: "挂账", value: "arrears" }, { label: "自定义", value: "virtual" }, ], isIdeal: [