Merge branch 'h5_zyly_vue_0517' into Development

# Conflicts:
#	.gitignore
#	view/0.js
#	view/1.js
#	view/10.js阿斯顿
#	view/11.js
#	view/12.js
#	view/13.js
#	view/14.js
#	view/15.js
#	view/16.js
#	view/17.js
#	view/18.js
#	view/19.js
#	view/2.js
#	view/20.js
#	view/21.js
#	view/22.js
#	view/23.js
#	view/24.js
#	view/25.js
#	view/26.js
#	view/27.js
#	view/28.js
#	view/29.js
#	view/3.js
#	view/30.js
#	view/31.js
#	view/32.js
#	view/33.js
#	view/34.js
#	view/35.js
#	view/36.js
#	view/37.js
#	view/38.js
#	view/4.js
#	view/5.js
#	view/6.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js

src/views/xianhuo/xianhuo.vue

@@ -332,7 +332,9 @@ export default {
       this.p++;
       this.p++;
       this.getZyData();
       this.getZyData();
     },
     },
-    toSearch() {},
+    toSearch() {
+        window.location.href = "/v3/search/search_index.html?ptag=lxshop-topnav";
+    },
     resetRight() {
     resetRight() {
       this.getZyData();
       this.getZyData();
     },
     },