121212

common/queue.js

@@ -299,5 +299,30 @@ module.exports = {
 		const hours = Math.ceil(diffInMs / (1000 * 60 * 60));  
 		    
 		return [rest,hours > 0 ? hours : 0];  // 返回非负值
+	},
+	convert12to24:function (time12h) {
+	  // 使用正则表达式匹配12小时制格式
+	  const regex = /^(0?[1-9]|1[0-2]):([0-5]\d)\s?(AM|PM)$/i;
+	  const match = time12h.match(regex);
+	  
+	  if (!match) {
+	    throw new Error('无效的时间格式，请使用如 "2:00 PM" 或 "02:00 PM" 的格式');
+	  }
+	  
+	  let hour = parseInt(match[1], 10);
+	  const minute = match[2];
+	  const period = match[3].toUpperCase();
+	  
+	  // 处理AM/PM转换逻辑
+	  if (period === 'PM' && hour !== 12) {
+	    hour += 12;
+	  } else if (period === 'AM' && hour === 12) {
+	    hour = 0;
+	  }
+	  
+	  // 格式化为两位数
+	  const hour24 = hour.toString().padStart(2, '0');
+	  
+	  return `${hour24}:${minute}`;
 	}
 };

my/jilu/mianshiDetail.vue

@@ -52,7 +52,7 @@
           </view>
           <view class="msg-item">
             <view class="msg-label">联系人</view>
-            <view class="msg-value">{{info.hrName}}</view>
+            <view class="msg-value">{{info.hrName}}  {{info.hrPhone}}</view>
           </view>
           <view class="msg-item">
             <view class="msg-label">备注</view>
@@ -234,6 +234,8 @@ export default {
 	 	  if (res.code == 0) {
 			  let statusArr=['','待接受','已同意','已拒绝','已过期']
 			  res.data.statusText=statusArr[res.data.status]
+			  var detailTime=res.data.detailTime?that.$queue.convert12to24(res.data.detailTime):''
+			  res.data.interviewDateTime=res.data.interviewDateTime.substring(0,10)+' '+detailTime
 			   var expired=that.$queue.isDateExpired(res.data.interviewDateTime)
 			   res.data.expired=expired[0]
 				res.data.restHour=expired[1]

package/search/search.vue

@@ -99,11 +99,11 @@
 									<view class="title-left flex align-center">
 										<view class="job-title-text"
 											style="max-width: 450rpx;overflow:hidden;white-space: nowrap;text-overflow: ellipsis;-o-text-overflow:ellipsis;">
-											<block v-if="isSameName(item.ruleClassifyName,item.stationName)">
+											<!-- <block v-if="isSameName(item.ruleClassifyName,item.stationName)">
 												{{item.ruleClassifyName}}-
-											</block>
+											</block> -->
 											<block>
-												{{item.stationName}}
+												{{item.ruleClassifyName}}
 											</block>
 										</view>
 										<view v-if="item.isDue" class="salary-text-box">
@@ -136,10 +136,10 @@
 										<view class="company-info-text">
 											{{item.user&&item.user.userName?item.user.userName:'未知'}}·{{item.hr&&item.hr.hrPosition||'匿名职位'}}
 										</view>
-										<view class="reply-time">10分钟前回复</view>
+										<view v-if="item.respondTime" class="reply-time">{{item.respondTime}}</view>
 									</view>
 									<view class="location-text">
-										{{item.county}} {{item.address}}
+										{{item.county}} 
 									</view>
 								</view>
 							</view>
@@ -185,8 +185,8 @@
 											<view class="company-info-text tags">
 												<u-tag borderColor="#fdfdfd" :text="it.experience" type="info" mode="light" size="mini"></u-tag>
 												<u-tag borderColor="#fdfdfd" :text="it.education" type="info" mode="light" size="mini"></u-tag>
-												<u-tag borderColor="#fdfdfd" text="单双休" type="info" mode="light" size="mini"></u-tag>
-												<u-tag borderColor="#fdfdfd" text="全品类" type="info" mode="light" size="mini"></u-tag>
+												<u-tag v-for="we in it.welfareTag&&it.welfareTag.split(';')||[]" borderColor="#fdfdfd" :text="we" type="info" mode="light" size="mini"></u-tag>
+												<u-tag v-for="indus in it.industry&&it.industry.split(',')||[]" borderColor="#fdfdfd" :text="indus" type="info" mode="light" size="mini"></u-tag>
 											</view>
 										</view>
 										<view class="location-text">
@@ -485,7 +485,7 @@
 					ruleClassifyName: this.keyword, //岗位名称
 					screen: this.selectedSort + 1, //1推荐 2最新
 					county: this.county, //区
-					city: '',//this.city, //城市
+					city: this.city, //城市
 					salaryRange: this.salaryRange, //薪资范围
 					education: this.education, //学历
 					experience: this.experience, //经验
@@ -493,11 +493,11 @@
 					companyPeople: this.companyPeople, //公司规模
 					lng: this.longitude,
 					lat: this.latitude,
-					userId: uni.getStorageSync('userId') ? uni.getStorageSync('userId') : ''
+					/* userId: uni.getStorageSync('userId') ? uni.getStorageSync('userId') : '' */
 				}
 				if(this.currentSx==1)
-					data.keyword=this.keyword
-				let action=this.currentSx==1?'/app/company/listCompany':'/app/postPush/userGetPostPushList'
+					data.key=this.keyword
+				let action=this.currentSx==1?'/app/company/getCompanyPostPush':'/app/postPush/userGetPostPushList'
 				
 				this.$Request.get(action, data).then(res => {
 					uni.stopPullDownRefresh()
@@ -1065,6 +1065,7 @@
 		line-height: 40rpx;
 		letter-spacing: 0.5%;
 		text-align: left;
+		white-space: nowrap;
 	}
 	
 	.reply-time {
@@ -1170,6 +1171,7 @@
 							gap:10rpx;
 							display: flex;
 							margin-top: 10rpx;
+							flex-flow: row wrap;
 						}
 					}
 

pages/index/game/gameList.vue

@@ -208,7 +208,7 @@
               <!-- 职位要求标签 -->
               <view
                 class="job-requirements"
-                v-if="item.experience || item.education || item.positionWelfare"
+                v-if="item.experience || item.education || item.welfareTag"
               >
                 <text class="requirement-tag" v-if="item.experience">{{
                   item.experience
@@ -218,7 +218,7 @@
                 }}</text>
                 <text
                   class="requirement-tag"
-                  v-for="(welfare, idx) in item.positionWelfare"
+                  v-for="(welfare, idx) in item.welfareTag"
                   :key="idx"
                   >{{ welfare }}</text
                 >
@@ -241,7 +241,7 @@
                 <view class="company-info-text">
                   {{item.user.userName?item.user.userName:'未知'}}·{{item.hr.hrPosition?item.hr.hrPosition:'未知'}}
                 </view>
-                <view class="reply-time">10分钟前回复</view>
+                <view v-if="item.respondTime" class="reply-time">{{item.respondTime}}</view>
               </view>
 
               <!-- 地址和距离 -->
@@ -435,7 +435,7 @@ export default {
 	}).then(res => {
 		if (res.code == 0) {
 			let arr = res.data
-		let classRule=[{id:'',name:'',label:'全部'}]
+		let classRule=[]
 		let industry=[{id:'不限',name:'不限'}]
 		var industryArr=this.industry==''?[]:this.industry.split(',')
 		industryArr.forEach(function(item){
@@ -536,7 +536,8 @@ export default {
       let data = {
         page: this.page,
         limit: this.limit,
-        postType: this.typeList.length > 0 ? this.typeList[this.current].name : "",
+        /* postType: this.typeList.length > 0 ? this.typeList[this.current].name : "", */
+		ruleClassifyName: this.typeList[this.current].name, //岗位名称
         screen: +this.currentSx + 1, //1推荐 2最新
         city: this.city == "全国" ? "" : this.city,
         lng: this.longitude,
@@ -607,10 +608,10 @@ export default {
 		  uni.hideLoading()
         if (res.code == 0) {
           res.data.records.map((item) => {
-            if (item.positionWelfare) {
-              item.positionWelfare = item.positionWelfare.split(",");
+            if (item.welfareTag) {
+              item.welfareTag = item.welfareTag.split(";");
             } else {
-              item.positionWelfare = [];
+              item.welfareTag = [];
             }
             if (item.distance) {
               if (parseFloat(item.distance) > 1000) {

pages/index/game/order.vue

@@ -29,12 +29,12 @@
 			<view class="job-info flex justify-center">
 				<view class="job-info-c">
 					<view class="job-info-c-top flex align-center justify-between">
-						<view class="job-info-c-title" v-if="info.stationName">
-							<block v-if="isSameName(info.ruleClassifyName,info.stationName)">
+						<view class="job-info-c-title">
+							<!-- <block v-if="isSameName(info.ruleClassifyName,info.stationName)">
 								{{info.ruleClassifyName}}-
-							</block>
+							</block> -->
 							<block>
-								{{info.stationName}}
+								{{info.ruleClassifyName}}
 							</block>
 						</view>
 						<view class="job-info-c-price" v-if="info.salaryRange">
@@ -81,19 +81,19 @@
 		<view class="enterprise-box-c-info flex align-start justify-between">
 			<view class="enterprise-left flex align-center">
 				<view class="avatar-container">
-					<image :src="info.company?info.company.companyLogo:'../../../static/logo.png'"
+					<image :src="info.hr&&info.hr.hrImg||'../../../static/logo.png'"
 						style="width: 95rpx;height: 95rpx;border-radius: 50%;" mode=""></image>
 					<view class="online-dot"></view>
 				</view>
 				<view class="enterprise-box-c-info-n">
 					<view class="">
-						{{info.company?info.company.companyName:''}}
+						{{info.user?info.user.userName:''}}
 					</view>
 					<view class="">
-						{{info.company?info.company.companyScope:''}}
+						{{info.hr&&info.hr.hrPosition||''}}
 					</view>
 				    <view>
-						3分钟前回复
+						{{info.respondTime||'未沟通'}}
 					</view>
 				</view>
 			</view>
@@ -131,9 +131,9 @@
 						<image src="/static/images/index/welfare.png" class="title-icon"></image>
 						<text>岗位福利</text>
 					</view>
-					<view class="jobRemarks-box-c-label flex align-center flex-wrap" v-if="info.positionWelfare">
+					<view class="jobRemarks-box-c-label flex align-center flex-wrap" v-if="info.welfareTag">
 						<view class="jobRemarks-box-c-label-item"
-							v-for="(item,index) in info.positionWelfare?info.positionWelfare.split(','):[]"
+							v-for="(item,index) in info.welfareTag?info.welfareTag.split(';'):[]"
 							:key="index">
 							{{item}}
 						</view>
@@ -145,12 +145,7 @@
 					</view>
 
 					<view class="job-description">
-						<view class="description-item">1.完整的晋升机制，每年2次调薪机会；</view>
-						<view class="description-item">2.满一年五天带薪年假；</view>
-						<view class="description-item">3.每月员工下午茶；</view>
-						<view class="description-item">4.各类大促活动有对应的激励方案；</view>
-						<view class="description-item">5.丰厚的提成和年终奖励；</view>
-						<view class="description-item">6.开设员工俱乐部:羽毛球、篮球、舞蹈、瑜伽等等。</view>
+						<view class="description-item">{{info.positionWelfare}}</view>
 					</view>
 				</view>
 			</view>
@@ -162,7 +157,7 @@
 			<!-- 公司介绍卡片 -->
 			<view class="company-intro-card" @click="goInfo(info.company.companyId)">
 				<view class="company-avatar">
-					<image :src="info.company?info.company.companyLogo:'../../../static/logo.png'"
+					<image :src="info.company&&info.company.companyLogo||'../../../static/logo.png'"
 						style="width: 95rpx;height: 95rpx;border-radius: 50%;" mode="aspectFill"></image>
 				</view>
 				<view class="company-info">
@@ -607,7 +602,7 @@
 			//跳转更多职位
 			goToMoreJobs() {
 				uni.navigateTo({
-					url: '/package/list/companyList?companyId=' + this.info.company.companyId
+					url: '/my/enterpriseInfo/enterpriseInfo?companyId=' + this.info.company.companyId
 				})
 			},
 			//一键投递

pages/index/index.vue

@@ -255,7 +255,7 @@
 										<view class="gwList-box-item-box-label flex align-center flex-wrap">
 											<text class="job-tag">{{item.education}}</text>
 											<text class="job-tag">{{item.experience}}</text>
-											<text class="job-tag" v-for="(ite,ind) in item.positionWelfare"
+											<text class="job-tag" v-for="(ite,ind) in item.welfareTag"
 												:key="ind">{{ite}}</text>
 										</view>
 										<!-- <view class="gwList-box-item-box-line"></view> -->
@@ -269,7 +269,7 @@
 												<view class="company-info-text">
 													{{item.user.userName?item.user.userName:'未知'}}·{{item.hr.hrPosition?item.hr.hrPosition:'未知'}}
 												</view>
-												<view class="reply-time">10分钟前回复</view>
+												<view v-if="item.respondTime" class="reply-time">{{item.respondTime}}</view>
 											</view>
 											<view class="location-text">
 												{{item.distance}} {{item.county}} 
@@ -1423,10 +1423,10 @@
 					uni.hideLoading()
 					if (res.code == 0) {
 						res.data.records.map(item => {
-							if (item.positionWelfare) {
-								item.positionWelfare = item.positionWelfare.split(',')
+							if (item.welfareTag) {
+								item.welfareTag = item.welfareTag.split(';')
 							} else {
-								item.positionWelfare = []
+								item.welfareTag = []
 							}
 							if (item.distance) {
 								if (parseFloat(item.distance) > 1000) {