优化

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "vite-electron",
 	"private": true,
-	"version": "1.1.13",
+	"version": "1.1.14",
 	"main": "dist-electron/main.js",
 	"scripts": {
 		"dev": "chcp 65001 && vite",

src/views/group_buy/components/refundDialog.vue

@@ -73,7 +73,7 @@ function refundConfirm() {
 
 // 计算退单金额
 function refundNumChange(e) {
-    refundForm.refundAmount = Math.floor(newRow.value.orderAmount / e * 100) / 100
+    refundForm.refundAmount = Math.floor(newRow.value.orderAmount / newRow.value.number * e * 100) / 100
 }
 
 // 显示

src/views/home/components/settleAccount.vue

@@ -128,7 +128,7 @@ function getPrintList() {
   ipcRenderer.send("getPrintList");
   ipcRenderer.on("printList", (event, arg) => {
     localPrintList.value = arg;
-    console.log(localPrintList.value);
+    // console.log(localPrintList.value);
   });
 }
 

src/views/home/index.vue

@@ -32,13 +32,8 @@
       </div>
       <div class="shop_operation" v-loading="cartLoading">
         <div class="shop_list">
-          <div
+          <div class="item" :class="{ active: cartListActive == index }" v-for="(item, index) in cartList"
-            class="item"
+            :key="item.id" @click="selectCartItemHandle(item, index)">
-            :class="{ active: cartListActive == index }"
-            v-for="(item, index) in cartList"
-            :key="item.id"
-            @click="selectCartItemHandle(item, index)"
-          >
             <div class="name_wrap">
               <span>{{ item.name }}</span>
               <span>￥{{ item.salePrice }}</span>
@@ -50,20 +45,12 @@
             </div>
             <div class="num">
               <div class="left">
-                <div
+                <div class="icon_item" v-if="item.isGift == 'true'" @click="giftPackHandle('isGift', item)">
-                  class="icon_item"
-                  v-if="item.isGift == 'true'"
-                  @click="giftPackHandle('isGift', item)"
-                >
                   <el-icon class="icon">
                     <ShoppingBag />
                   </el-icon>
                 </div>
-                <div
+                <div class="icon_item" v-if="item.isPack == 'true'" @click="giftPackHandle('isPack', item)">
-                  class="icon_item"
-                  v-if="item.isPack == 'true'"
-                  @click="giftPackHandle('isPack', item)"
-                >
                   <el-icon class="icon" style="color: var(--primary-color)">
                     <Box />
                   </el-icon>
@@ -77,13 +64,8 @@
           </div>
         </div>
         <!-- 购物车操作栏 -->
-        <cartOperation
+        <cartOperation :item="cartList[cartListActive]" @confirm="(res) => addCart(res, 'edit')" @delete="delCartHandle"
-          :item="cartList[cartListActive]"
+          @pending="pendingCart" @clearCart="clearCartHandle" />
-          @confirm="(res) => addCart(res, 'edit')"
-          @delete="delCartHandle"
-          @pending="pendingCart"
-          @clearCart="clearCartHandle"
-        />
       </div>
       <div class="footer">
         <div class="top">
@@ -97,26 +79,17 @@
             <el-text class="t">打包(￥{{ cartInfo.packAmount || 0 }})</el-text>
           </div>
           <div class="num-wrap">
-            <el-text
+            <el-text>共{{ cartInfo.productNum || 0 }}种商品，{{
-              >共{{ cartInfo.productNum || 0 }}种商品，{{
+              cartInfo.productSum || 0
-                cartInfo.productSum || 0
+            }}件</el-text>
-              }}件</el-text
-            >
           </div>
         </div>
         <div class="btm">
           <el-button icon="Edit" @click="remarkRef.show()"></el-button>
           <div class="button">
-            <el-button
+            <el-button type="primary" style="width: 100%" :disabled="!cartList.length" v-loading="createOrderLoading"
-              type="primary"
+              @click="createOrderHandle">
-              style="width: 100%"
+              <span v-if="!createOrderLoading">结算(￥{{ cartInfo.totalAmount || 0 }})</span>
-              :disabled="!cartList.length"
-              v-loading="createOrderLoading"
-              @click="createOrderHandle"
-            >
-              <span v-if="!createOrderLoading"
-                >结算(￥{{ cartInfo.totalAmount || 0 }})</span
-              >
               <span v-else>下单中...</span>
             </el-button>
           </div>
@@ -133,30 +106,13 @@
   <remarkModal ref="remarkRef" @success="(e) => (remark = e)" />
   <!-- 修改取餐号 -->
   <takeFoodCode />
-  <el-drawer
+  <el-drawer v-model="membershow" :with-header="true" size="90%" title="选择会员">
-    v-model="membershow"
-    :with-header="true"
-    size="90%"
-    title="选择会员"
-  >
     <member :membershow="'1'"></member>
   </el-drawer>
-  <takeFoodCode
+  <takeFoodCode ref="takeFoodCodeRef" title="修改取餐号" placeholder="请输入取餐号" @success="takeFoodCodeSuccess" />
-    ref="takeFoodCodeRef"
-    title="修改取餐号"
-    placeholder="请输入取餐号"
-    @success="takeFoodCodeSuccess"
-  />
   <!-- 结算订单 -->
-  <settleAccount
+  <settleAccount ref="settleAccountRef" :cart="cartList" :amount="cartInfo.totalAmount" :remark="remark"
-    ref="settleAccountRef"
+    :masterId="masterId" :orderInfo="orderInfo" @paySuccess="createCodeAjax(1)" />
-    :cart="cartList"
-    :amount="cartInfo.totalAmount"
-    :remark="remark"
-    :masterId="masterId"
-    :orderInfo="orderInfo"
-    @paySuccess="createCodeAjax(1)"
-  />
   <!-- 快捷收银 -->
   <fastCashier ref="fastCashierRef" />
   <!-- 挂起订单 -->
@@ -170,6 +126,7 @@ export default {
 </script>
 <script setup>
 import { onMounted, ref } from "vue";
+import { useRoute } from 'vue-router'
 import { useUser } from "@/store/user.js";
 import remarkModal from "@/components/remarkModal.vue";
 import takeFoodCode from "@/components/takeFoodCode.vue";
@@ -193,6 +150,8 @@ import {
 import goods from "@/views/home/components/goods.vue";
 import member from "@/views/member/index.vue";
 
+const route = useRoute()
+
 const membershow = ref(false);
 const store = useUser();
 const remarkRef = ref(null);
@@ -412,6 +371,8 @@ async function createCodeAjax(type = "0") {
 
 onMounted(() => {
   createCodeAjax();
+
+  console.log('route', JSON.parse(route.query.user));
 });
 </script>