From 911d91240fc1fb1151048d4ec78fba93c21563e4 Mon Sep 17 00:00:00 2001 From: wangxia <779219182@qq.com> Date: Mon, 24 Apr 2023 11:35:52 +0800 Subject: [PATCH] 1 --- package.json | 4 +- src/api/job.js | 115 +- src/api/login.js | 14 +- src/api/userinfo.js | 238 +- src/components/FirstJob/detail.vue | 491 +- src/components/FirstJob/joblist.vue | 5310 ++++++++++---------- src/components/FirstJob/recordBill.vue | 2605 +++++----- src/components/Login/login.vue | 888 ++-- src/components/main/index.vue | 966 ++-- src/components/userinfo/accountsetting/inedex.vue | 1418 +++--- .../userinfo/usercenter/components/mybill.vue | 2959 ++++++----- .../userinfo/usercenter/components/townsman.vue | 1063 +++- src/permission.js | 7 +- src/style/index.less | 13 +- src/style/index.wxss | 13 +- src/utils/datalist.js | 464 +- src/utils/request.js | 93 +- src/views/main.vue | 18 +- src/views/userinfo.vue | 13 +- test.html | 17 + yarn.lock | 18 + 21 files changed, 8570 insertions(+), 8157 deletions(-) create mode 100644 test.html diff --git a/package.json b/package.json index 24c1b52..8accad7 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "js-cookie": "^3.0.1", "moment": "^2.29.1", "popmotion": "^9.3.5", + "v-viewer": "^1.6.4", "vue": "^2.6.11", "vue-amap": "^0.5.10", "vue-cropper": "^0.5.8", @@ -45,8 +46,7 @@ "prettier": "^2.2.1", "vue-template-compiler": "^2.6.11" }, - "gitHooks": { - }, + "gitHooks": {}, "lint-staged": { "*.{js,jsx,vue}": [ "vue-cli-service lint", diff --git a/src/api/job.js b/src/api/job.js index 1c4249f..0c0f9e5 100644 --- a/src/api/job.js +++ b/src/api/job.js @@ -1,97 +1,106 @@ import request from "../utils/request"; +import qs from "qs"; +let setqs = function (data) { + return qs.stringify(data); +}; // 获取职位列表 export function JobListApi(data) { - return request({ - url: "/yishoudan/store/job/list", - method: "post", - params: data, - }); + return request({ + url: "/yishoudan/store/job/list", + method: "post", + // data: setqs(data), + // headers: { "Content-Type": "application/x-www-form-urlencoded" }, + data: setqs(data), + }); } // 获取职位详情 export function getJobDetailApi(data) { - return request({ - url: `/yishoudan/store/job/getStoreJobDetailById?storeJobId=${data}`, - method: "get", - }); + return request({ + url: `/yishoudan/store/job/getStoreJobDetailById?storeJobId=${data}`, + method: "get", + }); } // 获取职位特色 export function getJobSpecialApi() { - return request({ - url: `/yishoudan/labels/getListByTypeAndIndustry?type=90&industry=2`, - method: "get", - }); + return request({ + url: `/yishoudan/labels/getListByTypeAndIndustry?type=90&industry=2`, + method: "get", + }); } // 获取省份 export function getProvinceApi() { - return request({ - url: `/yishoudan/city/getCityTree`, - method: "get", - }); + return request({ + url: `/yishoudan/city/getCityTree`, + method: "get", + }); } // 获取市县 export function getCityApi(id) { - return request({ - url: `/yishoudan/city/getCityByPid?pid=${id}`, - method: "get", - }); + return request({ + url: `/yishoudan/city/getCityByPid?pid=${id}`, + method: "get", + }); } // 录单报名 export function recordBillApi(data) { - return request({ - url: "/yishoudan/user/apply/order/addByAgency", - method: "post", - params: data, - }); + console.log(data); + + return request({ + url: "/yishoudan/user/apply/order/addByAgency", + method: "post", + data, + headers: { "Content-Type": "application/x-www-form-urlencoded" }, + }); } // 报名上传识别身份证信息 export function getIdCardInfoApi(data) { - return request({ - url: "/yishoudan/commons/idCardOcrRecognize", - method: "post", - data: data, - headers: { "Content-Type": "multipart/form-data" }, - }); + return request({ + url: "/yishoudan/commons/idCardOcrRecognize", + method: "post", + data, + headers: { "Content-Type": "multipart/form-data" }, + }); } // 获取渠道经理对应代理id export function getProxyInfoApi(data) { - return request({ - url: `/yishoudan/agency/getByPmdUserId?pmdUserId=${data}`, - }); + return request({ + url: `/yishoudan/agency/getByPmdUserId?pmdUserId=${data}`, + }); } // 根据关键字获取企业的列表 export function getStoreAliasApi(data) { - return request({ - url: `/yishoudan/store/getAllStoreAliasName?keys=${data}`, - }); + return request({ + url: `/yishoudan/store/getAllStoreAliasName?keys=${data}`, + }); } // 根据关键字获取企业的列表 export function getStoreJobApi(data) { - return request({ - url: `/yishoudan/store/job/getJobNameByStoreId?storeId=${data}`, - }); + return request({ + url: `/yishoudan/store/job/getJobNameByStoreId?storeId=${data}`, + }); } // 根据岗位id获取政策 export function getPolicyByJobIdApi(data) { - return request({ - url: `/yishoudan/store/job/getPolicyByStoreJobId?storeJobId=${data}`, - }); + return request({ + url: `/yishoudan/store/job/getPolicyByStoreJobId?storeJobId=${data}`, + }); } // 获取热门职位城市 export function getHotCityApi() { - return request({ - url: `/yishoudan/city/getHotCity`, - }); + return request({ + url: `/yishoudan/city/getHotCity`, + }); } // 获取热门职位城市 export function getCityWhichHasJobApi() { - return request({ - url: `/yishoudan/city/getCityHasOnlineJob`, - }); + return request({ + url: `/yishoudan/city/getCityHasOnlineJob`, + }); } // 获取热门企业 export function getHotStoreApi() { - return request({ - url: `/yishoudan/store/getHotStore`, - }); + return request({ + url: `/yishoudan/store/getHotStore`, + }); } diff --git a/src/api/login.js b/src/api/login.js index d0659c7..7728ae3 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -1,10 +1,14 @@ import request from "../utils/request"; +import qs from "qs"; +let setqs = function (data) { + return qs.stringify(data); +}; // 登录相关接口 export function loginApi(data) { return request({ url: "/yishoudan/login", method: "post", - params: data, + data: setqs(data), }); } // 获取验证码 @@ -12,7 +16,7 @@ export function getPhoneCodeApi(data) { return request({ url: "/yishoudan/commons/sendMsgCode", method: "post", - params: data, + data: setqs(data), }); } // 注册接口 @@ -20,14 +24,14 @@ export function registerApi(data) { return request({ url: "/yishoudan/register", method: "post", - params: data, + data: setqs(data), }); } // 退出登录 export function logoutApi() { return request({ url: "/yishoudan/logout", - // params: data, + // data: data, }); } // 修改密码 @@ -35,6 +39,6 @@ export function logoutApi() { export function updatePswApi(data) { return request({ url: "/yishoudan/updatePassword", - params: data, + data: data, }); } diff --git a/src/api/userinfo.js b/src/api/userinfo.js index 78649b9..62ae994 100644 --- a/src/api/userinfo.js +++ b/src/api/userinfo.js @@ -1,179 +1,211 @@ import request from "../utils/request"; +import qs from "qs"; +let setqs = function (data) { + return qs.stringify(data); +}; // 获取卡券信息 export function userCardApi(data) { - return request({ - url: "/yishoudan/usercoupon/list", - // method: "post", - params: data, - }); + return request({ + url: "/yishoudan/usercoupon/list", + // method: "post", + data: data, + }); } // 获取用户余额信息 export function userBalanceApi(data) { - return request({ - url: "/yishoudan/wallet/info", - // method: "post", - params: data, - }); + return request({ + url: "/yishoudan/wallet/info", + // method: "post", + data: data, + }); } // 获取用户提现详情 export function userDetailApi(data) { - return request({ - url: "/yishoudan/wallet/withdrawal/list", - // method: "post", - params: data, - }); + return request({ + url: "/yishoudan/wallet/withdrawal/list", + // method: "post", + data: data, + }); } // // 获取我的老乡信息 // export function userTownsmanApi(data) { // return request({ // url: "/yishoudan/workorder/getLaoXiangList", // // method: "post", -// params: data, +// data: data, // }); // } // 获取我的报名信息 export function userBillApi(data) { - return request({ - url: "/yishoudan/user/apply/order/list", - // method: "post", - params: data, - }); + return request({ + url: "/yishoudan/user/apply/order/list", + method: "post", + data: setqs(data), + }); } // 获取我的报名状态数量 export function userBillNumberApi(data) { - return request({ - url: "/yishoudan/user/apply/order/listStatisticsNum", - // method: "post", - params: data, - }); + return request({ + url: "/yishoudan/user/apply/order/listStatisticsNum", + // method: "post", + data: data, + }); } // 获取跟进记录详情 export function userBillDetailApi(data) { - return request({ - url: "/yishoudan/user/apply/order/details?orderId=" + data, - // method: "post", - }); + return request({ + url: "/yishoudan/user/apply/order/details?orderId=" + data, + // method: "post", + }); } // 获取用户信息 export function userBaseInfoApi(data) { - return request({ - url: "/yishoudan/user/getUserInfo", - // method: "post", - params: data, - }); + return request({ + url: "/yishoudan/user/getUserInfo", + // method: "post", + data: data, + }); } // 获取用户积分信息 export function getPointApi(data) { - return request({ - url: "/yishoudan/wallet/getPoint", - // method: "post", - params: data, - }); + return request({ + url: "/yishoudan/wallet/getPoint", + // method: "post", + data: data, + }); } // 获取用户积分使用信息 export function getPointDetailApi(data) { - return request({ - url: "/yishoudan/pointUseRecord/list", - // method: "post", - params: data, - }); + return request({ + url: "/yishoudan/pointUseRecord/list", + // method: "post", + data: data, + }); } // 登录状态账号设置修改密码 export function setUserPswApi(data) { - return request({ - url: "/yishoudan/changePassword", - // method: "post", - params: data, - }); + return request({ + url: "/yishoudan/changePassword", + method: "post", + data: setqs(data), + }); } // 登录状态账号修改绑定手机号 export function setUserTelApi(data) { - return request({ - url: "/yishoudan/user/changeTel", - // method: "post", - params: data, - }); + return request({ + url: "/yishoudan/user/changeTel", + // method: "post", + data: data, + }); } // 账号修改绑定银行卡 export function getUserBankListApi(data) { - return request({ - url: "/yishoudan/user/bank/getUserBankList", - // method: "post", - params: data, - }); + return request({ + url: "/yishoudan/user/bank/getUserBankList", + // method: "post", + data: data, + }); } // 实名认证 export function setUserRealNameApi(data) { - return request({ - url: "/yishoudan/user/realNameAuth", - // method: "post", - params: data, - }); + return request({ + url: "/yishoudan/user/realNameAuth", + // method: "post", + data: data, + }); } // 获取用户微信绑定的二维码 export function getUserWxApi(data) { - return request({ - url: "/yishoudan/user/getMiniAppQrCodeOfBindUser", - // method: "post", - params: data, - }); + return request({ + url: "/yishoudan/user/getMiniAppQrCodeOfBindUser", + // method: "post", + data: data, + }); } // 上传用户头像 export function uploadUserAvatarApi(data) { - return request({ - url: "/yishoudan/user/changeUserImgsrc", - method: "post", - headers: { "Content-Type": "multipart/form-data" }, - data: data, - // data, - }); + return request({ + url: "/yishoudan/user/changeUserImgsrc", + method: "post", + headers: { "Content-Type": "multipart/form-data" }, + data: data, + // data, + }); } // 获取我的老乡 export function userTownsmanApi(data) { - return request({ - url: "/yishoudan/agency/user/list", - method: "post", - params: data, - // data, - }); + return request({ + url: "/yishoudan/agency/user/list", + method: "post", + data: setqs(data), + // data, + }); +} +// 获取点击的老乡详情 +export function townsmanDetailApi(data) { + return request({ + url: "/yishoudan/agency/user/details/" + data, + // data, + }); +} +// 获取点击的老乡图片 +export function townsmanDetailImgsApi(data) { + return request({ + url: "/imgs/list/" + data + "?type=20", + // data, + }); +} +// 删除图片 +export function delTowmsmanDetailImgApi(data) { + return request({ + url: "/imgs/del/" + data, + }); +} +// 提交老乡的信息 +export function updateTownsmanInfoApi(data) { + return request({ + url: "/user/updateInfo", + method: "post", + data: data, + }); } // 我的老乡各个状态统计 export function gettownsManCountApi(data) { - return request({ - url: "/yishoudan/agency/user/listStatistics", - method: "post", - params: data, - }); + return request({ + url: "/yishoudan/agency/user/listStatistics", + method: "post", + data: data, + }); } // 成员管理:获取成员列表 export function getMemberListApi(data) { - return request({ - url: "/yishoudan/user/getAgencyCorpUsers", - method: "post", - params: data, - }); + return request({ + url: "/yishoudan/user/getAgencyCorpUsers", + method: "post", + data: data, + }); } // 成员管理:删除成员 export function deleteMemberApi(data) { - return request({ - url: "/yishoudan/user/delAgencyCorpUser", - method: "post", - params: data, - }); + return request({ + url: "/yishoudan/user/delAgencyCorpUser", + method: "post", + data: data, + }); } // 成员管理:添加成员 export function addMemberApi(data) { - return request({ - url: "/yishoudan/user/addAgencyUser", - method: "post", - params: data, - }); + return request({ + url: "/yishoudan/user/addAgencyUser", + method: "post", + data: data, + }); } diff --git a/src/components/FirstJob/detail.vue b/src/components/FirstJob/detail.vue index 085aba7..85946c4 100644 --- a/src/components/FirstJob/detail.vue +++ b/src/components/FirstJob/detail.vue @@ -89,7 +89,7 @@ - --> + --> + --> - + - + 一手职位 - + 企业详情 @@ -123,45 +123,19 @@
- +
- -
+ +
-
+
- + - +
{{ jobDetail.jobName }}
@@ -172,52 +146,30 @@
- {{ item }} + {{ item }}
-
+
暂无要求
- {{ item }} + {{ item }}
-
+
暂无特色
-
-
+
+ "> + >-->
  |  
- {{ jobDetail.minMonthlyPay }}-{{ jobDetail.maxMonthlyPay }}元/月 + {{ jobDetail.minMonthlyPay }}- + {{ jobDetail.maxMonthlyPay }}元/月
@@ -249,7 +200,7 @@ 新页面 -
--> +
-->
@@ -263,14 +214,8 @@ - + --> +
@@ -278,60 +223,37 @@ +
-->

- 基本信息 - 财务结算 - 职位通告 + 基本信息 + 财务结算 + 职位通告
- - + +
复制
- {{ + + {{ jobDetail.jobDesp - }}暂无详单 + }} + + 暂无详单

温馨提示
-
- {{ jobDetail.notes || "-" }} -
+
{{ jobDetail.notes || "-" }}
薪资待遇
- + + --> 薪资明细 {{ jobDetail.salaryDetail || "-" }} @@ -374,9 +296,11 @@ 薪资说明 - {{ + + {{ jobDetail.salaryDesp || "-" - }} + }} + + -->
面试要求
- + 性别年龄 - 男 {{ jobDetail.minAgeMan }} - {{ + + 男 {{ jobDetail.minAgeMan }} + + {{ "- " + jobDetail.maxAgeMan - }}岁 ; + }} + 岁 ; + + 女 {{ jobDetail.minAgeWoman }} - {{ "- " + jobDetail.maxAgeWoman }} + {{ "- " + jobDetail.maxAgeWoman }}岁 + @@ -459,7 +379,7 @@ + --> + --> + -->
-
+
岗位说明
- + 工作内容 {{ jobDetail.workContent || "-" }} @@ -522,12 +437,14 @@ 倒班频次 {{ jobDetail.workByTurns }} - --> + --> 换岗调班 - {{ + + {{ jobDetail.otherDesp || "-" - }} + }} +
@@ -539,16 +456,16 @@
吃饭
  • - 吃饭{{ jobDetail.workingLunch || "-" }} + 吃饭 + {{ jobDetail.workingLunch || "-" }}
  • + --> + --> + --> + -->
  • 住宿
    • - 住宿费用{{ jobDetail.dormitory || "-" }} + 住宿费用 + {{ jobDetail.dormitory || "-" }}
    • - 宿舍设施{{ jobDetail.dormitoryFacilities || "-" }} + 宿舍设施 + {{ jobDetail.dormitoryFacilities || "-" }}
    • - 宿舍距离{{ jobDetail.dormDistance || "-" }} + 宿舍距离 + {{ jobDetail.dormDistance || "-" }}
    • - 厂车{{ jobDetail.bus || "-" }} + 厂车 + {{ jobDetail.bus || "-" }}
    • - 住宿要求{{ jobDetail.dormitoryDesp || "-" }} + 住宿要求 + {{ jobDetail.dormitoryDesp || "-" }}
    • + --> + --> + --> + --> + --> + -->
  • @@ -662,16 +580,14 @@ 班次时间 9:30-14:00;17:00-22:00 - --> + -->
    其他信息
    -
    - {{ jobDetail.otherInfo || "-" }} -
    +
    {{ jobDetail.otherInfo || "-" }}
    - + @@ -684,17 +600,9 @@
    代理须知
    -
    - {{ jobDetail.agencyStatement || "-" }} -
    +
    {{ jobDetail.agencyStatement || "-" }}
    - + 代理利润 {{ jobDetail.agencyProfit || "-" }} @@ -702,7 +610,7 @@ + --> 扣税说明 {{ jobDetail.deductTaxDesp || "-" }} @@ -710,7 +618,7 @@ + --> 出名单 {{ jobDetail.outListTime || "-" }} @@ -726,7 +634,7 @@
    职位通告
    复制
    - +
    {{ jobDetail.jobDesp || "-" }}
    @@ -735,28 +643,34 @@
    -

    服务热线

    +

    + 服务热线 +

    0371-6611 3723

    +
    -->
    -

    企业详情

    +

    + 企业详情 +

    {{ jobDetail.aliasName }}

    - - + +

    + 是文案我很长很长我是文案我很 长很长-->

    -

    企业位置

    +

    + 企业位置 +

    @@ -774,25 +688,22 @@

    服务热线

    0371-6611 3723

    -
    --> +
    -->
    diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue index 95df57b..1ba1c4f 100644 --- a/src/components/FirstJob/recordBill.vue +++ b/src/components/FirstJob/recordBill.vue @@ -1,38 +1,31 @@ diff --git a/src/components/Login/login.vue b/src/components/Login/login.vue index c01e265..21a1b37 100644 --- a/src/components/Login/login.vue +++ b/src/components/Login/login.vue @@ -1,200 +1,143 @@ +
    +
    +
    diff --git a/src/components/main/index.vue b/src/components/main/index.vue index cb8c22d..09a9d2a 100644 --- a/src/components/main/index.vue +++ b/src/components/main/index.vue @@ -1,148 +1,112 @@ diff --git a/src/components/userinfo/accountsetting/inedex.vue b/src/components/userinfo/accountsetting/inedex.vue index 1b2d1d7..fc4fa03 100644 --- a/src/components/userinfo/accountsetting/inedex.vue +++ b/src/components/userinfo/accountsetting/inedex.vue @@ -1,143 +1,85 @@ diff --git a/src/components/userinfo/usercenter/components/mybill.vue b/src/components/userinfo/usercenter/components/mybill.vue index ce59516..99d517b 100644 --- a/src/components/userinfo/usercenter/components/mybill.vue +++ b/src/components/userinfo/usercenter/components/mybill.vue @@ -1,31 +1,29 @@ diff --git a/src/components/userinfo/usercenter/components/townsman.vue b/src/components/userinfo/usercenter/components/townsman.vue index 36c63ec..1fbe6dc 100644 --- a/src/components/userinfo/usercenter/components/townsman.vue +++ b/src/components/userinfo/usercenter/components/townsman.vue @@ -8,9 +8,9 @@
  • 空闲中{{ statusNum.num1 == 0 ? "" : statusNum.num1 }}
  • -
  • +
  • 在职中{{ statusNum.num3 == 0 ? "" : statusNum.num3 }}
  • @@ -44,8 +44,8 @@ - -
    + +
    老乡详情
    @@ -54,37 +54,33 @@
    - {{currentTownsmanDetail.username}}/ - {{currentTownsmanDetail.sex}}/ - {{currentTownsmanDetail.age}}/ - {{currentTownsmanDetail.nation}} + {{currentTownsmanDetail.name}}{{currentTownsmanDetail.sex && currentTownsmanDetail.sex == 1 ? '/男':'/女'}}{{currentTownsmanDetail.age && '/' + currentTownsmanDetail.age + '岁'}}{{currentTownsmanDetail.nation && '/' + currentTownsmanDetail.nation + '族'}} - 编辑 + 编辑

    - {{currentTownsmanDetail.position}} + {{currentTownsmanDetail.address || '-'}}

    - - {{currentTownsmanDetail.IDcard}} + {{currentTownsmanDetail.idCard ? currentTownsmanDetail.idCard : '-' }} - - {{currentTownsmanDetail.tel}} + {{currentTownsmanDetail.tel ? currentTownsmanDetail.tel : '-' }}
    -
    - - - +
    +
    + + +
    -
    +
    - 工作一 + 工作{{item.index}}
    @@ -92,7 +88,7 @@ 报名岗位 - {{currentTownsmanDetail.jobName}} + {{item.storeJobName || '-'}} @@ -100,57 +96,156 @@ 报名企业 - {{currentTownsmanDetail.storeName}} + {{item.storeName || '-'}} 政策 - - {{currentTownsmanDetail.policy}} + + {{item.policy}} - {{policyStatus?'收起':'展开'}} + {{item.policyStatus?'收起':'展开'}} 状态 - - {{currentTownsmanDetail.status == 1 ? '在职中' : ''}} + + {{item.statusText}} - 入职时间 + {{item.timeText}} - {{new Date(currentTownsmanDetail.entryTime)}} + {{item.timeStr}}
    -
    +
    - 跟进记录 + 跟进记录{{item.index}}
    +
    +
    - +
    老乡信息
    - + - + - + @@ -164,12 +259,12 @@ - + - + {{item.name}} @@ -178,32 +273,44 @@ - + - + - + - - + + + 上传 - - 取消 - 提交 - + +
    +
    + +

    {{item.title}}

    +
    + +
    +
    +
    + +

    {{item.name}}

    +
    + +
    + + 取消 + 提交 +
    @@ -213,12 +320,51 @@ @@ -793,14 +1380,14 @@ export default { margin-bottom: 20px; } .boxStyle { - padding: 20px 0; + padding: 6px 0; border-bottom: 1px solid #eee; } .userInfo { border-bottom: 1px solid #eee; .userInfo_top { display: flex; - margin-bottom: 20px; + margin-bottom: 12px; justify-content: space-between; align-items: center; & > div > div:first-child { @@ -808,12 +1395,12 @@ export default { } } .userInfo_bottom { - margin-bottom: 20px; + margin-bottom: 10px; img { width: 64px; height: 64px; - margin-right: 10px; + margin: 0 10px 10px 0; border-radius: 4px; } } @@ -827,6 +1414,8 @@ export default { .policy { position: relative; height: 20px; + text-align: left; + white-space: pre-wrap; margin-bottom: 20px; overflow: hidden; } @@ -843,6 +1432,15 @@ export default { // border: 1px solid #eee; } } +.townsmanDetailModal { + /deep/ .ant-modal-content { + .ant-modal-body { + min-height: 600px; + max-height: 700px; + overflow: auto; + } + } +} .editDetailModal { /deep/ .ant-modal-content { .ant-modal-header { @@ -850,7 +1448,39 @@ export default { border-bottom: 0px solid #000; } .ant-modal-body { + max-height: 650px; + overflow: auto; padding: 30px 120px 30px 70px; + .imgBox { + display: flex; + flex-flow: row wrap; + > div { + display: flex; + align-items: center; + justify-content: space-between; + width: calc(50% - 10px); + height: 60px; + padding-left: 6px; + border: 1px solid #d9d9d9; + margin-bottom: 12px; + > div { + display: flex; + align-items: center; + } + &:nth-of-type(2n - 1) { + margin-right: 20px; + } + .icon-shanchu { + font-size: 12px; + cursor: pointer; + margin-right: 12px; + } + } + img { + width: 44px; + height: 44px; + } + } } } } @@ -878,4 +1508,261 @@ export default { animation-name: uploadAnimateInlineOut; } } +#progressinfo { + margin: 0 !important; +} +#progressinfo > div { + margin-left: 24px; + padding-top: 0; + padding-bottom: 0; + padding-right: 16px; + position: relative; +} + +.titleMain div { + padding-bottom: 20px; + padding-left: 13px; + border-left: 2px solid #cccccc; + left: 16px; + line-height: 20px; + /*height: 22px;*/ + font-size: 16px; + font-weight: bold; + color: #333333; +} + +.cg-cricle, +.cb-cricle { + position: absolute; + left: -4.5px; + top: 1px; + background: #cccccc; + width: 10px; + height: 10px; + border-radius: 100%; +} + +.ui-list-info { + padding-bottom: 24px; + border-left: 2px solid #cccccc; + padding-left: 13px; + position: relative; + top: -3px; + margin-bottom: -4px; +} +#progressinfo > .ui-step-one:last-of-type > .ui-list-info { + border-left: none; +} +#progressinfo { + margin-top: 24px; + font-size: 14px; + margin-bottom: 125px; + ul { + margin-bottom: 0; + + li { + display: flex; + justify-content: space-between; + align-items: center; + border-left: 1px solid #e8e8e8; + margin-left: 4px; + position: relative; + padding-bottom: 29px; + + p { + margin-bottom: 0; + } + + > div:first-child { + position: absolute; + width: 8px; + height: 8px; + left: -4.5px; + top: 0; + border: 2px solid #1890ff; + background-color: #fff; + border-radius: 50%; + box-sizing: border-box; + } + + > div:nth-child(2) { + margin-left: 37px; + margin-top: -7px; + } + + > div:last-child { + color: #ccc; + cursor: pointer; + } + } + + li:last-child { + border-color: transparent; + } + } + + .loadmore { + text-align: center; + color: #1890ff; + } + .titleMain > div > img { + position: absolute; + top: 0px; + left: -10px; + display: inline-block; + width: 20px; + height: 20px; + background-color: #ccc; + line-height: 20px; + border-radius: 50%; + padding: 2px; + } + .titleMain:first-of-type > div { + color: #ff4400; + } + .titleMain:first-of-type > div > img { + background-color: #ff4400; + } +} +.billDetailModal { + /deep/ .ant-modal-content { + .ant-modal-body { + max-height: 700px; + overflow: auto; + padding: 30px; + // 跟进信息的状态 + #progressinfo { + margin: 0 !important; + } + #progressinfo > div { + margin-left: 24px; + padding-top: 0; + padding-bottom: 0; + padding-right: 16px; + position: relative; + } + + .titleMain div { + padding-bottom: 20px; + padding-left: 13px; + border-left: 2px solid #cccccc; + left: 16px; + line-height: 20px; + /*height: 22px;*/ + font-size: 16px; + font-weight: bold; + color: #333333; + } + + .cg-cricle, + .cb-cricle { + position: absolute; + left: -4.5px; + top: 1px; + background: #cccccc; + width: 10px; + height: 10px; + border-radius: 100%; + } + + .ui-list-info { + padding-bottom: 24px; + border-left: 2px solid #cccccc; + padding-left: 13px; + position: relative; + top: -3px; + margin-bottom: -4px; + } + #progressinfo { + margin-top: 24px; + font-size: 14px; + margin-bottom: 125px; + ul { + margin-bottom: 0; + + li { + display: flex; + justify-content: space-between; + align-items: center; + border-left: 1px solid #e8e8e8; + margin-left: 4px; + position: relative; + padding-bottom: 29px; + + p { + margin-bottom: 0; + } + + > div:first-child { + position: absolute; + width: 8px; + height: 8px; + left: -4.5px; + top: 0; + border: 2px solid #1890ff; + background-color: #fff; + border-radius: 50%; + box-sizing: border-box; + } + + > div:nth-child(2) { + margin-left: 37px; + margin-top: -7px; + } + + > div:last-child { + color: #ccc; + cursor: pointer; + } + } + + li:last-child { + border-color: transparent; + } + } + + .loadmore { + text-align: center; + color: #1890ff; + } + } + .titleMain > div > img { + position: absolute; + top: 0px; + left: -10px; + display: inline-block; + width: 20px; + height: 20px; + background-color: #ccc; + line-height: 20px; + border-radius: 50%; + padding: 2px; + } + .titleMain:first-of-type > div { + color: #ff4400; + } + .titleMain:first-of-type > div > img { + background-color: #ff4400; + } + } + .ant-modal-header { + background-color: #f5f5f5; + border-bottom: 0px solid #000; + } + } +} +.recordInfo { + /deep/ .ant-modal-content { + .ant-modal-body { + padding-left: 120px; + .mb8 { + margin-bottom: 20px !important; + } + .ant-row > div:first-child { + text-align: right; + margin-right: 32px; + } + } + } +} diff --git a/src/permission.js b/src/permission.js index 403f2f0..97c3507 100644 --- a/src/permission.js +++ b/src/permission.js @@ -25,12 +25,7 @@ router.beforeEach(async (to, from, next) => { "/updatepsw", // "/register", ]; - if (Cookies.get("LOGIN_DATA")) { - console.log(!sessionStorage.getItem("LOGIN_DATA")); - if (!sessionStorage.getItem("LOGIN_DATA")) { - console.log("notset"); - sessionStorage.setItem("LOGIN_DATA", Cookies.get("LOGIN_DATA")); - } + if (localStorage.getItem("LOGIN_DATA")) { var isLogin = true; } // const isLogin = localStorage.getItem("LOGIN_DATA") !== null ? true : false; diff --git a/src/style/index.less b/src/style/index.less index 12b7368..6aaf1cd 100644 --- a/src/style/index.less +++ b/src/style/index.less @@ -1,4 +1,4 @@ -@import "http://at.alicdn.com/t/c/font_3135652_me9fsfpihrt.css"; +@import "http://at.alicdn.com/t/c/font_3135652_jrvheq4b5p.css"; // 初始化页面样式 body, h1, @@ -587,3 +587,14 @@ p.bottombox { border-color: #ddd !important; box-shadow: none !important; } +.ant-btn-primary:hover { + border-color: #ff4400; + background-color: #ff5416; + color: #fff; +} +.ant-input:hover { + border-color: #ff4400; +} +.ant-select-selection:active { + box-shadow: none; +} diff --git a/src/style/index.wxss b/src/style/index.wxss index cd62c32..7d29e8b 100644 --- a/src/style/index.wxss +++ b/src/style/index.wxss @@ -1,4 +1,4 @@ -@import "http://at.alicdn.com/t/c/font_3135652_me9fsfpihrt.css"; +@import "http://at.alicdn.com/t/c/font_3135652_jrvheq4b5p.css"; body, h1, h2, @@ -526,3 +526,14 @@ p.bottombox::after { border-color: #ddd !important; box-shadow: none !important; } +.ant-btn-primary:hover { + border-color: #ff4400; + background-color: #ff5416; + color: #fff; +} +.ant-input:hover { + border-color: #ff4400; +} +.ant-select-selection:active { + box-shadow: none; +} diff --git a/src/utils/datalist.js b/src/utils/datalist.js index f6bd471..3bb3221 100644 --- a/src/utils/datalist.js +++ b/src/utils/datalist.js @@ -1,234 +1,234 @@ export let nationlist = [ - { - id: "01", - name: "汉族", - }, - { - id: "02", - name: "蒙古族", - }, - { - id: "03", - name: "回族", - }, - { - id: "04", - name: "藏族", - }, - { - id: "05", - name: "维吾尔族", - }, - { - id: "06", - name: "苗族", - }, - { - id: "07", - name: "彝族", - }, - { - id: "08", - name: "壮族", - }, - { - id: "09", - name: "布依族", - }, - { - id: "10", - name: "朝鲜族", - }, - { - id: "11", - name: "满族", - }, - { - id: "12", - name: "侗族", - }, - { - id: "13", - name: "瑶族", - }, - { - id: "14", - name: "白族", - }, - { - id: "15", - name: "土家族", - }, - { - id: "16", - name: "哈尼族", - }, - { - id: "17", - name: "哈萨克族", - }, - { - id: "18", - name: "傣族", - }, - { - id: "19", - name: "黎族", - }, - { - id: "20", - name: "傈僳族", - }, - { - id: "21", - name: "佤族", - }, - { - id: "22", - name: "畲族", - }, - { - id: "23", - name: "高山族", - }, - { - id: "24", - name: "拉祜族", - }, - { - id: "25", - name: "水族", - }, - { - id: "26", - name: "东乡族", - }, - { - id: "27", - name: "纳西族", - }, - { - id: "28", - name: "景颇族", - }, - { - id: "29", - name: "柯尔克孜族", - }, - { - id: "30", - name: "土族", - }, - { - id: "31", - name: "达斡尔族", - }, - { - id: "32", - name: "仫佬族", - }, - { - id: "33", - name: "羌族", - }, - { - id: "34", - name: "布朗族", - }, - { - id: "35", - name: "撒拉族", - }, - { - id: "36", - name: "毛难族", - }, - { - id: "37", - name: "仡佬族", - }, - { - id: "38", - name: "锡伯族", - }, - { - id: "39", - name: "阿昌族", - }, - { - id: "40", - name: "普米族", - }, - { - id: "41", - name: "塔吉克族", - }, - { - id: "42", - name: "怒族", - }, - { - id: "43", - name: "乌孜别克族", - }, - { - id: "44", - name: "俄罗斯族", - }, - { - id: "45", - name: "鄂温克族", - }, - { - id: "46", - name: "崩龙族", - }, - { - id: "47", - name: "保安族", - }, - { - id: "48", - name: "裕固族", - }, - { - id: "49", - name: "京族", - }, - { - id: "50", - name: "塔塔尔族", - }, - { - id: "51", - name: "独龙族", - }, - { - id: "52", - name: "鄂伦春族", - }, - { - id: "53", - name: "赫哲族", - }, - { - id: "54", - name: "门巴族", - }, - { - id: "55", - name: "珞巴族", - }, - { - id: "56", - name: "基诺族", - }, - { - id: "57", - name: "其他", - }, - { - id: "58", - name: "外国血统中国人士", - }, + { + id: "01", + name: "汉族", + }, + { + id: "02", + name: "蒙古族", + }, + { + id: "03", + name: "回族", + }, + { + id: "04", + name: "藏族", + }, + { + id: "05", + name: "维吾尔族", + }, + { + id: "06", + name: "苗族", + }, + { + id: "07", + name: "彝族", + }, + { + id: "08", + name: "壮族", + }, + { + id: "09", + name: "布依族", + }, + { + id: "10", + name: "朝鲜族", + }, + { + id: "11", + name: "满族", + }, + { + id: "12", + name: "侗族", + }, + { + id: "13", + name: "瑶族", + }, + { + id: "14", + name: "白族", + }, + { + id: "15", + name: "土家族", + }, + { + id: "16", + name: "哈尼族", + }, + { + id: "17", + name: "哈萨克族", + }, + { + id: "18", + name: "傣族", + }, + { + id: "19", + name: "黎族", + }, + { + id: "20", + name: "傈僳族", + }, + { + id: "21", + name: "佤族", + }, + { + id: "22", + name: "畲族", + }, + { + id: "23", + name: "高山族", + }, + { + id: "24", + name: "拉祜族", + }, + { + id: "25", + name: "水族", + }, + { + id: "26", + name: "东乡族", + }, + { + id: "27", + name: "纳西族", + }, + { + id: "28", + name: "景颇族", + }, + { + id: "29", + name: "柯尔克孜族", + }, + { + id: "30", + name: "土族", + }, + { + id: "31", + name: "达斡尔族", + }, + { + id: "32", + name: "仫佬族", + }, + { + id: "33", + name: "羌族", + }, + { + id: "34", + name: "布朗族", + }, + { + id: "35", + name: "撒拉族", + }, + { + id: "36", + name: "毛难族", + }, + { + id: "37", + name: "仡佬族", + }, + { + id: "38", + name: "锡伯族", + }, + { + id: "39", + name: "阿昌族", + }, + { + id: "40", + name: "普米族", + }, + { + id: "41", + name: "塔吉克族", + }, + { + id: "42", + name: "怒族", + }, + { + id: "43", + name: "乌孜别克族", + }, + { + id: "44", + name: "俄罗斯族", + }, + { + id: "45", + name: "鄂温克族", + }, + { + id: "46", + name: "崩龙族", + }, + { + id: "47", + name: "保安族", + }, + { + id: "48", + name: "裕固族", + }, + { + id: "49", + name: "京族", + }, + { + id: "50", + name: "塔塔尔族", + }, + { + id: "51", + name: "独龙族", + }, + { + id: "52", + name: "鄂伦春族", + }, + { + id: "53", + name: "赫哲族", + }, + { + id: "54", + name: "门巴族", + }, + { + id: "55", + name: "珞巴族", + }, + { + id: "56", + name: "基诺族", + }, + { + id: "57", + name: "其他", + }, + { + id: "58", + name: "外国血统中国人士", + }, ]; diff --git a/src/utils/request.js b/src/utils/request.js index 927e3e8..dd6c3ed 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,6 +1,8 @@ import axios from "axios"; import router from "@/router"; import Cookies from "js-cookie"; +import qs from "qs"; + // import Vue from "vue"; // const baseURL = "http://1shoudan.com"; // 正式环境线上 const baseURL = "http://idaotian.com"; // 正式环境线上 @@ -13,42 +15,67 @@ const baseURL = "http://idaotian.com"; // 正式环境线上 // const data1 = require.context("./", false, /\.js$/); // 测试用 // console.log(data1.keys()); axios.defaults.withCredentials = true; //添加这行代码 +// axios.defaults.headers.post["Content-Type"] = "application/x-www-form-urlencoded" // console.log(axios); const service = axios.create({ - 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: 60000, // request timeout - crossDomain: true, + // 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: 60000, // request timeout + crossDomain: true, }); +service.interceptors.request.use( + (req) => { + console.log(req); + // if (req.method == "post" && req.headers["Content-type"]) { + // if (req.headers["Content-type"].indexOf("multipart/form-data") == -1 && req.headers["Content-type"].indexOf("application/x-www-form-urlencoded") == -1) { + // let dataObj = qs.stringify(req.data); + // console.log(dataObj); + // req.data = dataObj; + // } + // } + + if (localStorage.getItem("LOGIN_DATA")) { + req.headers.Authorization = "Bearer " + JSON.parse(localStorage.getItem("LOGIN_DATA")).token; + } + // application/json + // if(req.headers.common.Accept.indexOf('application/json') > 0 || req.headers.Accept.indexOf('application/json') > 0){ + // console.log('is application/json'); + // } + return req; + }, + (err) => { + console.log(err); + } +); service.interceptors.response.use( - (response) => { - const { msg, status } = response.data; - return response; - // console.log(status) ; - // if (status == 9999) { - // sessionStorage.removeItem("LOGIN_DATA"); - // Cookies.remove("LOGIN_DATA"); - // router.push("/login"); - // // 跳转到登录页面 - // // this.$message.warning(msg); - // return Promise.reject(new Error("token过期")); - // } - // if (response.status === 200) { - // return response; - // } else { - // // Message.error(message) - // return Promise.reject(new Error(msg)); - // } - }, - (error) => { - console.log(error); - // if (error.toString().indexOf("9999") !== -1) { - // router.push("/login"); - // // Vue.$message.warning(msg) - // } else if (error.message.indexOf("500") !== -1) { - // } - // return Promise.reject(error); - } + (response) => { + console.log(response); + let { msg, status } = response.data; + // return response; + console.log(status); + if (status == 9999) { + localStorage.removeItem("LOGIN_DATA"); + router.push("/login"); + // 跳转到登录页面 + // this.$message.warning(msg); + return Promise.reject(new Error("token过期")); + } + if (response.status === 200) { + return response; + } else { + // Message.error(message) + return Promise.reject(new Error(msg)); + } + }, + (error) => { + console.log(error); + // if (error.toString().indexOf("9999") !== -1) { + // router.push("/login"); + // // Vue.$message.warning(msg) + // } else if (error.message.indexOf("500") !== -1) { + // } + // return Promise.reject(error); + } ); export default service; diff --git a/src/views/main.vue b/src/views/main.vue index 7ae790f..a343784 100644 --- a/src/views/main.vue +++ b/src/views/main.vue @@ -191,12 +191,11 @@
    --> - -
    + -->