优化

pages/index/index.vue

@@ -1484,6 +1484,7 @@ export default {
 				data.companyId = uni.getStorageSync('companyId')
 
 			this.$Request.getT('/app/postPush/getCompanyClassify', data).then(res => {
+				uni.hideLoading()
 				if (res.code === 0 && res.data.length > 0) {
 					let arr = []
 					let tagMap = {}

pages/my/educationExperience.vue

@@ -171,8 +171,8 @@ export default {
 			     that.formData.companyName= res.school
 				that.formData.employmentTime= [res.startTime,res.endTime]
 				that.formData.departmentIndex= that.departments.indexOf(res.degree)<=0?0:that.departments.indexOf(res.degree)
-				that.formData.workContent= res.profession
-				that.formData.workPerformance= res.detail
+				that.formData.workContent= res.detail
+				that.formData.workPerformance= res.profession
 			  } else {
 			    uni.showToast({
 			      title: res.msg,

pages/my/jobApplicant/workRecord.vue

@@ -82,7 +82,7 @@
           </view>
         </view>
 
-        <view class="experience-item" v-for="(exp, index) in workExperiences" :key="index">
+        <view class="experience-item" v-for="(exp, index) in workExperiences" :key="index" @click.stop="goToWorkExperience(exp.workExpId)">
           <view class="job-content">
             <view class="job-icon">
               <image src="/static/images/jobApplicant/xuexiao.svg" mode="scaleToFill" />
@@ -106,9 +106,17 @@
                   <view class="yuan">·</view>
                   <view class="duration">{{ it.startTime }} - {{ it.endTime }}</view>
                 </view>
-                <view class="exp-content">
+                <!-- <view class="exp-content">
                   <view class="content-label">{{ it.workContent }}</view>
-                </view>
+                </view> -->
+				<view style="margin-bottom: 10rpx;font-size: 22rpx;">工作内容</view>
+				<view class="content-label">
+					{{ it.workContent }}
+				</view>
+				<view style="margin: 12rpx 0;font-size: 22rpx;">工作业绩</view>
+				<view class="content-label">
+					{{it.workPerformance}}
+				</view>
                 <view class="exp-content">
                   <view class="skill-tags">
                     <view class="tag" v-for="skill in it.skills">{{ skill }}</view>
@@ -126,13 +134,13 @@
           <view class="form-item required">
             <view class="job-title">
               <view class="job-title-txt">教育经历</view>
-              <image @click="goEducationalBackground" class="job-image" src="@/static/images/jobApplicant/edit.svg"
+              <image @click="goEducationalBackground('')" class="job-image" src="@/static/images/jobApplicant/edit.svg"
                 mode="scaleToFill" />
             </view>
           </view>
         </view>
 
-        <view class="experience-item" v-for="(item, index) in eduList" :key="index">
+        <view class="experience-item" v-for="(item, index) in eduList" :key="index" @click.stop="goEducationalBackground(item.eduId)">
           <view class="job-content">
             <view class="job-icon">
               <image src="/static/images/jobApplicant/bumen.svg" mode="scaleToFill" />
@@ -274,6 +282,7 @@ export default {
           ]
         },
       ],
+	  hasEcommerceExperience: false,
       eduList: [{
         school: "学校时间",
         profession: "专业",
@@ -300,6 +309,8 @@ export default {
       var that = this
       this.$Request.getT("/app/userFirst/getUserResumes", {}).then((res) => {
         if (res.code == 0) {
+			that.hasEcommerceExperience = res.data.resumeList && res.data.resumeList.ifExp ? true :
+				false
           res.data.workExps.forEach(function (item) {
             item.type = JSON.parse(item.type)
             item.workExpDetails = []
@@ -340,8 +351,10 @@ export default {
     goWorkProgress() {
       uni.navigateTo({ url: '/pages/my/workExperience' })
     },
-    goEducationalBackground() {
-      uni.navigateTo({ url: '/pages/my/educationExperience' })
+    goEducationalBackground(id = '') {
+      uni.navigateTo({
+      	url: `/pages/my/educationExperience?id=${id}`
+      })
     },
     // 选择头像
     async chooseAvatar() {
@@ -388,7 +401,21 @@ export default {
         skills: "请填写面试技能要求",
       });
     },
-
+	goToWorkExperience(id = '') {
+		// 获取业务类型数据
+		const businessTypes = this.getBusinessTypes()
+		uni.navigateTo({
+			url: `/pages/my/workExperience?id=${id}&businessTypes=${encodeURIComponent(JSON.stringify(businessTypes))}`
+		})
+	},
+	getBusinessTypes() {
+		// 根据是否有跨境电商经验返回业务类型
+		if (this.hasEcommerceExperience) {
+			return ['0']
+		} else {
+			return []
+		}
+	},
     // 删除工作经历
     removeWorkExperience(index) {
       if (this.workExperiences.length > 1) {
@@ -760,6 +787,7 @@ export default {
   line-height: 20rpx;
   text-align: left;
   margin-bottom: 10rpx;
+  white-space: pre-wrap;
 }
 
 .skill-tags {

pages/my/onlineResume.vue

@@ -134,7 +134,7 @@
 										<view class="company-name">{{ item.companyName }}</view>
 										<view class="work-period">{{ it.startTime }}-{{ it.endTime }}</view>
 									</view>
-									<view style="margin-bottom: 10rpx;font-size: 22rpx;">工作内容：</view>
+									<view style="margin-bottom: 10rpx;font-size: 22rpx;">工作内容</view>
 									<view class="job-description">
 										{{ it.workContent }}
 									</view>

pages/my/workExperience.vue

@@ -766,10 +766,11 @@ export default {
 		textarea {
 			width: 100%;
 			padding: 20rpx 0;
-			height: fit-content;
-			min-height: 40rpx;
+			height: auto !important;
+			// min-height: 40rpx;
 			resize: none;
 			line-height: 1.5;
+			overflow-y: hidden;
 		}
 
 		.form-textarea {

pages/talentSearch/resumeDetail.vue

@@ -131,16 +131,16 @@
 									</view>
 								</view>
 
-								<!-- <view class="company-period-row">
-									<view class="company-name">{{ item.companyName }}</view>
-									<view class="work-period">
-										{{ detail.startTime ? detail.startTime.slice(0, 7) : '' }} -
-										{{ detail.endTime ? detail.endTime.slice(0, 7) : '至今' }}
-									</view>
+								<!-- <view class="job-description">
+									{{ detail.workContent ? detail.workContent : '暂无工作描述' }}
 								</view> -->
-
+								<view style="margin-bottom: 10rpx;font-size: 22rpx;">工作内容</view>
 								<view class="job-description">
-									{{ detail.workContent ? detail.workContent : '暂无工作描述' }}
+									{{ detail.workContent || '暂无工作内容'}}
+								</view>
+								<view style="margin: 12rpx 0;font-size: 22rpx;">工作业绩</view>
+								<view class="job-description">
+									{{detail.workPerformance || '暂无工作业绩'}}
 								</view>
 
 								<view class="skill-tags" v-if="detail.skills">
@@ -826,6 +826,7 @@ export default {
 						line-height: 24rpx;
 						letter-spacing: 0%;
 						text-align: left;
+						white-space: pre-wrap;
 					}
 
 					.skill-tags {