diff --git a/dist-electron/main.js b/dist-electron/main.js
index 7d21254..f0016f7 100644
--- a/dist-electron/main.js
+++ b/dist-electron/main.js
@@ -1 +1,87 @@
-"use strict";const s=require("path"),e=require("electron");let t;e.app.whenReady().then(()=>{t=new e.BrowserWindow({title:"银收客",width:1024,height:768,fullscreenable:!0,fullscreen:!process.env.VITE_DEV_SERVER_URL,simpleFullscreen:!0,frame:!!process.env.VITE_DEV_SERVER_URL,webPreferences:{nodeIntegration:!0,contextIsolation:!1}}),process.env.VITE_DEV_SERVER_URL?t.loadURL(process.env.VITE_DEV_SERVER_URL):t.loadFile(s.resolve(__dirname,"../dist/index.html")),e.app.on("activate",()=>{e.BrowserWindow.getAllWindows().length===0&&createWindow()}),e.ipcMain.on("quitHandler",(i,r)=>{e.app.quit()}),e.ipcMain.on("getPrintList",()=>{t.webContents.getPrintersAsync().then(i=>{t.webContents.send("printList",i)})});const n=new e.BrowserWindow({show:!0,width:464,height:2206,webPreferences:{nodeIntegration:!0,contextIsolation:!1}});process.env.VITE_DEV_SERVER_URL?n.loadFile(s.join(__dirname,"../public/print.html")):n.loadFile(s.resolve(__dirname,"../dist/print.html")),e.ipcMain.on("printerInfoSync",(i,r)=>{n.webContents.send("getParams",r)}),n.on("printStart",(i,r)=>{let o=JSON.parse(r).deviceName;n.webContents.print({silent:!0,deviceName:o,pageSize:{width:58e3,height:276e3},scaleFactor:80,landscape:!1,margins:{marginType:"none",top:0,bottom:0,left:0,right:0},dpi:{horizontal:203,vertical:203}})})});e.app.on("window-all-closed",()=>{process.platform!=="darwin"&&e.app.quit()});
+"use strict";
+const path = require("path");
+const electron = require("electron");
+let win;
+electron.app.whenReady().then(() => {
+  win = new electron.BrowserWindow({
+    title: "银收客",
+    width: 1024,
+    height: 768,
+    fullscreenable: true,
+    fullscreen: process.env.VITE_DEV_SERVER_URL ? false : true,
+    simpleFullscreen: true,
+    frame: process.env.VITE_DEV_SERVER_URL ? true : false,
+    webPreferences: {
+      // 集成网页和 Node.js，也就是在渲染进程中，可以调用 Node.js 方法
+      nodeIntegration: true,
+      contextIsolation: false
+    }
+  });
+  if (process.env.VITE_DEV_SERVER_URL) {
+    win.loadURL(process.env.VITE_DEV_SERVER_URL);
+  } else {
+    win.loadFile(path.resolve(__dirname, "../dist/index.html"));
+  }
+  electron.app.on("activate", () => {
+    if (electron.BrowserWindow.getAllWindows().length === 0) {
+      createWindow();
+    }
+  });
+  electron.ipcMain.on("quitHandler", (_, msg) => {
+    electron.app.quit();
+  });
+  electron.ipcMain.on("getPrintList", () => {
+    win.webContents.getPrintersAsync().then((res) => {
+      win.webContents.send("printList", res);
+    });
+  });
+  const printWin = new electron.BrowserWindow({
+    show: false,
+    width: 464,
+    height: 2206,
+    webPreferences: {
+      // 集成网页和 Node.js，也就是在渲染进程中，可以调用 Node.js 方法
+      nodeIntegration: true,
+      contextIsolation: false
+    }
+  });
+  if (process.env.VITE_DEV_SERVER_URL) {
+    printWin.loadFile(path.join(__dirname, "../public/print.html"));
+  } else {
+    printWin.loadFile(path.resolve(__dirname, "../dist/print.html"));
+  }
+  electron.ipcMain.on("printerInfoSync", (event, arg) => {
+    printWin.webContents.send("getParams", arg);
+  });
+  electron.ipcMain.on("printStart", (event, arg) => {
+    console.log(arg);
+    const _parmas = JSON.parse(arg);
+    console.log(_parmas);
+    let name = _parmas.deviceName;
+    printWin.webContents.print({
+      silent: true,
+      deviceName: name,
+      pageSize: {
+        width: 58e3,
+        height: 276e3
+      },
+      scaleFactor: 80,
+      landscape: false,
+      margins: {
+        marginType: "none",
+        top: 0,
+        bottom: 0,
+        left: 0,
+        right: 0
+      },
+      dpi: {
+        horizontal: 203,
+        vertical: 203
+      }
+    });
+  });
+});
+electron.app.on("window-all-closed", () => {
+  if (process.platform !== "darwin")
+    electron.app.quit();
+});
diff --git a/electron/main.js b/electron/main.js
index 5cfd09f..2c9df85 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -48,7 +48,7 @@ app.whenReady().then(() => {
 
   // 创建打印小票子窗口
   const printWin = new BrowserWindow({
-    show: true,
+    show: false,
     width: 464,
     height: 2206,
     webPreferences: {
@@ -71,8 +71,10 @@ app.whenReady().then(() => {
   })
 
   // 执行打印操作
-  printWin.on('printStart', (event, arg) => {
+  ipcMain.on('printStart', (event, arg) => {
+    console.log(arg);
     const _parmas = JSON.parse(arg)
+    console.log(_parmas)
     let name = _parmas.deviceName
     printWin.webContents.print({
       silent: true,
diff --git a/package.json b/package.json
index 0717fdf..05c1fc5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "vite-electron",
 	"private": true,
-	"version": "1.0.14",
+	"version": "1.0.18",
 	"main": "dist-electron/main.js",
 	"scripts": {
 		"dev": "chcp 65001 && vite",
diff --git a/public/print.html b/public/print.html
index 750a8a2..7ec1b47 100644
--- a/public/print.html
+++ b/public/print.html
@@ -13,9 +13,13 @@
     <div id="app">
       <div class="print_view">
         <div class="title t1">{{data.shop_name}}</div>
-        <div class="title t2">结算单【{{data.carts[0].masterId}}】</div>
-        <div class="row">订单号:202404021023542223445</div>
-        <div class="row">交易时间:2024-04-02 10:15</div>
+        <div class="title t2">
+          结算单【{{data.orderInfo && data.orderInfo.masterId}}】
+        </div>
+        <div class="row">
+          订单号:{{data.orderInfo && data.orderInfo.orderNo}}
+        </div>
+        <div class="row">交易时间:{{data.createdAt}}</div>
         <div class="row">收银员:【POS-1】1</div>
         <div class="line"></div>
         <table class="table">
@@ -38,14 +42,14 @@
         <div class="line"></div>
         <div class="row between">
           <span>合计:</span>
-          <span>30.00</span>
+          <span>{{data.amount}}</span>
         </div>
-        <div class="row between">
+        <!-- <div class="row between">
           <span>合计:</span>
           <span>30.00</span>
-        </div>
+        </div> -->
         <div class="row between">
-          <span>原价:20.00，节省了0</span>
+          <span>原价:{{data.amount}}，节省了0</span>
         </div>
         <div class="row between">
           <span>积分:</span>
@@ -57,7 +61,7 @@
         </div>
         <div class="line"></div>
         <div class="row">备注:</div>
-        <div class="row">打印时间:2024-04-02 10:15</div>
+        <div class="row">打印时间:{{data.printTime}}</div>
       </div>
     </div>
     <script type="module">
@@ -77,9 +81,12 @@
               data.value = JSON.parse(arg);
               console.log(data.value);
 
-              // setTimeout(() => {
-              //   ipcRenderer.send("printStart");
-              // }, 500);
+              setTimeout(() => {
+                ipcRenderer.send(
+                  "printStart",
+                  JSON.stringify({ deviceName: data.value.deviceName })
+                );
+              }, 500);
             });
           });
 
diff --git a/src/api/device.js b/src/api/device.js
index 7b065ef..88f72a6 100644
--- a/src/api/device.js
+++ b/src/api/device.js
@@ -49,4 +49,17 @@ export function tbPrintMachineDelete(params) {
         url: "tbPrintMachine",
         params
     });
+}
+
+/**
+ * 根据类型查询打印机列表
+ * @param {*} params 
+ * @returns 
+ */
+export function bySubType(params) {
+    return request({
+        method: "get",
+        url: "/tbPrintMachine/bySubType",
+        params
+    });
 }
\ No newline at end of file
diff --git a/src/views/device/add.vue b/src/views/device/add.vue
index a7f44a5..0e7bbef 100644
--- a/src/views/device/add.vue
+++ b/src/views/device/add.vue
@@ -192,7 +192,7 @@ const form = ref({
   },
   name: "小票打印机",
   subType: "cash", // 打印类型
-  status: 0,
+  status: 1,
   sort: "",
   shopId: store.userInfo.shopId,
 });
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index c5ede7b..40c0620 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -33,8 +33,8 @@
                   inline-prompt
                   active-text="开"
                   inactive-text="关"
-                  :active-value="0"
-                  :inactive-value="1"
+                  :active-value="1"
+                  :inactive-value="0"
                   width="90"
                   @change="statusChange($event, item)"
                 />
diff --git a/src/views/home/components/settleAccount.vue b/src/views/home/components/settleAccount.vue
index 48353f8..24b599f 100644
--- a/src/views/home/components/settleAccount.vue
+++ b/src/views/home/components/settleAccount.vue
@@ -92,10 +92,11 @@
 </template>
 
 <script setup>
-import { ref } from "vue";
+import { onMounted, ref } from "vue";
 import { useUser } from "@/store/user.js";
 import payCard from "@/components/payCard/payCard.vue";
 import { print } from "@/api/pay";
+import { bySubType } from "@/api/device";
 import { ElMessage } from "element-plus";
 import dayjs from "dayjs";
 
@@ -133,17 +134,45 @@ const props = defineProps({
 
 const isPrint = ref(true);
 
+const printList = ref([]);
+
+// 获取打印机状态
+async function bySubTypeAjax() {
+  try {
+    const res = await bySubType({
+      shopId: store.userInfo.shopId,
+      contentType: "local",
+      subType: "cash",
+    });
+    printList.value = res;
+  } catch (error) {
+    console.log(error);
+  }
+}
+
 async function printHandle() {
-  if (!isPrint.value) return;
-  const data = {
-    shop_name: store.userInfo.merchantName,
-    carts: props.cart,
-    amount: props.amount,
-    remark: props.remark,
-    orderInfo: props.orderInfo,
-    deviceName: printForm.value.deviceName,
-  };
-  ipcRenderer.send("printerInfoSync", JSON.stringify(data));
+  try {
+    if (!isPrint.value) return;
+    if (printList.value.length) {
+      const data = {
+        shop_name: store.userInfo.merchantName,
+        carts: props.cart,
+        amount: props.amount,
+        remark: props.remark,
+        orderInfo: props.orderInfo,
+        deviceName: printList.value[0].config.deviceName,
+        createdAt: dayjs(props.orderInfo.createdAt).format(
+          "YYYY-MM-DD HH:mm:ss"
+        ),
+        printTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+      };
+      ipcRenderer.send("printerInfoSync", JSON.stringify(data));
+    } else {
+      ElMessage.error("您还没有添加打印设备");
+    }
+  } catch (error) {
+    console.log(error);
+  }
   // try {
   //     printLoading.value = true
   //     await print({
@@ -162,6 +191,7 @@ async function printHandle() {
 // 订单已支付
 function paySuccess() {
   dialogVisible.value = false;
+  printHandle();
   emit("paySuccess");
 }
 
@@ -172,6 +202,10 @@ function show() {
 defineExpose({
   show,
 });
+
+onMounted(() => {
+  bySubTypeAjax();
+});
 </script>
 
 <style>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 40246ab..8caa883 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -331,8 +331,8 @@ async function addCart(params, type = "add") {
       shopId: store.userInfo.shopId,
       skuId: type == "add" ? params.id : params.skuId,
       number: params.number || 1,
-      isPack: allSelected.value ? true : params.isPack || false,
-      isGift: params.isGift || false,
+      isPack: params.isPack || "false",
+      isGift: params.isGift || 'false',
       cartId: type == "add" ? "" : params.id,
       uuid: params.uuid || store.userInfo.uuid,
       type: type,
@@ -367,6 +367,8 @@ async function queryCartAjax() {
     });
     if (i == res.list.length) {
       allSelected.value = true;
+    } else {
+      allSelected.value = false;
     }
   } catch (error) {
     console.log("获取购物车商品", error);