From 8f42ba8189be934b007aaea59616cab9e5198c88 Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Fri, 1 Nov 2024 10:47:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=A8=E6=80=81=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=A0=87=E7=AD=BE=E5=B0=8F=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 5 +++-- .env.test | 4 ++-- public/tag_print.css | 3 +++ public/tag_print.html | 4 ++-- public/tag_print.scss | 2 ++ src/store/print.js | 4 ++++ src/views/device/add_label.vue | 9 +++++++-- 7 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.env.development b/.env.development index 6211cfb..55ea4fd 100644 --- a/.env.development +++ b/.env.development @@ -29,12 +29,13 @@ VITE_API_KP_URL = 'https://invoice.sxczgkj.cn/api' # VITE_API_URL = 'http://192.168.1.34:10589/cashier-client' # 测试 -# VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client' +VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client' # 预发布 # VITE_API_URL = 'https://pre-cashierclient.sxczgkj.cn/cashier-client' +# 张松本地 # VITE_API_URL = 'https://36z1017t45.goho.co/cashier-client' # 正式 -VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client' \ No newline at end of file +# VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client' \ No newline at end of file diff --git a/.env.test b/.env.test index bb4c344..d834422 100644 --- a/.env.test +++ b/.env.test @@ -17,7 +17,7 @@ VITE_API_PHP_URL = 'https://czgdoumei.sxczgkj.com/index.php/api' VITE_API_KP_URL = 'https://invoice.sxczgkj.cn/api' # 测试 -# VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client' +VITE_API_URL = 'https://cashier-client.sxczgkj.cn/cashier-client' # 预发布 # VITE_API_URL = 'https://pre-cashierclient.sxczgkj.cn/cashier-client' @@ -26,4 +26,4 @@ VITE_API_KP_URL = 'https://invoice.sxczgkj.cn/api' # VITE_API_URL = 'https://36z1017t45.goho.co/cashier-client' # 正式 -VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client' \ No newline at end of file +# VITE_API_URL = 'https://cashierclient.sxczgkj.cn/cashier-client' \ No newline at end of file diff --git a/public/tag_print.css b/public/tag_print.css index 858bee9..d05cd62 100644 --- a/public/tag_print.css +++ b/public/tag_print.css @@ -47,6 +47,9 @@ body { } .print_view .header .logo { width: 90px; + height: 30px; + -o-object-fit: cover; + object-fit: cover; } .print_view .header .title { margin-left: 6px; diff --git a/public/tag_print.html b/public/tag_print.html index a3d68ea..c9431b9 100644 --- a/public/tag_print.html +++ b/public/tag_print.html @@ -14,8 +14,8 @@
- - + +
{{data.outNumber}}
diff --git a/public/tag_print.scss b/public/tag_print.scss index 623f9d5..fa2a371 100644 --- a/public/tag_print.scss +++ b/public/tag_print.scss @@ -38,6 +38,8 @@ body { .logo { $size: 90px; width: $size; + height: 30px; + object-fit: cover; } .title { margin-left: 6px; diff --git a/src/store/print.js b/src/store/print.js index 6006e89..9d4bfe5 100644 --- a/src/store/print.js +++ b/src/store/print.js @@ -2,6 +2,7 @@ import { defineStore } from "pinia"; import { ipcRenderer } from "electron"; import { bySubType } from "@/api/device"; import { useUser } from "@/store/user.js"; +import { useShop } from "@/store/shop.js"; import dayjs from "dayjs"; import receiptPrint from "@/components/lodop/receiptPrint.js"; import lodopPrintWork from "@/components/lodop/lodopPrintWork.js"; @@ -64,6 +65,8 @@ export const usePrint = defineStore({ }, // 打印标签小票 labelPrint(props) { + const shopInfo = useShop(); + if ( this.deviceLableList.length && this.checkLocalPrint(this.deviceLableList[0].config.deviceName) @@ -97,6 +100,7 @@ export const usePrint = defineStore({ createdAt: dayjs(props.createdAt).format("YYYY-MM-DD HH:mm:ss"), isPrint: false, count: `${count}/${sum}`, + ticketLogo: shopInfo.info.ticketLogo, }); } } diff --git a/src/views/device/add_label.vue b/src/views/device/add_label.vue index 48055f1..8a7a787 100644 --- a/src/views/device/add_label.vue +++ b/src/views/device/add_label.vue @@ -78,7 +78,7 @@
- +
@@ -122,6 +122,7 @@ import { Loading } from "element-plus/es/components/loading/src/service"; import classify from "@/components/classify/index.vue"; import QRCode from 'qrcode' import { usePrint } from "@/store/print.js"; +import { useShop } from "@/store/shop.js"; const printStore = usePrint(); @@ -129,6 +130,7 @@ const store = useUser(); const router = useRouter(); const route = useRoute(); +const shopInfo = useShop(); const classifyRef = ref(null); const printList = ref([]); @@ -162,7 +164,8 @@ const printData = ref({ name: '【测试勿管】甜橙马黛茶', skuName: '测试、加珍珠', masterId: '#A9', - createdAt: dayjs().format('YYYY-MM-DD HH:mm:ss') + createdAt: dayjs().format('YYYY-MM-DD HH:mm:ss'), + ticketLogo: shopInfo.info.ticketLogo, }) // 获取打印机列表 @@ -284,6 +287,8 @@ onMounted(() => { .logo { $size: 90px; width: $size; + height: 30px; + object-fit: cover; } .title {