jufubao-mall 2.0.16-beta54 → 2.0.16-beta55

package/package.json

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

package/src/components/JfbMallResourceShopList/JfbMallResourceShopList.vue

@@ -40,7 +40,6 @@
           >{{ city.name }}</view>
         </view>
       </view>
-      
       <view v-if="styleLayout==3 && brandList.length" class="brand_wrap">
         <swiper :style="{height: swiperHeight + 'rpx'}" style="background-color: #FFFFFF;" :indicator-dots="swiperShowDot"
           :indicator-active-color="mainColor"
@@ -63,23 +62,6 @@
       </view>
       <view class="query_filter" :style="[queryFilterStyle]" v-if="showQuery === 'Y'">
         <view v-if="filterItemsComp.length===1">店铺列表</view>
-        <!-- <template>
-          <view class="query_filter_r" @click="switchQueryModal('city')" v-if="filterModeData.includes('city_code')">
-            区域 <xd-font-icon icon="iconxia_down" :size="24" style="margin-left: 4rpx;"></xd-font-icon>
-          </view>
-          <view class="query_filter_r" @click="switchQueryModal('brand')" v-if="filterModeData.includes('brand_id')">
-            品牌 <xd-font-icon icon="iconxia_down" :size="24" style="margin-left: 4rpx;"></xd-font-icon>
-          </view>
-          <view class="query_filter_r" @click="switchQueryModal('business')" v-if="filterModeData.includes('namespace')">
-            业务线 <xd-font-icon icon="iconxia_down" :size="24" style="margin-left: 4rpx;"></xd-font-icon>
-          </view>
-          <view class="query_filter_r" @click="switchQueryModal('consume_mode')" v-if="filterModeData.includes('consume_mode')">
-            门店分类 <xd-font-icon icon="iconxia_down" :size="24" style="margin-left: 4rpx;"></xd-font-icon>
-          </view>
-        </template>
-        <view class="query_filter_r" @click="switchQueryModal('filter')" v-if="filterModeData.includes('filter')">
-          筛选 <xd-font-icon icon="icontijianshaixuan" :size="24"></xd-font-icon>
-        </view> -->
         <view
           class="query_filter_r"
           v-for="item in filterItemsComp" :key="item.value"
@@ -509,9 +491,9 @@
         //设置业务请求代码
         this.setNameSpace(options);
         console.log(this.xnamespace,'options','mmmmmm')
-        if(this.xnamespace){
-          this.namespace = this.xnamespace;
-        }
+        // if(this.xnamespace){
+        //   this.namespace = this.xnamespace;
+        // }
         //地址参数传入过滤条件选中
         if(options['brand_ids']){
           this.$set(this.searchFilterParams, 'brand', options['brand_ids'].split(','));
@@ -846,7 +828,7 @@
         let params = {
           page_size: this.page_size,
           page_token: this.page_token,
-          namespace: this.xnamespace,
+          // namespace: this.xnamespace,
           ...this.options,
         }
 
@@ -892,11 +874,6 @@
         })
       },
       p_getSearchFilter(){
-        //未开启过滤条件
-        if(this.showQuery === 'N') {
-          this.searchFilterList = [];
-          return
-        }
         return new Promise((resolve, reject) => {
           let data = this.getParams();
           data = {
@@ -914,27 +891,38 @@
             data: this.$xdUniHelper.deleteParamEmptyKey(data)
           }).then(res => {
             console.log(res,'res11111')
-            this.searchFilterList = res.items || [];
-            console.log(  this.searchFilterList,'  this.searchFilterList')
+            //未开启过滤条件
+            if(this.showQuery === 'N') {
+              this.searchFilterList = [];
+            }else{
+              this.searchFilterList = res.items || [];
+              console.log(  this.searchFilterList,'  this.searchFilterList')
+            }
             this.brandList = res.brands.map(item => {
               item.icon = getServiceUrl(item.icon, 'size2');
               return item;
             });
             if(this.showBusinessLine == 'Y'){
-              if(this.dimension==='business'){
-                this.namespaceList = res.namespaces;
-              } else if(this.dimension==='store'){
-                //当导航维度是按门店分类时，用categories代替业务线
-                this.namespaceList = res.categories;
+              if(this.namespaceList.length == 0){
+                if(this.dimension==='business'){
+                  this.namespaceList = res.namespaces;
+                } else if(this.dimension==='store'){
+                  //当导航维度是按门店分类时，用categories代替业务线
+                  this.namespaceList = res.categories;
+                }
+                if(this.showAllBusinessLine == 'Y'){
+                  this.namespaceList = [{label: "全部", value: "all"}].concat(this.namespaceList);
+                }
+                this.namespace = this.namespaceList[0].value;
               }
               if(this.showAllBusinessLine == 'Y'){
-                this.namespaceList = [{label: "全部", value: "all"}].concat(this.namespaceList);
+                let hasAll = this.namespaceList.some(item=>item.value==='all');
+                if(!hasAll){
+                  this.namespaceList = [{label: "全部", value: "all"}].concat(this.namespaceList);
+                }
               }else{
                 this.namespaceList = this.namespaceList.filter(item => item.value!=='all');
               }
-              if(this.namespaceList.length){
-                this.namespace = this.xnamespace||this.namespaceList[0].value;
-              }
             }
             // setTimeout(()=>{
             this.$nextTick(()=>{

package/src/components/JfbMallResourceShopList/cusAttr/content.js

@@ -352,6 +352,32 @@ export default (data, gValue, gColor, oldData) => {
           // {value:'hdSelf', label: '到店取',input:'',check: false,placeholder:'到店取名称，默认“去点餐”'},
         ])
       },
+      rules:[{
+        validator: (rule, value, callback) => {
+          let errorStr = '';
+          //设置为空
+          if(!value || (value && value.length === 0)) {
+            callback();
+            return;
+          }
+          //非空，判断设置的名称长度不能大于4
+          if(value && value.length > 0) {
+            let len = value.length;
+            for(let i = 0; i < len; i++) {
+              if(value[i].input.length > 4) {
+                errorStr = `${value[i].label}名称最大长度不能超过4个汉字`;
+                break
+              }
+            }
+          }
+          if(errorStr) {
+            callback(errorStr)
+            return
+          }
+
+          callback()
+        }, message: '输入名称内容最多4字', trigger: ['blur', 'change']
+      }]
     },
     {ele: 'group_end'},
     {