From 665a300269602c8c43f44b6367a941dd9ca47e47 Mon Sep 17 00:00:00 2001 From: wangxia <779219182@qq.com> Date: Tue, 20 Jun 2023 09:15:45 +0800 Subject: [PATCH] 1 --- package.json | 1 + src/components/FirstJob/components/recommend.vue | 299 ++++++------ src/components/FirstJob/detail.vue | 572 +++++++++++++---------- src/components/FirstJob/joblist.vue | 11 +- src/style/index.less | 8 +- src/style/index.wxss | 4 +- src/utils/request.js | 4 +- src/views/main.vue | 2 +- yarn.lock | 25 + 9 files changed, 513 insertions(+), 413 deletions(-) diff --git a/package.json b/package.json index 8accad7..b7d40e9 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "js-cookie": "^3.0.1", "moment": "^2.29.1", "popmotion": "^9.3.5", + "swiper": "^4.0.7", "v-viewer": "^1.6.4", "vue": "^2.6.11", "vue-amap": "^0.5.10", diff --git a/src/components/FirstJob/components/recommend.vue b/src/components/FirstJob/components/recommend.vue index f4d7864..d2dbefc 100644 --- a/src/components/FirstJob/components/recommend.vue +++ b/src/components/FirstJob/components/recommend.vue @@ -2,65 +2,48 @@
-

推荐职位

+

+ 推荐职位 +

- +
-
- - -
- - - 服务费{{ item.servetype }} +
+
+ + +
+ + + 服务费{{ item.servetype }} +
+
{{item.storeName !== null && item.storeName !== "" ? item.storeName: item.aliasName }}
+ +
+
+ {{ item.district }} + {{ item.gender }} + {{ item.age }}
-
- {{ - item.storeName !== null && item.storeName !== "" - ? item.storeName - : item.aliasName - }} +
+ + {{ item1 }}
- - -
- {{ item.district }} - {{ item.gender }} - {{ item.age }} -
-
- - {{ item1 }} -
-
- + >--> +
@@ -68,18 +51,15 @@ diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue index d7c96e5..36705a3 100644 --- a/src/components/FirstJob/joblist.vue +++ b/src/components/FirstJob/joblist.vue @@ -236,7 +236,7 @@
全部
自营
-
三方
+
@@ -2613,7 +2613,7 @@ export default { .maincontentright { width: 240px; position: relative; - top: -40px; + top: -50px; > div { margin-bottom: 16px; border: 1px solid #ededed; @@ -2631,8 +2631,9 @@ export default { margin-top: 0; margin-bottom: 0; // padding-top: 10px; - height: 40px; - line-height: 40px; + height: 50px; + padding: 0; + line-height: 50px; font-size: 16px; font-weight: 600; border-bottom: none; @@ -2651,7 +2652,7 @@ export default { width: 240px; height: 160px; // height: 114px; - padding: 0 20px 20px 20px; + // padding: 0 20px 20px 20px; // border-radius: 4px; background-color: #fff; text-align: center; diff --git a/src/style/index.less b/src/style/index.less index 357df33..9e3744a 100644 --- a/src/style/index.less +++ b/src/style/index.less @@ -387,11 +387,11 @@ p.bottombox { text-align: center; // border-bottom: 1px solid #eeefef; font-weight: 600; - margin-top: 12px; font-size: 16px; - padding-bottom: 12px; - margin-bottom: 16px; - color: rgba(0, 0, 0, 0.85); + padding: 12px 0; + color: #ff4400; + background-color: #FEE9E1; + &::after { content: ""; display: block; diff --git a/src/style/index.wxss b/src/style/index.wxss index 7d29e8b..dd39e17 100644 --- a/src/style/index.wxss +++ b/src/style/index.wxss @@ -344,10 +344,8 @@ p.bottombox { position: relative; text-align: center; font-weight: 600; - margin-top: 12px; font-size: 16px; - padding-bottom: 12px; - margin-bottom: 16px; + padding: 12px 0; color: rgba(0, 0, 0, 0.85); } h1.bottombox::after, diff --git a/src/utils/request.js b/src/utils/request.js index dd6c3ed..0c18946 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,10 +4,10 @@ import Cookies from "js-cookie"; import qs from "qs"; // import Vue from "vue"; -// const baseURL = "http://1shoudan.com"; // 正式环境线上 +// const baseURL = "http://1shoudan.com"; // 正式环境线上 废弃 const baseURL = "http://idaotian.com"; // 正式环境线上 // const baseURL = "http://idagou.cn"; // 正式环境线上 -// console.log(baseURL); +// console.log(baseURL); // const baseURL = "https://d.matripe.com.cn"; // 正式环境本地 // const baseURL = "http://bl7.matripe.com.cn:8001"; // 测试环境本地 // const baseURL = "http://1shoudan.renminshitang.com.cn"; // 测试环境线上 diff --git a/src/views/main.vue b/src/views/main.vue index 7f41a47..7811bd8 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -1,7 +1,7 @@