From 749ffe15a43d54118fb1fdf4d4a114bb5f8b8a68 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Thu, 26 May 2022 17:56:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FirstJob/components/timepicker.vue  |  24 +-
 src/components/FirstJob/joblist.vue                |  52 ++--
 src/components/FirstJob/recordBill.vue             | 336 ++++++++++++++++++---
 .../accountsetting/components/boundtel.vue         |  22 +-
 .../userinfo/usercenter/components/mybill.vue      |  45 ++-
 src/style/index.less                               |   2 +-
 src/style/index.wxss                               |  66 +++-
 src/utils/commonUtil.js                            |  12 +-
 src/utils/request.js                               |   4 +-
 9 files changed, 457 insertions(+), 106 deletions(-)

diff --git a/src/components/FirstJob/components/timepicker.vue b/src/components/FirstJob/components/timepicker.vue
index 51ab68f..01dacc9 100644
--- a/src/components/FirstJob/components/timepicker.vue
+++ b/src/components/FirstJob/components/timepicker.vue
@@ -1,8 +1,8 @@
 <template>
-  <div>
+  <div class="">
     <!-- <span @click="showPicker">{{ getLangText(label.datetimePicker) }}</span> -->
     <div class="date-picker-bg" v-show="isShow" @click="closePicker"></div>
-    <div class="date-picker" v-show="isShow">
+    <div class="date-picker time-container" v-show="isShow">
       <div class="picker-top">
         <span class="picker-arrow" @click="preYear">&lsaquo;&lsaquo;</span>
         <span class="picker-arrow" @click="preMonth">&lsaquo;</span>
@@ -177,10 +177,13 @@ export default {
     },
     isShow() {
       const that = this;
+         let box = document.querySelector('.time-container')
+      box.style.opacity = 1
       if (this.isShow) {
         // console.log(this.selectHour);
-
+ 
         this.$nextTick(() => {
+       
           this.selectDate = new Date(
             new Date(this.datetime || new Date()).format("yyyy-MM-dd 00:00")
           ).getTime();
@@ -277,7 +280,13 @@ export default {
       // this.confirmPicker();
     },
     closePicker() {
+      let box = document.querySelector('.time-container')
+      box.style.opacity = 0
+      setTimeout(() => {
       this.$emit("update:is-show", false);
+        
+      }, (300));
+      console.log(box);
     },
     setNow() {
       // this.year = new Date().getFullYear();
@@ -358,8 +367,7 @@ export default {
     },
     closebox() {
       console.log(this.selectDate);
-
-      this.$emit("update:is-show", false);
+      this.closePicker()
     },
     // onSelectMinute(n) {
     //   this.selectMinute = n;
@@ -420,6 +428,10 @@ export default {
 };
 </script>
 <style lang="less">
+.time-container{
+  opacity: 1;
+  transition: opacity .3s;
+}
 .date-picker-bg {
   position: fixed;
   left: 0;
@@ -437,7 +449,7 @@ export default {
   left: 0;
   display: block;
   padding: 4px;
-  z-index: 6;
+  z-index: 9;
   // border: solid 1px gainsboro;
   border-radius: 8px;
   box-shadow: 2px 2px 8px #ddd;
diff --git a/src/components/FirstJob/joblist.vue b/src/components/FirstJob/joblist.vue
index a58b368..c5c09d4 100644
--- a/src/components/FirstJob/joblist.vue
+++ b/src/components/FirstJob/joblist.vue
@@ -63,7 +63,7 @@
 				</div>
 
 				<span class="searchBox">
-					<a-input placeholder="搜索企业/公司" @keyup.enter="onSearch" @input="resetsearch" v-model="formvalue.aliasName" class="searchinput" style="" allow-clear
+					<a-input placeholder="搜索企业/公司/职位" @keyup.enter="onSearch" @input="resetsearch" v-model="formvalue.aliasName" class="searchinput" style="" allow-clear
 						><div slot="prefix" @click="visible = true">
 							<span>{{ currentCity }}</span
 							><i class="iconfont icon-sousuoxiala"></i
@@ -71,8 +71,8 @@
 								class="ageinput"
 								placeholder="年龄,如20"
 								v-model="formvalue.ageStr"
-                type='number'
-                @mousewheel.prevent="()=>false"
+								type="number"
+								@mousewheel.prevent="() => false"
 								@input="resetAgeSearch"
 								@keyup.enter="onSearch"
 								@click.stop="
@@ -268,8 +268,7 @@
 										<span v-if="item.jobDesp" :class="'copyInfo' + index">{{ item.jobDesp }}</span
 										><span v-else>暂无详单</span>
 									</template> -->
-						<router-link target="_blank" :to="'/detail/' + item.id" rel="opener">
-									<a-button type="primary" class="jobDesp">更多</a-button></router-link>
+								<router-link target="_blank" :to="'/detail/' + item.id" rel="opener"> <a-button type="primary" class="jobDesp">更多</a-button></router-link>
 								<!-- </a-popover> -->
 
 								<button @click="torecord(item)">报名</button>
@@ -753,7 +752,7 @@ export default {
 		cityModalClose() {
 			// 城市选择弹出框关闭
 			this.cityValue = "";
-      this.searchCity()
+			this.searchCity();
 		},
 
 		// 获取日期信息
@@ -884,7 +883,7 @@ export default {
 			console.log(index);
 		},
 		searchCity() {
-				this.currentCityList = [];
+			this.currentCityList = [];
 			if (this.cityValue) {
 				this.hotCityList.forEach((item) => {
 					// console.log(item);
@@ -894,11 +893,10 @@ export default {
 						this.currentCityList.push(item);
 					}
 				});
-			
 			}
-      	if (this.currentCityList.length == 0) {
-					this.currentCityList = this.hotCityList;
-				}
+			if (this.currentCityList.length == 0) {
+				this.currentCityList = this.hotCityList;
+			}
 		},
 		resetCityList(e) {
 			if (e.target.value.length === 0) {
@@ -1153,15 +1151,15 @@ export default {
 				}
 				.ant-input-suffix {
 					right: 0px !important;
-          .ant-input-clear-icon{
-            margin-right: 20px;
-            width: 1.5em !important;
-            height: 1.5em !important;
-            >svg {
-              width: 100%;
-              height: 100%;
-            }
-          }
+					.ant-input-clear-icon {
+						margin-right: 20px;
+						width: 1.5em !important;
+						height: 1.5em !important;
+						> svg {
+							width: 100%;
+							height: 100%;
+						}
+					}
 				}
 			}
 			> .ant-input {
@@ -1216,9 +1214,9 @@ export default {
 				border-color: #e9e9e9;
 				border-top-color: transparent;
 				border-bottom-color: transparent;
-         &::-webkit-inner-spin-button {
-        -webkit-appearance: none;
-    }
+				&::-webkit-inner-spin-button {
+					-webkit-appearance: none;
+				}
 				&:hover {
 					border-left-color: #e9e9e9;
 					border-right-color: #e9e9e9;
@@ -1627,8 +1625,8 @@ export default {
 						background-color: #fff;
 						color: rgba(255, 106, 0, 1);
 						transition: none;
-            box-shadow: none ;
-            text-shadow:none;
+						box-shadow: none;
+						text-shadow: none;
 						cursor: pointer;
 						&:hover {
 							color: #fff;
@@ -1643,7 +1641,7 @@ export default {
 						// border: 1px solid rgba(77, 87, 94, 0.3);
 						border-radius: 4px;
 					}
-				>	a {
+					> a {
 						button:first-child {
 							border: 1px solid #d9d9d9;
 							// border-radius: 4px;
@@ -1653,7 +1651,7 @@ export default {
 							&:hover {
 								color: #ff7614;
 								border-color: #ff7614;
-                background-color: #fff ;
+								background-color: #fff;
 							}
 						}
 					}
diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue
index c8158c3..e38e816 100644
--- a/src/components/FirstJob/recordBill.vue
+++ b/src/components/FirstJob/recordBill.vue
@@ -95,9 +95,9 @@
 					</div>
 				</a-form-model-item>
 
-				<a-form-model-item ref="interviewTime" label="面试时间" prop="interviewTime" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
+				<a-form-model-item class="time-input" ref="interviewTime" label="面试时间" prop="interviewTime" :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-input v-model="form.interviewTime" placeholder="请选择面试时间" @input="verify" allowClear @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"
@@ -199,9 +199,9 @@
 				<a-form-model-item ref="policy" label="政策" prop="policy" class="policyContainer" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
 					<!-- <a-input v-model="form.policy" type='textarea'/> -->
 					<div class="policy" style="">
-						{{form.policy}}
+						{{ form.policy }}
 					</div>
-          <div class="openContral"><span v-if="isFold" @click="toFold(1)">展开</span><span v-else @click="toFold(2)">收起</span></div>
+					<div class="openContral"><span v-if="isFold" @click="toFold(1)">展开</span><span v-else @click="toFold(2)">收起</span></div>
 				</a-form-model-item>
 			</a-form-model>
 
@@ -260,8 +260,8 @@ export default {
 			proxyStatus: "", // 代理选择的控制
 			storeStatus: "", // 企业选择的控制
 			jobnameStatus: "", // 岗位选择的控制
-      isContainerShow:false, // 政策展示控制按钮是否显示
-      isFold:false,
+			isContainerShow: false, // 政策展示控制按钮是否显示
+			isFold: false,
 			previewImage: "",
 			isMaster: true,
 			isShow: false,
@@ -409,20 +409,20 @@ export default {
 	 * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
 	 */
 	mounted() {
-    let that = this
+		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
+				policy.style.marginBottom = "24px";
+				that.isContainerShow = true;
+				that.isFold = true;
 			} else {
 				policy.style.minHeight = "230px";
-          that.isContainerShow = false
-          that.isFold = false
+				that.isContainerShow = false;
+				that.isFold = false;
 			}
 		}, 200);
 		// })
@@ -806,17 +806,16 @@ 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'
-
-      }
-    }
+		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>
@@ -835,7 +834,6 @@ export default {
 		.ant-form {
 			width: 640px;
 		}
-		
 	}
 	.upline {
 		position: relative !important;
@@ -1113,31 +1111,279 @@ export default {
 	}
 }
 /deep/ .policyContainer {
-  position: relative;
-  .ant-form-item-children{
-    position: unset;
- .policy {
+	position: relative;
+	.ant-form-item-children {
+		position: unset;
+		.policy {
+      // position: relative;
 			padding: 0 16px;
-      // padding-bottom: 24px;
+			// padding-bottom: 24px;
 			white-space: pre-wrap;
-			// border: 1px solid #ddd;
 			border-radius: 4px;
-      overflow: hidden;
-     line-height: 2;
+			overflow: hidden;
+			line-height: 2;
+     
 		}
-    .openContral{
-      position: absolute;
-      height: 20px;
-      line-height: 20px;
-      bottom: 0;
-      right: 10px;
-      cursor: pointer;
-      &:hover {
-        color: #ff6a00;
+		.openContral {
+			position: absolute;
+			height: 20px;
+			line-height: 20px;
+			bottom: 0;
+			right: 10px;
+			cursor: pointer;
+       &::after{
+        content: '';
+        position: absolute;
+        width: 480px;
+        height: 1px;
+        background-color: #eee;
+        bottom: -10px;
+        left: -445px;
       }
-    }
-  }
- 
-  // background-color: #ff6a00;
+			&:hover {
+				color: #ff6a00;
+			}
+		}
+	}
+
+	// background-color: #ff6a00;
+}
+/deep/ .date-picker {
+	.picker-content {
+		table {
+			width: 100%;
+			// padding: 4px !important;
+			margin: 4px 0;
+			border-collapse: separate;
+			border-spacing: 0;
+			font-size: 12px;
+			line-height: 20px !important;
+			.contain {
+				height: 2px;
+			}
+			thead {
+				padding-bottom: 5px;
+				tr {
+					margin-bottom: 5px;
+					background-color: #ff6a001a;
+					color: rgba(77, 87, 94);
+					th {
+						text-align: center;
+						font-weight: 600;
+						font-size: 14px;
+						line-height: 26px;
+						&:first-child {
+							border-radius: 4px 0 0 4px;
+						}
+						&:last-child {
+							border-radius: 0 4px 4px 0;
+						}
+					}
+				}
+			}
+			tbody {
+				margin-top: 10px;
+				tr {
+					td {
+						// height: 50px;
+						box-sizing: border-box;
+						color: rgba(77, 87, 94);
+						// font-weight: 600;
+						padding: 0 4px;
+						font-size: 14px;
+						cursor: pointer;
+						&:first-child {
+							border-radius: 4px 0 0 4px;
+						}
+						&:last-child {
+							border-radius: 0 4px 4px 0;
+						}
+						div {
+							border: 1px solid transparent;
+							position: relative;
+							width: 30px;
+							height: 26px;
+							line-height: 24px;
+							border-radius: 4px;
+							text-align: center;
+							margin: 0 2px;
+							z-index: 99;
+							box-sizing: border-box;
+						}
+					}
+					td.gray {
+						font-weight: 400;
+						color: rgba(138, 138, 138, 0.7);
+					}
+					td.bggray {
+						position: relative;
+						color: #ccc;
+						cursor: default;
+
+						&::after {
+							content: "";
+							position: absolute;
+							display: block;
+							width: 100%;
+							height: 26px;
+							background-color: #f5f5f5;
+							top: 50%;
+							transform: translateY(-50%);
+							left: 0;
+							z-index: 9;
+						}
+					}
+
+					.bggray:first-child::after {
+						border-radius: 4px 0 0 4px;
+					}
+					.bggray:last-of-type::after {
+						border-radius: 0 4px 4px 0;
+					}
+					td:not(.bggray):hover {
+						div {
+							border: 1px solid #ff6a00;
+							color: #ff6a00;
+						}
+					}
+					td.active {
+						div {
+							background: #ff6a00;
+							color: white !important;
+							font-weight: bold;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	.picker-content1:extend(.picker-content all) {
+		// &: extend ;
+		display: flex;
+		flex-direction: row;
+		table {
+			width: calc(100% - 40px);
+			margin-right: 4px;
+			// border-right: 1px solid #eee;
+		}
+		.hour-list {
+			display: flex;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			border-left: 1px solid #eee;
+			list-style: none;
+			padding: 5px 2px 0 4px;
+			margin: 0;
+			height: 100%;
+			overflow-x: hidden;
+			width: 300px;
+			font-size: 12px;
+			overflow-y: auto;
+			&::-webkit-scrollbar {
+				/*滚动条整体样式*/
+				width: 0px !important; /*高宽分别对应横竖滚动条的尺寸*/
+				height: 4px;
+			}
+			&::-webkit-scrollbar-thumb {
+				/*滚动条里面小方块*/
+				border-radius: 5px;
+				// -webkit-box-shadow: inset 0 0 5px rgba(126, 126, 126, 0.06);
+				background: #ddd !important;
+			}
+			// &::-webkit-scrollbar-track {
+			//   /*滚动条里面轨道*/
+			//   -webkit-box-shadow: inset 0 0 5px rgba(112, 112, 112, 0.06);
+			//   border-radius: 0;
+			//   background: rgba(0, 0, 0, 0.1);
+			// }
+			li {
+				padding: 0;
+				margin: 0;
+				margin-bottom: 6px;
+				color: #4d575ecc;
+				font-weight: 600;
+				background-color: #ff6a001a;
+				width: 48%;
+				border-radius: 4px;
+				/* font-weight: 600; */
+				display: flex;
+				height: 26px !important;
+				line-height: 26px;
+				font-size: 14px;
+				justify-content: center;
+				align-items: center;
+				padding: 0 4px;
+				height: 26px;
+				cursor: pointer;
+				span:last-child {
+					margin-left: 0 !important;
+				}
+				&:hover {
+					color: white;
+					background: #ff6a00;
+				}
+			}
+			// li:not(:last-child) {
+			// border-bottom: solid 1px gainsboro;
+			// }
+
+			.active {
+				color: white;
+				background: #ff6a00;
+			}
+		}
+		.minutes-list {
+			width: 60px;
+		}
+	}
+
+	.picker-footer {
+		display: block;
+		line-height: 42px;
+		text-align: right;
+		white-space: nowrap;
+		button {
+			outline: none;
+			border: solid 1px gainsboro;
+			border-radius: 2px;
+			text-align: center;
+			padding-left: 1px;
+			color: #8a8a8a;
+			height: 24px;
+			width: 50px;
+			line-height: 20px;
+			font-size: 12px;
+			margin-right: 12px;
+			background-color: #f3f3f3;
+			&:first-child {
+				background-color: #fff;
+				&:active,
+				&:hover {
+					border-color: #eee;
+					background-color: #eee;
+				}
+			}
+			&:last-child {
+				background-color: #ff6a00;
+				border-color: #ff6a00;
+				color: #fff;
+				&:active,
+				&:hover {
+					border-color: #ff6a00;
+					background-color: #ff6a00;
+				}
+			}
+		}
+	}
+}
+/deep/ .time-input {
+	margin-bottom: 16px;
+	.ant-input {
+		font-size: 20px !important;
+		&::placeholder {
+			font-size: 14px;
+		}
+	}
 }
 </style>
diff --git a/src/components/userinfo/accountsetting/components/boundtel.vue b/src/components/userinfo/accountsetting/components/boundtel.vue
index 60504ee..e73aef0 100644
--- a/src/components/userinfo/accountsetting/components/boundtel.vue
+++ b/src/components/userinfo/accountsetting/components/boundtel.vue
@@ -77,13 +77,9 @@ export default {
   computed: {},
   // 侦听器
   watch: {
-  },
-  // 生命周期钩子   注：没用到的钩子请自行删除
-  /**
-   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
-   */
-  created() {
-   setTimeout(()=>{
+    "userinfo.tel"(value){
+  //  setTimeout(()=>{
+    console.log(value);
      console.log(this.userinfo);
     if (this.userinfo.tel) {
       this.istelshow = true;
@@ -91,14 +87,22 @@ export default {
     }
     this.isShow = true
     
-   },100)
+  //  },200)
+    }
+  },
+  // 生命周期钩子   注：没用到的钩子请自行删除
+  /**
+   * 组件实例创建完成，属性已绑定，但DOM还未生成，$ el属性还不存在
+   */
+  created() {
+  
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
    * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
    */
   mounted() {
-  
+
     
   },
   // 组件方法
diff --git a/src/components/userinfo/usercenter/components/mybill.vue b/src/components/userinfo/usercenter/components/mybill.vue
index c56b8f2..597bfb3 100644
--- a/src/components/userinfo/usercenter/components/mybill.vue
+++ b/src/components/userinfo/usercenter/components/mybill.vue
@@ -64,6 +64,7 @@
             ><i slot="prefix" class="iconfont icon-sousuo"></i>
             <button slot="suffix" @click="onSearch">搜索</button>
           </a-input>
+           <a-range-picker style="" @change="dateChange" class=""/>
         </div>
         <div class="pagechange">
           <button @click="changepage(-1)">上一页</button>
@@ -104,6 +105,7 @@
             </ul>
             <ul class="billInfo" style="">
               <li>
+                <div class="serial">{{index + 1}}</div>
                 <i
                   class="iconfont icon-shenfenzheng"
                   :style="{
@@ -148,6 +150,7 @@
           @change="onChange"
         />
         <div class="ant-pagination-options-quick-jumper">
+          <span>共{{pagination.total}}条，</span>
           跳至<input
             ref="pageinput"
             type="text"
@@ -255,6 +258,9 @@ export default {
       console.log(e);
       this.getBill();
     },
+    dateChange(e){
+      console.log(e);
+    },
     inputpageChange(e) {
       const pagenumcount = this.pagination.total / this.pagination.pageSize;
       console.log(pagenumcount);
@@ -747,9 +753,10 @@ export default {
     display: flex;
     justify-content: space-between;
     .searchinput {
-      width: 400px;
+      display: flex;
       position: relative;
       .ant-input {
+      width: 400px;
         // width: 300px;
         position: relative;
         height: 32px;
@@ -808,6 +815,17 @@ export default {
         //   border: none;
         // }
       }
+      .ant-calendar-picker-input{
+        display: flex;
+        margin-left: 50px;
+        width: 260px;
+        .ant-calendar-range-picker-input{
+          width: 95px;
+        }
+        .ant-calendar-picker-clear{
+          margin-right: 10px;
+        }
+      }
     }
     .pagechange {
       button {
@@ -843,7 +861,8 @@ export default {
         // li {
         // }
         li:first-child {
-          width: 213px;
+          width: 263px;
+          padding-left: 60px;
         }
         li:nth-child(2) {
           width: 246px;
@@ -869,6 +888,10 @@ export default {
       .billInfo {
         li {
           border-color: rgba(0, 122, 255, 0.6) !important;
+          .serial{
+          border-color: rgba(0, 122, 255, 0.6) !important;
+
+          }
         }
       }
     }
@@ -920,7 +943,23 @@ export default {
           }
         }
         li:first-child {
-          width: 213px;
+          position: relative;
+          width: 273px;
+          padding-left: 60px;
+          .serial{
+            display: flex;
+            align-items: center;
+            position: absolute;
+            height: 100%;
+            width: 60px;
+            left: 0;
+            font-weight: 600;
+            color: #666;
+            font-size: 18px;
+            justify-content: center;
+            background-color: #fff;
+            border-right: 1px solid #ccc ;
+          }
           // flex-direction: column;
 
           // justify-content: space-around;
diff --git a/src/style/index.less b/src/style/index.less
index ece92fb..f824dde 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -371,7 +371,7 @@ i {
 // 日期选择框
 .ant-calendar-picker-container-content {
 	margin-top: 3px;
-	width: 341px !important;
+	// width: 341px !important;
 }
 .ant-calendar-picker {
 	border-color: #d9d9d9 !important;
diff --git a/src/style/index.wxss b/src/style/index.wxss
index b0c759a..9b173bc 100644
--- a/src/style/index.wxss
+++ b/src/style/index.wxss
@@ -1,4 +1,4 @@
-@import "http://at.alicdn.com/t/font_3135652_9tpi9n6784g.css";
+@import "http://at.alicdn.com/t/font_3135652_fha9d3mzga5.css";
 body,
 h1,
 h2,
@@ -136,7 +136,6 @@ i {
 }
 .ant-calendar-picker-container-content {
   margin-top: 3px;
-  width: 341px !important;
 }
 .ant-calendar-picker {
   border-color: #d9d9d9 !important;
@@ -204,27 +203,31 @@ i {
   border: none;
 }
 .ant-cascader-menus.monthlypay,
-.ant-cascader-menus.agestr {
+.ant-cascader-menus.agestr,
+.ant-cascader-menus.gender {
   width: 100vw;
   margin: 0 auto;
-  top: 70px !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;
 }
 .ant-cascader-menus.monthlypay .ant-cascader-menu,
-.ant-cascader-menus.agestr .ant-cascader-menu {
+.ant-cascader-menus.agestr .ant-cascader-menu,
+.ant-cascader-menus.gender .ant-cascader-menu {
   height: auto;
   width: 100%;
 }
 .ant-cascader-menus.monthlypay .ant-cascader-menu .ant-cascader-menu-item,
-.ant-cascader-menus.agestr .ant-cascader-menu .ant-cascader-menu-item {
+.ant-cascader-menus.agestr .ant-cascader-menu .ant-cascader-menu-item,
+.ant-cascader-menus.gender .ant-cascader-menu .ant-cascader-menu-item {
   width: 100%;
   text-align: left;
   padding-left: calc(-550vw) !important;
 }
 .ant-cascader-menus.monthlypay .ant-cascader-menu .ant-cascader-menu-item:hover,
-.ant-cascader-menus.agestr .ant-cascader-menu .ant-cascader-menu-item:hover {
+.ant-cascader-menus.agestr .ant-cascader-menu .ant-cascader-menu-item:hover,
+.ant-cascader-menus.gender .ant-cascader-menu .ant-cascader-menu-item:hover {
   background-color: rgba(255, 106, 0, 0.1);
   color: #ff6a00;
 }
@@ -384,3 +387,52 @@ p.bottombox::after {
 .ant-spin-text {
   color: #fda21d;
 }
+.ant-popover .ant-popover-content .ant-popover-inner-content {
+  position: relative;
+  width: 600px;
+  white-space: pre-wrap !important;
+}
+.ant-popover .ant-popover-content .ant-popover-inner-content > 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;
+}
+.ant-popover .ant-popover-content .ant-popover-inner-content > div:hover {
+  background-color: #ff6a00;
+  color: #fff;
+}
+.xiangdan .ant-modal-content {
+  width: 600px;
+  max-height: calc(60vh);
+}
+.xiangdan .ant-modal-content .ant-modal-body {
+  padding-top: 36px;
+  position: relative;
+  min-height: 480px;
+  white-space: pre-wrap !important;
+}
+.xiangdan .ant-modal-content .ant-modal-body .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;
+}
+.xiangdan .ant-modal-content .ant-modal-body .copy:hover {
+  color: #fff;
+  background-color: #ff6a00;
+}
diff --git a/src/utils/commonUtil.js b/src/utils/commonUtil.js
index 50470c1..a0de4d4 100644
--- a/src/utils/commonUtil.js
+++ b/src/utils/commonUtil.js
@@ -1208,15 +1208,15 @@ export function userApplyOrderStatusArray() {
   // ];
   let orderStatus = [
 
-    { id: "10", name: "报名审核中", value: "10", text: "报名审核中", num: 0 },
-    { id: "20", name: "审核通过", value: "20", text: "审核通过", num: 0 },
-    { id: "21", name: "审核未通过", value: "21", text: "审核未通过", num: 0 },
+    { id: "10", name: "已报名，审核中", value: "10", text: "报名审核中", num: 0 },
+    { id: "20", name: "报名成功，待面试", value: "20", text: "审核通过", num: 0 },
+    { id: "21", name: "审核未通过，报名失败", value: "21", text: "审核未通过", num: 0 },
     { id: "25", name: "已接到", value: "25", text: "已接到", num: 0 },
     { id: "26", name: "未接到", value: "26", text: "未接到", num: 0 },
-    { id: "30", name: "面试通过", value: "30", text: "面试通过", num: 0 },
+    { id: "30", name: "面试通过，待入职", value: "30", text: "面试通过", num: 0 },
     { id: "35", name: "面试未通过", value: "35", text: "面试未通过", num: 0 },
-    { id: "40", name: "已入职", value: "40", text: "已入职", num: 0 },
-    { id: "45", name: "通过未入职", value: "45", text: "通过未入职", num: 0 },
+    { id: "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 }
 ];
diff --git a/src/utils/request.js b/src/utils/request.js
index 03ab9a0..3d9915c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,8 +13,8 @@ console.log(baseURL);
 axios.defaults.withCredentials = true; //添加这行代码
 // console.log(axios);
 const service = axios.create({
-  // baseURL: "/api_prod", // url = base url + request url
-  baseURL: baseURL, //  baseURL: "/api", // url = base url + request url
+  baseURL: "/api_prod", // url = base url + request url
+  // baseURL: baseURL, //  baseURL: "/api", // url = base url + request url
   withCredentials: true, // send cookies when cross-domain requests
   timeout: 10000, // request timeout
   crossDomain: true,