jufubao-mall 2.0.45 → 2.0.46-beta2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/components/JfbMallConfirm/JfbMallConfirm.vue +4 -3
  3. package/src/components/JfbMallProductInfo/XdSku.vue +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-mall",
3
- "version": "2.0.45",
3
+ "version": "2.0.46-beta2",
4
4
  "private": false,
5
5
  "description": "聚福宝商城业务组件插件包",
6
6
  "main": "index.js",
package/src/components/JfbMallConfirm/JfbMallConfirm.vue CHANGED
@@ -87,7 +87,7 @@
87
87
  <xd-list-item v-if="shop.sub_show_delivery_price==='Y'" label="配送费用" showBottom :paddingLR="isCardLayout ? '32rpx' : '48rpx'" paddingTB="24rpx" class="xd-my-list-item">
88
88
  <xd-unit :price="shop.user_logistics_amount_origin" :fontSize="28" :isOld="false"></xd-unit>
89
89
  </xd-list-item>
90
- <xd-list-item v-if="shop.deliveryPickValue === 'samecity'" class="xd-my-list-item"
90
+ <xd-list-item v-if="shop.deliveryPickValue === 'samecity' && shop.sub_show_delivery_time !== 'N'" class="xd-my-list-item"
91
91
  :label="shop.time_label" showRight :paddingLR="isCardLayout ? '32rpx' : '48rpx'" paddingTB="24rpx" showBottom
92
92
  @click="toSetSelectTime(shopIndex,shop)">
93
93
  {{shop.selectTime ? shop.selectTime.dateTime : "请选择"}}
@@ -1196,7 +1196,6 @@
1196
1196
  }
1197
1197
  let subscribeTimeInfo = this.shopList.map(item => {
1198
1198
  console.log(item,'ajaajjaja');
1199
-
1200
1199
  let result = {};
1201
1200
  if(item.support_delivery_method_options.length && !item.deliveryPickValue) err_text = "请选择配送方式";
1202
1201
  else if(item.deliveryPickValue === 'takeout'){
@@ -1213,7 +1212,9 @@
1213
1212
  }
1214
1213
  }else if(item.deliveryPickValue === 'samecity'){
1215
1214
  if(!item.selectTime){
1216
- err_text = `请选择${item.time_label}`;
1215
+ if(item.sub_show_delivery_time !== 'N'){
1216
+ err_text = `请选择${item.time_label}`;
1217
+ }
1217
1218
  }else{
1218
1219
  result['date'] = item.selectTime.dateItem.date;
1219
1220
  result['hourSpan'] = item.selectTime.dateTimeItem.name;
package/src/components/JfbMallProductInfo/XdSku.vue CHANGED
@@ -499,7 +499,7 @@ export default {
499
499
  .map((item) => ({ name: item.name, value: item.values[item.checked] }));
500
500
  // console.log(JSON.stringify(otherChecked), 'otherChecked')
501
501
  //没有选中任何其它sku，所有都可以选，直接返回true
502
- if (otherChecked.length === 0) return curSku.enabled;
502
+ // if (otherChecked.length === 0) return true;
503
503
 
504
504
  /**
505
505
  * skuArr （当前 + 已选中）sku列表