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

my/jilu/bossMianshiDetail.vue

@@ -32,7 +32,7 @@
             <view class="user-img">
               <image :src="info.userEntity&&info.userEntity.avatar||'@/static/images/geren.png'" mode="aspectFill" />
             </view>
-            <view @click="goTo('/pages/talentSearch/resumeDetail?resumesId=255&postPushId='+info.postPush.postPushId)" class="user-name"
+            <view @click="goTo('/pages/talentSearch/resumeDetail?resumesId='+info.resumesId+'&postPushId='+info.postPush.postPushId)" class="user-name"
               >{{info.userEntity&&info.userEntity.userName||'匿名'}}
               <u-icon
                 name="arrow-right"
@@ -43,7 +43,7 @@
             ></view>
           </view>
           <view class="img-phone">
-            <view class="img-item-icon">
+            <view v-if="info.resumesAttachment" @click="seekDoc(info.resumesAttachment)" class="img-item-icon">
               <image src="@/static/images/my/fujianjianli.svg" mode="scaleToFill" />
               <text>附件简历</text>
             </view>
@@ -397,6 +397,10 @@ export default {
 				that.info.interviewResultType=that.resultType
 				that.info.interviewProcesses=4
 				that.currentStep=4
+				this.$Request.getT("/app/chat/selectByTwoIds", {userId:this.info.userEntity.userId,'focusedUserId':this.$queue.getData('userId')}).then((res) => {
+				  if (res.code == 0) 
+					this.$queue.sendImMessage(this.info.userEntity.userId,'面试结果：'+(that.resultType==0?'恭喜您通过面试啦':(that.resultType==1?'我们需要再考虑一下':'非常抱歉，您与我们招聘的岗位不太匹配！')),98,res.data)
+				})
 			} else {
 				uni.showToast({
 					title: res.msg,
@@ -452,6 +456,29 @@ export default {
 				})
 			}
 		})
+	},
+	seekDoc(it) {
+		if(!it||!it.attachmentAddress)
+			return
+		//#ifdef APP-PLUS
+		uni.downloadFile({
+			url: it.attachmentAddress,
+			success: function (res) {
+				var filePath = res.tempFilePath;
+				uni.openDocument({
+					filePath: filePath,
+					showMenu: true,
+					success: function (res) {
+						console.log('打开文档成功');
+					}
+				});
+			}
+		});
+		return;
+		//#endif
+		uni.navigateTo({
+			url: '/pages/index/webView?url=' + it.attachmentAddress + '&title=' + it.attachmentName
+		});
 	}
   },
 };

pages/msg/im.vue

@@ -403,7 +403,24 @@
 							style="margin-left: 20rpx;color: #000000;background-color: #ffffff;">
 							{{item.content}}已拒绝
 						</view>
-
+						<view v-if="item.content && item.messageType === 99"
+							class="chat-listitem-text"
+							style="padding-bottom: 20rpx;;padding-top: 20rpx;margin-left: 20rpx;color: #000000;background-color: #ffffff;border: 1rpx solid #c6fee7;background: linear-gradient(to bottom, #D9FEED, #ffffff);">
+							<view class="flex align-center">
+								<image src="../../static/im/orderInfo.png"
+									style="width: 60rpx;height: 60rpx;margin-right: 10rpx;flex-shrink: 0;" mode="aspectFill"></image>
+								您收到了{{item.content}}
+							</view>
+						</view>
+						<view v-if="item.content && item.messageType === 98"
+							class="chat-listitem-text"
+							style="padding-bottom: 20rpx;;padding-top: 20rpx;margin-left: 20rpx;color: #000000;background-color: #ffffff;border: 1rpx solid #c6fee7;background: linear-gradient(to bottom, #D9FEED, #ffffff);">
+							<view class="flex align-center">
+								<image src="../../static/im/orderInfo.png"
+									style="width: 60rpx;height: 60rpx;margin-right: 10rpx;flex-shrink: 0;" mode="aspectFill"></image>
+								{{item.content}}
+							</view>
+						</view>
 
 						<image @tap="viewImg(item.content)" v-if="item.content && item.messageType === 2"
 							:src="item.content" style="height: 200rpx;width: 200rpx;margin-left: 20rpx;"></image>
@@ -505,6 +522,24 @@
 							style="margin-right: 20rpx;">
 							{{item.content}}已拒绝
 						</view>
+						<view v-if="item.content && item.messageType === 99"
+							class="chat-listitem-text textColor"
+							style="padding-bottom: 20rpx;;padding-top: 20rpx;margin-right: 20rpx;color: #000000;background-color: #ffffff;border: 1rpx solid #c6fee7;background: linear-gradient(to bottom, #D9FEED, #ffffff);">
+							<view class="flex align-center">
+								<image src="../../static/im/orderInfo.png"
+									style="width: 60rpx;height: 60rpx;margin-right: 10rpx;flex-shrink: 0;" mode="aspectFill"></image>
+								您发送了{{item.content}}
+							</view>
+						</view>
+						<view v-if="item.content && item.messageType === 98"
+							class="chat-listitem-text textColor"
+							style="padding-bottom: 20rpx;;padding-top: 20rpx;margin-right: 20rpx;color: #000000;background-color: #ffffff;border: 1rpx solid #c6fee7;background: linear-gradient(to bottom, #D9FEED, #ffffff);">
+							<view class="flex align-center">
+								<image src="../../static/im/orderInfo.png"
+									style="width: 60rpx;height: 60rpx;margin-right: 10rpx;flex-shrink: 0;" mode="aspectFill"></image>
+								{{item.content}}
+							</view>
+						</view>
 						<view class="chat-listitem-text textColor" style="margin-right: 20rpx;"
 							v-if="item.content && item.messageType === 18"
 							@click="openMapss(item.content.latitude,item.content.longitude,item.content.address)">

pages/msg/index.vue

@@ -95,6 +95,8 @@
 							style="height: 40rpx;width: 40rpx;"></image></view>
 							<view class="text-grey" v-else-if="item.messageType == 20">[视频通话]</view>
 							<view class="text-grey" v-else-if="item.messageType == 21">[语音通话]</view>
+							<view class="text-grey" v-else-if="item.messageType == 99">[面试邀约]</view>
+							<view class="text-grey" v-else-if="item.messageType == 98">[{{item.content}}]</view>
 							<view class="text-grey" v-else>[其他消息类型]</view>
 							<view v-if="item.contentCount"
 								style="height: 32rpx;width: 32rpx;border-radius: 100rpx;background-color: red;color: #FFF;text-align: center;">

pages/msg/interviewInvitation.vue

@@ -531,6 +531,10 @@
 				this.$Request.postJson('/app/interviewRecord/saveInterview', data).then(ret => {
 					if (ret.code == 0) {
 						     // 回传上一页
+							 this.$Request.getT("/app/chat/selectByTwoIds", {userId:this.interviewerId,'focusedUserId':this.$queue.getData('userId')}).then((res) => {
+							   if (res.code == 0) 
+								this.$queue.sendImMessage(this.interviewerId,'一份面试邀约',99,res.data)
+							 })
 						      uni.$emit('saveInterviewResult', "success");
 						      uni.navigateBack();
 					}