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

pages/index/index.vue

@@ -1316,7 +1316,7 @@ export default {
 				postType: '', //工作性质
 				expectedPosition: this.jobSxTypeList.length > 0 ? this.jobSxTypeList[this.currentJobSx].projectName : '', //岗位名称
 				screen: +this.currentJobSxs + 1, //1推荐 2最新
-				expectedCity: this.city == '全国' ? '' : this.city, //城市
+				city: this.city == '全国' ? '' : this.city, //城市
 				salaryRange: this.salaryRange, //薪资范围
 				eduRange: this.education, //学历
 				expRange: this.experience, //经验

pages/talentSearch/index.vue

@@ -380,7 +380,7 @@
 					limit: this.limit,
 					skillName: this.searchKeyword || "",
 					expectedPosition: this.selectedText || "", //期望职位
-					expectedCity: this.city || "", //期望城市
+					city: this.city || "", //期望城市
 					salaryRange: this.salaryRange || "", //薪资
 					resumesStatus: this.resumesStatus || "", //个人状态
 					expRange: this.experience || "", //工作经验

pages/talentSearch/resumeDetail.vue

@@ -303,7 +303,7 @@ export default {
 			//去联系
 			this.getDetail()
 			this.$Request.postJson('/app/chat/insertChatConversation', {
-				userId: this.userEntity.userId, //会话对象的id
+				userId: this.userEntity, //会话对象的id
 				focusedUserId: uni.getStorageSync('userId'), //当前登录者Id
 				postPushId: this.postPushId,
 				resumesId: this.resumesId,
@@ -312,7 +312,7 @@ export default {
 				if (ret.code == 0) {
 					uni.navigateTo({
 						url: '/pages/msg/im?byUserId=' + this.userEntity
-							.userId + '&chatConversationId=' + ret.data
+							 + '&chatConversationId=' + ret.data
 								.chatConversationId + '&resumesId=' + this.resumesId + '&postPushId=' +
 							this.postPushId
 					})
@@ -330,11 +330,13 @@ export default {
 				companyId: uni.getStorageSync('companyId')
 			}
 			this.$Request.get('/app/resumes/selectResumesByResumesId', data).then(res => {
+				console.log(res,'hhhhhhh')
 				if (res.code == 0) {
 					uni.hideLoading()
 					var data = res.data;
 					this.resumeData = res.data;
-					this.userEntity = data.userEntity
+					// this.userEntity = data.userEntity
+					this.userEntity = data.userId
 					this.eduList = data.eduList
 					this.intentions = data.intentionList
 					this.resumeList = data.resumesListDtoList