修复bug

my/jilu/bossMianshiDetail.vue

@@ -118,9 +118,14 @@
           <text>面试结果</text>
           <view class="user-img-result">
             <image
-              :src="'@/static/images/my/'+info.interviewResultType==0?'mianshitongguo':(info.interviewResultType==1?'kaolvyixia':'butongguo')+'.svg'"
+              :src="`/static/images/my/${info.interviewResultType == 0 
+                ? 'mianshitongguo' 
+                : info.interviewResultType == 1 
+                  ? 'butongguo' 
+                  : 'kaolvyixia'}.svg`"
               mode="scaleToFill"
-            />{{info.interviewResultType==0?'面试通过':(info.interviewResultType==1?'考虑一下':'不通过')}}
+            />
+			{{info.interviewResultType==0?'面试通过':(info.interviewResultType==1?'不通过':'考虑一下')}}
           </view></view
         >
         <view class="mianshi-result-txt">

my/order/pay.vue

@@ -299,6 +299,11 @@
 						style="background-color: #ffffff;border: 1px solid #016bf6;color: #016bf6;">
 						编辑
 					</view>
+					<view class="btn-box bgBox btn-boxs flex justify-center align-center"
+						@click="deletePosition(info.postPushId)"
+						style="background-color: #ffffff;border: 1px solid #016bf6;color: #016bf6;">
+						删除
+					</view>
 				</view>
 			</view>
 		</view>
@@ -510,6 +515,36 @@ export default {
 					this.$queue.showToast(res.msg);
 				}
 			});
+		},
+		deletePosition(id){
+			let that = this;
+			uni.showModal({
+				content: '确认删除该岗位吗？',
+				title: '提示',
+				confirmColor: '#016BF6',
+				success(iet) {
+					if (iet.confirm) {
+						that.$Request.post('/app/postPush/deletePostPush', {postPushId: id}).then(res => {
+							if (res.code == 0) {
+								uni.showToast({
+									title: '删除成功',
+									duration: 1500
+								})
+								setTimeout(()=>{
+									uni.switchTab({
+										url: '/pages/my/index'
+									})
+								},500)
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none'
+								})
+							}
+						})
+					}
+				}
+			})
 		}
 	}
 }

package/jobIntention/basicInfo.vue

@@ -259,6 +259,7 @@
 						this.age = res.data.age
 						this.avatar = res.data.avatar;
 						this.userName = res.data.userName;
+						this.phone = res.data.phone
 					}
 					uni.hideLoading();
 				});

package/jobIntention/fund.vue

@@ -158,7 +158,7 @@ export default {
       border-radius: 60rpx;
       padding: 8rpx 20rpx;
       padding-right: 12rpx;
-      font-size: 24rpx;
+      font-size: 28rpx;
       color: #007aff;
       gap: 8rpx;
 
@@ -185,7 +185,7 @@ export default {
       border: 1rpx solid #e5e7eb;
       border-radius: 8rpx;
       padding: 20rpx;
-      font-size: 26rpx;
+      font-size: 28rpx;
       margin-bottom: 16rpx;
     }
 
@@ -194,13 +194,13 @@ export default {
       background-color: #007aff;
       color: #fff;
       border-radius: 8rpx;
-      font-size: 24rpx;
+      font-size: 28rpx;
       padding: 10rpx 24rpx;
       margin-bottom: 10rpx;
     }
 
     .word-count {
-      font-size: 22rpx;
+      font-size: 26rpx;
       color: #999;
       text-align: right;
 
@@ -212,7 +212,7 @@ export default {
 
   .tag-section {
     .section-title {
-      font-size: 28rpx;
+      font-size: 30rpx;
       color: #666;
       margin-bottom: 20rpx;
     }
@@ -228,7 +228,7 @@ export default {
         border: 1rpx solid #d1d5db;
         border-radius: 60rpx;
         color: #4b5563;
-        font-size: 26rpx;
+        font-size: 28rpx;
         background-color: #fff;
       }
 
@@ -240,7 +240,7 @@ export default {
     }
 
     .selected-count {
-      font-size: 24rpx;
+      font-size: 26rpx;
       color: #666;
     }
   }

pages/msg/im.vue

@@ -199,7 +199,8 @@
 				</view>
 			</view>
 			<!-- 简历简介 -->
-			<view class="jobs flex justify-center" v-if="JSON.stringify(resumesInfo)!='{}'">
+			<view class="jobs flex justify-center" v-if="JSON.stringify(resumesInfo)!='{}'" 
+			@click="goNav('/pages/talentSearch/resumeDetail?resumesId=' + resumesId + '&postPushId=' + postPushId, 'company')">
 				<view class="talent-list">
 					<view class="talent-card">
 						<view class="talent-content">

pages/my/businessLicense.vue

@@ -163,7 +163,7 @@ export default {
         width: 100%;
         color: rgba(102, 102, 102, 1);
         font-family: DM Sans;
-        font-size: 24rpx;
+        font-size: 28rpx;
         font-weight: 400;
         line-height: 32rpx;
         text-align: left;
@@ -174,7 +174,7 @@ export default {
         width: 100%;
         color: #1f2c37;
         font-family: DM Sans;
-        font-size: 28rpx;
+        font-size: 30rpx;
         font-weight: 600;
         line-height: 44rpx;
         text-align: left;
@@ -183,7 +183,7 @@ export default {
         width: 100%;
         color: rgba(102, 102, 102, 1);
         font-family: DM Sans;
-        font-size: 24rpx;
+        font-size: 28rpx;
         font-weight: 400;
         line-height: 32rpx;
         text-align: left;

pages/my/index.vue

@@ -2040,12 +2040,12 @@ page {
 
 .info-box-btn {
 	width: 100%;
-	padding: 44rpx 0 40rpx 0;
+	padding: 60rpx 0 40rpx 0;
 	box-sizing: border-box;
 
 	image {
-		width: 50rpx;
-		height: 50rpx;
+		width: 60rpx;
+		height: 60rpx;
 		padding: 9rpx;
 	}
 }

pages/my/jobPosting.vue

@@ -20,7 +20,7 @@
 								<radio value="1" class="radio-size" :disabled="isDisabled" />急聘
 							</label>
 							<text
-								style="position: absolute;right: 0;bottom: 18px;font-size: 12px;color: rgba(120, 130, 138, 1);">急聘职位剩余{{
+								style="position: absolute;right: 0;bottom: 18px;font-size: 13px;color: rgba(120, 130, 138, 1);">急聘职位剩余{{
 									vipDueTimes }}个</text>
 						</view>
 					</radio-group>
@@ -336,60 +336,58 @@ export default {
 
 
 			const data = {
-				postPushId: this.postPushId,
 				type: this.check,
 				isDue: this.selectedValue,
-				// companyId: (this.companyId === undefined || this.companyId === 'undefined') ? '' : this.companyId,
 				positionDetails: this.text,
 				ruleClassifyId: this.jobInfo.ruleClassifyId,
 				ruleClassifyName: this.jobInfo.ruleClassifyName,
 				orderId: 1
 			}
-			
+			console.log(this.postPushId)
+			uni.navigateTo({
+				url: "/pages/my/jobPostingSecond?pid=" + this.postPushId + '&companyId=' +
+					this.companyId + "&status=" + this
+						.status + "&companyName=" + this.companyName + '&type=' + this.update + '&workData=' + JSON.stringify(this.jobInfo) + '&isBack=' + true + '&ruleClassifyId=' + this.jobInfo.ruleClassifyId + '&dataInfo=' + JSON.stringify(data)
+			});
 
 			// 发送请求
-			this.$Request.postJson("/app/postPush/savePostPush", data)
-				.then((res) => {
-					uni.hideLoading();
-
-					if (res.code === 0) {
-						uni.showToast({
-							title: '提交成功',
-							icon: 'success'
-						});
-						console.log("sssssss", this.companyId)
-						var pid = res.data || ""
-						if (!pid) {
-							uni.showToast({
-								title: '系统错误，请重新提交',
-								icon: 'none'
-							});
-							return
-						}
-						// 提交成功后跳转到职位发布页面
-						setTimeout(() => {
-
-							uni.redirectTo({
-								url: "/pages/my/jobPostingSecond?pid=" + pid + '&companyId=' +
-									this.companyId + "&status=" + this
-										.status + "&companyName=" + this.companyName + '&type=' + this.update + '&workData=' + JSON.stringify(this.jobInfo) + '&isBack=' + true + '&ruleClassifyId=' + this.jobInfo.ruleClassifyId
-							});
-						}, 1500);
-					} else {
-						uni.showToast({
-							title: res.msg || '提交失败，请重试',
-							icon: 'none'
-						});
-					}
-				})
-				.catch((err) => {
-					uni.hideLoading();
-					console.error('请求失败：', err);
-					uni.showToast({
-						title: '网络异常，请稍后重试',
-						icon: 'none'
-					});
-				});
+			// this.$Request.postJson("/app/postPush/savePostPush", data)
+			// 	.then((res) => {
+			// 		uni.hideLoading();
+
+			// 		if (res.code === 0) {
+			// 			uni.showToast({
+			// 				title: '提交成功',
+			// 				icon: 'success'
+			// 			});
+			// 			console.log("sssssss", this.companyId)
+			// 			var pid = res.data || ""
+			// 			if (!pid) {
+			// 				uni.showToast({
+			// 					title: '系统错误，请重新提交',
+			// 					icon: 'none'
+			// 				});
+			// 				return
+			// 			}
+			// 			// 提交成功后跳转到职位发布页面
+			// 			setTimeout(() => {
+							
+			// 			}, 1500);
+			// 		} else {
+			// 			uni.showToast({
+			// 				title: res.msg || '提交失败，请重试',
+			// 				icon: 'none'
+			// 			});
+			// 		}
+			// 	})
+			// 	.catch((err) => {
+			// 		uni.hideLoading();
+			// 		console.error('请求失败：', err);
+			// 		uni.showToast({
+			// 			title: '网络异常，请稍后重试',
+			// 			icon: 'none'
+			// 		});
+			// 	});
 
 
 		}
@@ -433,7 +431,7 @@ export default {
 				color: rgba(102, 102, 102, 1);
 				width: 100%;
 				font-family: DM Sans;
-				font-size: 24rpx;
+				font-size: 28rpx;
 				font-weight: 400;
 				line-height: 32rpx;
 				letter-spacing: 0.5%;
@@ -446,7 +444,7 @@ export default {
 				width: 100%;
 				color: rgba(31, 44, 55, 1);
 				font-family: DM Sans;
-				font-size: 28rpx;
+				font-size: 36rpx;
 				font-weight: 500;
 				line-height: 44rpx;
 				margin-top: 20rpx;
@@ -520,7 +518,7 @@ export default {
 				display: flex;
 				flex-direction: column;
 				justify-content: space-between;
-				font-size: 14px;
+				font-size: 28rpx;
 			}
 
 			.radioselet {
@@ -594,7 +592,7 @@ export default {
 	.txt-desc {
 		color: rgba(102, 102, 102, 1);
 		font-family: DM Sans;
-		font-size: 24rpx;
+		font-size: 26rpx;
 		font-weight: 400;
 		line-height: 32rpx;
 		text-align: left;

pages/my/jobPostingSecond.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="switch-roles">
-		<nav-bar title="选择职位要求" color="#000" :isBack="isBack"></nav-bar>
+		<nav-bar title="选择职位要求" color="#000"></nav-bar>
 		<view class="roles-content">
 			<view class="content">
 				<view class="title">继续填写</view>
@@ -99,7 +99,7 @@ export default {
 			showExper: false,
 			showLevel: false,
 			showMoney: false,
-			isBack: false,
+			// isBack: false,
 
 			// 经验选择数据源
 			listExper: [{
@@ -158,6 +158,7 @@ export default {
 			    { value: "4k", label: "4k" },
 			    { value: "5k", label: "5k" },
 			    { value: "6k", label: "6k" },
+				{ value: "7k", label: "7k" },
 			    { value: "8k", label: "8k" },
 			    { value: "10k", label: "10k" },
 			    { value: "12k", label: "12k" },
@@ -186,6 +187,7 @@ export default {
 			    { value: "4k", label: "4k" },
 			    { value: "5k", label: "5k" },
 			    { value: "6k", label: "6k" },
+				{ value: "7k", label: "7k" },
 			    { value: "8k", label: "8k" },
 			    { value: "10k", label: "10k" },
 			    { value: "12k", label: "12k" },
@@ -234,18 +236,24 @@ export default {
 			],
 			type: '',
 			ruleClassifyId:'',//岗位id
+			dataInfo:{}
 		};
 	},
 	components: {
 		navBar,
 	},
 	onLoad(options) {
+		let stationNameInfo = this.$queue.getJson('companyAddressInfo') || [];
+		console.log(options)
+		if(options.dataInfo){
+			this.dataInfo = JSON.parse(options.dataInfo)
+		}
 		if(options.ruleClassifyId){
 			this.ruleClassifyId = options.ruleClassifyId;
 		}
-		if (options.isBack == 'true') {
-			this.isBack = true;
-		}
+		// if (options.isBack == 'true') {
+		// 	this.isBack = true;
+		// }
 		// 接收上个页面传递的公司名称参数
 		if (options.companyName) {
 			this.companyName = decodeURIComponent(options.companyName);
@@ -260,7 +268,6 @@ export default {
 			this.getcompanystatus()
 		}
 		if (options.workData) {
-			console.log(JSON.parse(options.workData), '测试11111')
 			let workData = JSON.parse(options.workData)
 			this.selectedExper = workData.experience;
 			this.selectedLevel = workData.education;
@@ -268,14 +275,16 @@ export default {
 			this.salaryTimes = workData.salaryTimes || '';
 			this.welfareTag = workData.welfareTag || '';
 			this.positionTag = workData.positionTag ? workData.positionTag.split (',') : [];
-			this.address = workData.address;
-			this.stationName.fullText = workData.address, //地址
-				this.stationName.latitude = workData.lat
-			this.stationName.longitude = workData.lng;
-			this.stationName.province = workData.province;
-			this.stationName.city = workData.city;
-			this.stationName.district = workData.county;
-			this.jobTitle = workData.ruleClassifyName;
+			this.address = workData.address || this.$queue.getData('companyAddress');
+			this.stationName.fullText = workData.address || this.$queue.getData('companyAddress'), //地址
+			this.stationName.latitude = workData.lat || stationNameInfo.latitude
+			this.stationName.longitude = workData.lng || stationNameInfo.longitude
+			this.stationName.province = workData.province || stationNameInfo.province
+			this.stationName.city = workData.city || stationNameInfo.city
+			this.stationName.district = workData.county || stationNameInfo.district
+			this.jobTitle = workData.ruleClassifyName
+			console.log(11111,this.$queue.getData('companyAddress'))
+			console.log(this.address)
 		}
 		this.fundListener = uni.$on("fundData", (data) => {
 			console.log("接收到的福利数据：", data);
@@ -289,8 +298,9 @@ export default {
 			this.address = data.fullText;
 			this.stationName = data;
 			this.stationName.fullText = data.fullText;
-
-			this.stationName = data; // 赋值给当前页面变量
+			this.$queue.setData('companyAddress', data.fullText);
+			this.$queue.setJson('companyAddressInfo', data);
+			
 		});
 		if (options.companyId) {
 			this.companyId = options.companyId;
@@ -309,13 +319,12 @@ export default {
 			if (options.type && options.type == 'updata') {
 				this.getInfo()
 			}
-
 			console.log('接收PID：', this.pid);
 		} else {
-			uni.navigateTo({
-				url: '/pages/my/jobPosting?companyId=' + this.companyId + '&status=' + this.status +
-					'&companyName=' + this.companyName
-			})
+			// uni.navigateTo({
+			// 	url: '/pages/my/jobPosting?companyId=' + this.companyId + '&status=' + this.status +
+			// 		'&companyName=' + this.companyName
+			// })
 		}
 
 	},
@@ -518,6 +527,11 @@ export default {
 			const str = positionTag.join(',');
 			// 构造提交数据
 			const data = {
+				type: this.dataInfo.type,
+				isDue: this.dataInfo.isDue,
+				positionDetails: this.dataInfo.positionDetails,
+				ruleClassifyId:this.dataInfo.ruleClassifyId,
+				ruleClassifyName: this.dataInfo.ruleClassifyName,
 				orderid: 1,
 				postPushId: this.pid,
 				experience: this.selectedExper, //工作经验
@@ -533,9 +547,7 @@ export default {
 				county: this.stationName.district,
 				// companyId: (this.companyId === undefined || this.companyId === 'undefined') ? '' : this.companyId,
 				salaryTimes: this.salaryTimes
-
 			};
-
 			// 调用接口提交
 			uni.showLoading({
 				title: "提交中..."
@@ -620,7 +632,7 @@ export default {
 
 			.desc {
 				color: #666;
-				font-size: 24rpx;
+				font-size: 28rpx;
 				margin-bottom: 20rpx;
 			}
 
@@ -650,7 +662,7 @@ export default {
 
 			.txt-desc {
 				color: #666;
-				font-size: 24rpx;
+				font-size: 26rpx;
 				margin-top: 20rpx;
 				line-height: 1.5;
 			}

pages/my/peopleNumber.vue

@@ -173,7 +173,7 @@ export default {
         color: rgba(102, 102, 102, 1);
         width: 100%;
         font-family: DM Sans;
-        font-size: 24rpx;
+        font-size: 28rpx;
         font-weight: 400;
         line-height: 32rpx;
         letter-spacing: 0.5%;
@@ -193,7 +193,7 @@ export default {
           background: rgba(245, 248, 254, 1);
           color: rgba(153, 153, 153, 1);
           font-family: DM Sans;
-          font-size: 28rpx;
+          font-size: 30rpx;
           font-weight: 400;
           line-height: 44rpx;
           text-align: center;

pages/recruitmentData/interviewManage.vue

@@ -75,8 +75,8 @@
               <view class="interview-time">面试时间: {{ interview.interviewDateTime }}</view>
             </view>
             <view class="interview-result">
-              <text class="result-text" :class="interview.status === 'passed' ? 'passed' : 'failed'">
-                {{ interview.status === 'passed' ? '已通过' : '未通过' }}
+              <text class="result-text" :class="interview.interviewResultType === 0 ? 'passed' : interview.interviewResultType === 1?'failed' : ''">
+                {{ interview.interviewResultType === 0 ? '已通过' : interview.interviewResultType === 1?'未通过':'待定' }}
               </text>
             </view>
           </view>
@@ -102,11 +102,16 @@
 				  <view class="position-info">面试职位: {{ interview.postPush.ruleClassifyName }} | {{ interview.resumesListDto[0].minSalary }}-{{ interview.resumesListDto[0].maxSalary }}</view>
 				  <view class="interview-time">面试时间: {{ interview.interviewDateTime }}</view>
 				</view>
-				<view class="interview-result">
-				  <text class="result-text" :class="interview.status === 'passed' ? 'passed' : 'failed'">
-				    {{ interview.status === 'passed' ? '已通过' : '未通过' }}
+				<view class="interview-result" v-if="interview.interviewResultType">
+				  <text class="result-text" :class="interview.interviewResultType === 0 ? 'passed' : interview.interviewResultType === 1?'failed' : ''">
+				    {{ interview.interviewResultType === 0 ? '已通过' : interview.interviewResultType === 1?'未通过':'待定' }}
 				  </text>
 				</view>
+				<view class="interview-result" v-else>
+					<text class="result-text">
+					  {{ interview.status === 1 ? '待接受' : interview.status === 2 ? '已同意' : interview.status === 3 ? '已取消' : '' }}
+					</text>
+				</view>
 			</block>
           </view>
         </view>

pages/talentSearch/index.vue

@@ -379,7 +379,7 @@
 				let data = {
 					page: this.page,
 					limit: this.limit,
-					skillName: this.searchKeyword || "",
+					lastWorkPosition: this.searchKeyword || "",
 					expectedPosition: this.selectedText || "", //期望职位
 					city: this.city || "", //期望城市
 					salaryRange: this.salaryRange || "", //薪资