优化

.env.development

@@ -5,10 +5,10 @@ ENV = development
 # VITE_API_WSS = 'wss://sockets.sxczgkj.com/wss'
 
 # 正式ws
-VITE_API_WSS = 'wss://czgeatws.sxczgkj.com/wss'
+# VITE_API_WSS = 'wss://czgeatws.sxczgkj.com/wss'
 
 # 本地ws
-# VITE_API_WSS = 'ws://192.168.1.31:2348'
+VITE_API_WSS = 'ws://192.168.1.31:2348'
 
 # 正式 php
 VITE_API_PHP_URL = 'https://newblockwlx.sxczgkj.cn/index.php/api'
@@ -20,10 +20,10 @@ VITE_API_PHP_URL = 'https://newblockwlx.sxczgkj.cn/index.php/api'
 VITE_API_KP_URL = 'https://invoice.sxczgkj.cn/api'
 
 # 本地调试连接
-# VITE_API_URL = 'http://192.168.1.31/'
+VITE_API_URL = 'http://192.168.1.31/'
 
 # 线上测试
 # VITE_API_URL = 'https://tapi.cashier.sxczgkj.cn'
 
 # 线上正式
-VITE_API_URL = 'https://cashier.sxczgkj.com'
+# VITE_API_URL = 'https://cashier.sxczgkj.com'

src/store/global.js

@@ -156,6 +156,16 @@ export const useGlobal = defineStore("global", {
         label: "管理员消费",
       },
     ],
+    refundType: [
+      {
+        type: "cash",
+        label: "手动退款",
+      },
+      {
+        type: "payBack",
+        label: "原路退回",
+      },
+    ],
   }),
   actions: {
     // 更新状态

src/views/device/add.vue

@@ -219,7 +219,7 @@ function printHandle() {
   printStore.pushReceiptData(printData, false);
   setTimeout(() => {
     printDataLoading.value = false;
-  }, 1500);
+  }, 2500);
 }
 
 // 提交打印机

src/views/device/add_label.vue

@@ -178,7 +178,7 @@ const printHandle = _.throttle(function () {
   );
   setTimeout(() => {
     printLoading.value = false;
-  }, 1000);
+  }, 2500);
 }, 1500, { leading: true, trailing: false })
 
 // 提交打印机

src/views/order/components/printDrawer.vue

@@ -140,7 +140,7 @@ async function printHandle(type) {
   }
   setTimeout(() => {
     printLoading.value = false;
-  }, 1500);
+  }, 2500);
 }
 
 async function show(row) {

src/views/order/index.vue

@@ -50,9 +50,12 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="状态" width="100">
+          <el-table-column label="状态" width="150">
             <template v-slot="scope">
               {{ filterLable("orderStatus", scope.row.status) }}
+              <span v-if="scope.row.status == 'refund'" class="refund">
+                ({{ filterLable("refundType", scope.row.refundType) }})
+              </span>
             </template>
           </el-table-column>
           <el-table-column label="订单信息" width="340">
@@ -216,6 +219,7 @@ function filterLable(key, type) {
   }
 }
 
+
 // 过滤退款条件
 function refundState(row) {
   switch (row.status) {
@@ -297,6 +301,10 @@ onMounted(() => {
 </script>
 
 <style scoped lang="scss">
+.refund {
+  color: var(--el-color-danger);
+}
+
 .flex {
   display: flex;
 }