虚拟商品不支持加入购物车

pages/goods/index.vue

@@ -158,7 +158,7 @@
         </view>
 
         <!-- 评价 -->
-        <detail-comment-card class="detail-comment-selector" :goodsId="state.goodsId" />
+        <!-- <detail-comment-card class="detail-comment-selector" :goodsId="state.goodsId" /> -->
         <!-- 详情 -->
         <detail-content-card
           class="detail-content-selector"
@@ -176,7 +176,7 @@
           <view class="buy-box ss-flex ss-col-center ss-p-r-20" v-if="state.goodsInfo.stock > 0">
             <button
               class="ss-reset-button add-btn ui-Shadow-Main"
-              @tap="state.showSelectSku = true"
+              @tap="handleJoinShoppingCart"
             >
               加入购物车
             </button>
@@ -224,7 +224,7 @@
   import detailCellSku from './components/detail/detail-cell-sku.vue';
   import detailTabbar from './components/detail/detail-tabbar.vue';
   import detailSkeleton from './components/detail/detail-skeleton.vue';
-  import detailCommentCard from './components/detail/detail-comment-card.vue';
+  // import detailCommentCard from './components/detail/detail-comment-card.vue';
   import detailContentCard from './components/detail/detail-content-card.vue';
   import detailActivityTip from './components/detail/detail-activity-tip.vue';
   import { isEmpty } from 'lodash-es';
@@ -262,6 +262,16 @@
     state.selectedSku = e;
     state.settlementSku = e;
   }
+  
+  // 点击加入购物车，虚拟商品不能加入购物车
+  function handleJoinShoppingCart () {
+	  // type： 0实体商品， 99文件
+	  if (state.goodsInfo.type !== '0') {
+		  uni.showToast({ title: '虚拟商品不能加入购物车', icon: 'none', duration: 2000 })
+		  return
+	  }
+	  state.showSelectSku = true
+  }
 
   // 添加购物车
   function onAddCart(e) {

pages/order/confirm.vue

@@ -27,6 +27,18 @@
           />
         </view>
       </view>
+	  <view v-if="state.orderInfo?.items.every(k => k.spuType !== '0')" class="order-item ss-flex ss-col-center ss-row-between ss-p-x-20 bg-white ss-r-10">
+	    <view class="item-title">接收邮箱</view>
+	    <view class="ss-flex ss-col-center">
+	      <uni-easyinput
+	        maxlength="20"
+	        placeholder="虚拟商品会发送到此邮箱"
+	        v-model="state.orderPayload.email"
+	        :inputBorder="false"
+	        :clearable="false"
+	      />
+	    </view>
+	  </view>
     </view>
 
     <!-- 价格信息 -->
@@ -291,7 +303,12 @@
         return;
       }
     }
-    submitOrder();
+    console.log(state.orderPayload, 'submit-order-pay', state);
+    if (state.orderInfo.items.every(k => k.spuType !== '0') && !state.orderPayload.email) {
+      uni.showToast({ title: '请填写接收邮箱！', icon: 'none', duration: 2000 })
+      return
+    }
+    submitOrder()
   }
 
   // 创建订单&跳转
@@ -310,6 +327,9 @@
       combinationHeadId: state.orderPayload.combinationHeadId,
       seckillActivityId: state.orderPayload.seckillActivityId,
       pointActivityId: state.orderPayload.pointActivityId,
+      receiverExtend: {
+        email: state.orderPayload.email
+      }
     });
     if (code !== 0) {
       return;

pages/order/list.vue

@@ -158,7 +158,7 @@
       value: 10,
     },
     {
-      name: '待收货',
+      name: '已发货',
       value: 20,
     },
     {