From a546fd3fb570ce0ca7375ec463142c05aef3ac1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Fri, 6 Dec 2024 17:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E8=AF=BE=E4=B8=8B=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tool/Instead/components/cart-item.vue     | 116 +++++++++++-------
 1 file changed, 69 insertions(+), 47 deletions(-)

diff --git a/src/views/tool/Instead/components/cart-item.vue b/src/views/tool/Instead/components/cart-item.vue
index 33c6247..6942436 100644
--- a/src/views/tool/Instead/components/cart-item.vue
+++ b/src/views/tool/Instead/components/cart-item.vue
@@ -1,27 +1,17 @@
 <template>
-  <div
-    class="flex order-item u-m-b-14 relative"
-    :class="[isActive]"
-    @click="itemClick"
-  >
+  <div class="flex order-item u-m-b-14 relative" :class="[isActive]" @click="itemClick">
     <div class="absolute status-box">
       <span class="pack" v-if="item.isPack === 'true'"> 包 </span>
-      <span class="da" v-if="item.isPrint||item.isPrint===null"> 打 </span>
+      <span class="da" v-if="item.isPrint || item.isPrint === null"> 打 </span>
       <span class="isWaitCall" v-if="item.isWaitCall">等 </span>
       <span class="tui" v-if="item.status === 'return'"> 退 </span>
     </div>
     <div class="flex u-col-top">
       <div class="img">
-        <div
-          class="isSeatFee img u-line-1 u-flex u-col-center u-row-center"
-          v-if="isSeatFee"
-        >
+        <div class="isSeatFee img u-line-1 u-flex u-col-center u-row-center" v-if="isSeatFee">
           <span>{{ item.name }}</span>
         </div>
-        <div
-          class="isSeatFee img u-line-1 u-flex u-col-center u-row-center"
-          v-else-if="!item.productId"
-        >
+        <div class="isSeatFee img u-line-1 u-flex u-col-center u-row-center" v-else-if="!item.productId">
           <span> 临时菜 </span>
         </div>
         <img v-else :src="item.coverImg" class="" alt="" />
@@ -31,19 +21,23 @@
           <div class="name" :class="{ 'free-price': item.status === 'return' }">
             {{ item.name }}
           </div>
-          <span class="good_info_discount" v-if="item.isGift === 'true'"
-            >赠</span
-          >
+          <span class="good_info_discount" v-if="item.isGift === 'true'">赠</span>
         </div>
-        <div v-if="item.typeEnum=='weight'" class="specSnap">
-          ￥{{ currentPrice}}/{{ item.unit }}
+        <div v-if="item.typeEnum == 'weight'" class="specSnap">
+          ￥{{ currentPrice }}/{{ item.unit }}
         </div>
         <div v-if="item.specSnap" class="specSnap">
           {{ item.specSnap }}
         </div>
+        <div v-if="item.proGroupInfo" class="specSnapss">
+          <span>{{ item.groupType == 0 ? '固定套餐' : '可选套餐' }}:</span>
+          <span v-for="(a, b) in proGroupInfo" :key="a.proId">
+            {{ b == 0 ? '' : ',' }}{{ a.proName }}
+          </span>
+        </div>
 
         <div class="" v-if="placeNum == 0">
-          <div class="note" v-if="item.note">备注:{{ item.note  }}</div>
+          <div class="note" v-if="item.note">备注:{{ item.note }}</div>
           <div class="note flex" v-else>
             <span>备注:</span>
             <span class="el-icon-edit u-font-12" @click="editNote"></span>
@@ -62,19 +56,10 @@
           <div class="order-input-number">
             <i class="icon-remove" @click="changeOrderNumber(true)"></i>
             <div style="width: 40px" class="number-box">
-              <el-input
-                :min="0"
-                type="number"
-                @input="cartGoodsNumberInput"
-                @change="cartGoodsNumberChange"
-                v-model="number"
-                placeholder="0"
-              ></el-input>
+              <el-input :min="0" type="number" @input="cartGoodsNumberInput" @change="cartGoodsNumberChange"
+                v-model="number" placeholder="0"></el-input>
             </div>
-            <i
-              class="el-icon-circle-plus icon-add"
-              @click="changeOrderNumber(false)"
-            ></i>
+            <i class="el-icon-circle-plus icon-add" @click="changeOrderNumber(false)"></i>
           </div>
         </div>
       </div>
@@ -99,11 +84,9 @@
             <div v-if="isShowVipPrice && vipAllPrice != allPrice">
               ￥{{ vipAllPrice }}
             </div>
-            <div
-              :class="{
-                'free-price': isShowVipPrice && vipAllPrice != allPrice,
-              }"
-            >
+            <div :class="{
+              'free-price': isShowVipPrice && vipAllPrice != allPrice,
+            }">
               <span> ￥{{ allPrice }}</span>
             </div>
           </div>
@@ -167,24 +150,27 @@ export default {
     };
   },
   computed: {
-    currentPrice(){
-      if(!this.isShowVipPrice){
+    currentPrice() {
+      if (!this.isShowVipPrice) {
         return this.item.salePrice
       }
-      return this.memberPrice?this.memberPrice:this.item.salePrice
+      return this.memberPrice ? this.memberPrice : this.item.salePrice
     },
-    discountNewPrice(){
+    proGroupInfo() {
+      return JSON.parse(this.item.proGroupInfo)
+    },
+    discountNewPrice() {
       const item = this.item;
-      const originPrice=this.isShowVipPrice?this.vipAllPrice:this.allPrice
-      const discount=(this.item.discountSaleAmount*this.item.number)
-      return (originPrice-discount).toFixed(2)
+      const originPrice = this.isShowVipPrice ? this.vipAllPrice : this.allPrice
+      const discount = (this.item.discountSaleAmount * this.item.number)
+      return (originPrice - discount).toFixed(2)
     },
     vipAllPrice() {
       const item = this.item;
       const price =
         this.isShowVipPrice &&
-        item.memberPrice != null &&
-        item.memberPrice != undefined
+          item.memberPrice != null &&
+          item.memberPrice != undefined
           ? item.memberPrice <= 0
             ? item.salePrice
             : item.memberPrice
@@ -254,19 +240,23 @@ export default {
 ::v-deep .number-box .el-input__inner {
   border: none;
 }
+
 ::v-deep .el-button--text {
   color: #000;
 }
+
 ::v-deep .number-box .el-input__inner {
   border: none;
   padding: 0 4px;
   text-align: center;
 }
+
 .isSeatFee {
   background: #3f9eff;
   color: #fff;
   font-size: 12px;
 }
+
 .icon-remove {
   border: 1px solid #d8d8d8;
   width: 22px;
@@ -286,11 +276,13 @@ export default {
     background: #999;
   }
 }
+
 .icon-add {
   color: rgb(34, 191, 100);
   font-size: 22px;
   cursor: pointer;
 }
+
 .flex.order-item {
   padding: 4px;
   border-radius: 2px;
@@ -301,6 +293,7 @@ export default {
   justify-content: space-between;
   background-color: rgba(0, 0, 0, 0);
   transition: all 0.3s;
+
   .status-box {
     width: 18px;
     position: absolute;
@@ -309,7 +302,8 @@ export default {
     display: flex;
     flex-direction: column;
     gap: 2px;
-    > span {
+
+    >span {
       display: block;
       width: 18px;
       height: 18px;
@@ -320,9 +314,11 @@ export default {
       color: #fff;
     }
   }
+
   .isWaitCall {
     background: #d3adf7;
   }
+
   .pack {
     background: #35ac6a;
   }
@@ -330,9 +326,11 @@ export default {
   .da {
     background: #35ac6a;
   }
+
   .tui {
     background: #ac4735;
   }
+
   &.active {
     background-color: rgba(0, 0, 0, 0.04);
   }
@@ -354,6 +352,27 @@ export default {
       font-size: 12px;
       margin-top: 3px;
     }
+
+    .specSnapss {
+      display: flex;
+      justify-content: flex-start;
+      align-items: center;
+      flex-wrap: wrap;
+      color: #999;
+      font-size: 12px;
+      margin-top: 3px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 2;
+
+      .specSnap {
+        color: #999;
+        font-size: 12px;
+        margin-top: 3px;
+      }
+    }
   }
 
   .name {
@@ -375,6 +394,7 @@ export default {
     }
   }
 }
+
 .note {
   max-width: 70%;
   font-size: 12px;
@@ -384,6 +404,7 @@ export default {
   margin-top: 5px;
   word-break: break-all;
 }
+
 .order-number-box {
   position: relative;
 
@@ -415,6 +436,7 @@ export default {
     }
   }
 }
+
 .good_info_discount {
   height: 16px;
   padding: 0 3px;