diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/channelMerchant.json index 234bb6aec..fd6053fb2 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/channelMerchant.json @@ -111,5 +111,10 @@ "alipaySubMerchantNoRequired": "Please enter sub-merchant no.", "wechatSubMerchantNo": "Sub-merchant No.", "wechatSubMerchantNoPlaceholder": "Please enter WeChat sub-merchant no.", - "wechatSubMerchantNoRequired": "Please enter sub-merchant no." + "wechatSubMerchantNoRequired": "Please enter sub-merchant no.", + "groupTerminal": "Terminal Ledger", + "cardTerminal": "Terminal Ledger", + "cardTerminalDesc": "Register channel-side terminal numbers and bind system terminals", + "cardTerminalBadge": "In Dev", + "cardTerminalTooltip": "Channel-specific terminal fields design in progress, not yet available" } diff --git a/apps/daxpay-admin/src/locales/langs/id-ID/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/id-ID/payment/merchant/channelMerchant.json index 3c557e445..b3da756ca 100644 --- a/apps/daxpay-admin/src/locales/langs/id-ID/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/id-ID/payment/merchant/channelMerchant.json @@ -111,5 +111,10 @@ "alipaySubMerchantNoRequired": "Silakan masukkan nomor sub-pedagang.", "wechatSubMerchantNo": "Sub-pedagang No.", "wechatSubMerchantNoPlaceholder": "Silakan masukkan nomor sub-pedagang WeChat.", - "wechatSubMerchantNoRequired": "Silakan masukkan nomor sub-pedagang." + "wechatSubMerchantNoRequired": "Silakan masukkan nomor sub-pedagang.", + "groupTerminal": "Buku Terminal", + "cardTerminal": "Buku Terminal", + "cardTerminalDesc": "Daftarkan nomor terminal saluran dan tautkan ke terminal sistem", + "cardTerminalBadge": "Dalam Pengembangan", + "cardTerminalTooltip": "Desain field terminal per saluran sedang berjalan, belum tersedia" } diff --git a/apps/daxpay-admin/src/locales/langs/ja-JP/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/ja-JP/payment/merchant/channelMerchant.json index 0c8871fd0..ec0f0c598 100644 --- a/apps/daxpay-admin/src/locales/langs/ja-JP/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/ja-JP/payment/merchant/channelMerchant.json @@ -111,5 +111,10 @@ "alipaySubMerchantNoRequired": "サブマーチャント番号を入力してください。", "wechatSubMerchantNo": "サブマーチャントNo.", "wechatSubMerchantNoPlaceholder": "WeChat サブマーチャント番号を入力してください。", - "wechatSubMerchantNoRequired": "サブマーチャント番号を入力してください。" + "wechatSubMerchantNoRequired": "サブマーチャント番号を入力してください。", + "groupTerminal": "端末台帳", + "cardTerminal": "端末台帳", + "cardTerminalDesc": "本チャネル加盟店の端末番号を登録し、システム端末と紐付けます", + "cardTerminalBadge": "開発中", + "cardTerminalTooltip": "チャネル固有の端末フィールド設計中、未公開" } diff --git a/apps/daxpay-admin/src/locales/langs/ko-KR/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/ko-KR/payment/merchant/channelMerchant.json index 6772fbd5e..b3e6950ba 100644 --- a/apps/daxpay-admin/src/locales/langs/ko-KR/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/ko-KR/payment/merchant/channelMerchant.json @@ -111,5 +111,10 @@ "alipaySubMerchantNoRequired": "하위 판매자 번호를 입력하세요.", "wechatSubMerchantNo": "하위 판매자 번호", "wechatSubMerchantNoPlaceholder": "WeChat 하위 판매자 번호를 입력하세요.", - "wechatSubMerchantNoRequired": "하위 판매자 번호를 입력하세요." + "wechatSubMerchantNoRequired": "하위 판매자 번호를 입력하세요.", + "groupTerminal": "단말 대장", + "cardTerminal": "단말 대장", + "cardTerminalDesc": "본 채널 가맹점의 단말 번호를 등록하고 시스템 단말에 연결합니다", + "cardTerminalBadge": "개발 중", + "cardTerminalTooltip": "채널별 단말 필드 설계 중, 미오픈" } diff --git a/apps/daxpay-admin/src/locales/langs/ms-MY/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/ms-MY/payment/merchant/channelMerchant.json index a4a6c7036..d8e0606fc 100644 --- a/apps/daxpay-admin/src/locales/langs/ms-MY/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/ms-MY/payment/merchant/channelMerchant.json @@ -111,5 +111,10 @@ "alipaySubMerchantNoRequired": "Sila masukkan no sub-peniaga.", "wechatSubMerchantNo": "Sub-peniaga No.", "wechatSubMerchantNoPlaceholder": "Sila masukkan no sub-peniaga WeChat.", - "wechatSubMerchantNoRequired": "Sila masukkan no sub-peniaga." + "wechatSubMerchantNoRequired": "Sila masukkan no sub-peniaga.", + "groupTerminal": "Lejar Terminal", + "cardTerminal": "Lejar Terminal", + "cardTerminalDesc": "Daftar nombor terminal saluran dan ikat ke terminal sistem", + "cardTerminalBadge": "Dalam Pembangunan", + "cardTerminalTooltip": "Reka bentuk field terminal per saluran sedang berjalan, belum tersedia" } diff --git a/apps/daxpay-admin/src/locales/langs/th-TH/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/th-TH/payment/merchant/channelMerchant.json index 1f2ff3a95..9ac6e66b5 100644 --- a/apps/daxpay-admin/src/locales/langs/th-TH/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/th-TH/payment/merchant/channelMerchant.json @@ -111,5 +111,10 @@ "alipaySubMerchantNoRequired": "กรุณากรอกหมายเลขร้านค้าย่อย", "wechatSubMerchantNo": "ผู้ค้ารายย่อยเลขที่", "wechatSubMerchantNoPlaceholder": "กรุณากรอกหมายเลขร้านค้าย่อย WeChat", - "wechatSubMerchantNoRequired": "กรุณากรอกหมายเลขร้านค้าย่อย" + "wechatSubMerchantNoRequired": "กรุณากรอกหมายเลขร้านค้าย่อย", + "groupTerminal": "บัญชีเทอร์มินัล", + "cardTerminal": "บัญชีเทอร์มินัล", + "cardTerminalDesc": "ลงทะเบียนหมายเลขเทอร์มินัลช่องทางและผูกกับเทอร์มินัลระบบ", + "cardTerminalBadge": "กำลังพัฒนา", + "cardTerminalTooltip": "กำลังออกแบบ field terminal ตามช่องทาง ยังไม่เปิดให้ใช้งาน" } diff --git a/apps/daxpay-admin/src/locales/langs/vi-VN/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/vi-VN/payment/merchant/channelMerchant.json index 354c75f75..ce63be942 100644 --- a/apps/daxpay-admin/src/locales/langs/vi-VN/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/vi-VN/payment/merchant/channelMerchant.json @@ -111,5 +111,10 @@ "alipaySubMerchantNoRequired": "Vui lòng nhập số người bán phụ.", "wechatSubMerchantNo": "Số người bán phụ", "wechatSubMerchantNoPlaceholder": "Vui lòng nhập số người bán phụ WeChat.", - "wechatSubMerchantNoRequired": "Vui lòng nhập số người bán phụ." + "wechatSubMerchantNoRequired": "Vui lòng nhập số người bán phụ.", + "groupTerminal": "Sổ thiết bị", + "cardTerminal": "Sổ thiết bị", + "cardTerminalDesc": "Đăng ký số thiết bị kênh và liên kết với thiết bị hệ thống", + "cardTerminalBadge": "Đang phát triển", + "cardTerminalTooltip": "Đang thiết kế trường terminal theo kênh, chưa mở" } diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/channelMerchant.json index bec8e594e..efc692b9b 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/channelMerchant.json @@ -111,5 +111,10 @@ "alipaySubMerchantNoRequired": "请输入子商户号", "wechatSubMerchantNo": "特约商户号", "wechatSubMerchantNoPlaceholder": "请输入微信特约商户号", - "wechatSubMerchantNoRequired": "请输入特约商户号" + "wechatSubMerchantNoRequired": "请输入特约商户号", + "groupTerminal": "终端台账", + "cardTerminal": "终端台账", + "cardTerminalDesc": "登记本通道商户下的通道侧终端号, 并可绑定系统终端", + "cardTerminalBadge": "开发中", + "cardTerminalTooltip": "终端差异化字段设计中,暂未开放" } diff --git a/apps/daxpay-admin/src/locales/langs/zh-HK/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/zh-HK/payment/merchant/channelMerchant.json index 860c9e290..d626133c8 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-HK/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/zh-HK/payment/merchant/channelMerchant.json @@ -111,5 +111,10 @@ "alipaySubMerchantNoRequired": "請輸入子商户號", "wechatSubMerchantNo": "特約商户號", "wechatSubMerchantNoPlaceholder": "請輸入微信特約商户號", - "wechatSubMerchantNoRequired": "請輸入特約商户號" + "wechatSubMerchantNoRequired": "請輸入特約商户號", + "groupTerminal": "終端台帳", + "cardTerminal": "終端台帳", + "cardTerminalDesc": "登記本通道商戶下的通道側終端號, 並可綁定系統終端", + "cardTerminalBadge": "開發中", + "cardTerminalTooltip": "終端差異化欄位設計中,暫未開放" } diff --git a/apps/daxpay-admin/src/locales/langs/zh-TW/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/zh-TW/payment/merchant/channelMerchant.json index a63af8ef6..2c75c7c14 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-TW/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/zh-TW/payment/merchant/channelMerchant.json @@ -111,5 +111,10 @@ "alipaySubMerchantNoRequired": "請輸入子商戶號", "wechatSubMerchantNo": "特約商戶號", "wechatSubMerchantNoPlaceholder": "請輸入微信特約商戶號", - "wechatSubMerchantNoRequired": "請輸入特約商戶號" + "wechatSubMerchantNoRequired": "請輸入特約商戶號", + "groupTerminal": "終端台帳", + "cardTerminal": "終端台帳", + "cardTerminalDesc": "登記本通道商戶下的通道側終端號, 並可綁定系統終端", + "cardTerminalBadge": "開發中", + "cardTerminalTooltip": "終端差異化欄位設計中,暫未開放" } diff --git a/apps/daxpay-admin/src/views/payment/channel/adapay/manage/AdapayDirectMchManage.vue b/apps/daxpay-admin/src/views/payment/channel/adapay/manage/AdapayDirectMchManage.vue index ebbf9a4a3..e65d8a719 100644 --- a/apps/daxpay-admin/src/views/payment/channel/adapay/manage/AdapayDirectMchManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/adapay/manage/AdapayDirectMchManage.vue @@ -7,6 +7,7 @@ import { IconifyIcon } from '@vben-core/icons'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import AdapayDirectChannelMerchantBasicInfo from './AdapayDirectChannelMerchantBasicInfo.vue'; @@ -138,6 +139,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayChannelMerchantManage.vue b/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayChannelMerchantManage.vue index a7f2d3743..64c7e47e4 100644 --- a/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayChannelMerchantManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayChannelMerchantManage.vue @@ -7,6 +7,7 @@ import { IconifyIcon } from '@vben-core/icons'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import AlipayAppAuthTokenUpdate from './AlipayAppAuthTokenUpdate.vue'; @@ -134,6 +135,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayMchManage.vue b/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayMchManage.vue index 2fbef9f84..87698bd75 100644 --- a/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayMchManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/AlipayMchManage.vue @@ -8,6 +8,7 @@ import { IconifyIcon } from '@vben-core/icons'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import AlipayChannelMerchantBasicInfo from './AlipayChannelMerchantBasicInfo.vue'; @@ -165,6 +166,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/channel/dougong/manage/mch/DougongMchManage.vue b/apps/daxpay-admin/src/views/payment/channel/dougong/manage/mch/DougongMchManage.vue index 474b9d1fc..70684fed7 100644 --- a/apps/daxpay-admin/src/views/payment/channel/dougong/manage/mch/DougongMchManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/dougong/manage/mch/DougongMchManage.vue @@ -9,11 +9,11 @@ import { IconifyIcon } from '@vben-core/icons'; import { DougongChannelMerchantApi } from '#/api/payment/channel/dougong/channel-merchant.api'; + import DougongMchConfigEdit from '#/views/payment/channel/dougong/config/DougongMchConfigEdit.vue'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import CommonChannelMerchantBasicInfo from '#/views/payment/merchant/channel-merchant/detail/CommonChannelMerchantBasicInfo.vue'; - import DougongMchConfigEdit from '#/views/payment/channel/dougong/config/DougongMchConfigEdit.vue'; - defineOptions({ name: 'DougongMchManage' }); const emit = defineEmits<{ @@ -146,6 +146,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/channel/douyin/manage/DouyinDirectMchManage.vue b/apps/daxpay-admin/src/views/payment/channel/douyin/manage/DouyinDirectMchManage.vue index f59ec3f89..b85f4f7b4 100644 --- a/apps/daxpay-admin/src/views/payment/channel/douyin/manage/DouyinDirectMchManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/douyin/manage/DouyinDirectMchManage.vue @@ -8,6 +8,7 @@ import { IconifyIcon } from '@vben-core/icons'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import DouyinDirectChannelMerchantBasicInfo from './DouyinDirectChannelMerchantBasicInfo.vue'; @@ -175,6 +176,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/channel/fuyou/manage/mch/FuyouMchManage.vue b/apps/daxpay-admin/src/views/payment/channel/fuyou/manage/mch/FuyouMchManage.vue index f186c02b3..3faeabfc7 100644 --- a/apps/daxpay-admin/src/views/payment/channel/fuyou/manage/mch/FuyouMchManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/fuyou/manage/mch/FuyouMchManage.vue @@ -9,6 +9,7 @@ import { IconifyIcon } from '@vben-core/icons'; import { FuyouChannelMerchantApi } from '#/api/payment/channel/fuyou/channel-merchant.api'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import CommonChannelMerchantBasicInfo from '#/views/payment/merchant/channel-merchant/detail/CommonChannelMerchantBasicInfo.vue'; @@ -133,6 +134,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/channel/hkrt/manage/mch/HkrtMchManage.vue b/apps/daxpay-admin/src/views/payment/channel/hkrt/manage/mch/HkrtMchManage.vue index bfcec181d..4428e63ee 100644 --- a/apps/daxpay-admin/src/views/payment/channel/hkrt/manage/mch/HkrtMchManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/hkrt/manage/mch/HkrtMchManage.vue @@ -8,6 +8,7 @@ import { IconifyIcon } from '@vben-core/icons'; import { HkrtChannelMerchantApi } from '#/api/payment/channel/hkrt/channel-merchant.api'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import HkrtChannelMerchantBasicInfo from './HkrtChannelMerchantBasicInfo.vue'; @@ -137,6 +138,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/channel/hmpay/manage/mch/HmpayMchManage.vue b/apps/daxpay-admin/src/views/payment/channel/hmpay/manage/mch/HmpayMchManage.vue index b113a9086..28b0d2e9d 100644 --- a/apps/daxpay-admin/src/views/payment/channel/hmpay/manage/mch/HmpayMchManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/hmpay/manage/mch/HmpayMchManage.vue @@ -10,6 +10,7 @@ import { HmpayChannelMerchantApi } from '#/api/payment/channel/hmpay/channel-merchant.api'; import HmpayMchConfigEdit from '#/views/payment/channel/hmpay/config/HmpayMchConfigEdit.vue'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import CommonChannelMerchantBasicInfo from '#/views/payment/merchant/channel-merchant/detail/CommonChannelMerchantBasicInfo.vue'; @@ -35,7 +36,7 @@ /** * 功能卡片配置 - * 河马付(杉德)服务商模式, 商户有杉德商户号/门店号等配置, 创建后可查看/配置 + * 河马付(杉德)服务商模式, 商户有杉德商户号/门店号等配置, 创建后可查看/配置 */ const functionCards = computed(() => [ { @@ -156,6 +157,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/channel/lakala/manage/mch/LakalaMchManage.vue b/apps/daxpay-admin/src/views/payment/channel/lakala/manage/mch/LakalaMchManage.vue index c44e47509..4f5a54158 100644 --- a/apps/daxpay-admin/src/views/payment/channel/lakala/manage/mch/LakalaMchManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/lakala/manage/mch/LakalaMchManage.vue @@ -8,6 +8,7 @@ import { IconifyIcon } from '@vben-core/icons'; import { LakalaChannelMerchantApi } from '#/api/payment/channel/lakala/channel-merchant.api'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import LakalaChannelMerchantBasicInfo from './LakalaChannelMerchantBasicInfo.vue'; @@ -137,6 +138,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/channel/leshua/manage/mch/LeshuaMchManage.vue b/apps/daxpay-admin/src/views/payment/channel/leshua/manage/mch/LeshuaMchManage.vue index 3b0f85e71..ab147889d 100644 --- a/apps/daxpay-admin/src/views/payment/channel/leshua/manage/mch/LeshuaMchManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/leshua/manage/mch/LeshuaMchManage.vue @@ -9,6 +9,7 @@ import { IconifyIcon } from '@vben-core/icons'; import { LeshuaChannelMerchantApi } from '#/api/payment/channel/leshua/channel-merchant.api'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import CommonChannelMerchantBasicInfo from '#/views/payment/merchant/channel-merchant/detail/CommonChannelMerchantBasicInfo.vue'; @@ -132,6 +133,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/channel/ums/manage/UmsDirectMchManage.vue b/apps/daxpay-admin/src/views/payment/channel/ums/manage/UmsDirectMchManage.vue index 24ce4790c..b42c78664 100644 --- a/apps/daxpay-admin/src/views/payment/channel/ums/manage/UmsDirectMchManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/ums/manage/UmsDirectMchManage.vue @@ -7,6 +7,7 @@ import { IconifyIcon } from '@vben-core/icons'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import UmsDirectChannelMerchantBasicInfo from './UmsDirectChannelMerchantBasicInfo.vue'; @@ -138,6 +139,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/channel/vbill/manage/mch/VbillMchManage.vue b/apps/daxpay-admin/src/views/payment/channel/vbill/manage/mch/VbillMchManage.vue index 51fb7541a..7f9c1ba5b 100644 --- a/apps/daxpay-admin/src/views/payment/channel/vbill/manage/mch/VbillMchManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/vbill/manage/mch/VbillMchManage.vue @@ -9,6 +9,7 @@ import { IconifyIcon } from '@vben-core/icons'; import { VbillChannelMerchantApi } from '#/api/payment/channel/vbill/channel-merchant.api'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import CommonChannelMerchantBasicInfo from '#/views/payment/merchant/channel-merchant/detail/CommonChannelMerchantBasicInfo.vue'; @@ -132,6 +133,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/WechatChannelMerchantManage.vue b/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/WechatChannelMerchantManage.vue index 40ba7a636..dd1a86e38 100644 --- a/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/WechatChannelMerchantManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/WechatChannelMerchantManage.vue @@ -10,6 +10,7 @@ import { ProductEnum } from '#/enums/payment/productEnum'; import { useMessage } from '#/hooks/useMessage'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import WechatChannelMerchantBasicInfo from './WechatChannelMerchantBasicInfo.vue'; @@ -176,6 +177,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/WechatDirectMchManage.vue b/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/WechatDirectMchManage.vue index 0fae89baa..42aa48ee1 100644 --- a/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/WechatDirectMchManage.vue +++ b/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/WechatDirectMchManage.vue @@ -9,6 +9,7 @@ import { IconifyIcon } from '@vben-core/icons'; import { ProductEnum } from '#/enums/payment/productEnum'; + import TerminalCardPlaceholder from '#/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue'; import ChannelMerchantNameEditModal from '#/views/payment/merchant/channel-merchant/detail/ChannelMerchantNameEditModal.vue'; import WechatDirectChannelMerchantBasicInfo from './WechatDirectChannelMerchantBasicInfo.vue'; @@ -168,6 +169,7 @@ :class="getGroupColorClass(group.color)" > + diff --git a/apps/daxpay-admin/src/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue b/apps/daxpay-admin/src/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue new file mode 100644 index 000000000..8d529e699 --- /dev/null +++ b/apps/daxpay-admin/src/views/payment/device/terminal/channel/TerminalCardPlaceholder.vue @@ -0,0 +1,57 @@ + + + + +