Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/views/mall/components/confirm_order/index.vue

@@ -1,6 +1,6 @@
 <!--  -->
 <template>
-  <div class="default-width py-3">
+  <div class="py-3" style="max-width: 900px; margin: 0 auto;min-width: 900px;">
     <v-card class=" pa-5">
       <v-btn class="mb-1" variant="text" size="x-large" prepend-icon="mdi-chevron-triple-left" color="primary" @click.stop="goBack">返回</v-btn>
       <div v-if="skuInfo">

src/views/mall/components/details/s-select-sku.vue

@@ -102,6 +102,7 @@ const props = defineProps({
 
   // 加入购物车
   function onAddCart() {
+    if (props.goodsInfo.type !== '0') return Snackbar.warning('虚拟商品不能加入购物车')
     if (state.selectedSku.id <= 0) {
       Snackbar.warning('请选择商品规格')
       return;