Merge branch 'master' of http://47.95.113.45:19998/r/matripe/code/yishoudan

src/api/userinfo.js

@@ -24,14 +24,14 @@ export function userDetailApi(data) {
 		params: data,
 	});
 }
-// 获取我的老乡信息
+// // 获取我的老乡信息
-export function userTownsmanApi(data) {
+// export function userTownsmanApi(data) {
-  return request({
+//   return request({
-    url: "/yishoudan/workorder/getLaoXiangList",
+//     url: "/yishoudan/workorder/getLaoXiangList",
-    // method: "post",
+//     // method: "post",
-    params: data,
+//     params: data,
-  });
+//   });
-}
+// }
 // 获取我的报名信息
 export function userBillApi(data) {
 	return request({
@@ -120,3 +120,20 @@ export function uploadUserAvatarApi(data) {
 		// data,
 	});
 }
+// 获取我的老乡
+export function userTownsmanApi(data) {
+	return request({
+		url: "/yishoudan/agency/user/list",
+		method: "post",
+		params: data,
+		// data,
+	});
+}
+// 我的老乡各个状态统计
+export function gettownsManCountApi(data) {
+	return request({
+		url: "/yishoudan/agency/user/listStatistics",
+		method: "post",
+		params: data,
+	});
+}

src/components/FirstJob/components/recommend.vue

@@ -20,9 +20,9 @@
             </div>
             <div class="jobname">
               {{
-                item.aliasName !== null && item.aliasName !== ""
+                item.storeName !== null && item.storeName !== ""
-                  ? item.aliasName
+                  ? item.storeName
-                  : item.storeName
+                  : item.aliasName
               }}
             </div>
           </a>

src/components/FirstJob/detail.vue

@@ -121,43 +121,18 @@
 		<div class="maincontent w">
 			<div class="maincontentleft">
 				<div class="subset">
-          <a-skeleton
+					<a-skeleton avatar :loading="skeletonshow" v-if="skeletonshow" :paragraph="{ rows: 4 }" />
-            avatar
-            :loading="skeletonshow"
-            v-if="skeletonshow"
-            :paragraph="{ rows: 4 }"
-          />
 
 					<div class="subsetleft" v-else>
 						<div class="imgbox">
-              <a-carousel
+							<a-carousel arrows :autoplay="true" effect="fade" :dots="true" ref="scrollimg" v-if="storeImage.length !== 0">
-                arrows
+								<div slot="prevArrow" class="custom-slick-arrow" style="left: 5px; z-index: 99">
-                :autoplay="true"
-                effect="fade"
-                :dots="true"
-                ref="scrollimg"
-                v-if="storeImage.length !== 0"
-              >
-                <div
-                  slot="prevArrow"
-                  class="custom-slick-arrow"
-                  style="left: 5px; z-index: 99"
-                >
 									<a-icon type="left-circle" />
 								</div>
-                <div
+								<div slot="nextArrow" class="custom-slick-arrow" style="right: 5px; z-index: 99">
-                  slot="nextArrow"
-                  class="custom-slick-arrow"
-                  style="right: 5px; z-index: 99"
-                >
 									<a-icon type="right-circle" />
 								</div>
-                <img
+								<img v-for="(item, index) in storeImage" :key="index" :src="item" alt="" />
-                  v-for="(item, index) in storeImage"
-                  :key="index"
-                  :src="item"
-                  alt=""
-                />
 							</a-carousel>
 							<img v-else src="../../../static/img/nopicture.png" alt="" />
 						</div>
@@ -170,36 +145,16 @@
 							</div>
 							<div class="jobtag">
 								<!-- <span>返费</span> -->
-                <a-tag
+								<a-tag :color="labelColor[index % labelColor.length]" v-for="(item, index) in jobDetail.jobRequestLabelNames" :key="index">{{ item }}</a-tag>
-                  :color="labelColor[index % labelColor.length]"
-                  v-for="(item, index) in jobDetail.jobRequestLabelNames"
-                  :key="index"
-                  >{{ item }}</a-tag
-                >
 							</div>
-              <div
+							<div style="height: 27px" v-if="!jobDetail.jobRequestLabelNames" class="jobtag">
-                style="height: 27px"
-                v-if="!jobDetail.jobRequestLabelNames"
-                class="jobtag"
-              >
 								<a-tag :color="labelColor[1]">暂无要求</a-tag>
 							</div>
 							<div class="jobtag1">
 								<!-- <span>返费</span> -->
-                <a-tag
+								<a-tag v-for="(item, index) in jobDetail.jobSpecialLabelNames" :key="index">{{ item }}</a-tag>
-                  v-for="(item, index) in jobDetail.jobSpecialLabelNames"
-                  :key="index"
-                  >{{ item }}</a-tag
-                >
 							</div>
-              <div
+							<div style="display: flex; align-items: center; height: 26px; margin-top: 16px">
-                style="
-                  display: flex;
-                  align-items: center;
-                  height: 26px;
-                  margin-top: 16px;
-                "
-              >
 								<div class="jobpricehour">
 									<!-- <template v-if="jobDetail.hourlyPay"
                     ><span>{{ jobDetail.hourlyPay }}</span
@@ -209,12 +164,7 @@
                     ><span>{{ jobDetail.dayPay }}</span
                     >元/日</template
                   > -->
-                  {{
+									{{ getSalaryClassifyValue(jobDetail.salaryClassify, jobDetail.salaryClassifyValue) }}
-                    getSalaryClassifyValue(
-                      jobDetail.salaryClassify,
-                      jobDetail.salaryClassifyValue
-                    )
-                  }}
 								</div>
 								<span style="font-size: 16px">&nbsp;&nbsp;|&nbsp;&nbsp;</span>
 								<div class="jobpricemonth">
@@ -248,9 +198,13 @@
 								<span>{{ jobDetail.servetype }}</span>
 							</div>
 						</div>
-            <button class="dropdown bottombox1" @click="torecord()">
+						<div class="bottombox">
-              报名
+							<!-- <a-popover title="" trigger="click" placement="bottomRight">
-            </button>
+								
+								<a-button type="primary" class="jobDesp">职位详单</a-button>
+							</a-popover> -->
+							<button class="dropdown bottombox1" @click="torecord()">报名</button>
+						</div>
 					</div>
 				</div>
 				<!-- <div class="proxy">
@@ -260,17 +214,17 @@
 				<div class="jobinformationbox">
 					<h1>
 						<div class="infotitle">
-              <span
+							<span @click="tabchange = 1" :class="tabchange === 1 ? 'active' : ''">基本信息</span>
-                @click="tabchange = 1"
+							<span @click="tabchange = 0" :class="tabchange !== 1 ? 'active' : ''">财务结算</span>
-                :class="tabchange === 1 ? 'active' : ''"
-                >基本信息</span
-              >
-              <span
-                @click="tabchange = 0"
-                :class="tabchange !== 1 ? 'active' : ''"
-                >财务结算</span
-              >
 						</div>
+						<div class="copy" @click="xiangdanVisible = true">通告</div>
+						<a-modal v-model="xiangdanVisible" title="通告" class="xiangdan" :footer="null" @ok="handleOk">
+							<!-- <template slot="content" class="jobDesp_content"> -->
+							<div class="copy" @click="copyText($event)">复制</div>
+							<span v-if="jobDetail.jobDesp" class="copyInfo">{{ jobDetail.jobDesp }}</span
+							><span v-else>暂无详单</span>
+							<!-- </template> -->
+						</a-modal>
 					</h1>
 					<div v-if="tabchange === 1" style="display: flex">
 						<!-- 薪资 -->
@@ -281,12 +235,7 @@
 							</div>
 							<div class="pay" id="pay">
 								<div class="mb12 mt20">薪资待遇</div>
-                <a-descriptions
+								<a-descriptions bordered size="small" :column="1" class="leftDesc boubleLevel">
-                  bordered
-                  size="small"
-                  :column="1"
-                  class="leftDesc boubleLevel"
-                >
 									<!-- <a-descriptions-item class="test1">
                     <span slot="label" class="fw500">工价</span>
                     <span>{{ jobDetail.calculationUnit }}</span>
@@ -309,9 +258,7 @@
 									</a-descriptions-item>
 									<a-descriptions-item>
 										<span slot="label" class="fw500">补充说明</span>
-                    <span style="white-space: break-spaces">{{
+										<span style="white-space: break-spaces">{{ jobDetail.salaryDesp || "-" }}</span>
-                      jobDetail.salaryDesp || "-"
-                    }}</span>
 									</a-descriptions-item>
 									<!-- <a-descriptions-item style="padding: 0">
                     <span slot="label">薪资说明</span>
@@ -349,24 +296,15 @@
 							<!-- 岗位要求 -->
 							<div class="required" id="required">
 								<div class="mb12 mt20">面试要求</div>
-                <a-descriptions
+								<a-descriptions bordered size="small" :column="1" class="leftDesc">
-                  bordered
-                  size="small"
-                  :column="1"
-                  class="leftDesc"
-                >
 									<a-descriptions-item class="test1">
 										<span slot="label" class="fw500">性别年龄</span>
 										<span>
 											<span class="man" v-if="jobDetail.minAgeMan"
-                        >男 {{ jobDetail.minAgeMan }}
+												>男 {{ jobDetail.minAgeMan }} <span v-if="jobDetail.maxAgeMan">{{ "- " + jobDetail.maxAgeMan }}</span
-                        <span v-if="jobDetail.maxAgeMan">{{
-                          "- " + jobDetail.maxAgeMan
-                        }}</span
 												>岁 ；</span
 											><span class="woman" v-if="jobDetail.minAgeWoman">
-                        女 {{ jobDetail.minAgeWoman }}
+												女 {{ jobDetail.minAgeWoman }} <span> {{ "- " + jobDetail.maxAgeWoman }}</span
-                        <span> {{ "- " + jobDetail.maxAgeWoman }}</span
 												>岁</span
 											>
 										</span>
@@ -402,12 +340,7 @@
 							<!-- 基本信息 -->
 							<div class=" " id="contentspecial">
 								<div class="mb12 mt20">岗位说明</div>
-                <a-descriptions
+								<a-descriptions bordered size="small" :column="1" class="leftDesc">
-                  bordered
-                  size="small"
-                  :column="1"
-                  class="leftDesc"
-                >
 									<a-descriptions-item class="test1">
 										<span slot="label" class="fw500">工作内容</span>
 										<span>{{ jobDetail.workContent || "-" }}</span>
@@ -438,9 +371,7 @@
                   </a-descriptions-item> -->
 									<a-descriptions-item>
 										<span slot="label" class="fw500">补充说明</span>
-                    <span style="white-space: break-spaces">{{
+										<span style="white-space: break-spaces">{{ jobDetail.otherDesp || "-" }}</span>
-                      jobDetail.otherDesp || "-"
-                    }}</span>
 									</a-descriptions-item>
 								</a-descriptions>
 							</div>
@@ -452,8 +383,7 @@
 										<div>吃饭</div>
 										<ul>
 											<li>
-                        <span>吃饭</span
+												<span>吃饭</span><span>{{ jobDetail.workingLunch || "-" }}</span>
-                        ><span>{{ jobDetail.workingLunch || "-" }}</span>
 											</li>
 											<!-- <li>
                         <span>餐补</span
@@ -471,10 +401,7 @@
                         <span>民族窗口</span><span>{{ jobDetail.muslim }}</span>
                       </li> -->
 											<li>
-                        <span>补充说明</span
+												<span>补充说明</span><span style="white-space: break-spaces">{{ jobDetail.workingLunchDesp || "-" }}</span>
-                        ><span style="white-space: break-spaces">{{
-                          jobDetail.workingLunchDesp || "-"
-                        }}</span>
 											</li>
 										</ul>
 									</li>
@@ -482,12 +409,10 @@
 										<div>住宿</div>
 										<ul>
 											<li>
-                        <span>住宿</span
+												<span>住宿</span><span>{{ jobDetail.dormitory || "-" }}</span>
-                        ><span>{{ jobDetail.dormitory || "-" }}</span>
 											</li>
 											<li>
-                        <span>宿舍设施</span
+												<span>宿舍设施</span><span>{{ jobDetail.dormitoryFacilities || "-" }}</span>
-                        ><span>{{ jobDetail.dormitoryFacilities || "-" }}</span>
 											</li>
 											<!-- <li>
                         <span>宿舍距离</span
@@ -508,17 +433,13 @@
                         ><span>{{ jobDetail.dormitoryFacilities }}</span>
                       </li> -->
 											<li>
-                        <span>水电费</span
+												<span>水电费</span><span>{{ jobDetail.waterAndElec || "-" }}</span>
-                        ><span>{{ jobDetail.waterAndElec || "-" }}</span>
 											</li>
 											<!-- <li>
                         <span>班车</span><span>{{ jobDetail.regularBus }}</span>
                       </li> -->
 											<li>
-                        <span>补充说明</span
+												<span>补充说明</span><span style="white-space: break-spaces">{{ jobDetail.dormitoryDesp || "-" }}</span>
-                        ><span style="white-space: break-spaces">{{
-                          jobDetail.dormitoryDesp || "-"
-                        }}</span>
 											</li>
 										</ul>
 									</li>
@@ -586,13 +507,7 @@
 							<div class="mb12 mt20">代理须知</div>
 							<div class="showInfo">{{ jobDetail.agencyStatement || "-" }}</div>
 						</div>
-            <a-descriptions
+						<a-descriptions bordered size="small" :column="1" class="leftDesc mt20" style="width: 900px">
-              bordered
-              size="small"
-              :column="1"
-              class="leftDesc mt20"
-              style="width: 900px"
-            >
 							<a-descriptions-item class="test1">
 								<span slot="label" class="fw500">代理利润</span>
 								<span>{{ jobDetail.agencyProfit || "-" }}</span>
@@ -622,16 +537,14 @@
 				</div>
 			</div>
 			<div class="maincontentright">
-        <!-- <div class="hotphone">
+				<div class="hotphone">
 					<h1 class="bottombox"><i>服务热线</i></h1>
-					<p>135 2307 4549</p>
+					<p>0371-6611 3723</p>
-				</div> -->
-        <div class="jobDetailInfo">
-          <h1 class="bottombox">
-            <i>职位详版</i> <span class="copy" @click="copyText">复制</span>
-          </h1>
-          <p class="copyInfo">{{ jobDetail.jobDesp || "-" }}</p>
 				</div>
+				<!-- <div class="jobDetailInfo" style="display:none">
+					<h1 class="bottombox"><i>职位详版</i> <span class="copy" @click="copyText">复制</span></h1>
+					<p class="copyInfo">{{ jobDetail.jobDesp || "-" }}</p>
+				</div> -->
 				<div class="companyinfo">
 					<div class="companydetail">
 						<h1 class="bottombox"><i>企业详情</i></h1>
@@ -656,22 +569,19 @@
 				<recommend />
 			</div>
 		</div>
-    <div class="hotTel">
+		<!-- <div class="hotTel">
 			<i class="iconfont icon-kefu"></i>
 			<p>服务热线</p>
 			<div>
 				<p>服务热线</p>
-        <p>135 2307 4549</p>
+				<p>0371-6611 3723</p>
-      </div>
 			</div>
+		</div> -->
 	</div>
 </template>
 <script>
 import { getJobDetailApi } from "../../api/job";
-import {
+import { disposeJobListData, getSalaryClassifyValue } from "../../utils/commonUtil";
-  disposeJobListData,
-  getSalaryClassifyValue,
-} from "../../utils/commonUtil";
 import recommend from "../../components/FirstJob/components/recommend.vue";
 import { nationlist } from "../../utils/datalist";
 // import GDMap from '../map.vue'
@@ -697,20 +607,12 @@ export default {
 			storeInfo: {},
 			id: this.$route.params.id,
 			visible: false, // 录单模态框的展示
+			xiangdanVisible: false, // 详单的弹出
 			confirmLoading: false, // 录单提交的loading效果
 			skeletonshow: true,
 			tabchange: 1,
 			nationlist,
-      labelColor: [
+			labelColor: ["pink", "blue", "purple", "orange", "green", "cyan", "red", "purple"],
-        "pink",
-        "blue",
-        "purple",
-        "orange",
-        "green",
-        "cyan",
-        "red",
-        "purple",
-      ],
 			form: {
 				// 录单数据
 				name: "",
@@ -771,9 +673,7 @@ export default {
 					console.log(data);
 					this.jobDetail = disposeJobListData(data.data.storeJob);
 					this.skeletonshow = false;
-          this.jobDetail.district = disposeJobListData(
+					this.jobDetail.district = disposeJobListData(data.data.store).district;
-            data.data.store
-          ).district;
 					let newdata = {
 						id: data.data.storeJob.id,
 						aliasName: data.data.store.aliasName,
@@ -1212,6 +1112,7 @@ export default {
 						}
 					}
 				}
+				.bottombox {
 					.bottombox1 {
 						width: 116px;
 						height: 32px;
@@ -1229,6 +1130,26 @@ export default {
 							background-color: rgba(255, 121, 26);
 						}
 					}
+					.jobDesp {
+						width: 116px;
+						height: 32px;
+						line-height: 30px;
+						font-size: 16px;
+						margin-right: 20px;
+						// border: 1px solid rgba(77, 87, 94, 0.3);
+						border-radius: 4px;
+						border: 1px solid #ff6a00;
+						background-color: #fff;
+						color: rgba(255, 106, 0, 1);
+						transition: none;
+						cursor: pointer;
+						&:hover {
+							color: #fff;
+
+							background-color: rgba(255, 121, 26);
+						}
+					}
+				}
 			}
 		}
 		.proxy {
@@ -1285,6 +1206,26 @@ export default {
 			}
 		}
 		.jobinformationbox {
+			h1 {
+				position: relative;
+				.copy {
+					position: absolute;
+					padding: 0px 12px;
+					right: 0px;
+					bottom: 12px;
+					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;
+					}
+				}
+			}
 			.navigation {
 				width: 55px !important;
 				margin-left: 25px;
@@ -1508,12 +1449,7 @@ export default {
 		font-size: 16px;
 		color: #878787;
 	}
-  .boubleLevel
+	.boubleLevel > .ant-descriptions-view > table > tbody > .ant-descriptions-row:last-child > .ant-descriptions-item-content {
-    > .ant-descriptions-view
-    > table
-    > tbody
-    > .ant-descriptions-row:last-child
-    > .ant-descriptions-item-content {
 		// padding: 0 !important;
 		.noborder {
 			.ant-descriptions-view {

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;

src/components/FirstJob/recordBill.vue

@@ -22,14 +22,7 @@
 		</a-breadcrumb>
 		<div class="content">
 			<a-form-model ref="ruleForm" :model="form" :colon="true" :rules="rules">
-        <a-form-model-item
+				<a-form-model-item ref="proxy" label="代理" prop="" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="height: 30px; margin-bottom: 18px">
-          ref="proxy"
-          label="代理"
-          prop=""
-          :wrapperCol="{ span: 18 }"
-          :labelCol="{ span: 4 }"
-          style="height: 30px; margin-bottom: 18px"
-        >
 					<!-- <a-input
             :value="
               proxyinfo.userName !== '' &&
@@ -41,28 +34,9 @@
             :disabled="true"
           /> -->
 					<div class="pzbox" style="width: 100%">
-            <span v-if="proxyStatus === ''">
+						<span v-if="proxyStatus === ''"> {{ proxyinfo.userName !== "" && proxyinfo.userName !== null && proxyinfo.userName !== undefined ? proxyinfo.userName : proxyinfo.tel }}</span>
-              {{
+						<a-select v-if="proxyStatus === 'proxy'" mode="combobox" auto-focus style="width: calc(100% - 200px)" placeholder="请选择代理" @blur="proxyStatus = ''">
-                proxyinfo.userName !== "" &&
+							<a-select-option v-for="i in proxyList" :key="i.userName" @click="proxyChange(i)">
-                proxyinfo.userName !== null &&
-                proxyinfo.userName !== undefined
-                  ? proxyinfo.userName
-                  : proxyinfo.tel
-              }}</span
-            >
-            <a-select
-              v-if="proxyStatus === 'proxy'"
-              mode="combobox"
-              auto-focus
-              style="width: calc(100% - 200px)"
-              placeholder="请选择代理"
-              @blur="proxyStatus = ''"
-            >
-              <a-select-option
-                v-for="i in proxyList"
-                :key="i.userName"
-                @click="proxyChange(i)"
-              >
 								{{ i.userName }}
 							</a-select-option>
 						</a-select>
@@ -78,36 +52,12 @@
 						>
 					</div>
 				</a-form-model-item>
-        <a-form-model-item
+				<a-form-model-item ref="username" label="报名企业" prop="username" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="height: 30px; margin-bottom: 18px">
-          ref="username"
-          label="报名企业"
-          prop="username"
-          :wrapperCol="{ span: 18 }"
-          :labelCol="{ span: 4 }"
-          style="height: 30px; margin-bottom: 18px"
-        >
 					<!-- <a-input :value="firminfo.aliasName" :disabled="true" /> -->
 					<div class="pzbox" style="width: 100%">
 						<span v-if="storeStatus === ''">{{ firminfo.aliasName }}</span>
-            <a-select
+						<a-select v-if="storeStatus === 'store'" show-search auto-focus mode="combobox" placeholder="请选择企业" style="width: calc(100% - 200px)" :default-active-first-option="false" :show-arrow="false" :filter-option="false" :not-found-content="null" @search="storeSearch" @blur="storeStatus = ''">
-              v-if="storeStatus === 'store'"
+							<a-select-option v-for="i in storeList" :key="i.id + ''" @click="storeChange(i)">
-              show-search
-              auto-focus
-              mode="combobox"
-              placeholder="请选择企业"
-              style="width: calc(100% - 200px)"
-              :default-active-first-option="false"
-              :show-arrow="false"
-              :filter-option="false"
-              :not-found-content="null"
-              @search="storeSearch"
-              @blur="storeStatus = ''"
-            >
-              <a-select-option
-                v-for="i in storeList"
-                :key="i.id + ''"
-                @click="storeChange(i)"
-              >
 								{{ i.aliasName }}
 							</a-select-option>
 						</a-select>
@@ -123,31 +73,12 @@
 						>
 					</div>
 				</a-form-model-item>
-        <a-form-model-item
+				<a-form-model-item ref="username" label="岗位" prop="username" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="height: 30px">
-          ref="username"
-          label="岗位"
-          prop="username"
-          :wrapperCol="{ span: 18 }"
-          :labelCol="{ span: 4 }"
-          style="height: 30px"
-        >
 					<!-- <a-input :value="firminfo.jobName" :disabled="true" /> -->
 					<div class="pzbox" style="width: 100%">
 						<span v-if="jobnameStatus === ''">{{ firminfo.jobName }}</span>
-            <a-select
+						<a-select v-if="jobnameStatus === 'jobname'" show-search auto-focus placeholder="请选择岗位" option-filter-prop="children" style="width: 200px" @blur="jobnameStatus = ''">
-              v-if="jobnameStatus === 'jobname'"
+							<a-select-option v-for="i in storeJobList" :key="i.id" @click="storeJobChange(i)">
-              show-search
-              auto-focus
-              placeholder="请选择岗位"
-              option-filter-prop="children"
-              style="width: 200px"
-              @blur="jobnameStatus = ''"
-            >
-              <a-select-option
-                v-for="i in storeJobList"
-                :key="i.id"
-                @click="storeJobChange(i)"
-              >
 								{{ i.aliasName }}
 							</a-select-option>
 						</a-select>
@@ -163,28 +94,10 @@
 						>
 					</div>
 				</a-form-model-item>
-        <a-form-model-item
+
-          ref="interviewTime"
+				<a-form-model-item ref="interviewTime" label="面试时间" prop="interviewTime" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
-          label="面试时间"
+					<timepicker :isShow.sync="isShow" :datetime.sync="form.interviewTime"></timepicker>
-          prop="interviewTime"
+					<a-input v-model="form.interviewTime" placeholder="请选择面试时间" @input="verify" @click="getDateinfo"><i class="iconfont icon-rili" slot="suffix" @click="getDateinfo"></i></a-input>
-          :wrapperCol="{ span: 18 }"
-          :labelCol="{ span: 4 }"
-        >
-          <timepicker
-            :isShow.sync="isShow"
-            :datetime.sync="form.interviewTime"
-          ></timepicker>
-          <a-input
-            v-model="form.interviewTime"
-            placeholder="请选择面试时间"
-            @input="verify"
-            @click="getDateinfo"
-            ><i
-              class="iconfont icon-rili"
-              slot="suffix"
-              @click="getDateinfo"
-            ></i
-          ></a-input>
 					<!-- <a-date-picker
             :showToday="false"
             format="YYYY-MM-DD HH:mm"
@@ -204,123 +117,14 @@
             @click="isShow = true"
           /> -->
 				</a-form-model-item>
-        <a-row class="specialbox">
-          <a-col :span="12">
-            <a-form-model-item
-              ref="userName"
-              label="姓名"
-              prop="userName"
-              :wrapperCol="{ span: 15 }"
-              :labelCol="{ span: 8 }"
-            >
-              <a-input
-                v-model="form.userName"
-                placeholder="请输入老乡姓名"
-                class="special-input"
-              />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-model-item
-              ref="sex"
-              label="性别"
-              prop="sex"
-              :wrapperCol="{ span: 18 }"
-              :labelCol="{ span: 5 }"
-            >
-              <a-radio-group
-                v-model="form.sex"
-                defaultValue="nan"
-                class="radiobox"
-              >
-                <a-radio value="1"> 男 </a-radio>
-                <a-radio value="2"> 女 </a-radio>
-              </a-radio-group>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-        <a-row>
-          <a-col :span="12">
-            <!-- :offset="2" -->
-            <a-form-model-item
-              ref="age"
-              label="年龄"
-              prop="age"
-              :wrapperCol="{ span: 15 }"
-              :labelCol="{ span: 8 }"
-            >
-              <a-input
-                v-model="form.age"
-                placeholder="请输入年龄"
-                class="special-input"
-              />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="12">
-            <a-form-model-item
-              ref="peoplecard"
-              label="民族"
-              prop="peoplecard"
-              :wrapperCol="{ span: 15 }"
-              :labelCol="{ span: 5 }"
-            >
-              <a-select
-                v-model="form.nation"
-                placeholder="请选择民族"
-                class="special-input"
-              >
-                <a-select-option
-                  v-for="item in nationlist"
-                  :key="item.id"
-                  :value="item.name"
-                  >{{ item.name }}</a-select-option
-                >
-              </a-select>
-            </a-form-model-item>
-          </a-col>
-        </a-row>
-        <a-form-model-item
-          ref="tel"
-          label="电话"
-          prop="tel"
-          :wrapperCol="{ span: 18 }"
-          :labelCol="{ span: 4 }"
-          style="margin-bottom: 18px"
-        >
-          <a-input
-            v-model="form.tel"
-            placeholder="请输入电话号"
-            :max-length="11"
-          />
-        </a-form-model-item>
 				<a-row>
 					<a-col :span="20">
-            <a-form-model-item
+						<a-form-model-item ref="idCard" label="身份证号" prop="idCard" :wrapperCol="{ span: 16 }" :labelCol="{ span: 5 }">
-              ref="idCard"
+							<a-input v-model="form.idCard" @change="getIdInfo($event)" placeholder="请输入老乡身份证号" :max-length="18" />
-              label="身份证号"
-              prop="idCard"
-              :wrapperCol="{ span: 16 }"
-              :labelCol="{ span: 5 }"
-            >
-              <a-input
-                v-model="form.idCard"
-                @change="getIdInfo($event)"
-                placeholder="请输入老乡身份证号"
-                :max-length="18"
-              />
 						</a-form-model-item>
 					</a-col>
 					<a-col :span="4" class="idCardUpload"
-            ><a-upload
+						><a-upload :customRequest="customRequestFun" list-type="picture-card" :file-list="fileList" @change="handleChange" @preview="handlePreview" style="margin-left: -50px" :beforeUpload="beforeUpload" :data="dataObj">
-              :customRequest="customRequestFun"
-              list-type="picture-card"
-              :file-list="fileList"
-              @change="handleChange"
-              @preview="handlePreview"
-              style="margin-left: -50px"
-              :beforeUpload="beforeUpload"
-              :data="dataObj"
-            >
 							<!-- <div
                 v-if="fileList.length < 1"
                 style="
@@ -337,48 +141,53 @@
                 :src="form.idCardImageUrl"
                 alt="avatar"
               /> -->
-              <div
+							<div v-if="fileList.length == 0" style="display: flex; justify-content: center; align-items: center" class="nloding">
-                v-if="fileList.length == 0"
-                style="
-                  display: flex;
-                  justify-content: center;
-                  align-items: center;
-                "
-                class="nloding"
-              >
 								<a-icon type="plus" />
 								<div class="ant-upload-text">上传证件</div>
 							</div>
 						</a-upload>
-            <div
+						<div v-if="loading" style="display: flex; justify-content: center; align-items: center" class="uploading">
-              v-if="loading"
+							<a-icon :type="loading ? 'loading' : 'plus'" style="margin-right: 10px" />
-              style="
-                display: flex;
-                justify-content: center;
-                align-items: center;
-              "
-              class="uploading"
-            >
-              <a-icon
-                :type="loading ? 'loading' : 'plus'"
-                style="margin-right: 10px"
-              />
 							<div class="ant-upload-text">上传中</div>
 						</div>
-            <i
+						<i class="iconfont icon-guanbi" v-if="fileList.length !== 0 && !loading" @click="fileList = []"></i
-              class="iconfont icon-guanbi"
-              v-if="fileList.length !== 0 && !loading"
-              @click="fileList = []"
-            ></i
 					></a-col>
 				</a-row>
-        <a-form-model-item
+				<a-row class="specialbox">
-          ref="peoplecard"
+					<a-col :span="12">
-          label="家庭住址"
+						<a-form-model-item ref="userName" label="姓名" prop="userName" :wrapperCol="{ span: 15 }" :labelCol="{ span: 8 }">
-          prop="peoplecard"
+							<a-input v-model="form.userName" placeholder="请输入老乡姓名" class="special-input" />
-          :wrapperCol="{ span: 18 }"
+						</a-form-model-item>
-          :labelCol="{ span: 4 }"
+					</a-col>
-        >
+					<a-col :span="12">
+						<a-form-model-item ref="sex" label="性别" prop="sex" :wrapperCol="{ span: 18 }" :labelCol="{ span: 5 }">
+							<a-radio-group v-model="form.sex" defaultValue="nan" class="radiobox">
+								<a-radio value="1"> 男 </a-radio>
+								<a-radio value="2"> 女 </a-radio>
+							</a-radio-group>
+						</a-form-model-item>
+					</a-col>
+				</a-row>
+				<a-row>
+					<a-col :span="12">
+						<!-- :offset="2" -->
+						<a-form-model-item ref="age" label="年龄" prop="age" :wrapperCol="{ span: 15 }" :labelCol="{ span: 8 }">
+							<a-input v-model="form.age" placeholder="请输入年龄" class="special-input" />
+						</a-form-model-item>
+					</a-col>
+					<a-col :span="12">
+						<a-form-model-item ref="peoplecard" label="民族" prop="peoplecard" :wrapperCol="{ span: 15 }" :labelCol="{ span: 5 }">
+							<a-select v-model="form.nation" placeholder="请选择民族" class="special-input">
+								<a-select-option v-for="item in nationlist" :key="item.id" :value="item.name">{{ item.name }}</a-select-option>
+							</a-select>
+						</a-form-model-item>
+					</a-col>
+				</a-row>
+				<a-form-model-item ref="tel" label="电话" prop="tel" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }" style="margin-bottom: 18px">
+					<a-input v-model="form.tel" placeholder="请输入电话号" :max-length="11" />
+				</a-form-model-item>
+
+				<a-form-model-item ref="peoplecard" label="家庭住址" prop="peoplecard" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
 					<a-input v-model="form.address" placeholder="请输入家庭住址" />
 				</a-form-model-item>
 
@@ -387,18 +196,12 @@
             <a-select-option :value="apply.id">{{ apply.id }}</a-select-option>
           </a-select>
         </a-form-model-item> -->
-        <a-form-model-item
+				<a-form-model-item ref="policy" label="政策" prop="policy" class="policyContainer" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
-          ref="policy"
+					<!-- <a-input v-model="form.policy" type='textarea'/> -->
-          label="政策"
+					<div class="policy" style="">
-          prop="policy"
+						{{form.policy}}
-          :wrapperCol="{ span: 18 }"
+					</div>
-          :labelCol="{ span: 4 }"
+          <div class="openContral"><span v-if="isFold" @click="toFold(1)">展开</span><span v-else @click="toFold(2)">收起</span></div>
-        >
-          <a-input
-            v-model="form.policy"
-            style="min-height: 150px; max-height: 200px"
-            type="textarea"
-          />
 				</a-form-model-item>
 			</a-form-model>
 
@@ -417,27 +220,11 @@
 					>
 						取消
 					</a-button>
-          <a-button
+					<a-button style="margin-left: 10px; color: #fff; background-color: #ff6a00; border-color: #ff6a00" @click="handleOk" :loading="confirmLoading"> 提交 </a-button>
-            style="
-              margin-left: 10px;
-              color: #fff;
-              background-color: #ff6a00;
-              border-color: #ff6a00;
-            "
-            @click="handleOk"
-            :loading="confirmLoading"
-          >
-            提交
-          </a-button>
 				</div>
 			</div>
 		</div>
-    <a-modal
+		<a-modal title="预览" :visible="previewVisible" :footer="null" @cancel="previewVisible = false">
-      title="预览"
-      :visible="previewVisible"
-      :footer="null"
-      @cancel="previewVisible = false"
-    >
 			<img alt="example" :src="form.idCardImageUrl" />
 		</a-modal>
 	</div>
@@ -449,13 +236,7 @@ import { nationlist } from "../../utils/datalist";
 import moment from "moment";
 import { isEmptyCheck, getAgeFromBirthday } from "../../utils/commonUtil";
 import timepicker from "./components/timepicker.vue";
-import {
+import { recordBillApi, getProxyInfoApi, getStoreAliasApi, getStoreJobApi, getPolicyByJobIdApi } from "@/api/job";
-  recordBillApi,
-  getProxyInfoApi,
-  getStoreAliasApi,
-  getStoreJobApi,
-  getPolicyByJobIdApi,
-} from "@/api/job";
 import request from "@/utils/request";
 // import axios from "axios";
 import $ from "jquery";
@@ -479,6 +260,8 @@ export default {
 			proxyStatus: "", // 代理选择的控制
 			storeStatus: "", // 企业选择的控制
 			jobnameStatus: "", // 岗位选择的控制
+      isContainerShow:false, // 政策展示控制按钮是否显示
+      isFold:false,
 			previewImage: "",
 			isMaster: true,
 			isShow: false,
@@ -563,8 +346,7 @@ export default {
 					//   trigger: "blur",
 					// },
 					{
-            pattern:
+						pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
-              /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
 						message: "请输入正确的手机号",
 						trigger: "blur",
 					},
@@ -626,7 +408,25 @@ export default {
 	 * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
 	 * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
 	 */
-  mounted() {},
+	mounted() {
+    let that = this
+		const policy = document.querySelector(".policy");
+		// this.$nextTick(()=>{
+		setTimeout(() => {
+			console.log(policy.offsetHeight);
+			if (policy.offsetHeight >= 230) {
+				policy.style.maxHeight = "230px";
+        	policy.style.marginBottom = '24px'
+          that.isContainerShow = true
+          that.isFold = true
+			} else {
+				policy.style.minHeight = "230px";
+          that.isContainerShow = false
+          that.isFold = false
+			}
+		}, 200);
+		// })
+	},
 	// 组件方法
 	methods: {
 		async getJob(value) {
@@ -794,8 +594,7 @@ export default {
 						that.dataObj.policy = response.data.policy;
 						that.dataObj.signature = response.data.signature;
 						that.dataObj.ossaccessKeyId = response.data.accessid;
-            that.dataObj.key =
+						that.dataObj.key = response.data.dir + that.getUUID() + "_${filename}";
-              response.data.dir + that.getUUID() + "_${filename}";
 						that.dataObj.dir = response.data.dir;
 						that.dataObj.host = response.data.host;
 						console.log("响应的数据222。。。", that.dataObj);
@@ -809,9 +608,7 @@ export default {
 		},
 		getUUID() {
 			return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
-        return (
+				return (c === "x" ? (Math.random() * 16) | 0 : "r&0x3" | "0x8").toString(16);
-          c === "x" ? (Math.random() * 16) | 0 : "r&0x3" | "0x8"
-        ).toString(16);
 			});
 		},
 		async customRequestFun(file) {
@@ -846,8 +643,7 @@ export default {
 				// headers: {'Content-Type': 'application/x-www-form-urlencoded'}
 
 				headers: {
-          "Content-Type":
+					"Content-Type": "multipart/form-data;boundary = " + new Date().getTime(),
-            "multipart/form-data;boundary = " + new Date().getTime(),
 				},
 			})
 				.then(({ data }) => {
@@ -896,10 +692,7 @@ export default {
 
 					_self.uploadFileFlag = true;
 					console.log(data);
-          var img =
+					var img = _self.dataObj.host + "/" + _self.dataObj.key.replace("${filename}", file.file.name);
-            _self.dataObj.host +
-            "/" +
-            _self.dataObj.key.replace("${filename}", file.file.name);
 					_self.form.idCardImageUrl = img;
 					console.log(_self.form.idCardImageUrl);
 				},
@@ -1013,6 +806,17 @@ export default {
 				}
 			}
 		},
+    toFold(value){
+      let policy = document.querySelector('.policy')
+      if(value == 1){
+        this.isFold = false
+        policy.style.maxHeight = 'unset'
+      } else {
+        this.isFold = true
+        policy.style.maxHeight = '230px'
+
+      }
+    }
 	},
 };
 </script>
@@ -1031,6 +835,7 @@ export default {
 		.ant-form {
 			width: 640px;
 		}
+		
 	}
 	.upline {
 		position: relative !important;
@@ -1307,4 +1112,32 @@ export default {
 		// }
 	}
 }
+/deep/ .policyContainer {
+  position: relative;
+  .ant-form-item-children{
+    position: unset;
+ .policy {
+			padding: 0 16px;
+      // padding-bottom: 24px;
+			white-space: pre-wrap;
+			// border: 1px solid #ddd;
+			border-radius: 4px;
+      overflow: hidden;
+     line-height: 2;
+		}
+    .openContral{
+      position: absolute;
+      height: 20px;
+      line-height: 20px;
+      bottom: 0;
+      right: 10px;
+      cursor: pointer;
+      &:hover {
+        color: #ff6a00;
+      }
+    }
+  }
+ 
+  // background-color: #ff6a00;
+}
 </style>

src/components/ServiceOutlets/index.vue

@@ -54,7 +54,7 @@
       <div class="maincontentright">
         <div class="hotphone">
           <h1 class="bottombox"><i>服务热线</i></h1>
-          <p>0371-6666 6666</p>
+          <p>0371-6611 3723</p>
         </div>
         <!-- <div class="relationme">
           <p class="bottombox"><i>一手单合作</i></p>

src/components/main/index.vue

@@ -105,7 +105,7 @@
           <div class="left">
             <p>总部地址：河南省郑州市郑东新区升龙广场2号楼A座</p>
             <p>接待地址：河南省郑州市航空港区相州街29-60号</p>
-            <p>联系电话：135 2307 4549</p>
+            <p>联系电话：0371-6611 3723</p>
           </div>
           <div class="right">
             <span

src/components/userinfo/accountsetting/components/boundtel.vue

@@ -4,6 +4,7 @@
       <span v-if="!istelshow">绑定手机</span>
       <span v-else>已绑定手机</span>
     </div>
+    <div v-if="isShow">
       <div class="contentbody" v-if="!istelshow">
       <div class="warninginfo">
         您的账号可能存在安全风险，为了确保为您本人操作，请先进行安全验证
@@ -34,6 +35,7 @@
       </button>
     </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -68,27 +70,37 @@ export default {
         timmer: null,
       },
       istelshow: false,
+      isShow :false
     };
   },
   // 计算属性
   computed: {},
   // 侦听器
-  watch: {},
+  watch: {
+  },
   // 生命周期钩子   注：没用到的钩子请自行删除
   /**
    * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
    */
   created() {
+   setTimeout(()=>{
+     console.log(this.userinfo);
     if (this.userinfo.tel) {
       this.istelshow = true;
-      console.log(this.istelshow);
+      // console.log(this.istelshow);
     }
+    this.isShow = true
+    
+   },100)
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
    * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
    */
-  mounted() {},
+  mounted() {
+  
+    
+  },
   // 组件方法
   methods: {
     async submit() {

src/components/userinfo/accountsetting/components/loginpsw.vue

@@ -10,7 +10,8 @@
 			</div>
 			<div class="password">
 				<div>密码</div>
-        <input type="password" v-model.trim="password" />
+				<input type="password" v-model.trim="password" class="passwordInp"/>
+				<i class="iconfont icon-biyan1" @click="changeStatus"></i>
 			</div>
 			<button @click="submit">确定</button>
 		</div>
@@ -56,8 +57,7 @@ export default {
 	 */
 	created() {
 		console.log(this.userinfo.hidename);
-    this.username =
+		this.username = this.userinfo.userName || this.userinfo.nickName || this.userinfo.tel;
-      this.userinfo.userName || this.userinfo.nickName || this.userinfo.tel;
 	},
 	/**
 	 * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
@@ -82,6 +82,18 @@ export default {
 			}
 			console.log(this.password);
 		},
+		changeStatus(e) {
+			// console.log(e);
+      let pas = document.querySelector('.passwordInp')
+      // console.dir(pas);
+			if (e.target.className == "iconfont icon-biyan1") {
+				e.target.className = "iconfont icon-zhengyan1";
+        pas.attributes[1].nodeValue = 'text'
+			} else {
+				e.target.className = "iconfont icon-biyan1";
+        pas.attributes[1].nodeValue = 'password'
+			}
+		},
 	},
 };
 </script>
@@ -109,9 +121,16 @@ export default {
 			}
 		}
 		.password {
+			position: relative;
 			input {
 				background-color: #fff;
 			}
+			.iconfont {
+				position: absolute;
+				font-size: 14px;
+				right: 48%;
+				top: 36px;
+			}
 		}
 		button {
 			width: 64px;

src/components/userinfo/accountsetting/inedex.vue

@@ -78,7 +78,7 @@
           <div class="username" v-else>Hi,{{ userinfo.hidetel }}</div>
         </div>
         <div class="priceinfo">
-          <ul>
+          <ul style="display:none">
             <li
               @click="pushto('/accountsetting/myintegral')"
               :class="{ tagactive: activelist === 6 }"
@@ -140,6 +140,7 @@
           <li
             @click="pushto('/accountsetting/boundbankcard')"
             :class="{ tagactive: activelist === 3 }"
+            style="display:none"
           >
             <span
               ><i class="iconfont icon-bangdingyinhangka"></i>绑定银行卡</span
@@ -163,6 +164,7 @@
           <li
             @click="pushto('/accountsetting/realname')"
             :class="{ tagactive: activelist === 4 }"
+            style="display:none"
           >
             <span><i class="iconfont icon-shimingrenzheng"></i>实名认证</span
             ><span

src/components/userinfo/usercenter/components/mybill.vue

@@ -19,12 +19,18 @@
           :class="{ townsmanactive: pagination.status === 20 }"
         >
           待面试
+        </li>
+        <li
+          @click="pagination.status = 25"
+          :class="{ townsmanactive: pagination.status === 25 }"
+        >
+          已接到
         </li>
          <li
           @click="pagination.status = 30"
           :class="{ townsmanactive: pagination.status === 30 }"
         >
-          待入职
+          面试通过
         </li>
         <li
           @click="pagination.status = 40"
@@ -33,17 +39,12 @@
           在职中
         </li>
         <li
-          @click="pagination.status = 50"
+          @click="pagination.status = 999"
-          :class="{ townsmanactive: pagination.status === 50 }"
+          :class="{ townsmanactive: pagination.status === 999 }"
-        >
-          待离职
-        </li>
-        <li
-          @click="pagination.status = 60"
-          :class="{ townsmanactive: pagination.status === 60 }"
         >
-          已完成
+          报名结束
         </li>
+        
         <!-- <li
           @click="pagination.status = 70"
           :class="{ townsmanactive: pagination.status === 70 }"
@@ -352,8 +353,8 @@ export default {
               // console.log(parent.offsetHeight);
               // console.log(sibling.offsetHeight);
               // console.log(window.getComputedStyle(parent).height);
-              console.log("子元素高度", sibling.offsetHeight);
+              // console.log("子元素高度", sibling.offsetHeight);
-              console.log("父元素高度", parent.offsetHeight);
+              // console.log("父元素高度", parent.offsetHeight);
               if (sibling.offsetHeight > parent.offsetHeight) {
                 // sibling.style.height = "100%";
                 sibling.style.overflow = "hidden";
@@ -363,14 +364,15 @@ export default {
                 item.isunfold = false;
               }
               item.controlUnfold = true;
+              console.log(item.status);
               // setTimeout(() => {
-              if (item.status == 10 || item.status == 20 || item.status == 30) {
+              if (item.status == 10 || item.status == 20 || item.status == 21 || item.status == 25 || item.status == 26|| item.status == 30|| item.status == 35|| item.status == 45) {
                 item.statusTimeInfo = "面试时间";
                 item.statusShowTime = item.interviewTime;
-              } else if (item.status == 40 || item.status == 50) {
+              } else if (item.status == 40) {
                 item.statusTimeInfo = "入职时间";
                 item.statusShowTime = item.entryTime;
-              } else {
+              } else if (item.status == 50) {
                 item.statusTimeInfo = "离职时间";
                 item.statusShowTime = item.leaveTime;
               }

src/components/userinfo/usercenter/components/townsman.vue

@@ -1,23 +1,34 @@
 <template>
 	<div class="townsman-container w">
 		<div class="contenttitle">
-      <span>我的老乡</span>
+			<ul @click="resetpag">
-      <div @click="getTownsman">
+				<li @click="pagination.status = 0" :class="{ townsmanactive: pagination.status === 0 }">
-        <button
+					全部<span>{{ statusNum.num0 }}</span>
-          @click="pagination.searchTag = 1"
+				</li>
-          :class="{ townsmanactive: pagination.searchTag === 1 }"
+				<li @click="pagination.status = 1" :class="{ townsmanactive: pagination.status === 1 }">
-        >
+					空闲中<span>{{ statusNum.num1 }}</span>
-          已在职
+				</li>
-        </button>
+				<li @click="pagination.status = 2" :class="{ townsmanactive: pagination.status === 2 }">
-        <button
+					报名中<span>{{ statusNum.num2 }}</span>
-          @click="pagination.searchTag = 0"
+				</li>
-          :class="{ townsmanactive: pagination.searchTag === 0 }"
+				<li @click="pagination.status = 3" :class="{ townsmanactive: pagination.status === 3 }">
-        >
+					在职中<span>{{ statusNum.num3 }}</span>
-          未在职
+				</li>
-        </button>
+			</ul>
-      </div>
 		</div>
 		<div class="contentbody">
+			<div class="searchbox">
+				<div class="searchinput">
+					<a-input placeholder="请输入老乡姓名/身份证号" @keyup.enter="onSearch" @input="resetsearch" v-model="pagination.keys"
+						><i slot="prefix" class="iconfont icon-sousuo"></i>
+						<button slot="suffix" @click="onSearch">搜索</button>
+					</a-input>
+				</div>
+				<div class="pagechange">
+					<button @click="changepage(-1)">上一页</button>
+					<button @click="changepage(1)">下一页</button>
+				</div>
+			</div>
 			<a-table
 				:columns="columns"
 				:data-source="data"
@@ -34,30 +45,16 @@
 				<a slot="name" slot-scope="text">{{ text }}</a>
 			</a-table>
 			<div class="pagecontainer">
-        <a-pagination
+				<a-pagination :current="+pagination.pageNum" :default-current="1" :defaultPageSize="8" :total="pagination.total" @change="onChange" />
-          :current="+pagination.pageNum"
+				<div class="ant-pagination-options-quick-jumper">跳至<input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" :style="{ 'background-Color': '#f6f6f6' }" />页</div>
-          :default-current="1"
-          :defaultPageSize="1"
-          :total="pagination.total"
-          @change="onChange"
-        />
-        <div class="ant-pagination-options-quick-jumper">
-          跳至<input
-            ref="pageinput"
-            type="text"
-            @keyup.enter="inputpageChange"
-            @blur="inputpageChange"
-            :style="{ 'background-Color': '#f6f6f6' }"
-          />页
-        </div>
 			</div>
 		</div>
 	</div>
 </template>
 
 <script>
-import { userTownsmanApi } from "../../../../api/userinfo";
+import { userTownsmanApi, gettownsManCountApi } from "../../../../api/userinfo";
-import { formatDateYMD } from "../../../../utils/commonUtil";
+import { formatDateYMD, getUserApplyOrderStatusById } from "../../../../utils/commonUtil";
 
 export default {
 	// 组件名称
@@ -74,10 +71,7 @@ export default {
 				emptyText: () => (
 					<div>
 						<div>
-              <img
+							<img src="https://user-images.githubusercontent.com/507615/54591670-ac0a0180-4a65-11e9-846c-e55ffce0fe7b.png" style="width:105px;height:90px;marginTop:20px" />
-                src="https://user-images.githubusercontent.com/507615/54591670-ac0a0180-4a65-11e9-846c-e55ffce0fe7b.png"
-                style="width:105px;height:90px;marginTop:20px"
-              />
 						</div>
 						<div style="marginBottom:20px">暂无数据</div>
 					</div>
@@ -85,19 +79,36 @@ export default {
 			},
 			pagination: {
 				pageNum: 1,
-        pageSize: 1,
+				pageSize: 8,
 				total: null, //分页配置
-        searchTag: 1,
+				status: 0,
+        keys:null,
+				// searchTag: 1,
 			},
 			isspinning: false,
-      columns: [
+			sortedInfo: null,
+			statusNum: {
+				num0: 0,
+				num1: 0,
+				num2: 0,
+				num3: 0,
+			},
+			data: [],
+		};
+	},
+	// 计算属性
+	computed: {
+		columns() {
+			let { sortedInfo } = this;
+			sortedInfo = sortedInfo || {};
+			const columns = [
 				{
 					title: "序号",
 					dataIndex: "index",
 					key: "index",
 					scopedSlots: { customRender: "index" },
 					ellipsis: true,
-          width: 60,
+					width: 40,
 				},
 				{
 					title: "老乡姓名",
@@ -107,24 +118,48 @@ export default {
 					width: 90,
 				},
 				{
-          title: "跟进记录",
+					title: "年龄",
-          dataIndex: "userServeRecordDespLatest",
+					dataIndex: "age",
-          key: "userServeRecordDespLatest",
+					key: "age",
 					ellipsis: true,
+					width: 50,
 				},
 				{
-          title: "更新时间",
+					title: "民族",
-          dataIndex: "updateTime",
+					dataIndex: "nation",
-          key: "updateTime",
+					key: "nation",
 					ellipsis: true,
-          width: 160,
+					width: 50,
+				},
+				{
+					title: "手机号",
+					dataIndex: "tel",
+					key: "tel",
+					ellipsis: true,
+					width: 120,
+				},
+				{
+					title: "身份证号",
+					dataIndex: "IDCard",
+					key: "IDCard",
+					ellipsis: true,
+					// width: 50,
+				},
+				{
+					title: "状态",
+					dataIndex: "userApplyOrder",
+					key: "userApplyOrder",
+					sorter: (a, b) =>  a.userApplyOrder.localeCompare(b.userApplyOrder),
+         
+					// sortOrder: sortedInfo.columnKey == "userApplyOrder" && sortedInfo.order,
+					// ellipsis: true,
+					width: 120,
+				},
+			];
+      console.log(sortedInfo);
+			return columns;
 		},
-      ],
-      data: [],
-    };
 	},
-  // 计算属性
-  computed: {},
 	// 侦听器
 	watch: {},
 	// 生命周期钩子   注：没用到的钩子请自行删除
@@ -138,13 +173,20 @@ export default {
 	 * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
 	 * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
 	 */
-  mounted() {},
+	mounted() {
+		this.gettownsManCount();
+	},
 	// 组件方法
 	methods: {
-    onChange(e) {
+		onChange(e,e1,e2) {
+      console.log(e);
+      console.log(e1);
+      console.log(e2);
+      if (typeof e ==  'number') {
 			this.pagination.pageNum = e;
 			this.getTownsman();
-      console.log(e);
+        
+      }
 		},
 		inputpageChange(e) {
 			const pagenumcount = this.pagination.total / this.pagination.pageSize;
@@ -166,16 +208,18 @@ export default {
 			// let jobinfo = {...this.pagination , searchTag:1}
 			try {
 				this.isspinning = true;
+				console.log(this.pagination);
 				const { data } = await userTownsmanApi(this.pagination);
-        console.log(data);
 				if (data.status === 200) {
 					// console.log();
 					this.data = data.data.recordList;
 					this.data.forEach((item, index) => {
-            console.log(item);
+						// console.log(item);
+						item.userApplyOrder = getUserApplyOrderStatusById(item.userApplyOrderStatus);
 						item.updateTime = formatDateYMD(item.updateTime);
 						item.index = index + 1;
 					});
+					console.log(data);
 
 					console.log(true);
 					this.pagination.total = data.data.recordCount;
@@ -185,6 +229,18 @@ export default {
 			}
 			this.isspinning = false;
 		},
+		async gettownsManCount() {
+			try {
+				const { data } = await gettownsManCountApi(this.pagination);
+				console.log(data);
+				if (data.status == 200) {
+					console.log("yes");
+					this.statusNum = data.data;
+				}
+			} catch (error) {
+				console.log(error);
+			}
+		},
 		getPopupContainer(el, dialogContext) {
 			console.log(el);
 			console.log(dialogContext);
@@ -194,6 +250,47 @@ export default {
 				return document.body;
 			}
 		},
+		resetpag() {
+			this.pagination = {
+				//分页配置
+				pageNum: 1,
+				pageSize: 8,
+				total: null,
+				status: this.pagination.status,
+        keys: null
+			};
+			this.getTownsman();
+		},
+		resetsearch(e) {
+			console.log(e);
+			if (e.target.value.length === 0) {
+				this.pagination.keys = "";
+
+		this.gettownsManCount();
+				this.getTownsman();
+			}
+		},
+		onSearch() {
+      if(this.pagination.keys != null && this.pagination.keys.length != 0){
+			this.getTownsman();
+		this.gettownsManCount();
+
+      }
+		},
+		changepage(num) {
+			console.log(Math.ceil(this.pagination.total / this.pagination.pageSize));
+			if ((this.pagination.pageNum === 1 && num === -1) || (this.pagination.pageNum === Math.ceil(this.pagination.total / this.pagination.pageSize) && num === 1)) {
+				if (num === -1) {
+					this.$message.warning("已经到第一页了");
+				} else {
+					this.$message.warning("已经到最后一页了");
+				}
+				return;
+			} else {
+				this.pagination.pageNum += num;
+			}
+			this.getTownsman();
+		},
 	},
 };
 </script>
@@ -201,23 +298,62 @@ export default {
 <style scoped lang="less">
 .townsman-container {
 	padding: 0 10px;
+	background-color: #fff;
+	border: 1px solid #0000;
 }
 .contenttitle {
 	display: flex;
-  padding-bottom: 16px;
+	padding-bottom: 0px;
 	justify-content: space-between;
 	border-bottom: 1px solid rgba(77, 87, 94, 0.1);
+
 	margin-top: 16px;
 	margin-bottom: 16px;
-  span {
+
-    font-size: 20px;
+	ul {
-    color: #ff6a00;
+		display: flex;
-  }
+		height: 40px;
-  div {
 		.townsmanactive {
-      border-color: #ff6a00;
+			// border-color: #;
+			width: 128px;
 			color: #ff6a00;
 			z-index: 999;
+			border-bottom: 2px solid #ff6a00;
+			> span {
+				font-size: 16px;
+				color: #ff6a00;
+			}
+		}
+		li {
+			position: relative;
+			width: 118px;
+			font-size: 16px;
+			// height: 40px;
+			padding-bottom: 16px;
+			color: #666;
+			// line-height: 40px;
+			text-align: center;
+			transition: width 0.2s;
+			cursor: pointer;
+			> span {
+				margin-left: 12px;
+				font-size: 16px;
+				color: #666;
+			}
+			&::after {
+				content: "";
+				position: absolute;
+				display: block;
+				width: 1px;
+				height: 16px;
+				right: 0;
+				top: 5px;
+				// transform: translateY(-50%);
+				background-color: #eeeeee;
+			}
+			&:last-child::after {
+				display: none;
+			}
 		}
 		button {
 			width: 100px;
@@ -227,7 +363,6 @@ export default {
 			border: 1px solid #cccccc;
 			background-color: #fff;
 			margin-right: -1px;
-      // transition: all 1s;
 			cursor: pointer;
 			&:hover {
 				color: #ff6a00;
@@ -243,6 +378,92 @@ export default {
 }
 .contentbody {
 	overflow: hidden;
+	/deep/ .searchbox {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 16px;
+		.searchinput {
+			width: 326px;
+			position: relative;
+			.ant-input {
+				// width: 300px;
+				position: relative;
+				height: 32px;
+				text-indent: 10px;
+				background: #fff;
+				// border: 1px solid rgba(77, 87, 94, 0.3);
+				border-radius: 136px;
+				box-shadow: 0px 2px 4px 0px transparent;
+				font-size: 14px !important;
+				padding-right: 0;
+				border-color: #e9e9e9;
+				// z-index: ;
+				&::placeholder {
+					text-indent: 10px;
+					font-size: 14px !important;
+				}
+				&:hover {
+					border-color: #ff6a00;
+					box-shadow: none;
+				}
+				&:focus {
+					border-color: #ff6a00;
+				}
+			}
+			.ant-input-affix-wrapper {
+				.ant-input-prefix {
+					position: absolute;
+					width: 20px;
+					right: 0;
+					top: 16px;
+					i {
+						color: #c9c9c9;
+					}
+				}
+				.ant-input-suffix {
+					// position: absolute;
+					right: 0px !important;
+				}
+			}
+			button {
+				width: 70px;
+				height: 32px;
+				color: white;
+				background: #ff6a00;
+				border-color: #ff6a00;
+				border: none;
+				border-radius: 16px;
+				font-size: 14px;
+				box-shadow: none;
+				cursor: pointer;
+				outline: none;
+				&:hover {
+					background-color: #ff842b;
+				}
+				// &:focus {
+				//   border: none;
+				// }
+			}
+		}
+		.pagechange {
+			button {
+				width: 66px;
+				height: 24px;
+				border: 1px solid rgba(77, 87, 94, 0.3);
+				border-radius: 4px;
+				font-size: 14px;
+				color: #4d575e;
+				background-color: #fff;
+				&:hover {
+					border-color: #ff6a00;
+					color: #ff6a00;
+				}
+				&:first-child {
+					margin-right: 12px;
+				}
+			}
+		}
+	}
 	/deep/ .ant-table-placeholder {
 		min-height: 300px;
 		> div {
@@ -252,5 +473,30 @@ export default {
 			// transform: translateY(-50%);
 		}
 	}
+	/deep/ .ant-table-content {
+		.ant-table-body {
+			.ant-table-thead {
+				th {
+					padding: 16px 0;
+
+					&:not(:first-child) {
+						> span {
+							//  line-height: 22px;
+							> div {
+								//  line-height: 1;
+								border-left: 1px solid #ccc;
+								padding-left: 12px;
+							}
+						}
+					}
+				}
+			}
+			.ant-table-tbody {
+				.ant-table-row-cell-ellipsis {
+					padding: 16px 0;
+				}
+			}
+		}
+	}
 }
 </style>

src/components/userinfo/usercenter/index.vue

@@ -21,7 +21,7 @@
           </ul>
         </div> -->
         <div class="priceinfo">
-          <ul>
+          <ul style="">
             <li
               @click="pushto('/userinfo/usercenter/myintegral')"
               :class="{ tagactive: activelist === 3 }"

src/router/index.js

@@ -110,7 +110,7 @@ const routes = [
         name: "accountsetting",
         component: () =>
           import("../components/userinfo/accountsetting/inedex.vue"),
-        redirect: "accountsetting/myintegral",
+        redirect: "accountsetting/boundtel",
         children: [
           {
             path: "loginpsw",

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;
+        }
+      }
+    }
+  }
+ 
+}

src/utils/commonUtil.js

@@ -1198,14 +1198,28 @@ function getJobSpecialLabelNamesArray(jobSpecialLabelNames) {
  * 处理工单状态
  */
 export function userApplyOrderStatusArray() {
+  // let orderStatus = [
+  //   { id: "10", name: "审核中", value: "10", text: "审核中" },
+  //   { id: "20", name: "待面试", value: "20", text: "待面试" },
+  //   { id: "30", name: "待入职", value: "30", text: "待入职" },
+  //   { id: "40", name: "在职中", value: "40", text: "在职中" },
+  //   { id: "50", name: "待离职", value: "50", text: "待离职" },
+  //   { id: "60", name: "已完成", value: "60", text: "已完成" },
+  // ];
   let orderStatus = [
-    { id: "10", name: "审核中", value: "10", text: "审核中" },
+
-    { id: "20", name: "待面试", value: "20", text: "待面试" },
+    { id: "10", name: "报名审核中", value: "10", text: "报名审核中", num: 0 },
-    { id: "30", name: "待入职", value: "30", text: "待入职" },
+    { id: "20", name: "审核通过", value: "20", text: "审核通过", num: 0 },
-    { id: "40", name: "在职中", value: "40", text: "在职中" },
+    { id: "21", name: "审核未通过", value: "21", text: "审核未通过", num: 0 },
-    { id: "50", name: "待离职", value: "50", text: "待离职" },
+    { id: "25", name: "已接到", value: "25", text: "已接到", num: 0 },
-    { id: "60", name: "已完成", value: "60", text: "已完成" },
+    { id: "26", name: "未接到", value: "26", 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: "60", name: "已完成", value: "60", text: "已完成", num: 0 }
+];
   return orderStatus;
 }
 

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: "/api_prod", // url = base url + request url
-  // baseURL: baseURL, //  baseURL: "/api", // 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,

src/views/main.vue

@@ -38,6 +38,13 @@
                 >我的报名
               </router-link>
             </li>
+            <li>
+              <router-link
+                to="/mytownsman"
+                :class="routertitleindex == 4 ? 'titleactive' : ''"
+                >我的老乡
+              </router-link>
+            </li>
             <!-- <li>
               <router-link to="/serviceoutlets"
                 ><a