From 7b7dcefd5f82ff56c10a901f673c363b8eedc8ec Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 14 Mar 2025 18:30:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E7=A7=B0=E9=87=8D=E5=95=86=E5=93=81=E5=A2=9E=E5=8A=A0=E8=B5=B7?=
 =?UTF-8?q?=E5=94=AE=E6=95=B0=E9=87=8F=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/carts.ts                         |  6 ++----
 src/views/tool/Instead/components/carts/list.vue   |  8 +++++---
 .../tool/Instead/components/popup-weight-goods.vue | 14 +++++++++++++-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/store/modules/carts.ts b/src/store/modules/carts.ts
index 75a99d3..8008777 100644
--- a/src/store/modules/carts.ts
+++ b/src/store/modules/carts.ts
@@ -639,10 +639,8 @@ export const useCartsStore = defineStore("carts", () => {
   const delArr = ['skuData', 'coverImg', 'specInfo', 'placeNum', 'update_time', 'create_time', 'packFee', 'memberPrice', 'type']
   function sendMessage(operate_type: msgType, message: any) {
     const msg = { ...message, operate_type: operate_type, table_code: table_code.value }
-    if (operate_type == 'edit') {
-      for (let i in delArr) {
-        delete msg[delArr[i]]
-      }
+    for (let i in delArr) {
+      delete msg[delArr[i]]
     }
     console.log('send msg', msg)
     WebSocketManager.sendMessage(msg);
diff --git a/src/views/tool/Instead/components/carts/list.vue b/src/views/tool/Instead/components/carts/list.vue
index 5719b67..c33c96d 100644
--- a/src/views/tool/Instead/components/carts/list.vue
+++ b/src/views/tool/Instead/components/carts/list.vue
@@ -73,7 +73,9 @@
           <template #content>
             <div class="u-flex color-000 u-font-14 u-row-between">
               <span class="font-bold">会员优惠</span>
-              <span class="u-m-l-30">{{ carts.giftMoney(carts.vipDiscount) }}</span>
+              <span class="u-m-l-30">
+                {{ customTruncateToTwoDecimals(carts.giftMoney(carts.vipDiscount)) }}
+              </span>
             </div>
             <div class="u-flex color-000 u-font-14 u-row-between">
               <span class="font-bold">赠送</span>
@@ -91,8 +93,8 @@
       <div class="u-flex u-row-between">
         <el-link type="primary">打印制作单</el-link>
         <div>
-          <span class="totalNumber">共{{ carts.totalNumber }}件</span>
-          <span class="totalPrice">￥{{ carts.payMoney }}</span>
+          <span class="totalNumber">共{{ customTruncateToTwoDecimals(carts.totalNumber) }}件</span>
+          <span class="totalPrice">￥{{ customTruncateToTwoDecimals(carts.payMoney) }}</span>
         </div>
       </div>
       <div class="btn-group" v-if="isXianFuKuan">
diff --git a/src/views/tool/Instead/components/popup-weight-goods.vue b/src/views/tool/Instead/components/popup-weight-goods.vue
index 93271e9..60c4121 100644
--- a/src/views/tool/Instead/components/popup-weight-goods.vue
+++ b/src/views/tool/Instead/components/popup-weight-goods.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="select_desk">
-    <el-dialog width="410px" title="套餐" v-model="show">
+    <el-dialog width="410px" :title="title" v-model="show">
+      <div class="u-flex" v-if="min">
+        <span>起售数量</span>
+        <span class="u-m-l-10">{{ min }}</span>
+        <span class="u-m-l-2">{{ item.unitName }}</span>
+      </div>
       <div class="select_desk_dialog u-p-b-20">
         <key-board isCanEmpty v-model="number" isFloat @clear="clear">
           <template #clear>
@@ -70,6 +75,8 @@ const state = reactive({
   item: "",
 });
 const { guazhangRen, number, show, hasOpen, loading, tips, focus, data, item } = toRefs(state);
+const title = ref("称重商品");
+let min = ref(0);
 const price = computed(() => {
   if (!item.value) {
     return 0;
@@ -101,11 +108,16 @@ function confirm() {
   if (number.value * 1 <= 0) {
     return ElMessage.error("请输入重量");
   }
+  if (number.value * 1 < min.value) {
+    return ElMessage.error("最小起售数量为" + min.value + item.value.unitName);
+  }
   emits("confirm", item.value, (number.value * 1).toFixed(2));
   close();
 }
 function open(data) {
   item.value = data;
+  min.value = data.skuList[0].suitNum || 0;
+  title.value = data.name;
   show.value = true;
 }
 function close() {