Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -43,7 +43,7 @@ module.exports = {
             order: req.query.order || 's_t_desc',
             order: req.query.order || 's_t_desc',
             limit: req.query.limit || '60',
             limit: req.query.limit || '60',
             color: req.query.color,
             color: req.query.color,
-            price: req.query.price,
+            price: req.query.priceRange,
             size: req.query.size,
             size: req.query.size,
             pd: req.query.pd,
             pd: req.query.pd,
             tagsFilter: req.query.tagsFilter
             tagsFilter: req.query.tagsFilter

@@ -38,3 +38,9 @@
         color: $grey;
         color: $grey;
     }
     }
 }
 }
+
+.button-ghost {
+    background-color: transparent;
+    border: none;
+    outline: none;
+}

@@ -2,7 +2,7 @@
     <div class="filter-box">
     <div class="filter-box">
     <div class="filter" :class="{ 'filter-open': isVisible}">
     <div class="filter" :class="{ 'filter-open': isVisible}">
         <div class="filter-actions">
         <div class="filter-actions">
-            <a href="javascript:;" class="filter-action" @click="clearVals">清空</a>
+            <button class="button-ghost filter-action" @click="clearVals">清空</button>
             <button class="button button-small filter-action" @click="okAction">确定</button>
             <button class="button button-small filter-action" @click="okAction">确定</button>
         </div>
         </div>
         <div class="filter-params">
         <div class="filter-params">
@@ -62,7 +62,7 @@
             },
             },
 
 
             okAction: function() {
             okAction: function() {
-                this.$set('selected', Object.assign({}, this.selected,this.params));
+                this.$set('selected', Object.assign({}, this.selected, this.params));
                 bus.$emit('filter.change', {
                 bus.$emit('filter.change', {
                     val: this.selected,
                     val: this.selected,
                     ref: this._uid
                     ref: this._uid
@@ -82,11 +82,11 @@
                 this.$set(`params.${this.subType}`, item);
                 this.$set(`params.${this.subType}`, item);
             },
             },
 
 
-            showLabel: function(key){
+            showLabel: function(key) {
                 const newSelected = this.params[key];
                 const newSelected = this.params[key];
                 const oldSelected = this.selected[key];
                 const oldSelected = this.selected[key];
 
 
-                if(newSelected) {
+                if (newSelected) {
                     return newSelected.name || '';
                     return newSelected.name || '';
                 } else {
                 } else {
                     return oldSelected && oldSelected.name || '';
                     return oldSelected && oldSelected.name || '';