Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

pages/msg/im.vue

@@ -123,7 +123,7 @@
 					<view class="gwList-box-item flex justify-center" @click="gotoInfo(postPushInfo.postPushId)">
 						<view class="gwList-box-item-box">
 							<view class="gwList-box-item-box-title flex justify-between align-center">
-								<text>{{postPushInfo.stationName}}</text>
+								<text>{{postPushInfo.ruleClassifyName || '暂无岗位'}}</text>
 								<text>{{postPushInfo.salaryRange}}</text>
 							</view>
 							<!-- 公司和人数 -->
@@ -133,14 +133,26 @@
 									v-if="postPushInfo.company">{{postPushInfo.company?postPushInfo.company.companyPeople:'0人'}}</text>
 							</view>
 							<view class="gwList-box-item-box-label flex align-center flex-wrap">
+								<!-- 本科 -->
 								<text
 									style="color: #666666;font-size: 26rpx;padding: 10rpx;background: rgba(198, 198, 198, 0.1);border-radius: 8rpx;margin-right: 10rpx;margin-bottom: 20rpx;">
 									{{postPushInfo.education}}
 								</text>
+								<!-- 要求年限 -->
 								<text
 									style="color: #666666;font-size: 26rpx;padding: 10rpx;background: rgba(198, 198, 198, 0.1);border-radius: 8rpx;margin-right: 10rpx;margin-bottom: 20rpx;">
 									{{postPushInfo.experience}}
 								</text>
+								<!-- 单双休 -->
+								<text v-if="postPushInfo.company"
+									style="color: #666666;font-size: 26rpx;padding: 10rpx;background: rgba(198, 198, 198, 0.1);border-radius: 8rpx;margin-right: 10rpx;margin-bottom: 20rpx;">
+									{{postPushInfo.company.workRestTime}}
+								</text>
+								<!-- 岗位福利 -->
+								<text
+									style="color: #666666;font-size: 26rpx;padding: 10rpx;background: rgba(198, 198, 198, 0.1);border-radius: 8rpx;margin-right: 10rpx;margin-bottom: 20rpx;">
+									{{postPushInfo.welfareTag}}
+								</text>
 								<text
 									style="color: #666666;font-size: 26rpx;padding: 10rpx;background: rgba(198, 198, 198, 0.1);border-radius: 8rpx;margin-right: 10rpx;margin-bottom: 20rpx;"
 									v-for="(ite,ind) in postPushInfo.positionWelfare" :key="ind">{{ite}}</text>
@@ -223,7 +235,7 @@
 							<!-- 求职期望 -->
 							<view class="job-expectation">
 								<image src="../../static/images/xiangzi.svg" class="job-icon" mode="aspectFit"></image>
-								<text class="expectation-text">{{ resumesInfo.resumesListDtoList&&resumesInfo.resumesListDtoList.companyName||'' }}·{{ resumesInfo.resumesListDtoList&&resumesInfo.resumesListDtoList.profession||'' }}</text>
+								<text class="expectation-text">{{ resumesInfo.resumesListDtoList&&resumesInfo.resumesListDtoList.school||'' }}·{{ resumesInfo.resumesListDtoList&&resumesInfo.resumesListDtoList.profession||'' }}</text>
 							</view>
 				
 							<!-- 技能标签 -->

pages/recruitmentData/interviewManage.vue

@@ -93,19 +93,21 @@
         <view v-if="allInterviews.length > 0" class="interview-list">
           <!-- 全部面试列表 -->
           <view class="interview-item" v-for="interview in allInterviews" :key="interview.id" @click="goToInterviewDetail(interview)">
-            <view class="interview-avatar">
-              <image :src="interview.resumesListDto[0].userAvatar" class="avatar-image" mode="aspectFill"></image>
-            </view>
-            <view class="interview-content">
-              <view class="interview-title">与{{ interview.resumesListDto[0].userName }}的面试</view>
-              <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' ? '已通过' : '未通过' }}
-              </text>
-            </view>
+            <block v-if="interview.resumesListDto.length > 0">
+				<view class="interview-avatar">
+				  <image :src="interview.resumesListDto[0].userAvatar" class="avatar-image" mode="aspectFill"></image>
+				</view>
+				<view class="interview-content">
+				  <view class="interview-title">与{{ interview.resumesListDto[0].userName }}的面试</view>
+				  <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' ? '已通过' : '未通过' }}
+				  </text>
+				</view>
+			</block>
           </view>
         </view>
         <view class="empty-state" v-else>
@@ -199,6 +201,7 @@ export default {
         this.allInterviews = res.data.records //沟通记录
         this.pendingFeedback = res.data.records.filter(item=>item.interviewProcesses === 3)
         this.feedbackReceived = res.data.records.filter(item=>item.interviewProcesses === 4)
+		console.log(this.pendingFeedback)
         this.tabs[0].name = '待反馈 (' + this.pendingFeedback.length + ')'
         this.tabs[1].name = '已反馈 (' + this.feedbackReceived.length + ')'
       })