路由调整

src/views/homepage/console/askLog.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="99" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/console/collectPro.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="99" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/console/collectSup.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="99" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/console/index.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="99" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/console/product.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="99" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/console/registerInfo.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="99" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/console/replyLog.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="99" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/console/userInfo.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="99" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/course/index.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="5" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/footer/cooperate.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="7" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/footer/index.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="7" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/footer/opinion.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="7" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/information/details.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="6" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/information/index.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="6" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/product/details.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="1" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/product/hardware.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="99" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>
@@ -181,6 +181,9 @@ export default {
       if (this.$route.params) {
         this.query = Object.assign(this.query, this.$route.params)
       }
+      if (this.$route.query) {
+        this.query = Object.assign(this.query, this.$route.query)
+      }
     })
   },
   methods: {

src/views/homepage/product/index.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="1" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>
@@ -231,7 +231,12 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.query = Object.assign(this.query, this.$route.params)
+      if (this.$route.params) {
+        this.query = Object.assign(this.query, this.$route.params)
+      }
+      if (this.$route.query) {
+        this.query = Object.assign(this.query, this.$route.query)
+      }
       HttpReq.webClientApi.homePageGetSearch({
         preview: false
       }).then((res) => {

src/views/homepage/project/index.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="3" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/publish/buyInfo.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="7" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/publish/index.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="7" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/publish/otherInfo.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="7" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/publish/supplyInfo.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="7" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/software/index.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="4" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/supplier/details.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="2" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>

src/views/homepage/supplier/index.vue

@@ -3,7 +3,7 @@
     <div class="head-box">
       <div class="head-box-top">
         <div class="top-call" />
-        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png"></div>
+        <div class="top-call"><img src="@/assets/home_images/cisnet_logo_b.png" class="touch" @click="$router.push('/home')"></div>
         <div class="top-call"><title-menus ref="titleMenus" menu-index="2" style="padding-top: 15px" /></div>
         <div class="top-call"><user-login ref="userLogin" /></div>
         <div class="top-call"><language-setting ref="languageSetting" /></div>
@@ -180,6 +180,9 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
+      if (this.$route.query) {
+        this.query = Object.assign(this.query, this.$route.query)
+      }
       HttpReq.webClientApi.homePageGetSearch({
         preview: false
       }).then((res) => {
@@ -195,6 +198,12 @@ export default {
           return item.label === this.$route.params.areaText
         })[0].value
       }
+      if (this.$route.query.areaText) {
+        this.query.area = this.areaOpts.filter(item => {
+          return item.label === this.$route.query.areaText
+        })[0].value
+      }
+      console.log(this.query)
       this.search()
     },
     search() {