Merge remote-tracking branch 'origin/develop' into develop

2021-11-02 14:02:41 +08:00
parent b3f92b8d7c ca1f9b3bb3
commit f3df7e1ea8
16 changed files with 1956 additions and 177 deletions
@@ -22,7 +22,8 @@
        placeholder="请输入关键词"
        clearable
      ></el-input>
-      <el-button class="primary_button" type="primary" @click="search">搜索</el-button>
+      <el-button  type="primary" @click="search">搜索</el-button>
+      <el-button style="margin-left: 5px;"  type="primary" @click="seniorSearch">高级搜索</el-button>
    </div>
  </div>
 </template>
@@ -74,6 +75,15 @@ export default {
        }
      })
    },
+    seniorSearch(){
+      this.$router.push({
+        name: 'AdvancedSearch',
+        params: {
+          selectKey: this.checkState,
+          searchValue: this.checkContent || undefined
+        }
+      })
+    },
  },
  mounted(){