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

@@ -45,10 +45,10 @@
   },
   "devDependencies": {
     "autoprefixer": "^6.4.0",
-    "babel-core": "^6.11.4",
+    "babel-core": "^6.13.0",
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-runtime": "^6.12.0",
-    "babel-preset-es2015": "^6.9.0",
+    "babel-preset-es2015": "^6.13.0",
     "babel-runtime": "^6.11.6",
     "eslint": "^3.2.2",
     "eslint-config-yoho": "^1.0.1",

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

@@ -2,7 +2,7 @@
     <div class="filter-box">
     <div class="filter" :class="{ 'filter-open': isVisible}">
         <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>
         </div>
         <div class="filter-params">
@@ -62,7 +62,7 @@
             },
 
             okAction: function() {
-                this.$set('selected', Object.assign({}, this.selected,this.params));
+                this.$set('selected', Object.assign({}, this.selected, this.params));
                 bus.$emit('filter.change', {
                     val: this.selected,
                     ref: this._uid
@@ -82,11 +82,11 @@
                 this.$set(`params.${this.subType}`, item);
             },
 
-            showLabel: function(key){
+            showLabel: function(key) {
                 const newSelected = this.params[key];
                 const oldSelected = this.selected[key];
 
-                if(newSelected) {
+                if (newSelected) {
                     return newSelected.name || '';
                 } else {
                     return oldSelected && oldSelected.name || '';