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

pages/my/index.vue

@@ -197,7 +197,7 @@
 						:style="XCXIsSelect == '否' ? 'margin-top:30rpx' : ''">
 						<view class="jobServer-box flex justify-center">
 							<view class="jobServer-box-c">
-								<view class="jobServer-box-title"> 求职服务 </view>
+								<!-- <view class="jobServer-box-title"> 求职服务 </view> -->
 								<view class="jobServer-box-btn flex justify-between">
 									<view class="jobServer-box-btn-item flex justify-center flex-wrap"
 										@click="goNav('/pages/my/onlineResume')">
@@ -2002,8 +2002,8 @@
 
 	.jobServer {
 		width: 100%;
-		height: 235rpx;
-		margin-top: 46rpx;
+		// height: 235rpx;
+		margin-top: 16rpx;
 		z-index: 1;
 
 		.jobServer-box {
@@ -2050,7 +2050,7 @@
 					image {
 						width: 62rpx;
 						height: 62rpx;
-						margin-bottom: 18rpx;
+						margin-bottom: 10rpx;
 					}
 				}
 			}
@@ -2167,7 +2167,7 @@
 	}
 	// 更多功能区域
 	.more-functions {
-		margin: 0 32rpx;
+		margin: 48rpx 32rpx 0;
 		padding: 24rpx 48rpx 48rpx 48rpx;
 		/* background: #fff;
 		border-radius: 24rpx; */

pages/my/workExperience.vue

@@ -248,7 +248,9 @@ export default {
 			console.log('岗位设置已更新:', data)
 			// 这里可以更新对应的技能显示
 			this.formData.resumes[this.operateKey].position=data.ruleClassifyName
-			this.formData.resumes[this.operateKey].positionId= data.ruleClassifyId
+			this.formData.resumes[this.operateKey].positionId= data.ruleClassifyId;
+			// 更新以后给岗位职业技能设置默认值
+			this.getDataInfo(this.formData.resumes[this.operateKey].positionId);
 		})
 		uni.$on('skillsUpdated', (data) => {
 			console.log('技能设置已更新:', data)
@@ -267,6 +269,18 @@ export default {
 		}
 	},
 	methods: {
+		getDataInfo(jobId) {
+			let data = {
+				ruleClassifyId: jobId
+			}
+			var action = jobId == '' || jobId == 0 ? '/app/userFirst/selectSkill' :
+				'/app/userFirst/getPostSkill'
+			this.$Request.getT(action, data).then(res => {
+				if (res.code == 0) {
+					this.formData.resumes[this.operateKey].skills = [res.data[0].childrenList[0].postSkillName]
+				}
+			})
+		},
 		goBack() {
 			uni.navigateBack()
 		},