!129 【缺陷修复】购物车提交前校验

Merge pull request !129 from puhui999/dev

pages/activity/groupon/list.vue

@@ -1,6 +1,6 @@
 <!-- 拼团活动列表 -->
 <template>
-  <s-layout navbar="inner" :bgStyle="{ color: '#FE832A' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FE832A' }" navbar="inner">
     <view class="page-bg" :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]" />
     <view class="list-content">
       <!-- 参团会员统计 -->

pages/activity/seckill/list.vue

@@ -1,6 +1,6 @@
 <!-- 秒杀活动列表 -->
 <template>
-  <s-layout navbar="inner" :bgStyle="{ color: 'rgb(245,28,19)' }">
+  <s-layout :bgStyle="{ backgroundColor: 'rgb(245,28,19)' }" navbar="inner">
     <!--顶部背景图-->
     <view
       class="page-bg"
@@ -146,7 +146,7 @@
   </s-layout>
 </template>
 <script setup>
-  import { reactive, computed, ref, nextTick } from 'vue';
+  import { computed, nextTick, reactive, ref } from 'vue';
   import { onLoad, onReachBottom } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import { useDurationTime } from '@/sheep/hooks/useGoods';

pages/coupon/list.vue

@@ -1,6 +1,6 @@
 <!-- 优惠券中心  -->
 <template>
-  <s-layout title="优惠券" :bgStyle="{ color: '#f2f2f2' }">
+  <s-layout :bgStyle="{ backgroundColor: '#f2f2f2' }" title="优惠券">
     <su-sticky bgColor="#fff">
       <su-tabs
         :list="tabMaps"

pages/index/cart.vue

@@ -1,9 +1,9 @@
 <template>
-	<s-layout title="购物车" tabbar="/pages/index/cart" :bgStyle="{ color: '#fff' }">
+  <s-layout :bgStyle="{ backgroundColor: '#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,25 +21,26 @@
       </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">
@@ -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/index/category.vue

@@ -1,6 +1,6 @@
 <!-- 商品分类列表 -->
 <template>
-  <s-layout title="分类" tabbar="/pages/index/category" :bgStyle="{ color: '#fff' }">
+  <s-layout :bgStyle="{ backgroundColor: '#fff' }" tabbar="/pages/index/category" title="分类">
     <view class="s-category">
       <view class="three-level-wrap ss-flex ss-col-top" :style="[{ height: pageHeight + 'px' }]">
         <!-- 商品分类（左） -->

pages/index/search.vue

@@ -1,6 +1,6 @@
 <!-- 搜索界面 -->
 <template>
-  <s-layout class="set-wrap" title="搜索" :bgStyle="{ color: '#FFF' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" class="set-wrap" title="搜索">
     <view class="ss-p-x-24">
       <view class="ss-flex ss-col-center">
         <uni-search-bar

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;

pages/pay/result.vue

@@ -1,6 +1,6 @@
 <!-- 支付结果页面 -->
 <template>
-  <s-layout title="支付结果" :bgStyle="{ color: '#FFF' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" title="支付结果">
     <view class="pay-result-box ss-flex-col ss-row-center ss-col-center">
       <!-- 信息展示 -->
       <view class="pay-waiting ss-m-b-30" v-if="payResult === 'waiting'" />
@@ -63,8 +63,8 @@
 </template>
 
 <script setup>
-  import { onLoad, onHide, onShow } from '@dcloudio/uni-app';
+  import { onHide, onLoad, onShow } from '@dcloudio/uni-app';
-  import { reactive, computed, ref } from 'vue';
+  import { computed, reactive, ref } from 'vue';
   import { isEmpty } from 'lodash-es';
   import sheep from '@/sheep';
   import PayOrderApi from '@/sheep/api/pay/order';

pages/public/faq.vue

@@ -1,6 +1,6 @@
 <!-- FAQ 常见问题 -->
 <template>
-  <s-layout class="set-wrap" title="常见问题" :bgStyle="{ color: '#FFF' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" class="set-wrap" title="常见问题">
     <uni-collapse>
       <uni-collapse-item v-for="(item, index) in state.list" :key="item">
         <template v-slot:title>

pages/public/richtext.vue

@@ -1,6 +1,6 @@
 <!-- 文章展示 -->
 <template>
-  <s-layout class="set-wrap" :title="state.title" :bgStyle="{ color: '#FFF' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" :title="state.title" class="set-wrap">
     <view class="ss-p-30">
       <mp-html class="richtext" :content="state.content" />
     </view>

pages/public/setting.vue

@@ -1,5 +1,5 @@
 <template>
-  <s-layout class="set-wrap" title="系统设置" :bgStyle="{ color: '#fff' }">
+  <s-layout :bgStyle="{ backgroundColor: '#fff' }" class="set-wrap" title="系统设置">
     <view class="header-box ss-flex-col ss-row-center ss-col-center">
       <image
         class="logo-img ss-m-b-46"

pages/user/address/list.vue

@@ -1,6 +1,6 @@
 <!-- 收件地址列表 -->
 <template>
-  <s-layout title="收货地址" :bgStyle="{ color: '#FFF' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" title="收货地址">
     <view v-if="state.list.length">
       <s-address-item
         hasBorderBottom
@@ -40,7 +40,7 @@
 
 <script setup>
   import { onBeforeMount, reactive } from 'vue';
-  import { onShow, onLoad } from '@dcloudio/uni-app';
+  import { onLoad, onShow } from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import { isEmpty } from 'lodash-es';
   import AreaApi from '@/sheep/api/system/area';

pages/user/goods-log.vue

@@ -1,6 +1,6 @@
 <!-- 商品浏览记录  -->
 <template>
-  <s-layout title="我的足迹" :bgStyle="{ color: '#f2f2f2' }">
+  <s-layout :bgStyle="{ backgroundColor: '#f2f2f2' }" title="我的足迹">
     <view 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">

pages/user/goods_details_store/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <s-layout title="选择自提门店" :bgStyle="{ color: '#FFF' }">
+  <s-layout :bgStyle="{ backgroundColor: '#FFF' }" title="选择自提门店">
     <view class="storeBox" ref="container">
       <view
         class="storeBox-box"

sheep/components/s-layout/s-layout.vue

@@ -107,7 +107,7 @@
       type: Object,
       default: () => ({
         src: '',
-        color: 'var(--ui-BG-1)',
+        backgroundColor: 'var(--ui-BG-1)',
       }),
     },
     tabbar: {

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)) {