wayne il y a 6 ans
Parent
commit
d4e6fa48f7
2 fichiers modifiés avec 23 ajouts et 11 suppressions
  1. 1 1
      pages/salary/_id.vue
  2. 22 10
      pages/salary/index.vue

+ 1 - 1
pages/salary/_id.vue

@@ -129,7 +129,7 @@ export default {
     // 使用 req 和 res
     console.log(req)
     if (process.server) {
-      const path = req.url
+      const path = req.url.replace(/c%23/, "c#").replace(/c%24/, "c++")
       const cityJob = path.split('/')[2]
       const city = cityJob.split('-')[0]
       const job = cityJob.split('-')[1]

+ 22 - 10
pages/salary/index.vue

@@ -64,20 +64,25 @@
           <br />就上程序员客栈
         </div>
         <div class="search-wrapper">
-          <el-select @change="changeJob" v-model="searchJob" placeholder="请选择">
-            <el-option v-for="item in jobList" :key="item.job" :label="item.job" :value="item.job"></el-option>
+          <el-select class="salary-job-search" style="margin-right:.1rem;width:3.75rem;" @change="changeJob" v-model="searchJob" placeholder="请选择">
+            <el-option
+              v-for="item in jobList"
+              :key="item.job"
+              :label="item.job"
+              :value="item.job_slug"
+            ></el-option>
           </el-select>
 
-          <el-select style="margin: 3px;width:100px;" v-model="searchCity" placeholder="请选择">
+          <el-select class="salary-city-search" style="margin-right:.1rem;width:2rem;" v-model="searchCity" placeholder="请选择">
             <el-option
               v-for="item in cityList"
               :key="item.city"
               :label="item.city"
-              :value="item.city"
+              :value="item.city_slug"
             ></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">-->
@@ -98,7 +103,7 @@
       <div class="content">
         <div
           class="info"
-        >截至2019年9月6日,调查了全国38749756名开发者的工资数据后发现,上海开发者平均工资最高达¥97974元/月,Python开发者的平均工资最高达66666元/月,本数据仅供参考。</div>
+        >截至2019年9月6日,调查了全国的开发者的工资数据后发现,{{city}}开发者平均工资最高达¥{{citySalary}}元/月,{{job}}开发者的平均工资最高达{{jobSalary}}元/月,本数据仅供参考。</div>
         <div class="module-wrapper">
           <div class="module-title">开发者薪资排行城市TOP10</div>
           <div id="city-chart" class="city-chart"></div>
@@ -263,12 +268,12 @@ export default {
         this.$message("请输入查询岗位名称");
         return false;
       }
-      this.searchJob = this.searchJob.replace(/c#/, "c%23");
-      this.searchJob = this.searchJob.replace(/c\+\+*/, "c%24");
+      // this.searchJob = this.searchJob.replace(/c#/, "c%23");
+      // this.searchJob = this.searchJob.replace(/c\+\+*/, "c%24");
       // this.$router.push(
       //   "/salary/detail?job=" + this.searchJob + "&city=" + this.searchCity
       // );
-      window.location.href = `/salary/${this.searchCity}-${this.searchJob}/`.replace(/c%23/, "c#").replace(/c%24/, "c++");
+      window.location.href = `/salary/${this.searchCity}-${this.searchJob}/`.replace(/c#/, "c%23").replace(/c\+\+*/, "c%24");
     },
     inVal(val) {
       this.searchJob = val;
@@ -531,7 +536,8 @@ export default {
 
   .city-chart,
   .job-chart {
-    margin: 0.48rem auto 0;
+    margin-top: 0.48rem;
+    margin-left: -0.24rem;
     width: 100%;
   }
 
@@ -560,4 +566,10 @@ export default {
   .pc .salary-city-search .el-input__inner {
     height: 53px;
   }
+  .mobile .salary-job-search .el-input__inner {
+    height: .85rem;
+  }
+  .mobile .salary-city-search .el-input__inner {
+    height: .85rem;
+  }
 </style>