Merge branch 'gyq' of https://gitee.com/shaanxi-super-shopkeeper_1/cashierdesktop into wwz

src/utils/request.js

@@ -4,7 +4,7 @@ import useStorage from '@/utils/useStorage'
 import router from '@/router'
 
 const service = axios.create({
-  baseURL: import.meta.env.MODE == 'development' ? '/api/' : '/api/admin',
+  baseURL: import.meta.env.MODE == 'development' ? '/api/' : import.meta.env.VITE_API_URL,
   // withCredentials: true, // 跨域请求时发送 cookies
   timeout: 5000, // 请求超时
 });

src/views/home/components/settleAccount.vue

@@ -94,19 +94,19 @@ const isPrint = ref(true)
 
 function printHandle() {
     if (!isPrint.value) return
-    // const data = {
-    //     shop_name: '测试打印',
-    //     carts: props.cart,
-    //     amount: props.amount,
-    //     remark: props.remark
-    // }
-    ipcRenderer.sendSync('printerInfoSync', '测试打印')
+    const data = {
+        shop_name: '大客餐饮',
+        carts: props.cart,
+        amount: props.amount,
+        remark: props.remark,
+        orderId: props.orderId
+    }
+    ipcRenderer.sendSync('printerInfoSync', JSON.stringify(data))
 }
 
 // 订单已支付
 function paySuccess() {
     dialogVisible.value = false
-    printHandle()
     emit('paySuccess')
 }
 

src/views/home/index.vue

@@ -97,7 +97,7 @@
   <remarkModal ref="remarkRef" @success="e => remark = e" />
   <!-- 修改取餐号 -->
   <takeFoodCode />
-  <el-drawer v-model="membershow" :with-header="true" size="90%" title="选择会员" >
+  <el-drawer v-model="membershow" :with-header="true" size="90%" title="选择会员">
     <member :membershow="'1'"></member>
   </el-drawer>
   <takeFoodCode ref="takeFoodCodeRef" title="修改取餐号" placeholder="请输入取餐号" @success="takeFoodCodeSuccess" />