Merge branch 'dev' of www.gitinn.com:proginn/proginn-frontend into dev

pages/salary/_id.vue

@@ -111,7 +111,7 @@
   export default {
     head() {
       return {
-        title: `${this.city}${this.job}月薪工资待遇查询，【城市】企业招聘【岗位】费用查询-程序员客栈`,
+        title: `${this.city}${this.job}月薪工资待遇查询，${this.city}企业招聘${this.job}费用查询-程序员客栈`,
         meta: [
             {
                 name: "keywords",

pages/salary/index.vue

@@ -4,7 +4,7 @@
       <div class="header">
         <h1 class="title">查岗位薪资 就上程序员客栈</h1>
         <div class="search-wrapper">
-          <el-select @change="changeJob" v-model="searchJob" placeholder="请选择">
+          <el-select class="salary-job-search" style="margin-right:5px;width:500px;" @change="changeJob" v-model="searchJob" placeholder="请选择">
             <el-option
               v-for="item in jobList"
               :key="item.job"
@@ -13,7 +13,7 @@
             ></el-option>
           </el-select>
 
-          <el-select style="margin: 10px;width:100px;" v-model="searchCity" placeholder="请选择">
+          <el-select class="salary-city-search" style="margin-right:5px;width:100px;" v-model="searchCity" placeholder="请选择">
             <el-option
               v-for="item in cityList"
               :key="item.city"
@@ -22,7 +22,7 @@
             ></el-option>
           </el-select>
 
-          <el-button style="background-color: #147eff;" @click="search" type="primary">查询</el-button>
+          <div class="search-btn" @click="search" type="primary">查询</div>
 
           <!--          <div class="search-content">-->
           <!--            <input type="text" @keyup.enter="search" v-model="searchJob" placeholder="请输入您需要查询的岗位名称，如c++软件工程师" class="search-input">-->
@@ -312,7 +312,7 @@ export default {
   .search-btn {
     width: 104px;
     height: 53px;
-    border-radius: 0px 4px 4px 0px;
+    border-radius: 4px;
     background-color: #147eff;
     line-height: 53px;
     text-align: center;
@@ -511,3 +511,12 @@ export default {
   }
 }
 </style>
+
+<style>
+  .pc .salary-job-search .el-input__inner {
+    height: 53px;
+  }
+  .pc .salary-city-search .el-input__inner {
+    height: 53px;
+  }
+</style>