【缺陷修复】购物车同时结算两个商品，一个仅支持门店自提，一个仅支持快递发货，就会无法结算

pages/index/cart.vue

@@ -1,9 +1,9 @@
 <template>
-	<s-layout title="购物车" tabbar="/pages/index/cart" :bgStyle="{ color: '#fff' }">
+  <s-layout :bgStyle="{ color: '#fff' }" tabbar="/pages/index/cart" title="购物车">
-		<s-empty v-if="state.list.length === 0" text="购物车空空如也,快去逛逛吧~" icon="/static/cart-empty.png" />
+    <s-empty v-if="state.list.length === 0" icon="/static/cart-empty.png" text="购物车空空如也,快去逛逛吧~" />
 
     <!-- 头部 -->
-		<view class="cart-box ss-flex ss-flex-col ss-row-between" v-if="state.list.length">
+    <view v-if="state.list.length" class="cart-box ss-flex ss-flex-col ss-row-between">
       <view class="cart-header ss-flex ss-col-center ss-row-between ss-p-x-30">
         <view class="header-left ss-flex ss-col-center ss-font-26">
           共
@@ -21,31 +21,32 @@
       </view>
       <!-- 内容 -->
       <view class="cart-content ss-flex-1 ss-p-x-30 ss-m-b-40">
-				<view class="goods-box ss-r-10 ss-m-b-14" v-for="item in state.list" :key="item.id">
+        <view v-for="item in state.list" :key="item.id" class="goods-box ss-r-10 ss-m-b-14">
           <view class="ss-flex ss-col-center">
             <label class="check-box ss-flex ss-col-center ss-p-l-10" @tap="onSelectSingle(item.id)">
               <radio :checked="state.selectedIds.includes(item.id)" color="var(--ui-BG-Main)"
                      style="transform: scale(0.8)" @tap.stop="onSelectSingle(item.id)" />
             </label>
-						<s-goods-item :title="item.spu.name" :img="item.spu.picUrl || item.goods.image"
+            <s-goods-item :img="item.spu.picUrl || item.goods.image" :price="item.sku.price"
-							:price="item.sku.price"
                           :skuText="item.sku.properties.length>1? item.sku.properties.reduce((items2,items)=>items2.valueName+' '+items.valueName):item.sku.properties[0].valueName"
-							priceColor="#FF3000" :titleWidth="400">
+                          :title="item.spu.name"
+                          :titleWidth="400" priceColor="#FF3000">
               <template v-if="!state.editMode" v-slot:tool>
-								<su-number-box :min="0" :max="item.sku.stock" :step="1" v-model="item.count" @change="onNumberChange($event, item)" />
+                <su-number-box v-model="item.count" :max="item.sku.stock" :min="0" :step="1"
+                               @change="onNumberChange($event, item)" />
               </template>
             </s-goods-item>
           </view>
         </view>
       </view>
       <!-- 底部 -->
-			<su-fixed bottom :val="48" placeholder v-if="state.list.length > 0" :isInset="false">
+      <su-fixed v-if="state.list.length > 0" :isInset="false" :val="48" bottom placeholder>
         <view class="cart-footer ss-flex ss-col-center ss-row-between ss-p-x-30 border-bottom">
           <view class="footer-left ss-flex ss-col-center">
             <label class="check-box ss-flex ss-col-center ss-p-r-30" @tap="onSelectAll">
               <radio :checked="state.isAllSelected" color="var(--ui-BG-Main)"
                      style="transform: scale(0.8)" @tap.stop="onSelectAll" />
-							<view class="ss-m-l-8"> 全选 </view>
+              <view class="ss-m-l-8"> 全选</view>
             </label>
             <text>合计：</text>
             <view class="text-price price-text">
@@ -71,8 +72,11 @@
 
 <script setup>
   import sheep from '@/sheep';
+  import SpuApi from '@/sheep/api/product/spu';
   import { computed, reactive } from 'vue';
-  import { fen2yuan } from '../../sheep/hooks/useGoods';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import { isEmpty } from '@/sheep/helper/utils';
+  import { DeliveryTypeEnum } from '@/sheep/util/const';
 
   const sys_navBar = sheep.$platform.navbar;
   const cart = sheep.$store('cart');
@@ -97,9 +101,8 @@
   }
 
   // 结算
-	function onConfirm() {
+  async function onConfirm() {
-		let items = []
+    const items = [];
-		let goods_list = [];
     state.selectedList = state.list.filter((item) => state.selectedIds.includes(item.id));
     state.selectedList.map((item) => {
       // 此处前端做出修改
@@ -107,29 +110,53 @@
         skuId: item.sku.id,
         count: item.count,
         cartId: item.id,
-				categoryId: item.spu.categoryId
+        categoryId: item.spu.categoryId,
-			})
-			goods_list.push({
-				// goods_id: item.goods_id,
-				goods_id: item.spu.id,
-				// goods_num: item.goods_num,
-				goods_num: item.count,
-				// 商品价格id真没有
-				// goods_sku_price_id: item.goods_sku_price_id,
       });
     });
-		// return;
+    if (isEmpty(items)) {
-		if (goods_list.length === 0) {
+      sheep.$helper.toast('请先选择商品');
-			sheep.$helper.toast('请选择商品');
       return;
     }
+    await validateDeliveryType(state.selectedList.map((item) => item.spu).map((spu) => spu.id));
     sheep.$router.go('/pages/order/confirm', {
       data: JSON.stringify({
-				items
+        items,
       }),
     });
   }
 
+  /** 校验配送方式 */
+  function validateDeliveryType(spuIds) {
+    return new Promise(async (resolve, reject) => {
+      const { data } = await SpuApi.getSpuListByIds(spuIds.join(','));
+      if (isEmpty(data)) {
+        reject('获取商品信息失败！！！');
+        return;
+      }
+      let onlyExpress = false;  // 只快递
+      let onlyPickup = false;   // 只自提
+      const deliveryTypes = data.map((item) => item.deliveryTypes);
+      for (const deliveryType of deliveryTypes) {
+        // 情况一：两种配送方式都支持
+        if (deliveryType.length > 1) {
+          continue;
+        }
+        // 情况二：只支持一种
+        if (deliveryType[0] === DeliveryTypeEnum.EXPRESS.type) {
+          onlyExpress = true;
+        } else if (deliveryType[0] === DeliveryTypeEnum.PICK_UP.type) {
+          onlyPickup = true;
+        }
+      }
+      if (onlyExpress || onlyPickup) {
+        reject('选中商品存在只支持特定配送方式的情况不允许提交！！！');
+        sheep.$helper.toast('选中商品存在只支持特定配送方式的情况不允许提交！！！');
+        return;
+      }
+      resolve();
+    });
+  }
+
   function onNumberChange(e, cartItem) {
     if (e === 0) {
       cart.delete(cartItem.id);
@@ -143,6 +170,7 @@
       goods_sku_price_id: cartItem.goods_sku_price_id,
     });
   }
+
   async function onDelete() {
     cart.delete(state.selectedIds);
   }

pages/order/confirm.vue

@@ -228,6 +228,7 @@
   import OrderApi from '@/sheep/api/trade/order';
   import TradeConfigApi from '@/sheep/api/trade/config';
   import { fen2yuan } from '@/sheep/hooks/useGoods';
+  import { DeliveryTypeEnum } from '@/sheep/util/const';
 
   const state = reactive({
     orderPayload: {},
@@ -376,14 +377,14 @@
 
     // 价格计算
     // 情况一：先自动选择“快递物流”
-    addressState.value.deliveryType = 1;
+    addressState.value.deliveryType = DeliveryTypeEnum.EXPRESS.type;
     let orderCode = await getOrderInfo();
     if (orderCode === 0) {
       return;
     }
     // 情况二：失败，再自动选择“门店自提”
     if (addressState.value.isPickUp) {
-      addressState.value.deliveryType = 2;
+      addressState.value.deliveryType = DeliveryTypeEnum.PICK_UP.type;
       let orderCode = await getOrderInfo();
       if (orderCode === 0) {
         return;

sheep/util/const.js

@@ -119,7 +119,11 @@ export const PromotionActivityTypeEnum = {
     name: '积分商城',
   },
 };
-
+/** 配送方式枚举 */
+export const DeliveryTypeEnum = {
+  EXPRESS: { type: 1, name: '快递发货' },
+  PICK_UP: { type: 2, name: '用户自提' },
+};
 export const getTimeStatusEnum = (startTime, endTime) => {
   const now = dayjs();
   if (now.isBefore(startTime)) {