From 6a86e5fa99d2fc8dc7b4f8919a20e775e8ecafb4 Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Thu, 23 May 2024 18:45:48 +0800 Subject: [PATCH] 1 --- .env.development | 5 + src/api/merchant.ts | 6 + src/components/bindMerBank/index.vue | 128 ++++++++++ .../default/components/header/index.vue | 4 + .../default/components/header/print.vue | 29 +++ src/layout/default/index.vue | 3 + src/utils/print.ts | 12 +- src/views/data/merchant/audit/detail.vue | 3 +- src/views/data/merchant/audit/index.vue | 59 ++++- src/views/data/merchant/merchant/edit.vue | 8 +- src/views/data/merchant/merchant/index.vue | 10 +- src/views/data/supplier/audit/index.vue | 6 +- src/views/merchant_withdraw/edit.vue | 12 +- src/views/merchant_withdraw/index.vue | 21 +- src/views/opurchase/opurchaseclass/index.vue | 6 + src/views/translationOrder/index.vue | 241 +++++++++++------- 16 files changed, 431 insertions(+), 122 deletions(-) create mode 100644 src/components/bindMerBank/index.vue create mode 100644 src/layout/default/components/header/print.vue diff --git a/.env.development b/.env.development index 1d2caa2..682dfda 100644 --- a/.env.development +++ b/.env.development @@ -2,4 +2,9 @@ NODE_ENV = 'development' VITE_NOW_TYPE = 'dist' # Base API # VITE_APP_BASE_URL='http://192.168.1.13:8546' + +# VITE_PUSH_URL = 'ws://192.168.1.22:8787' +# VITE_APP_BASE_URL = 'http://192.168.1.22:8546' + +VITE_PUSH_URL ='wss://erp.lihaink.cn/pull' VITE_APP_BASE_URL='https://erp.lihaink.cn' diff --git a/src/api/merchant.ts b/src/api/merchant.ts index e8f48a2..aac0f62 100644 --- a/src/api/merchant.ts +++ b/src/api/merchant.ts @@ -50,4 +50,10 @@ export function apiMerchantBindUser(params: any) { return request.post({ url: "/merchat/merchant/bind_user", params }); } + +// 绑定银行卡 +export function apiMerchantBindBank(params: any) { + return request.post({ url: "/merchat/merchant/bind_bank", params }); +} + // /admin?mer_id=506 diff --git a/src/components/bindMerBank/index.vue b/src/components/bindMerBank/index.vue new file mode 100644 index 0000000..cb263c6 --- /dev/null +++ b/src/components/bindMerBank/index.vue @@ -0,0 +1,128 @@ + + + diff --git a/src/layout/default/components/header/index.vue b/src/layout/default/components/header/index.vue index 0b1a790..8d0a0be 100644 --- a/src/layout/default/components/header/index.vue +++ b/src/layout/default/components/header/index.vue @@ -13,6 +13,9 @@
+
+ +
@@ -41,6 +44,7 @@ import UserDropDown from './user-drop-down.vue' import Setting from '../setting/index.vue' import MultipleTabs from './multiple-tabs.vue' import Cache from './cache.vue' +import Print from './print.vue' import useSettingStore from '@/stores/modules/setting' const appStore = useAppStore() diff --git a/src/layout/default/components/header/print.vue b/src/layout/default/components/header/print.vue new file mode 100644 index 0000000..c2e6213 --- /dev/null +++ b/src/layout/default/components/header/print.vue @@ -0,0 +1,29 @@ + + + + + \ No newline at end of file diff --git a/src/layout/default/index.vue b/src/layout/default/index.vue index bace47e..c0fbf03 100644 --- a/src/layout/default/index.vue +++ b/src/layout/default/index.vue @@ -33,6 +33,9 @@ const user_channel = connection.subscribe(`platform_1`); // 当user-2频道有message事件的消息时 user_channel.on('message', function (data) { console.log("收到消息--",data); + if(data.event=='platform_print'){ + console.log('收到打印消息'); + } }); // 断线事件 user_channel.on('close', function () { diff --git a/src/utils/print.ts b/src/utils/print.ts index 2e8f258..550ca85 100644 --- a/src/utils/print.ts +++ b/src/utils/print.ts @@ -4,7 +4,7 @@ import { hiprint, defaultElementTypeProvider } from "vue-plugin-hiprint"; hiprint.init(); hiprint.hiwebSocket.setHost("http://localhost:17521"); -window.open("hiprint://"); +// window.open("hiprint://"); // 配置 const WIDTH = 58; //纸张宽度 mm @@ -265,6 +265,16 @@ export const testPrint = () => { }); }; +export const printerList = ()=>{ + try{ + const list = hiprint.hiwebSocket.getPrinterList(); + return list; + }catch{ + ElMessage.error("请先安装打印机客户端") + return []; + } +} + // 计算字符串长度 function calculateStringLength(str: string) { let count = 0; diff --git a/src/views/data/merchant/audit/detail.vue b/src/views/data/merchant/audit/detail.vue index 804f752..48ab862 100644 --- a/src/views/data/merchant/audit/detail.vue +++ b/src/views/data/merchant/audit/detail.vue @@ -17,7 +17,7 @@ {{ formData.merchant?.mer_name }} - {{ formData.merchant?.service_user }} + {{ dataJSON.company_nickname }} {{ formData.merchant?.service_phone }} @@ -151,6 +151,7 @@ const onAudit = () => { service_phone: formData.merchant?.service_phone, mark: auditInfo.mark, }).then((res) => { + emit('success'); popupRef.value?.close(); }); }; diff --git a/src/views/data/merchant/audit/index.vue b/src/views/data/merchant/audit/index.vue index 9e33d50..31c7f8e 100644 --- a/src/views/data/merchant/audit/index.vue +++ b/src/views/data/merchant/audit/index.vue @@ -112,12 +112,40 @@ - - - - -