diff --git a/src/api/userinfo.js b/src/api/userinfo.js index 07fdcef..221c61a 100644 --- a/src/api/userinfo.js +++ b/src/api/userinfo.js @@ -3,6 +3,14 @@ import qs from "qs"; let setqs = function (data) { return qs.stringify(data); }; +// 获取代理的客户经理信息 +export function getUserManagerApi (data) { + return request({ + url: "/yishoudan/costumer/manager", + // method: "post", + // data: data, + }); +} // 获取卡券信息 export function userCardApi (data) { return request({ diff --git a/src/components/FirstJob/components/recommend.vue b/src/components/FirstJob/components/recommend.vue index 98b68ab..e118c56 100644 --- a/src/components/FirstJob/components/recommend.vue +++ b/src/components/FirstJob/components/recommend.vue @@ -141,7 +141,7 @@ export default { // height: 1008px; overflow: hidden; background: #ffffff; - // border-radius: 4px; + border-radius: 6px; // padding: 0px 20px 0px 20px; h1 { @@ -168,7 +168,9 @@ export default { } } .jobBox { - padding:16px 20px; + padding: 16px 20px; + border-radius: 0 0 6px 6px; + overflow: hidden; .jobinfobox:last-of-type { border-bottom: none; } @@ -190,6 +192,7 @@ export default { img { width: 100%; height: 100%; + border-radius: 6px; } span { position: absolute; diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue index 91ca00c..7ce5cd3 100644 --- a/src/components/FirstJob/detail.vue +++ b/src/components/FirstJob/detail.vue @@ -128,7 +128,7 @@ 财务结算 职位通告 - 我的政策更好，给我供人 + +

+ 客户经理 +

+ + + + +

{{managerInfo.workPhone}}

+

+ {{managerInfo.name}} + +

- -
-
-

- 企业详情 -

- - + -
-
-

{{store.storeName || '-'}}

-

{{store.storeInfo || '-' }}

- +
+
+

{{store.storeName || '-'}}

+

{{store.storeInfo || '-' }}

+ -
- - - -
+ --> +
+ + +
- - +
+ - - - - -
@@ -198,7 +176,7 @@
- + - +
@@ -279,13 +257,13 @@ {{sortStr}} -
按工价
+
工价优先
 -
按距离
+
距离优先
 -
按佣金
+
佣金优先
 @@ -494,12 +472,12 @@ >暂无详单 --> - - + @@ -530,14 +508,18 @@

{{ dateinfo.date }}

-

- 服务热线 +

+ 客户经理

- - -

0371-6611 3723

- + + + +

{{managerInfo.workPhone}}

+

+ {{managerInfo.name}} + +

- +
@@ -197,6 +197,7 @@ export default { * */ handleCancel() { + console.log('er'); this.loginShow = false }, /** @@ -226,8 +227,11 @@ export default { .ant-form-item-control { width: 430px !important; } + .ant-input-affix-wrapper .ant-input-suffix { + right: 120px; + } .ant-form-item-label { - line-height: 28px; + // line-height:40px; label { font-size: 16px; } @@ -240,7 +244,7 @@ export default { text-indent: 15px; font-size: 16px; padding: 0 !important; - border-radius: 0; + border-radius: 6px; border: 1px solid #dddddd; &:hover { border-color: #ff4400; @@ -257,7 +261,7 @@ export default { } } .forgetPsw { - height: 10px; + height: 0px; font-size: 16px; color: #666666; text-align: right; @@ -269,7 +273,7 @@ export default { height: 32px; // margin-top: 21px; background: #ff4400; - border-radius: 0px; + border-radius: 6px; border: none; font-size: 14px; color: #fff; diff --git a/src/components/userinfo/accountsetting/inedex.vue b/src/components/userinfo/accountsetting/inedex.vue index 9db333d..5591839 100644 --- a/src/components/userinfo/accountsetting/inedex.vue +++ b/src/components/userinfo/accountsetting/inedex.vue @@ -92,6 +92,15 @@ +
  • + + 登录密码 + + + 已设置 + + +
    • -
      +
      • 登录密码 @@ -137,9 +146,9 @@
        • -
      --> +
    --> -
    +
    @@ -472,7 +481,7 @@ export default { width: 346px; height: 158px; background: #ffffff; - border-radius: 0px; + border-radius: 6px; padding: 24px 0; text-align: center; border: 1px solid #ededed; @@ -540,7 +549,7 @@ export default { // margin-top: 16px; // padding: 0 16px; background-color: #fff; - border-radius: 0px; + border-radius: 6px; overflow: hidden; li { position: relative; @@ -602,29 +611,32 @@ export default { background-color: #fff; margin-top: 16px; // padding: 0 16px; - border-radius: 0px; + border-radius: 6px; overflow: hidden; - border: 1px solid #ededed; + // border: 1px solid #ededed; li { position: relative; display: flex; padding: 16px; line-height: 24px; justify-content: space-between; + border-radius: 6px; cursor: pointer; + &:not(:last-child) { + margin-bottom: 4px; // border-bottom: 1px solid #ededed; } - &:nth-child(-n + 3):after { - position: absolute; - content: ''; - display: inline-block; - height: 1px; - width: 314px; - bottom: -1px; - left: 16px; - background-color: #f3f4f4; - } + // &:nth-child(-n + 3):after { + // position: absolute; + // content: ''; + // display: inline-block; + // height: 1px; + // width: 314px; + // bottom: -1px; + // left: 16px; + // background-color: #f3f4f4; + // } > span:first-child { font-size: 16px; display: flex; @@ -650,17 +662,18 @@ export default { } &:hover { // background-color: #ff4400 !important; - color: #ff4400; + background-color: #f0f0f0; + // color: #ff4400; span { span { - color: #ff4400; + // color: #ff4400; } i { - color: #ff4400; + // color: #ff4400; } } i { - color: #ff4400; + // color: #ff4400; } } } diff --git a/src/components/userinfo/usercenter/components/mybill.vue b/src/components/userinfo/usercenter/components/mybill.vue index 077bd2b..3e22249 100644 --- a/src/components/userinfo/usercenter/components/mybill.vue +++ b/src/components/userinfo/usercenter/components/mybill.vue @@ -55,7 +55,7 @@
    - +
    报名时间：
    @@ -101,7 +101,7 @@
      -
    • +
    • {{ index + 1 }}
      展开 收起
    -
  • +
  • {{ item.statusTag }} {{ item.statusTimeInfo }}: {{ item.statusShowTime }} 具体以出名单时间为准 @@ -567,6 +575,7 @@ export default { }, resetpag() { // this.pagination.status = this.pagination.status + this.pagination.pageNum = 1 this.getBill() this.userBillNumber() }, @@ -1094,7 +1103,7 @@ export default { align-items: center; justify-content: space-between; .ant-input { - border-radius: 0; + border-radius: 6px; } .searchinput { display: flex; @@ -1199,7 +1208,7 @@ export default { width: 66px; height: 24px; border: 1px solid rgba(77, 87, 94, 0.3); - // border-radius: 4px; + border-radius: 4px; font-size: 14px; color: #4d575e; background-color: #fff; @@ -1225,6 +1234,7 @@ export default { border: 1px solid #e8e8e8; font-size: 14px; text-align: center; + border-radius: 6px; // li { // } li:first-child { @@ -1262,7 +1272,7 @@ export default { box-shadow: none; } .ant-select-selection { - border-radius: 0; + border-radius: 4px; } .ant-select-selection:hover { border-color: #ff4400; @@ -1293,7 +1303,7 @@ export default { // background-color: pink; margin-top: 16px; font-size: 14px; - + overflow: hidden; .proxyInfo { display: flex; height: 40px; @@ -1303,6 +1313,7 @@ export default { justify-content: space-between; align-items: center; border: 1px solid #ccc; + border-radius: 6px 6px 0 0; li { flex: 1; &:nth-child(2) { @@ -1322,6 +1333,7 @@ export default { .billInfo { display: flex; justify-content: space-between; + // overflow: hidden; li { display: flex; flex-direction: column; @@ -1330,6 +1342,7 @@ export default { text-align: center; border: 1px solid #ccc; border-top: none; + overflow: hidden; &:nth-child(-n + 3) { border-right: none; } @@ -1392,6 +1405,7 @@ export default { > p { // white-space: break-space; // text-align: center; + margin-bottom: 0; word-break: break-all; font-size: 14px; width: 100%; diff --git a/src/permission.js b/src/permission.js index 97c3507..1422fe6 100644 --- a/src/permission.js +++ b/src/permission.js @@ -8,6 +8,7 @@ router.beforeEach(async (to, from, next) => { // console.log(to); // console.log(from); // 路由守卫 + console.log(to); console.log(from); // if (from.fullPath === "/list") { // // console.log(213); @@ -27,6 +28,7 @@ router.beforeEach(async (to, from, next) => { ]; if (localStorage.getItem("LOGIN_DATA")) { var isLogin = true; + // next("/list"); } // const isLogin = localStorage.getItem("LOGIN_DATA") !== null ? true : false; // if (to.fullPath === from.fullPath) { @@ -35,13 +37,15 @@ router.beforeEach(async (to, from, next) => { // console.log(isLogin); // console.log(to); if (isLogin) { - next(); + if (to.fullPath == '/login') { + next('/list'); + + } else { + next(); + + } } else { - if ( - whiteList.some((obj) => { - return obj === to.path; - }) - ) { + if (whiteList.some((obj) => obj === to.path)) { next(); } else { next("/login"); diff --git a/src/store/index.js b/src/store/index.js index a82033f..767823f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -6,9 +6,15 @@ Vue.use(Vuex); export default new Vuex.Store({ state: { joblist: {}, - isLogin: false + isLogin: false, + managerInfo:{} + }, + mutations: { + setManagerInfo(state,val){ + console.log(val); + state.managerInfo = val + } }, - mutations: {}, actions: {}, modules: {}, }); diff --git a/src/style/index.less b/src/style/index.less index 009a5d1..90e9f87 100644 --- a/src/style/index.less +++ b/src/style/index.less @@ -149,6 +149,12 @@ i { .br8 { border-radius: 8px; } +.br6 { + border-radius: 6px; +} +.br4 { + border-radius: 4px; +} .dil { display: inline; } @@ -220,8 +226,8 @@ i { .m160 { margin: 16px 0; } -.mr0{ - margin-right: 0px !important; +.mr0 { + margin-right: 0px !important; } .mr4 { margin-right: 4px; @@ -475,9 +481,9 @@ i { align-items: center; justify-content: center; } -.fcsc{ - display: flex; - flex-direction: column; +.fcsc { + display: flex; + flex-direction: column; align-items: center; justify-content: center; } @@ -648,7 +654,7 @@ i { box-shadow: none; background-color: #fff; border-color: #ddd; - border-radius: 0; + border-radius: 6px; &:focus { border: 1px solid #ff4400; } @@ -658,7 +664,7 @@ i { } .ant-pagination-item { border: none; - border-radius: 0; + border-radius: 6px; a:hover { color: #ff4400; } diff --git a/src/style/userinfo.less b/src/style/userinfo.less index b6acad2..c556d61 100644 --- a/src/style/userinfo.less +++ b/src/style/userinfo.less @@ -1,17 +1,17 @@ // 左侧列表的active样式 .tagactive { - background-color: #ff4400 !important; - color: #fff !important; + background-color: rgba(255,68,0,0.10)!important; + color: #ff4400 !important; span { span { - color: #fff !important; + color: #ff4400 !important; } i { - color: #fff !important; + color: #ff4400 !important; } } i { - color: #fff !important; + color: #ff4400 !important; } } // 右侧title的样式 diff --git a/src/views/404.vue b/src/views/404.vue index bf5687e..e2b2e24 100644 --- a/src/views/404.vue +++ b/src/views/404.vue @@ -35,8 +35,15 @@ export default { diff --git a/src/views/main.vue b/src/views/main.vue index 8b7fd2f..7aa650c 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -367,7 +367,7 @@ export default { } else { this.routertitleindex = 7 } - if (to.fullPath == '/login' || !localStorage.getItem("LOGIN_DATA")) { + if (to.fullPath == '/login' || !localStorage.getItem('LOGIN_DATA')) { this.loginPage = true this.isLogin = false } else { @@ -386,10 +386,6 @@ export default { deep: true, immediate: true, }, - // isLogin() { - // this.isLogin = JSON.parse(localStorage.getItem("LOGIN_DATA")); - // console.log(this.isLogin); - // }, }, // 生命周期钩子 注：没用到的钩子请自行删除 /** @@ -567,6 +563,8 @@ export default { console.log(data) if (data.status === 200) { localStorage.removeItem('LOGIN_DATA') + localStorage.removeItem('DAOTIAN_token') + localStorage.removeItem('daotian_to_admin_token') this.reload() this.$router.push('/main') } else { @@ -624,7 +622,6 @@ export default { window.open('http://localhost:3000/#/merchantManagement/homePage?token=' + obj.token + '&username=' + (obj.user.userName ? obj.user.userName : obj.user.nickName) + '&avatar=' + obj.imgSrc + '&roleid=' + obj.user.agencyRoleId + '&agencyid=' + obj.user.agencyId + '&userInfo=' + JSON.stringify(obj)) } else { // 正式环境，通过缓存获取 - localStorage.setItem('daotian_to_admin_token', obj.token) localStorage.setItem('daotian_to_admin', JSON.stringify(obj)) localStorage.setItem('daotian_to_admin_token', obj.token) localStorage.setItem('daotian_to_admin_avatar', obj.imgSrc) diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue index 7d39f3b..df406b3 100644 --- a/src/views/merchantBack.vue +++ b/src/views/merchantBack.vue @@ -631,6 +631,8 @@ export default { console.log(data) if (data.status === 200) { localStorage.removeItem('LOGIN_DATA') + localStorage.removeItem('DAOTIAN_token') + localStorage.removeItem('daotian_to_admin_token') this.reload() this.$router.push('/main') } else { diff --git a/src/views/userinfo.vue b/src/views/userinfo.vue index 9d37636..dd1dc35 100644 --- a/src/views/userinfo.vue +++ b/src/views/userinfo.vue @@ -293,6 +293,8 @@ export default { console.log(data) if (data.status === 200) { localStorage.removeItem('LOGIN_DATA') + localStorage.removeItem('DAOTIAN_token') + localStorage.removeItem('daotian_to_admin_token') this.reload() this.$router.push('/main') } else {