jufubao-mall 2.0.46-beta2 → 2.0.46-beta7
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.
package/package.json
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'
|
|
90
|
+
<xd-list-item v-if="shop.deliveryPickValue === 'samecity'" 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,6 +1196,7 @@
|
|
|
1196
1196
|
}
|
|
1197
1197
|
let subscribeTimeInfo = this.shopList.map(item => {
|
|
1198
1198
|
console.log(item,'ajaajjaja');
|
|
1199
|
+
|
|
1199
1200
|
let result = {};
|
|
1200
1201
|
if(item.support_delivery_method_options.length && !item.deliveryPickValue) err_text = "请选择配送方式";
|
|
1201
1202
|
else if(item.deliveryPickValue === 'takeout'){
|
|
@@ -1212,9 +1213,7 @@
|
|
|
1212
1213
|
}
|
|
1213
1214
|
}else if(item.deliveryPickValue === 'samecity'){
|
|
1214
1215
|
if(!item.selectTime){
|
|
1215
|
-
|
|
1216
|
-
err_text = `请选择${item.time_label}`;
|
|
1217
|
-
}
|
|
1216
|
+
err_text = `请选择${item.time_label}`;
|
|
1218
1217
|
}else{
|
|
1219
1218
|
result['date'] = item.selectTime.dateItem.date;
|
|
1220
1219
|
result['hourSpan'] = item.selectTime.dateTimeItem.name;
|
|
@@ -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
|
-
|
|
502
|
+
if (otherChecked.length === 0) return curSku.enabled;
|
|
503
503
|
|
|
504
504
|
/**
|
|
505
505
|
* skuArr (当前 + 已选中)sku列表
|
|
@@ -92,11 +92,16 @@
|
|
|
92
92
|
:style="[{
|
|
93
93
|
height: product.category.imgHeight + 'px',
|
|
94
94
|
},categoryCompStyle]"
|
|
95
|
-
v-if="product.category.category_img && product.category['imgStatus'] === 'ok'"
|
|
95
|
+
v-if="product.category.category_img && product.category['imgStatus'] === 'ok'&&product.category.show_method==='picture'"
|
|
96
96
|
>
|
|
97
97
|
<image :src="product.category.category_img" mode="widthFix"></image>
|
|
98
|
-
</view>
|
|
98
|
+
</view>
|
|
99
99
|
<!--分类图片-->
|
|
100
|
+
<!--分类文字+背景-->
|
|
101
|
+
<view v-if="product.category.show_method==='text'&&product.category.show_config">
|
|
102
|
+
<view :style="[fontStyle(product.category.show_config)]">{{product.category.category_name}}</view>
|
|
103
|
+
</view>
|
|
104
|
+
<!--分类文字+背景-->
|
|
100
105
|
<!--商品显示-->
|
|
101
106
|
<view
|
|
102
107
|
class="productsBox"
|
|
@@ -467,6 +472,22 @@ export default {
|
|
|
467
472
|
bgColor: this.contBrandBgColor,
|
|
468
473
|
}
|
|
469
474
|
},
|
|
475
|
+
fontStyle(){
|
|
476
|
+
return(config)=>{
|
|
477
|
+
return {
|
|
478
|
+
height:'80rpx',
|
|
479
|
+
lineHeight:'80rpx',
|
|
480
|
+
textAlign:'center',
|
|
481
|
+
width:'100%',
|
|
482
|
+
fontSize:config.fontSize+'rpx',
|
|
483
|
+
color:config.fontColorStatus==='custom' ? config.fontColor : this.mainColor,
|
|
484
|
+
backgroundColor:config.backgroundColorStatus==='custom' ? config.backgroundColor : this.mainColor,
|
|
485
|
+
borderRadius:config.backgroundRadius?config.backgroundRadius+'rpx':0,
|
|
486
|
+
border:config.contBorder.type==='Y'?`${config.contBorder.value.width}rpx ${config.contBorder.value.style} ${config.contBorder.value.color}`:'none',
|
|
487
|
+
boxShadow: config.contShadow.type==='Y' ? `${config.contShadow.value.color} 0 0 ${config.contShadow.value.width}rpx`:''
|
|
488
|
+
}
|
|
489
|
+
}
|
|
490
|
+
},
|
|
470
491
|
},
|
|
471
492
|
created() {
|
|
472
493
|
this.nodataSp = getServiceUrl('/component/sp_nodata.png')
|
|
@@ -817,6 +838,11 @@ export default {
|
|
|
817
838
|
return prod;
|
|
818
839
|
})
|
|
819
840
|
}
|
|
841
|
+
if(item.category.show_method==='text'){
|
|
842
|
+
if(item.category.show_config){
|
|
843
|
+
item.category.show_config = JSON.parse(item.category.show_config);
|
|
844
|
+
}
|
|
845
|
+
}
|
|
820
846
|
this.$set(this.prdductsOrgFitler,key, this.$xdUniHelper.cloneDeep(item.items));
|
|
821
847
|
this.getPaginationData(item);
|
|
822
848
|
return item;
|