Merge branch 'master' of http://47.110.145.204:8085/godwithdh/wx_h5

src/components/search.vue

@@ -8,7 +8,7 @@
                 </select>
             </div>
             <div :class="{_input:true,radius:!typeList.select}" v-if="typeList.input">
-                <input class="input" v-model="inputValue" :placeholder="placeholder" v-on:input="changeInput"/>
+                <input class="input" v-model="inputValue" :placeholder="placeholder"  @keyup.13="keyDown($event)" @blur="keyDown"/>
                 <i class='iconfont icon-close' id="close" v-if="inputValue" @click='clearInputValue'></i>
             </div>
         </div>
@@ -87,6 +87,10 @@ export default {
     }
   },
   methods:{
+      keyDown(e){
+        this.search.searchvalue = this.inputValue;
+        this.global.$emit('searchData');
+      },
       searchData(e,type){
           let dateList = this.btns.map(x=>Util.getDate(x));
           let endDate = Util.dateFormat(new Date(),'yyyy-MM-dd');