From 9054d93b0d81fdc765dc3506766719ecab2cf081 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 15 May 2024 10:47:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E6=89=93=E5=8D=B0=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                     |  4 ++--
 index.html                           | 22 ++++++++++++++--------
 src/layout/myAside.vue               |  2 +-
 src/layout/myHeader.vue              | 18 +++++++++++++-----
 src/views/login/index.vue            |  1 +
 src/views/order/component/detail.vue |  1 +
 src/views/order/component/order.vue  |  2 +-
 7 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/.env.development b/.env.development
index 6a0e204..ce54d19 100644
--- a/.env.development
+++ b/.env.development
@@ -3,5 +3,5 @@ VITE_NOW_TYPE = 'dist'
 VITE_PUSH_URL = 'ws://192.168.1.22:8787'
 
 
-# VITE_BASE_URL = 'http://192.168.1.22:8546'
-VITE_BASE_URL = 'https://erp.lihaink.cn'
\ No newline at end of file
+VITE_BASE_URL = 'http://192.168.1.22:8546'
+# VITE_BASE_URL = 'https://erp.lihaink.cn'
\ No newline at end of file
diff --git a/index.html b/index.html
index 7d9c65c..76dd4eb 100644
--- a/index.html
+++ b/index.html
@@ -5,14 +5,20 @@
     <link rel="icon" type="image/svg+xml" href="/cashier.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>里海收银系统</title>
-    <script type="text/javascript" src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js">
-    </script>
+    <script
+      type="text/javascript"
+      src="https://js.cdn.aliyun.dcloud.net.cn/dev/uni-app/uni.webview.1.5.2.js"
+    ></script>
     <script type="text/javascript">
-      document.addEventListener('UniAppJSBridgeReady', function() {
-      })
-  //     window.receiveData = (e)=>{
-  //   ElMessage.success("接收到消息:" + JSON.stringify(e));
-  // }
+      document.addEventListener("UniAppJSBridgeReady", function () {});
+      function receiveData(data) {
+        try {
+          data = JSON.parse(data);
+          if (data.type === "connect") {
+            window.postMessage(data);
+          }
+        } catch (error) {}
+      }
     </script>
 
     <style>
@@ -44,7 +50,7 @@
         }
       }
       /* 大屏幕 */
-      @media screen and (min-width: 1900px){
+      @media screen and (min-width: 1900px) {
         html {
           font-size: 16px;
         }
diff --git a/src/layout/myAside.vue b/src/layout/myAside.vue
index 3772257..ce1daa1 100644
--- a/src/layout/myAside.vue
+++ b/src/layout/myAside.vue
@@ -14,7 +14,7 @@ const list = ref([
   { name: "saleOrder", title: "收银订单", ico: "DataLine", count: 0 },
   { name: "order", title: "待提采购", ico: "DataAnalysis", count: 0 },
   { name: "purchaseOrder", title: "采购订单", ico: "Tickets", count: 0 },
-  { name: "test", title: "打印", ico: "Tickets", count: 0 },
+  // { name: "test", title: "打印", ico: "Tickets", count: 0 },
 ]);
 const aup = () => {
   let index = list.value.findIndex((item) => item.name == route.name);
diff --git a/src/layout/myHeader.vue b/src/layout/myHeader.vue
index 1676137..060e95f 100644
--- a/src/layout/myHeader.vue
+++ b/src/layout/myHeader.vue
@@ -63,10 +63,18 @@ const APPprint = (content = "") => {
 
 onMounted(() => {
   mitt.on("printReceipt", printReceipt);
-  // ElMessage.success("接收到消息:");
-  window.receiveData = (e)=>{
-    ElMessage.success("接收到消息:");
-  }
+  // 监听消息
+  window.addEventListener(
+    "message",
+    function (event) {
+      // alert(JSON.stringify(event.data));
+      if(event.data.type === "connect"){
+        is_connect.value = true;
+        ElMessage.success("已连接打印机T58");
+      }
+    },
+    false
+  );
 });
 
 onUnmounted(() => {
@@ -96,7 +104,7 @@ onUnmounted(() => {
           点击自动连接打印机
         </el-button>
       </div>
-      <div style="margin-right: 1rem; color: #333" v-else>打印机正常运行</div>
+      <div style="margin-right: 1rem;" v-else @click="ElMessage.success('打印机已经连接啦')">已连接打印机T58</div>
       <el-dropdown trigger="hover">
         <div class="el-dropdown-link">
           <el-avatar :src="merInfo.avatar" icon="user-filled" />
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index eb5601d..b1da7f0 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -109,6 +109,7 @@ onMounted(() => {
       text-align: center;
       font-size: 1.3rem;
       padding-bottom: 2rem;
+      color: #333;
     }
   }
 }
diff --git a/src/views/order/component/detail.vue b/src/views/order/component/detail.vue
index fb296eb..2e53cc6 100644
--- a/src/views/order/component/detail.vue
+++ b/src/views/order/component/detail.vue
@@ -138,6 +138,7 @@ onUnmounted(() => {
         infinite-scroll-distance="300"
         infinite-scroll-delay="300"
         style="overflow: auto"
+        v-if="formData?.id"
         :infinite-scroll-immediate="false"
       >
         <div class="table-title">订单信息</div>
diff --git a/src/views/order/component/order.vue b/src/views/order/component/order.vue
index 7357ff6..b18012d 100644
--- a/src/views/order/component/order.vue
+++ b/src/views/order/component/order.vue
@@ -85,7 +85,7 @@ const getOrderList = (reload = false) => {
 
 const submitOrder = ()=>{
   createOrderApi().then(res=>{
-    console.log(res);
+    ElMessage.success("提交成功");
   })
 }