采用最新结算函数优化代客下单

src/views/home/components/cartItem.vue

@@ -68,6 +68,9 @@
         </div>
         <div class="num">
             <div class="left">
+                <div class="icon_item zen" v-if="item.is_time_discount">
+                    <span class="t">限时折扣</span>
+                </div>
                 <div class="icon_item zen" v-if="props.item.is_gift">
                     <span class="t">赠</span>
                 </div>

src/views/home/components/goods.vue

@@ -76,9 +76,9 @@
                         </transition>
                         <div class="dot" v-if="item.number">{{ item.number }}</div>
                         <div class="cover" v-if="shopListType == 'img'">
+                            <div class="xxzk" v-if="item.is_time_discount == 1">限时折扣</div>
                             <el-image :src="`${item.coverImg}?x-oss-process=image/resize,m_lfit,w_120,h_120`"
                                 class="el_img" fit="cover"></el-image>
-
                             <!-- 已下架 -->
                             <div class="sell_out" v-if="!item.isSale">
                                 <img class="sell_out_icon" src="@/assets/icon_goods_yxj.svg">
@@ -96,7 +96,6 @@
                             <div class="sell_out" v-else-if="item.isStock && item.stockNumber <= 0">
                                 <img class="sell_out_icon" src="@/assets/icon_goods_kcbz.svg">
                             </div>
-
                             <div class="weight" v-if="item.type == 'weight'">称重</div>
                             <div class="weight" v-if="item.type == 'package' && item.groupType == 1">可选套餐</div>
                             <div class="weight" v-if="item.type == 'package' && item.groupType == 0">固定套餐</div>
@@ -110,7 +109,7 @@
                                 </template>
                                 <template v-else>
                                     <el-text tag="del" class="del" size="small">￥{{ item.skuList[0].salePrice
-                                    }}</el-text>
+                                        }}</el-text>
                                     <el-text>￥{{ +item.skuList[0].memberPrice || item.skuList[0].salePrice }}</el-text>
                                 </template>
                             </div>
@@ -1124,6 +1123,18 @@ onMounted(() => {
                 height: 60%;
                 position: relative;
 
+                .xxzk {
+                    padding: 1px 3px 2px 6px;
+                    border-radius: 0 0 0 10px;
+                    position: absolute;
+                    top: 0;
+                    right: 0;
+                    z-index: 10;
+                    font-size: 12px;
+                    color: #fff;
+                    background-color: var(--el-color-danger);
+                }
+
                 .weight {
                     position: absolute;
                     left: 4px;

src/views/home/index.vue

@@ -265,13 +265,16 @@ function printReloadHandle() {
 }
 
 // 选择会员
-function selectUser(row) {
+async function selectUser(row) {
   console.log('selectUser===', row);
 
   goodsStore.vipUserInfo = { ...row }
   if (store.shopInfo.isMemberPrice && row.isVip) {
     goodsStore.showVipPrice = 1
   }
+
+  await goodsStore.updateGoodsList()
+
   goodsStore.calcCartInfo()
 }
 
@@ -297,13 +300,14 @@ async function createOrderHandle(t = 0) {
         shopId: store.shopInfo.id, // 店铺id
         seatNum: goodsStore.tableInfo.num || 0, // 用餐人数
         packFee: goodsStore.cartInfo.packFee, // 打包费
-        originAmount: formatDecimal(+goodsStore.cartInfo.totalAmount, 2, true), // 订单原金额（包含打包费+餐位费） 不含折扣价格
+        originAmount: goodsStore.cartInfo.costSummary.goodsOriginalAmount,
         tableCode: goodsStore.cartList[0].table_code, // 台桌号
         dineMode: goodsStore.allSelected ? store.shopInfo.eatModel.split(',')[1] : store.shopInfo.eatModel.split(',')[0], // 用餐方式
         remark: remark.value, // 备注
         placeNum: (goodsStore.orderListInfo.placeNum || 0) + 1, // 下单次数
         waitCall: 0, // 是否叫号
-        userId: goodsStore.vipUserInfo.userId, // 会员用户id
+        userId: goodsStore.vipUserInfo.userId || '', // 会员用户id
+        limitRate: goodsStore.limitDiscountRes
       }
 
       createOrderLoading.value = true;