diff --git a/apps/daxpay-admin/src/api/payment/device/qrcode.api.ts b/apps/daxpay-admin/src/api/payment/device/qrcode.api.ts index 83b3d26ee..e23b83917 100644 --- a/apps/daxpay-admin/src/api/payment/device/qrcode.api.ts +++ b/apps/daxpay-admin/src/api/payment/device/qrcode.api.ts @@ -72,7 +72,7 @@ export const DeviceQrCodeApi = { }, /** - * 获取码牌扫码链接(完整 H5 地址) + * 获取码牌扫码链接(完整地址, 按 programType 分流 /h 或 /m) */ getCodeLink(code: string): Promise> { return defHttp.get({ url: '/admin/device/qrcode/get-code-link', params: { code } }); @@ -89,6 +89,8 @@ export interface DeviceQrCodeQuery { batchNo?: string; /** 商户号 */ mchNo?: string; + /** 落地程序类型 h5/mini_app */ + programType?: string; /** 金额类型 random/fixed */ amountType?: string; /** 状态 enabled/disabled */ @@ -121,6 +123,8 @@ export interface DeviceQrCodeBatchParam { count?: number; /** 码牌名称 */ name?: string; + /** 落地程序类型 h5/mini_app, 创建后不可改 */ + programType?: string; /** 金额类型 random/fixed */ amountType?: string; /** 固定金额(分) */ @@ -155,6 +159,8 @@ export interface DeviceQrCodeResult extends BaseEntity { mchName?: string; /** 关联应用号(空=商户默认应用) */ appId?: string; + /** 落地程序类型 h5/mini_app */ + programType?: string; /** 金额类型 random/fixed */ amountType?: string; /** 固定金额(分) */ diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/device/qrcode.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/device/qrcode.json index 67279b965..917608e77 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/device/qrcode.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/device/qrcode.json @@ -13,7 +13,8 @@ "fixedAmount": "Fixed Amount", "status": "Status", "remark": "Remark", - "createTime": "Create Time" + "createTime": "Create Time", + "programType": "Code type" }, "status": { "enabled": "Enabled", @@ -54,5 +55,10 @@ "qrCodeTip": "Scan to enter the payment page", "copyLink": "Copy Link", "download": "Download QR Code", - "amountLabel": "Amount" + "amountLabel": "Amount", + "programType": { + "h5": "H5", + "mini_app": "Mini program" + }, + "validateProgramType": "Please select code type" } diff --git a/apps/daxpay-admin/src/locales/langs/id-ID/payment/device/qrcode.json b/apps/daxpay-admin/src/locales/langs/id-ID/payment/device/qrcode.json index 430eda876..0e39c1f41 100644 --- a/apps/daxpay-admin/src/locales/langs/id-ID/payment/device/qrcode.json +++ b/apps/daxpay-admin/src/locales/langs/id-ID/payment/device/qrcode.json @@ -13,7 +13,8 @@ "fixedAmount": "Jumlah Tetap", "status": "Status", "remark": "Komentar", - "createTime": "Ciptakan Waktu" + "createTime": "Ciptakan Waktu", + "programType": "Tipe kode" }, "status": { "enabled": "Diaktifkan", @@ -54,5 +55,10 @@ "qrCodeTip": "Pindai untuk masuk ke halaman pembayaran", "copyLink": "Salin Tautan", "download": "Unduh Kode QR", - "amountLabel": "Jumlah" + "amountLabel": "Jumlah", + "programType": { + "h5": "H5", + "mini_app": "Mini program" + }, + "validateProgramType": "Pilih tipe kode" } diff --git a/apps/daxpay-admin/src/locales/langs/ja-JP/payment/device/qrcode.json b/apps/daxpay-admin/src/locales/langs/ja-JP/payment/device/qrcode.json index 7f66a9117..3c64d02e8 100644 --- a/apps/daxpay-admin/src/locales/langs/ja-JP/payment/device/qrcode.json +++ b/apps/daxpay-admin/src/locales/langs/ja-JP/payment/device/qrcode.json @@ -13,7 +13,8 @@ "fixedAmount": "定額", "status": "状態", "remark": "述べる", - "createTime": "時間を作る" + "createTime": "時間を作る", + "programType": "コード種別" }, "status": { "enabled": "有効", @@ -54,5 +55,10 @@ "qrCodeTip": "スキャンして支払いページに入ります", "copyLink": "リンクをコピー", "download": "QRコードをダウンロード", - "amountLabel": "額" + "amountLabel": "額", + "programType": { + "h5": "H5", + "mini_app": "ミニプログラム" + }, + "validateProgramType": "コード種別を選択してください" } diff --git a/apps/daxpay-admin/src/locales/langs/ko-KR/payment/device/qrcode.json b/apps/daxpay-admin/src/locales/langs/ko-KR/payment/device/qrcode.json index 92c881128..fd805adc8 100644 --- a/apps/daxpay-admin/src/locales/langs/ko-KR/payment/device/qrcode.json +++ b/apps/daxpay-admin/src/locales/langs/ko-KR/payment/device/qrcode.json @@ -13,7 +13,8 @@ "fixedAmount": "정액", "status": "상태", "remark": "주목", - "createTime": "시간 만들기" + "createTime": "시간 만들기", + "programType": "코드 유형" }, "status": { "enabled": "활성화됨", @@ -54,5 +55,10 @@ "qrCodeTip": "결제 페이지로 들어가려면 스캔하세요", "copyLink": "링크 복사", "download": "QR 코드 다운로드", - "amountLabel": "양" + "amountLabel": "양", + "programType": { + "h5": "H5", + "mini_app": "미니프로그램" + }, + "validateProgramType": "코드 유형을 선택하세요" } diff --git a/apps/daxpay-admin/src/locales/langs/ms-MY/payment/device/qrcode.json b/apps/daxpay-admin/src/locales/langs/ms-MY/payment/device/qrcode.json index 25f989e03..47f78d8b8 100644 --- a/apps/daxpay-admin/src/locales/langs/ms-MY/payment/device/qrcode.json +++ b/apps/daxpay-admin/src/locales/langs/ms-MY/payment/device/qrcode.json @@ -13,7 +13,8 @@ "fixedAmount": "Jumlah Tetap", "status": "Status", "remark": "Teguran", - "createTime": "Cipta Masa" + "createTime": "Cipta Masa", + "programType": "Jenis kod" }, "status": { "enabled": "Didayakan", @@ -54,5 +55,10 @@ "qrCodeTip": "Imbas untuk masuk ke halaman pembayaran", "copyLink": "Salin Pautan", "download": "Muat turun Kod QR", - "amountLabel": "Jumlah" + "amountLabel": "Jumlah", + "programType": { + "h5": "H5", + "mini_app": "Program mini" + }, + "validateProgramType": "Sila pilih jenis kod" } diff --git a/apps/daxpay-admin/src/locales/langs/th-TH/payment/device/qrcode.json b/apps/daxpay-admin/src/locales/langs/th-TH/payment/device/qrcode.json index a8bf6458a..6458b7ca9 100644 --- a/apps/daxpay-admin/src/locales/langs/th-TH/payment/device/qrcode.json +++ b/apps/daxpay-admin/src/locales/langs/th-TH/payment/device/qrcode.json @@ -13,7 +13,8 @@ "fixedAmount": "จำนวนเงินคงที่", "status": "สถานะ", "remark": "หมายเหตุ", - "createTime": "สร้างเวลา" + "createTime": "สร้างเวลา", + "programType": "ประเภทโค้ด" }, "status": { "enabled": "เปิดใช้งานแล้ว", @@ -54,5 +55,10 @@ "qrCodeTip": "สแกนเพื่อเข้าสู่หน้าชำระเงิน", "copyLink": "คัดลอกลิงค์", "download": "ดาวน์โหลดรหัส QR", - "amountLabel": "จำนวน" + "amountLabel": "จำนวน", + "programType": { + "h5": "H5", + "mini_app": "มินิโปรแกรม" + }, + "validateProgramType": "โปรดเลือกประเภทโค้ด" } diff --git a/apps/daxpay-admin/src/locales/langs/vi-VN/payment/device/qrcode.json b/apps/daxpay-admin/src/locales/langs/vi-VN/payment/device/qrcode.json index dabd9da58..7b578f501 100644 --- a/apps/daxpay-admin/src/locales/langs/vi-VN/payment/device/qrcode.json +++ b/apps/daxpay-admin/src/locales/langs/vi-VN/payment/device/qrcode.json @@ -13,7 +13,8 @@ "fixedAmount": "Số tiền cố định", "status": "Trạng thái", "remark": "Nhận xét", - "createTime": "Tạo thời gian" + "createTime": "Tạo thời gian", + "programType": "Loại mã" }, "status": { "enabled": "Đã bật", @@ -54,5 +55,10 @@ "qrCodeTip": "Quét để vào trang thanh toán", "copyLink": "Sao chép liên kết", "download": "Tải xuống mã QR", - "amountLabel": "Số lượng" + "amountLabel": "Số lượng", + "programType": { + "h5": "H5", + "mini_app": "Mini program" + }, + "validateProgramType": "Vui lòng chọn loại mã" } diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/device/qrcode.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/device/qrcode.json index a5aebf0cc..7d519469b 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/device/qrcode.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/device/qrcode.json @@ -13,7 +13,8 @@ "fixedAmount": "固定金额", "status": "状态", "remark": "备注", - "createTime": "创建时间" + "createTime": "创建时间", + "programType": "码牌类型" }, "status": { "enabled": "启用", @@ -54,5 +55,10 @@ "qrCodeTip": "扫码即可进入支付页面", "copyLink": "复制链接", "download": "下载二维码", - "amountLabel": "金额" + "amountLabel": "金额", + "programType": { + "h5": "H5", + "mini_app": "小程序" + }, + "validateProgramType": "请选择码牌类型" } diff --git a/apps/daxpay-admin/src/locales/langs/zh-HK/payment/device/qrcode.json b/apps/daxpay-admin/src/locales/langs/zh-HK/payment/device/qrcode.json index 47c0cf5ba..82804d8b8 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-HK/payment/device/qrcode.json +++ b/apps/daxpay-admin/src/locales/langs/zh-HK/payment/device/qrcode.json @@ -13,7 +13,8 @@ "fixedAmount": "固定金額", "status": "狀態", "remark": "備註", - "createTime": "創建時間" + "createTime": "創建時間", + "programType": "碼牌類型" }, "status": { "enabled": "啓用", @@ -54,5 +55,10 @@ "qrCodeTip": "掃碼即可進入支付頁面", "copyLink": "複製鏈接", "download": "下載二維碼", - "amountLabel": "金額" + "amountLabel": "金額", + "programType": { + "h5": "H5", + "mini_app": "小程序" + }, + "validateProgramType": "請選擇碼牌類型" } diff --git a/apps/daxpay-admin/src/locales/langs/zh-TW/payment/device/qrcode.json b/apps/daxpay-admin/src/locales/langs/zh-TW/payment/device/qrcode.json index 220a09300..5205ea662 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-TW/payment/device/qrcode.json +++ b/apps/daxpay-admin/src/locales/langs/zh-TW/payment/device/qrcode.json @@ -13,7 +13,8 @@ "fixedAmount": "固定金額", "status": "狀態", "remark": "備註", - "createTime": "建立時間" + "createTime": "建立時間", + "programType": "碼牌類型" }, "status": { "enabled": "啟用", @@ -54,5 +55,10 @@ "qrCodeTip": "掃碼即可進入支付頁面", "copyLink": "複製連結", "download": "下載二維碼", - "amountLabel": "金額" + "amountLabel": "金額", + "programType": { + "h5": "H5", + "mini_app": "小程序" + }, + "validateProgramType": "請選擇碼牌類型" } diff --git a/apps/daxpay-admin/src/views/payment/device/qrcode/DeviceQrCode.vue b/apps/daxpay-admin/src/views/payment/device/qrcode/DeviceQrCode.vue index edd1f5b94..485f17880 100644 --- a/apps/daxpay-admin/src/views/payment/device/qrcode/DeviceQrCode.vue +++ b/apps/daxpay-admin/src/views/payment/device/qrcode/DeviceQrCode.vue @@ -57,6 +57,16 @@ name: $t('payment.device.qrcode.field.name'), placeholder: $t('common.pleaseInput'), }, + { + type: 'list', + field: 'programType', + name: $t('payment.device.qrcode.field.programType'), + placeholder: $t('common.pleaseSelect'), + selectList: [ + { label: $t('payment.device.qrcode.programType.h5'), value: 'h5' }, + { label: $t('payment.device.qrcode.programType.mini_app'), value: 'mini_app' }, + ], + }, { type: 'list', field: 'amountType', @@ -305,6 +315,22 @@ + + + +