From 25f6dfd8649a9adced83b140463846282cb9dfce Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Fri, 20 May 2022 09:55:27 +0800
Subject: [PATCH] 1

---
 src/components/FirstJob/joblist.vue  |   4 +-
 src/components/FirstJob/joblist1.vue | 392 +++++++++++++++++++++--------------
 src/style/index.less                 |   5 +-
 src/utils/request.js                 |   4 +-
 src/views/main.vue                   |   3 +-
 5 files changed, 249 insertions(+), 159 deletions(-)

diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index 7484422..ee1db26 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -284,7 +284,7 @@
             </div>
             <div class="subsetright">
               <div class="topContainer">
-                <div class="updateTime">
+                <div class="updateTime" style="display: none">
                   <span
                     >更新时间：{{ item.updateTime || "--" }} (
                     {{ item.diffTime || "--" }} )
@@ -351,7 +351,7 @@
         </div>
         <div class="hotphone">
           <h1 class="bottombox"><i>服务热线</i></h1>
-          <p>135 2307 4549</p>
+          <p>0371-6611 3723</p>
         </div>
         <!-- <div class="relationme">
           <p class="bottombox"><i>一手单合作</i></p>
diff --git a/src/components/FirstJob/joblist1.vue b/src/components/FirstJob/joblist1.vue
index cb211ec..a001144 100644
--- a/src/components/FirstJob/joblist1.vue
+++ b/src/components/FirstJob/joblist1.vue
@@ -79,29 +79,69 @@
             </ul>
           </div>
         </div>
-        <ul class="filterbox" style="display: none">
+
+        <span class="searchBox">
+          <a-input
+            placeholder="搜索企业/公司"
+            @keyup.enter="onSearch"
+            @input="resetsearch"
+            v-model="formvalue.aliasName"
+            class="searchinput"
+            style=""
+            ><div slot="prefix" @click="visible = true">
+              <span>{{ currentCity }}</span
+              ><i class="iconfont icon-sousuoxiala"></i
+              ><a-input
+                class="ageinput"
+                placeholder="年龄,如20"
+                v-model="formvalue.ageStr"
+                @input="resetAgeSearch"
+                @click.stop="
+                  () => {
+                    return false;
+                  }
+                "
+              ></a-input>
+            </div>
+            <button slot="suffix" @click="onSearch" style="">搜索</button>
+          </a-input>
+        </span>
+        <div class="hotStore">
+          <span>热门企业：</span>
+          <ul>
+            <li
+              v-for="(item, index) in hotStoreList"
+              :key="index"
+              @click="getHotStoreList(item)"
+            >
+              {{ item.aliasName }}
+            </li>
+            <!-- <li @click="resetResult" style="color: #aaa">重置</li> -->
+          </ul>
+        </div>
+        <ul class="filterbox" style="">
           <!-- @click="visible = true" -->
-          <li>
-            <i class="iconfont icon-dingwei"></i
-            ><a-cascader
-              :options="cityoption"
-              change-on-select
-              @change="onChange"
-              placeholder="选择城市"
-              v-model="formvalue.district"
-              popupClassName="flitercity"
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              id="city"
-              :popupStyle="{
-                transform: 'all .1s',
-              }"
-              ><i slot="suffixIcon" class="iconfont icon-xiala"></i
-            ></a-cascader>
-          </li>
+          <!-- <li>
+						<i class="iconfont icon-dingwei"></i
+						><a-cascader
+							:options="cityoption"
+							change-on-select
+							@change="onChange"
+							placeholder="选择城市"
+							v-model="formvalue.district"
+							popupClassName="flitercity"
+							:getPopupContainer="
+								(triggerNode) => {
+									return triggerNode.parentNode || document.body;
+								}
+							"
+							id="city"
+							:popupStyle="{
+								transform: 'all .1s',
+							}"
+							><i slot="suffixIcon" class="iconfont icon-xiala"></i
+						></a-cascader>
+					</li> -->
           <li>
             <a-cascader
               :options="options.price"
@@ -118,23 +158,39 @@
               ><i slot="suffixIcon" class="iconfont icon-xiala"></i
             ></a-cascader>
           </li>
-
           <li>
             <a-cascader
-              :options="options.age"
-              placeholder="年龄"
+              :options="options.gender"
+              placeholder="性别"
               @change="onChange"
-              popupClassName="agestr"
+              class="gender"
+              popupClassName="gender"
               :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model="formvalue.ageStr"
-              id="age"
+              v-model="formvalue.sex"
+              id="gender"
               ><i slot="suffixIcon" class="iconfont icon-xiala"></i
             ></a-cascader>
           </li>
+          <!-- <li>
+						<a-cascader
+							:options="options.age"
+							placeholder="年龄"
+							@change="onChange"
+							popupClassName="agestr"
+							:getPopupContainer="
+								(triggerNode) => {
+									return triggerNode.parentNode || document.body;
+								}
+							"
+							v-model="formvalue.ageStr"
+							id="age"
+							><i slot="suffixIcon" class="iconfont icon-xiala"></i
+						></a-cascader>
+					</li> -->
           <li class="special">
             <div
               @click.stop="isspecialboxshowclick"
@@ -166,48 +222,9 @@
             </div>
           </li>
           <li class="claerfilter">
-            <a
-              @click="claerfilter"
-              href="javascript:;"
-              v-if="
-                formvalue.district.length !== 0 ||
-                formvalue.monthlyPayStr.length !== 0 ||
-                formvalue.ageStr.length !== 0 ||
-                formvalue.jobSpecialLabelIds.length !== 0
-              "
-              >清空筛选</a
-            >
+            <a @click="claerfilter" href="javascript:;">清空筛选条件</a>
           </li>
         </ul>
-        <span>
-          <a-input
-            placeholder="搜索企业/公司"
-            @keyup.enter="onSearch"
-            @input="resetsearch"
-            v-model="searchvalue"
-            class="searchinput"
-            style="width: 500px"
-            ><div slot="prefix" @click="visible = true">
-              {{ currentCity }}<i class="iconfont icon-sousuoxiala"></i>
-            </div>
-            <button slot="suffix" @click="onSearch" style="margin-right: -12px">
-              搜索
-            </button>
-          </a-input>
-        </span>
-        <div class="hotStore">
-          <span>热门企业：</span>
-          <ul>
-            <li
-              v-for="(item, index) in hotStoreList"
-              :key="index"
-              @click="getHotStoreList(item)"
-            >
-              {{ item.aliasName }}
-            </li>
-            <li @click="resetResult" style="color: #aaa">重置</li>
-          </ul>
-        </div>
       </div>
     </div>
     <!-- 面包屑 -->
@@ -301,7 +318,7 @@
             </div>
             <div class="subsetright">
               <div class="topContainer">
-                <div class="updateTime">
+                <div class="updateTime" style="display: none">
                   <span
                     >更新时间：{{ item.updateTime || "--" }} (
                     {{ item.diffTime || "--" }} )
@@ -368,7 +385,7 @@
         </div>
         <div class="hotphone">
           <h1 class="bottombox"><i>服务热线</i></h1>
-          <p>135 2307 4549</p>
+          <p>0371-6611 3723</p>
         </div>
         <!-- <div class="relationme">
           <p class="bottombox"><i>一手单合作</i></p>
@@ -426,7 +443,7 @@ export default {
     return {
       // jobMainList: [], // 职位列表
       specialList: [], // 获取的特色列表
-      searchvalue: "",
+      // searchvalue: "",
       specialactive: [], // 点中的特色标签索引
       specialvalue: [], // 点中的特色标签
       visible: false, // 录单模态框的展示
@@ -496,6 +513,23 @@ export default {
             uid: 2,
           },
         ],
+        gender: [
+          {
+            value: "1",
+            label: "男",
+            uid: 3,
+          },
+          {
+            value: "2",
+            label: "女",
+            uid: 3,
+          },
+          {
+            value: "-1",
+            label: "男女不限",
+            uid: 3,
+          },
+        ],
       },
       relationList: [],
     };
@@ -506,44 +540,36 @@ export default {
   watch: {
     formvalue: {
       handler(e) {
-        // console.log(e);
+        console.log(e);
         // 筛选列表数据处理
         // if(e.city !== undefined){
-        if (e.district.length === 0) {
-          document.getElementById("city").style.width = 85 + "px";
-        } else {
-          const result = e.district.join("");
-          // console.log(result);
-          if (result.length > 6) {
-            document.getElementById("city").style.width =
-              (result.length + 3) * 14 + "px";
-            document.getElementById("city").style.maxWidth = "210px";
-            document.querySelector("#city").nextElementSibling.style.width =
-              (result.length + 3) * 14 + "px"; // 获取下一个兄弟元素s
-            document.getElementById("city").nextElementSibling.style.maxWidth =
-              "210px";
-          } else if (result.length > 5) {
-            document.getElementById("city").style.width =
-              (result.length + 2.8) * 14 + "px";
-            document.querySelector("#city").nextElementSibling.style.width =
-              (result.length + 2.6) * 14 + "px";
-          } else if (result.length > 4) {
-            document.getElementById("city").style.width =
-              (result.length + 2.4) * 14 + "px";
-            document.querySelector("#city").nextElementSibling.style.width =
-              (result.length + 2.4) * 14 + "px";
-          } else {
-            document.getElementById("city").style.width =
-              (result.length + 1.5) * 14 + "px";
-            document.getElementById("city").style.minWidth = 72 + "px";
-            document.querySelector("#city").nextElementSibling.style.width =
-              (result.length + 1.5) * 14 + "px";
-          }
-        }
+        // if (e.district.length === 0) {
+        // 	document.getElementById("city").style.width = 85 + "px";
+        // } else {
+        // 	const result = e.district.join("");
+        // 	// console.log(result);
+        // 	if (result.length > 6) {
+        // 		document.getElementById("city").style.width = (result.length + 3) * 14 + "px";
+        // 		document.getElementById("city").style.maxWidth = "210px";
+        // 		document.querySelector("#city").nextElementSibling.style.width = (result.length + 3) * 14 + "px"; // 获取下一个兄弟元素s
+        // 		document.getElementById("city").nextElementSibling.style.maxWidth = "210px";
+        // 	} else if (result.length > 5) {
+        // 		document.getElementById("city").style.width = (result.length + 2.8) * 14 + "px";
+        // 		document.querySelector("#city").nextElementSibling.style.width = (result.length + 2.6) * 14 + "px";
+        // 	} else if (result.length > 4) {
+        // 		document.getElementById("city").style.width = (result.length + 2.4) * 14 + "px";
+        // 		document.querySelector("#city").nextElementSibling.style.width = (result.length + 2.4) * 14 + "px";
+        // 	} else {
+        // 		document.getElementById("city").style.width = (result.length + 1.5) * 14 + "px";
+        // 		document.getElementById("city").style.minWidth = 72 + "px";
+        // 		document.querySelector("#city").nextElementSibling.style.width = (result.length + 1.5) * 14 + "px";
+        // 	}
+        // }
         // }
         // 工价的判断
-        if (e.monthlyPayStr.length === 0) {
+        if (e.monthlyPayStr.length == 0) {
           document.getElementById("price").style.width = 60 + "px";
+          document.getElementById("price").style.minWidth = 60 + "px";
         } else {
           const result = e.monthlyPayStr.join("");
           if (result.length >= 0) {
@@ -554,19 +580,31 @@ export default {
             // "150px";
           }
         }
-        // 年龄筛选长度的判断
-        if (e.ageStr.length === 0) {
-          document.getElementById("age").style.width = 60 + "px";
+        if (e.monthlyPayStr.length == 0) {
+          document.getElementById("price").style.width = 60 + "px";
+          document.getElementById("price").style.minWidth = 60 + "px";
         } else {
-          const result = e.ageStr.join("");
+          const result = e.monthlyPayStr.join("");
           if (result.length >= 0) {
-            document.getElementById("age").style.width = "90px";
-            document.getElementById("age").nextElementSibling.style.width =
-              "90px";
+            document.getElementById("price").style.width = "120px";
+            document.getElementById("price").nextElementSibling.style.width =
+              "130px";
             // document.querySelector(".ant-cascader-picker-label").style.width =
             // "150px";
           }
         }
+        // 年龄筛选长度的判断
+        // if (e.ageStr.length === 0) {
+        // 	document.getElementById("age").style.width = 60 + "px";
+        // } else {
+        // 	const result = e.ageStr.join("");
+        // 	if (result.length >= 0) {
+        // 		document.getElementById("age").style.width = "90px";
+        // 		document.getElementById("age").nextElementSibling.style.width = "90px";
+        // 		// document.querySelector(".ant-cascader-picker-label").style.width =
+        // 		// "150px";
+        // 	}
+        // }
       },
       deep: true,
     },
@@ -630,13 +668,13 @@ export default {
       //   }
       // } else
       this.formvalue.pageNum = 1;
-      if (e.target.value.trim() !== "") {
-        console.log("search");
-        this.formvalue.aliasName = e.target.value.trim();
-        this.getJobList();
-      } else if (this.searchvalue.trim() !== "") {
-        console.log("search1");
-        this.formvalue.aliasName = this.searchvalue;
+      if (
+        this.formvalue.aliasName.trim() !== "" ||
+        this.formvalue.ageStr.trim() !== ""
+      ) {
+        // console.log("search1");
+        // this.formvalue.aliasName = this.searchvalue;
+        console.log(this.formvalue);
         this.getJobList();
       }
 
@@ -674,17 +712,22 @@ export default {
     onChange(e, item) {
       console.log(e);
       console.log(item);
-      if (item) {
-        if (item.uid === 1) {
-          console.log(1);
-          this.formvalue.monthlyPayStr = item[0];
-        } else if (item.uid === 2) {
-          this.formvalue.ageStr = item[0];
-        } else if (item[0].id) {
-          console.log(e.join());
-          this.formvalue.district = e;
-        }
-      }
+      console.log(this.formvalue);
+      // if (item) {
+      // 	if (item.uid === 1) {
+      // 		console.log(1);
+      // 		this.formvalue.monthlyPayStr = item[0];
+      // 	} else if (item.uid === 2) {
+      // 		this.formvalue.ageStr = item[0];
+      // 	} else if (item[0].id) {
+      // 		console.log(e.join());
+      // 		this.formvalue.district = e;
+      // 	} else
+      // if (item[0].uid == 3){
+      // 		this.formvalue.sex = item[0].value;
+
+      //   }
+      // }
       this.getJobList();
     },
     pageChange(e) {
@@ -722,12 +765,17 @@ export default {
       // };
       this.formvalue.district = [];
       this.formvalue.monthlyPayStr = [];
-      this.formvalue.ageStr = [];
+      this.formvalue.ageStr = "";
       this.formvalue.jobSpecialLabelIds = [];
+      this.formvalue.aliasName = "";
+      this.formvalue.cityName = "";
+      this.formvalue.levelType = "";
+      this.formvalue.hotStoreId = "";
+      this.currentCity = "全国";
       this.formvalue.pageNum = pageNum;
       this.formvalue.pageSize = pageSize;
       this.formvalue.total = total;
-      console.log(this.formvalue);
+      // console.log(this.formvalue);
       this.specialactive = [];
       this.specialvalue = [];
       this.getJobList();
@@ -760,6 +808,7 @@ export default {
       // window.body.scrollY = 0;
     },
     moneyToFixed(value) {
+      console.log(value);
       return moneyToFixed(value);
     },
     // 重置搜索结果
@@ -774,7 +823,13 @@ export default {
       //   console.log(err);
       // });
     },
+    resetAgeSearch(e) {
+      if (e.target.value.length === 0) {
+        this.formvalue.ageStr = "";
 
+        this.getJobList();
+      }
+    },
     // 录单弹出层的关闭
     // handleCancel() {
     // 	this.visible = false;
@@ -929,8 +984,15 @@ export default {
         const { data } = await getHotStoreApi();
         console.log(data);
         if (data.status == 200) {
+          let middle = [];
           this.hotStoreList = data.data;
-          console.log(this.hotStoreList);
+          this.hotStoreList.forEach((item, index) => {
+            if (index <= 6) {
+              middle.push(item);
+            }
+          });
+          this.hotStoreList = middle;
+          // console.log(this.hotStoreList);
         }
       } catch (error) {
         console.log(error);
@@ -1155,33 +1217,38 @@ export default {
     .searchinput {
       margin-top: 19px;
       // margin-right: 285px;
-      i {
-        font-size: 12px;
-        margin-left: 4px;
-        color: #adadad;
-      }
-      .ant-input-affix-wrapper {
+      width: 1200px;
+      height: 44px;
+      &.ant-input-affix-wrapper {
         position: relative;
         .ant-input-prefix {
           position: absolute;
           left: 8px;
-          top: 16px;
+          top: 50%;
+          transform: translateY(-50%);
+          > div {
+            > span {
+              display: inline-block;
+              width: 50px;
+            }
+          }
           i {
             font-size: 12px;
-            color: #c9c9c9;
+            // margin-left: 15px;
+            color: #adadad;
           }
         }
         .ant-input-suffix {
           right: 0px !important;
         }
       }
-      .ant-input {
+      > .ant-input {
         width: 100%;
-        height: 32px;
-        text-indent: 40px;
+        height: 44px;
+        text-indent: 170px;
         background: #fff;
         // border: 1px solid rgba(77, 87, 94, 0.3);
-        border-radius: 136px;
+        // border-radius: 136px;
         box-shadow: 0px 2px 4px 0px transparent;
         font-size: 14px !important;
         padding-right: 0;
@@ -1199,14 +1266,14 @@ export default {
         }
       }
       button {
-        width: 70px;
-        height: 32px;
+        width: 120px;
+        height: 44px;
         color: white;
         background: #ff6a00;
         border-color: #ff6a00;
         border: none;
-        border-radius: 16px;
-        font-size: 14px;
+        // border-radius: 16px;
+        font-size: 18px;
         box-shadow: none;
         cursor: pointer;
         outline: none;
@@ -1217,6 +1284,26 @@ export default {
         //   border: none;
         // }
       }
+      .ageinput {
+        padding: 0;
+        margin: 0 15px;
+        height: 32px;
+        width: 100px;
+        border-radius: 0;
+        text-indent: 10px;
+        border-color: #e9e9e9;
+        border-top-color: transparent;
+        border-bottom-color: transparent;
+        &:hover {
+          border-left-color: #e9e9e9;
+          border-right-color: #e9e9e9;
+        }
+        &:focus {
+          box-shadow: none;
+          border-left-color: #e9e9e9;
+          border-right-color: #e9e9e9;
+        }
+      }
     }
     .specialbox {
       position: absolute;
@@ -1225,7 +1312,7 @@ export default {
       // display: ;
       transition: all 0.4s;
       left: 0;
-      top: 71px;
+      top: 164px;
       width: 100vw;
       background-color: #fff;
       z-index: 999;
@@ -1277,7 +1364,7 @@ export default {
       justify-content: flex-start;
       min-width: 645px;
       > li {
-        margin-top: 22px;
+        // margin-top: 22px;
         font-size: 14px;
         color: #4d575e;
         margin-right: 4px;
@@ -1417,14 +1504,15 @@ export default {
         position: relative;
         color: #8c8d8f;
         font-size: 14px;
-        margin: 28px 25px 0 20px;
+        margin: 0px 25px 0 20px;
         // color: rgba(78, 88, 95, 0.8);
         transform: translateY(-1px);
         // margin-left: 25px;
         a {
+          display: inline-block;
+          margin-top: 7px;
           transition: all 0.5s;
           line-height: 14px;
-
           &:active {
             color: rgb(255, 106, 0);
             transition: none;
diff --git a/src/style/index.less b/src/style/index.less
index 20c4dc3..356eb42 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -460,12 +460,13 @@ i {
 }
 
 .ant-cascader-menus.monthlypay,
-.ant-cascader-menus.agestr {
+.ant-cascader-menus.agestr,
+.ant-cascader-menus.gender {
   // position: fixed !important;
   // border-top: 1px solid #000;
 	width: 100vw;
 	margin: 0 auto;
-	top: 70px !important;
+	top: 164px !important;
 	-webkit-box-shadow: 0 8px 8px rgba(0, 0, 0, 0.15);
 	box-shadow: 0 8px 8px rgba(0, 0, 0, 0.15);
 	transition: none !important;
diff --git a/src/utils/request.js b/src/utils/request.js
index 03ab9a0..3d9915c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,8 +13,8 @@ console.log(baseURL);
 axios.defaults.withCredentials = true; //添加这行代码
 // console.log(axios);
 const service = axios.create({
-  // baseURL: "/api_prod", // url = base url + request url
-  baseURL: baseURL, //  baseURL: "/api", // url = base url + request url
+  baseURL: "/api_prod", // url = base url + request url
+  // baseURL: baseURL, //  baseURL: "/api", // url = base url + request url
   withCredentials: true, // send cookies when cross-domain requests
   timeout: 10000, // request timeout
   crossDomain: true,
diff --git a/src/views/main.vue b/src/views/main.vue
index 530dae6..e5b38af 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -258,9 +258,10 @@ export default {
         // 筛选的上传参数
         district: [], // 城镇数据
         monthlyPayStr: [], // 每月工资
-        ageStr: [], // 年龄数据
+        ageStr: "", // 年龄数据
         jobSpecialLabelIds: [], // 特色标签索引
         aliasName: "",
+        sex: [],
         pageNum: 1,
         pageSize: 8,
         total: null, //分页配置