jufubao-mall 2.0.40-beta2 → 2.0.40-beta4
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
|
@@ -340,7 +340,7 @@
|
|
|
340
340
|
</xd-down-drawer>
|
|
341
341
|
</template>
|
|
342
342
|
<CusVipOpenDialog
|
|
343
|
-
v-if="
|
|
343
|
+
v-if="showOpenVipDialog"
|
|
344
344
|
:bgImg="openVipBgImg"
|
|
345
345
|
:btnBgImg="openVipBtnBgImg"
|
|
346
346
|
@onOpen="handleOpenVip"
|
|
@@ -732,6 +732,9 @@
|
|
|
732
732
|
},
|
|
733
733
|
defaultUseWalletFirst(){
|
|
734
734
|
return this.checkPayMethod.includes('wallet');
|
|
735
|
+
},
|
|
736
|
+
showOpenVipDialog(){
|
|
737
|
+
return !this.isVip&&this.is_plus_site;
|
|
735
738
|
}
|
|
736
739
|
},
|
|
737
740
|
watch: {
|
|
@@ -417,6 +417,7 @@
|
|
|
417
417
|
if(this.topNavStatus === 'S'){
|
|
418
418
|
//服务类型
|
|
419
419
|
}
|
|
420
|
+
this.page_token = '1';
|
|
420
421
|
this.getList();
|
|
421
422
|
},
|
|
422
423
|
getParams(){
|
|
@@ -585,34 +586,39 @@
|
|
|
585
586
|
//未开启过滤条件
|
|
586
587
|
if(this.showQuery === 'N') {
|
|
587
588
|
this.searchFilterList = [];
|
|
588
|
-
return
|
|
589
|
+
return Promise.resolve([]);
|
|
589
590
|
}
|
|
590
591
|
let data = this.$xdUniHelper.deleteParamEmptyKey({
|
|
591
592
|
...this.options,
|
|
592
593
|
namespace: this.xnamespace,
|
|
593
594
|
keyword: this.keyword,
|
|
594
595
|
city_code: this.stateCity.city_code,
|
|
595
|
-
type:'sell',
|
|
596
|
-
|
|
597
|
-
|
|
598
|
-
jfbRootExec("getMallNewSearchFilterList", {
|
|
599
|
-
vm: this,
|
|
600
|
-
data: data
|
|
596
|
+
type: 'sell',
|
|
597
|
+
consume_mode: this.serverType.join(",")
|
|
601
598
|
})
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
return it;
|
|
607
|
-
});
|
|
608
|
-
return item;
|
|
609
|
-
});
|
|
610
|
-
this.$xdHideLoading();
|
|
611
|
-
})
|
|
612
|
-
.catch(err => {
|
|
613
|
-
this.$xdHideLoading();
|
|
614
|
-
this.$xdLog.catch(err);
|
|
599
|
+
return new Promise((resolve, reject) => {
|
|
600
|
+
jfbRootExec("getMallNewSearchFilterList", {
|
|
601
|
+
vm: this,
|
|
602
|
+
data: data
|
|
615
603
|
})
|
|
604
|
+
.then(res => {
|
|
605
|
+
this.searchFilterList = (res.items || []).map(item => {
|
|
606
|
+
item.options = item.options.map(it=>{
|
|
607
|
+
it.value = it.value + '';
|
|
608
|
+
return it;
|
|
609
|
+
});
|
|
610
|
+
return item;
|
|
611
|
+
});
|
|
612
|
+
resolve(this.searchFilterList)
|
|
613
|
+
this.$xdHideLoading();
|
|
614
|
+
})
|
|
615
|
+
.catch(err => {
|
|
616
|
+
this.$xdHideLoading();
|
|
617
|
+
this.$xdLog.catch(err);
|
|
618
|
+
reject(err);
|
|
619
|
+
})
|
|
620
|
+
})
|
|
621
|
+
|
|
616
622
|
},
|
|
617
623
|
|
|
618
624
|
handleTabs(type){
|
|
@@ -657,7 +663,7 @@
|
|
|
657
663
|
},
|
|
658
664
|
|
|
659
665
|
//==system event===
|
|
660
|
-
onJfbLoad(options) {
|
|
666
|
+
async onJfbLoad(options) {
|
|
661
667
|
|
|
662
668
|
|
|
663
669
|
//测试数据
|
|
@@ -692,7 +698,17 @@
|
|
|
692
698
|
|
|
693
699
|
// this.options = this.$xdUniHelper.cloneDeep(options);
|
|
694
700
|
this.options = this.reserveParams(options, ['brand_type', 'keyword', 'xnamespace', 'channel_code', 'consume_mode']);
|
|
695
|
-
this.
|
|
701
|
+
if(this.topNavStatus === 'C'){
|
|
702
|
+
let filterList = await this.getSearchFilterList();
|
|
703
|
+
let shopCate = filterList.find(item => item.value === 'shop_category');
|
|
704
|
+
let shopCateOptions = shopCate ? shopCate.options : [];
|
|
705
|
+
if(shopCateOptions.length){
|
|
706
|
+
let firstCate = shopCateOptions[0];
|
|
707
|
+
this.$set(this.searchFilterParams, 'shop_category', [firstCate.value]);
|
|
708
|
+
}
|
|
709
|
+
}else{
|
|
710
|
+
this.getSearchFilterList();
|
|
711
|
+
}
|
|
696
712
|
this.getList();
|
|
697
713
|
},
|
|
698
714
|
onJfbReachBottom(options) {
|