From dc1057e7354806b0964c963c2fc93ae6c4bc4042 Mon Sep 17 00:00:00 2001 From: wangxia <779219182@qq.com> Date: Fri, 20 May 2022 14:03:20 +0800 Subject: [PATCH 1/3] 1 --- src/api/userinfo.js | 25 +++++++++++++------- .../userinfo/usercenter/components/townsman.vue | 27 +++++++++++++++------- src/views/main.vue | 7 ++++++ 3 files changed, 43 insertions(+), 16 deletions(-) diff --git a/src/api/userinfo.js b/src/api/userinfo.js index b7de5c4..e5591e3 100644 --- a/src/api/userinfo.js +++ b/src/api/userinfo.js @@ -24,14 +24,14 @@ export function userDetailApi(data) { params: data, }); } -// 获取我的老乡信息 -export function userTownsmanApi(data) { - return request({ - url: "/yishoudan/workorder/getLaoXiangList", - // method: "post", - params: data, - }); -} +// // 获取我的老乡信息 +// export function userTownsmanApi(data) { +// return request({ +// url: "/yishoudan/workorder/getLaoXiangList", +// // method: "post", +// params: data, +// }); +// } // 获取我的报名信息 export function userBillApi(data) { return request({ @@ -120,3 +120,12 @@ export function uploadUserAvatarApi(data) { // data, }); } +// 获取我的老乡 +export function userTownsmanApi(data) { + return request({ + url: "/yishoudan/agency/user/list", + method: "post", + data: data, + // data, + }); +} diff --git a/src/components/userinfo/usercenter/components/townsman.vue b/src/components/userinfo/usercenter/components/townsman.vue index d8c0d1d..92d725c 100644 --- a/src/components/userinfo/usercenter/components/townsman.vue +++ b/src/components/userinfo/usercenter/components/townsman.vue @@ -1,7 +1,7 @@ diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue index ee1db26..a58b368 100644 --- a/src/components/FirstJob/joblist.vue +++ b/src/components/FirstJob/joblist.vue @@ -1,15 +1,15 @@ + +
+
+ +
+
+ + +
+
+ - {{ item1 }} -
-
- + > --> +
{{ item.jobName }}
+ +
+ {{ item.district }} + {{ item.gender }} + {{ item.age }} +
+
+ + {{ item1 }} +
+
+ - {{ item.minMonthlyPay ? item.minMonthlyPay : "" }}-{{ - item.maxMonthlyPay ? item.maxMonthlyPay : "" - }}元/月 -
-
- {{ - getSalaryClassifyValue( - item.salaryClassify, - item.salaryClassifyValue - ) - }} + {{ item.minMonthlyPay ? item.minMonthlyPay : "" }}-{{ item.maxMonthlyPay ? item.maxMonthlyPay : "" }}元/月 +
+
+ {{ getSalaryClassifyValue(item.salaryClassify, item.salaryClassifyValue) }} - -
-
-
-
-
- -
-
服务费
-
{{ item.servetype }}
-
-
-
- +
+
+
+ +
+
+ +
+
服务费
+
{{ item.servetype }}
+
+
+
+ + + 更多 + - + - -
-
-
- -
- -
- 跳至页 -
-
- -
-
-

我的日历

-

- {{ dateinfo.day }} -

-

- {{ dateinfo.week }} -

-

- {{ dateinfo.date }} -

-
-
-

服务热线

-

0371-6611 3723

-
- +
+ + + +
+ +
跳至
+
+ +
+
+

我的日历

+

+ {{ dateinfo.day }} +

+

+ {{ dateinfo.week }} +

+

+ {{ dateinfo.date }} +

+
+
+

服务热线

+

0371-6611 3723

+
+ - -
- - + + + + diff --git a/src/components/FirstJob/joblist1.vue b/src/components/FirstJob/joblist1.vue index a001144..2cbd726 100644 --- a/src/components/FirstJob/joblist1.vue +++ b/src/components/FirstJob/joblist1.vue @@ -1312,7 +1312,7 @@ export default { // display: ; transition: all 0.4s; left: 0; - top: 164px; + top: 144px; width: 100vw; background-color: #fff; z-index: 999; diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue index e477f52..c8158c3 100644 --- a/src/components/FirstJob/recordBill.vue +++ b/src/components/FirstJob/recordBill.vue @@ -1,36 +1,29 @@ diff --git a/src/components/ServiceOutlets/index.vue b/src/components/ServiceOutlets/index.vue index 84b3d04..dfb135c 100644 --- a/src/components/ServiceOutlets/index.vue +++ b/src/components/ServiceOutlets/index.vue @@ -54,7 +54,7 @@

服务热线

-

0371-6666 6666

+

0371-6611 3723

-
    +
    • import("../components/userinfo/accountsetting/inedex.vue"), - redirect: "accountsetting/myintegral", + redirect: "accountsetting/boundtel", children: [ { path: "loginpsw", diff --git a/src/style/index.less b/src/style/index.less index 356eb42..ece92fb 100644 --- a/src/style/index.less +++ b/src/style/index.less @@ -1,3 +1,4 @@ +@import "http://at.alicdn.com/t/font_3135652_fha9d3mzga5.css"; // 初始化页面样式 body, h1, @@ -133,7 +134,6 @@ i { fill: currentColor; overflow: hidden; } -@import "http://at.alicdn.com/t/font_3135652_onj5dmqt30d.css"; // 字体图标 // @font-face { // font-family: "iconfont"; /* Project id 3135652 */ @@ -466,7 +466,7 @@ i { // border-top: 1px solid #000; width: 100vw; margin: 0 auto; - top: 164px !important; + top: 144px !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; @@ -657,3 +657,62 @@ p.bottombox { .ant-spin-text { color: #fda21d; } + .ant-popover { + .ant-popover-content { + .ant-popover-inner-content { + position: relative; + width: 600px; + white-space: pre-wrap !important; + >div{ + position: absolute; + width: 44px; + height: 22px; + right: 10px; + top: 10px; + border: 1px solid #ff6a00; + color: #ff6a00; + border-radius: 999px; + line-height:22px; + text-align: center; + cursor: pointer; + &:hover { + background-color: #ff6a00; + color: #fff; + } + } + } + } +} +.xiangdan{ + .ant-modal-content{ + width: 600px; + max-height: calc(100vh - 40px); + .ant-modal-body{ + padding-top: 36px; + position: relative; + min-height: 480px; + white-space: pre-wrap !important; + + // max-height: ; + // background-color: #000; + .copy { + position: absolute; + padding: 0px 12px; + right: 20px; + top: 7px; + font-size: 14px; + border: 1px solid #ff6a00; + color: #ff6a00; + border-radius: 5px; + line-height: 22px; + text-align: center; + cursor: pointer; + &:hover { + color: #fff; + background-color: #ff6a00; + } + } + } + } + +} \ No newline at end of file diff --git a/src/utils/commonUtil.js b/src/utils/commonUtil.js index 5be934b..50470c1 100644 --- a/src/utils/commonUtil.js +++ b/src/utils/commonUtil.js @@ -1207,18 +1207,19 @@ export function userApplyOrderStatusArray() { // { id: "60", name: "已完成", value: "60", text: "已完成" }, // ]; let orderStatus = [ + { id: "10", name: "报名审核中", value: "10", text: "报名审核中", num: 0 }, { id: "20", name: "审核通过", value: "20", text: "审核通过", num: 0 }, { id: "21", name: "审核未通过", value: "21", text: "审核未通过", num: 0 }, { id: "25", name: "已接到", value: "25", text: "已接到", num: 0 }, { id: "26", name: "未接到", value: "26", text: "未接到", num: 0 }, - { id: "30", name: "待入职", value: "30", text: "待入职", num: 0 }, + { id: "30", name: "面试通过", value: "30", text: "面试通过", num: 0 }, { id: "35", name: "面试未通过", value: "35", text: "面试未通过", num: 0 }, - { id: "40", name: "在职中", value: "40", text: "在职中", num: 0 }, - { id: "45", name: "未入职", value: "45", text: "未入职", num: 0 }, - { id: "50", name: "已离职", value: "50", text: "已离职", num: 0 }, + { id: "40", name: "已入职", value: "40", text: "已入职", num: 0 }, + { id: "45", name: "通过未入职", value: "45", text: "通过未入职", num: 0 }, + { id: "50", name: "已离职", value: "50", text: "已离职", num: 0 } // { id: "60", name: "已完成", value: "60", text: "已完成", num: 0 } - ]; +]; return orderStatus; } diff --git a/src/utils/request.js b/src/utils/request.js index 3d9915c..03ab9a0 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 bd20da7..8420bd4 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -41,7 +41,7 @@
    • 我的老乡
    • @@ -576,7 +576,7 @@ export default { }, toList() { console.log(this.$router); - // this.$router.go(0); + // this.$router.go(0); // window.location.reload(); this.reload(); },