过滤条件展示调整

components/search/GoodList.vue

@@ -229,6 +229,9 @@
       clear_price: function () {
         this.min_price = ''
         this.max_price = ''
+        delete this.filter.goods_minpricermb
+        delete this.filter.goods_maxpricermb
+        this.$emit('filterPriceEvent', this.filter)
       }
     }
   }

components/search/Kind.vue

@@ -60,7 +60,7 @@
       <div class="sl-value">
         <ul class="list-inline" >
           <li><a class="f14" @click="restore('store')">全部</a></li>
-          <li>
+          <li v-if="getType(list_store_type,store_type_co)">
             <div class="f14" style="color: #999;" v-if="!getType(list_store_type,store_type_co)&&!co_click_flag">寄售</div>
             <a class="f14" v-if="getType(list_store_type,store_type_co)&&!co_click_flag" @click="click_store_type('CONSIGNMENT')">寄售</a>
             <span v-if="co_click_flag" @click="cancel_store_type('CONSIGNMENT')">
@@ -70,7 +70,7 @@
               </div>
             </span>
           </li>
-          <li>
+          <li v-if="getType(list_store_type,store_type_di)">
             <div class="f14" style="color: #999;" v-if="!getType(list_store_type,store_type_di)&&!di_click_flag">经销</div>
             <a class="f14" v-if="getType(list_store_type,store_type_di)&&!di_click_flag" @click="click_store_type('DISTRIBUTION')">经销</a>
             <span v-if="di_click_flag" @click="cancel_store_type('DISTRIBUTION')">
@@ -80,7 +80,7 @@
               </div>
             </span>
           </li>
-          <li>
+          <li v-if="getType(list_store_type,store_type_or)">
             <div class="f14" style="color: #999;" v-if="!getType(list_store_type,store_type_or)&&!or_click_flag">原厂</div>
             <a class="f14" v-if="getType(list_store_type,store_type_or)&&!or_click_flag" @click="click_store_type('ORIGINAL_FACTORY')">原厂</a>
             <span v-if="or_click_flag" @click="cancel_store_type('ORIGINAL_FACTORY')">
@@ -90,7 +90,47 @@
               </div>
             </span>
           </li>
-          <li>
+          <li v-if="getType(list_store_type,store_type_ag)">
+            <div class="f14" style="color: #999;" v-if="!getType(list_store_type,store_type_ag)&&!ag_click_flag">代理</div>
+            <a class="f14" v-if="getType(list_store_type,store_type_ag)&&!ag_click_flag" @click="click_store_type('AGENCY')">代理</a>
+            <span v-if="ag_click_flag" @click="cancel_store_type('AGENCY')">
+              <div class="sl-filter" >
+                <a class="text-num" >代理</a>
+                <span><i class="fa fa-close"></i></span>
+              </div>
+            </span>
+          </li>
+          <li v-if="!getType(list_store_type,store_type_co)">
+            <div class="f14" style="color: #999;" v-if="!getType(list_store_type,store_type_co)&&!co_click_flag">寄售</div>
+            <a class="f14" v-if="getType(list_store_type,store_type_co)&&!co_click_flag" @click="click_store_type('CONSIGNMENT')">寄售</a>
+            <span v-if="co_click_flag" @click="cancel_store_type('CONSIGNMENT')">
+              <div class="sl-filter">
+                <a class="text-num" >寄售</a>
+                <span><i class="fa fa-close"></i></span>
+              </div>
+            </span>
+          </li>
+          <li v-if="!getType(list_store_type,store_type_di)">
+            <div class="f14" style="color: #999;" v-if="!getType(list_store_type,store_type_di)&&!di_click_flag">经销</div>
+            <a class="f14" v-if="getType(list_store_type,store_type_di)&&!di_click_flag" @click="click_store_type('DISTRIBUTION')">经销</a>
+            <span v-if="di_click_flag" @click="cancel_store_type('DISTRIBUTION')">
+              <div class="sl-filter">
+                <a class="text-num" >经销</a>
+                <span><i class="fa fa-close"></i></span>
+              </div>
+            </span>
+          </li>
+          <li v-if="!getType(list_store_type,store_type_or)">
+            <div class="f14" style="color: #999;" v-if="!getType(list_store_type,store_type_or)&&!or_click_flag">原厂</div>
+            <a class="f14" v-if="getType(list_store_type,store_type_or)&&!or_click_flag" @click="click_store_type('ORIGINAL_FACTORY')">原厂</a>
+            <span v-if="or_click_flag" @click="cancel_store_type('ORIGINAL_FACTORY')">
+              <div class="sl-filter">
+                <a class="text-num" >原厂</a>
+                <span><i class="fa fa-close"></i></span>
+              </div>
+            </span>
+          </li>
+          <li v-if="!getType(list_store_type,store_type_ag)">
             <div class="f14" style="color: #999;" v-if="!getType(list_store_type,store_type_ag)&&!ag_click_flag">代理</div>
             <a class="f14" v-if="getType(list_store_type,store_type_ag)&&!ag_click_flag" @click="click_store_type('AGENCY')">代理</a>
             <span v-if="ag_click_flag" @click="cancel_store_type('AGENCY')">
@@ -109,7 +149,7 @@
       <div class="sl-value">
         <ul class="list-inline"  >
           <li><a class="f14" @click="restore('crname')">全部</a></li>
-          <li>
+          <li v-if="!crnameInArr(list_crname_temp, {'cr_name':'RMB'})">
             <a v-if="!crnameInArr(list_crname_temp, {'cr_name':'RMB'})&&!crname_click_flag.rmb_click_flag" class="f14" @click="click_crname('RMB')">大陆</a>
             <div style="color: #999;" v-if="crnameInArr(list_crname_temp, {'cr_name':'RMB'})&&!crname_click_flag.rmb_click_flag" class="f14">大陆</div>
             <span v-if="crname_click_flag.rmb_click_flag" @click="cancel_crname('RMB')">
@@ -119,7 +159,27 @@
               </div>
             </span>
           </li>
-          <li>
+          <li v-if="!crnameInArr(list_crname_temp, {'cr_name':'USD'})">
+            <a v-if="!crnameInArr(list_crname_temp, {'cr_name':'USD'})&&!crname_click_flag.usd_click_flag" class="f14" @click="click_crname('USD')">香港</a>
+            <div style="color: #999;" v-if="crnameInArr(list_crname_temp, {'cr_name':'USD'})&&!crname_click_flag.usd_click_flag" class="f14">香港</div>
+            <span v-if="crname_click_flag.usd_click_flag" @click="cancel_crname('USD')">
+              <div class="sl-filter">
+                <a class="text-num" >香港</a>
+                <span><i class="fa fa-close"></i></span>
+              </div>
+            </span>
+          </li>
+          <li v-if="crnameInArr(list_crname_temp, {'cr_name':'RMB'})">
+            <a v-if="!crnameInArr(list_crname_temp, {'cr_name':'RMB'})&&!crname_click_flag.rmb_click_flag" class="f14" @click="click_crname('RMB')">大陆</a>
+            <div style="color: #999;" v-if="crnameInArr(list_crname_temp, {'cr_name':'RMB'})&&!crname_click_flag.rmb_click_flag" class="f14">大陆</div>
+            <span v-if="crname_click_flag.rmb_click_flag" @click="cancel_crname('RMB')">
+              <div class="sl-filter">
+                <a class="text-num" >大陆</a>
+                <span><i class="fa fa-close"></i></span>
+              </div>
+            </span>
+          </li>
+          <li v-if="crnameInArr(list_crname_temp, {'cr_name':'USD'})">
             <a v-if="!crnameInArr(list_crname_temp, {'cr_name':'USD'})&&!crname_click_flag.usd_click_flag" class="f14" @click="click_crname('USD')">香港</a>
             <div style="color: #999;" v-if="crnameInArr(list_crname_temp, {'cr_name':'USD'})&&!crname_click_flag.usd_click_flag" class="f14">香港</div>
             <span v-if="crname_click_flag.usd_click_flag" @click="cancel_crname('USD')">
@@ -137,7 +197,27 @@
       <div class="sl-value">
         <ul class="list-inline"  >
           <li><a class="f14" @click="restore('crname')">全部</a></li>
-          <li>
+          <li v-if="!crnameInArr(list_crname_temp, {'cr_name':'RMB'})">
+            <a v-if="!crnameInArr(list_crname_temp, {'cr_name':'RMB'})&&!crname_click_flag.rmb_click_flag" class="f14" @click="click_crname('RMB')">人民币</a>
+            <div style="color: #999;" v-if="crnameInArr(list_crname_temp, {'cr_name':'RMB'})&&!crname_click_flag.rmb_click_flag" class="f14">人民币</div>
+            <span v-if="crname_click_flag.rmb_click_flag" @click="cancel_crname('RMB')">
+              <div class="sl-filter">
+                <a class="text-num" >人民币</a>
+                <span><i class="fa fa-close"></i></span>
+              </div>
+            </span>
+          </li>
+          <li v-if="!crnameInArr(list_crname_temp, {'cr_name':'USD'})">
+            <a v-if="!crnameInArr(list_crname_temp, {'cr_name':'USD'})&&!crname_click_flag.usd_click_flag" class="f14" @click="click_crname('USD')">美元</a>
+            <div style="color: #999;" v-if="crnameInArr(list_crname_temp, {'cr_name':'USD'})&&!crname_click_flag.usd_click_flag" class="f14">美元</div>
+            <span v-if="crname_click_flag.usd_click_flag" @click="cancel_crname('USD')">
+              <div class="sl-filter">
+                <a class="text-num" >美元</a>
+                <span><i class="fa fa-close"></i></span>
+              </div>
+            </span>
+          </li>
+          <li v-if="crnameInArr(list_crname_temp, {'cr_name':'RMB'})">
             <a v-if="!crnameInArr(list_crname_temp, {'cr_name':'RMB'})&&!crname_click_flag.rmb_click_flag" class="f14" @click="click_crname('RMB')">人民币</a>
             <div style="color: #999;" v-if="crnameInArr(list_crname_temp, {'cr_name':'RMB'})&&!crname_click_flag.rmb_click_flag" class="f14">人民币</div>
             <span v-if="crname_click_flag.rmb_click_flag" @click="cancel_crname('RMB')">
@@ -147,7 +227,7 @@
               </div>
             </span>
           </li>
-          <li>
+          <li v-if="crnameInArr(list_crname_temp, {'cr_name':'USD'})">
             <a v-if="!crnameInArr(list_crname_temp, {'cr_name':'USD'})&&!crname_click_flag.usd_click_flag" class="f14" @click="click_crname('USD')">美元</a>
             <div style="color: #999;" v-if="crnameInArr(list_crname_temp, {'cr_name':'USD'})&&!crname_click_flag.usd_click_flag" class="f14">美元</div>
             <span v-if="crname_click_flag.usd_click_flag" @click="cancel_crname('USD')">

pages/search/_keyword.vue

@@ -94,6 +94,7 @@
         if (kindarr.length === 0) {
           delete this.filter.goods_kindId
           delete this.paramJSON.goods_kindid
+          this.reloadKind()
           this.reloadBrand()
           this.reloadList()
           this.reloadStoreType()
@@ -112,6 +113,7 @@
           delete this.filter.goods_brandId
           delete this.paramJSON.goods_brandid
           this.reloadKind()
+          this.reloadBrand()
           this.reloadList()
           this.reloadStoreType()
           this.reloadCrname()