jufubao-mall 2.0.40-beta2 → 2.0.40-beta3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-mall",
-  "version": "2.0.40-beta2",
+  "version": "2.0.40-beta3",
   "private": false,
   "description": "聚福宝商城业务组件插件包",
   "main": "index.js",

package/src/components/JfbMallConfirm/JfbMallConfirm.vue

@@ -340,7 +340,7 @@
         </xd-down-drawer>
       </template>
       <CusVipOpenDialog
-        v-if="!isVip"
+        v-if="showOpenVipDialog"
         :bgImg="openVipBgImg"
         :btnBgImg="openVipBtnBgImg"
         @onOpen="handleOpenVip"
@@ -732,6 +732,9 @@
       },
       defaultUseWalletFirst(){
         return this.checkPayMethod.includes('wallet');
+      },
+      showOpenVipDialog(){
+        return !this.isVip&&this.is_plus_site;
       }
     },
     watch: {

package/src/components/JfbMallNewShopList/JfbMallNewShopList.vue

@@ -417,6 +417,7 @@
         if(this.topNavStatus === 'S'){
           //服务类型
         }
+        this.page_token = '1';
         this.getList();
       },
       getParams(){
@@ -585,7 +586,7 @@
         //未开启过滤条件
         if(this.showQuery === 'N') {
           this.searchFilterList = [];
-          return
+          return Promise.resolve([]);
         }
         let data = this.$xdUniHelper.deleteParamEmptyKey({
           ...this.options,
@@ -594,25 +595,29 @@
           city_code: this.stateCity.city_code,
           type:'sell',
         })
-
-        jfbRootExec("getMallNewSearchFilterList", {
-          vm: this,
-          data: data
-        })
-          .then(res => {
-            this.searchFilterList = (res.items || []).map(item => {
-              item.options = item.options.map(it=>{
-                it.value = it.value + '';
-                return it;
-              });
-              return item;
-            });
-            this.$xdHideLoading();
-          })
-          .catch(err => {
-            this.$xdHideLoading();
-            this.$xdLog.catch(err);
+        return new Promise((resolve, reject) => {
+          jfbRootExec("getMallNewSearchFilterList", {
+            vm: this,
+            data: data
           })
+            .then(res => {
+              this.searchFilterList = (res.items || []).map(item => {
+                item.options = item.options.map(it=>{
+                  it.value = it.value + '';
+                  return it;
+                });
+                return item;
+              });
+              resolve(this.searchFilterList)
+              this.$xdHideLoading();
+            })
+            .catch(err => {
+              this.$xdHideLoading();
+              this.$xdLog.catch(err);
+              reject(err);
+            })
+        })
+        
       },
 
       handleTabs(type){
@@ -657,7 +662,7 @@
       },
 
       //==system event===
-      onJfbLoad(options) {
+      async onJfbLoad(options) {
 
 
         //测试数据
@@ -692,7 +697,17 @@
 
         // this.options = this.$xdUniHelper.cloneDeep(options);
         this.options = this.reserveParams(options, ['brand_type', 'keyword', 'xnamespace', 'channel_code', 'consume_mode']);
-        this.getSearchFilterList();
+        if(this.topNavStatus === 'C'){
+          let filterList = await this.getSearchFilterList();
+          let shopCate = filterList.find(item => item.value === 'shop_category');
+          let shopCateOptions = shopCate ? shopCate.options : [];
+          if(shopCateOptions.length){
+            let firstCate = shopCateOptions[0];
+            this.$set(this.searchFilterParams, 'shop_category', firstCate.value);
+          }
+        }else{
+          this.getSearchFilterList();
+        }
         this.getList();
       },
       onJfbReachBottom(options) {