Merge branch 'master' of https://git.citupro.com/zhengnaiwen_citu/menduner-mall-uniapp

pages/commission/withdraw.vue

@@ -204,7 +204,6 @@
   // 提交提现
   const onConfirm = async () => {
     // 参数校验
-    //debugger;
     if (
       !state.accountInfo.price ||
       state.accountInfo.price > state.brokerageInfo.price ||

sheep/components/s-select-sku/s-select-sku.vue

@@ -43,7 +43,7 @@
 
       <!-- 属性选择 -->
       <view class="modal-content ss-flex-1">
-        <scroll-view scroll-y="true" class="modal-content-scroll" @touchmove.stop>
+        <scroll-view scroll-y="true" class="modal-content-scroll ss-p-b-20" @touchmove.stop>
           <view class="sku-item ss-m-b-20" v-for="property in propertyList" :key="property.id">
             <view class="label-text ss-m-b-20">{{ property.name }}</view>
             <view class="ss-flex ss-col-center ss-flex-wrap">
@@ -66,7 +66,7 @@
               </button>
             </view>
           </view>
-          <view class="buy-num-box ss-flex ss-col-center ss-row-between ss-m-b-40">
+          <view v-if="props.goodsInfo.type === '0'" class="buy-num-box ss-flex ss-col-center ss-row-between ss-m-b-20">
             <view class="label-text">购买数量</view>
             <su-number-box
               :min="1"
@@ -144,6 +144,11 @@
 
   // 加入购物车
   function onAddCart() {
+	  // type： 0实体商品， 99文件
+	  if (props.goodsInfo.type !== '0') {
+		  uni.showToast({ title: '虚拟商品不能加入购物车', icon: 'none', duration: 2000 })
+		  return
+	  }
     if (state.selectedSku.id <= 0) {
       sheep.$helper.toast('请选择规格');
       return;