个人简历修改

src/pages/user/resume/index.vue

@@ -34,7 +34,7 @@
                 </view>
             </view>
             <view class="information">
-                <text class="label">身份</text>
+                <text class="label">人员类别</text>
                 <text class="value">{{ resumeData.identityTypes }}</text>
             </view>
             <view class="information">
@@ -62,39 +62,28 @@
                 <text class="value">{{ resumeData.birthCodes }}</text>
             </view>
         </view>
-        <!-- 个人优势 -->
-        <view class="advantage">
-            <view class="flex-between">
-                <text class="gradient-title">个人优势</text>
-                <view class="arrow" bind:tap="navigateTo"></view>
-            </view>
-            <view class="content">
-                {{ resumeData.personalAdvantage }}
-            </view>
-        </view>
         <!-- 求职意向 -->
-        <view class="intention">
+        <!-- <view class="intention">
             <view class="flex-between">
                 <text class="gradient-title">求职意向</text>
-                <view class="arrow"></view>
             </view>
             <view class="postion">{{ resumeData.preferredPosition }}</view>
             <view class="salary">{{ resumeData.minSalary }}-{{ resumeData.maxSalary }}| {{ resumeData.preferredCityName }}</view>
-        </view>
-        <!-- 工作经历 -->
-        <view class="experience" @click="navigateTo('/pages/user/resume/workExperience/index')">
+        </view> -->
+        <!-- 求职意向 -->
+        <view class="intention" @click="toPage(1)">
             <view class="flex-between">
-                <text class="gradient-title">工作经历</text>
-                <view class="arrow"></view>
+                <text class="gradient-title">求职意向</text>
             </view>
-            <view class="list">
-                <view class="item" v-for="(item, index) in resumeData.workExperience" :key="index">
-                    <view class="name-date flex-between">
-                        <text class="name">·{{ item.companyName }}</text>
-                        <text class="date">{{ item.startDate }} ~ {{ item.endDate }}</text>
-                    </view>
-                    <view class="postion">·{{ item.position }}</view>
-                    <view class="content" style="white-space: pre-wrap">{{ item.content }} </view>
+            <view class="postion">{{ resumeData.positionNames }}</view>
+            <view class="salary-postion">
+                <view class="salary"
+                    >{{ resumeData.minSalary }}{{ resumeData.minSalary ? "-" : "" }}{{ resumeData.maxSalary
+                    }}{{ resumeData.districtCode ? " | " : "" }} {{ resumeData.districtCode }}</view
+                >
+                <view>
+                    <text class="text" style="margin-right: 30rpx">{{ resumeData.workModeText }}</text>
+                    <text class="text">{{ resumeData.needAccommodationText }}</text>
                 </view>
             </view>
         </view>
@@ -102,7 +91,6 @@
         <view class="experience" @click="navigateTo('/pages/user/resume/educationExperience/index')">
             <view class="flex-between">
                 <text class="gradient-title">教育经历</text>
-                <view class="arrow"></view>
             </view>
             <view class="list">
                 <view class="item" v-for="(item, index) in resumeData.educationExperience" :key="index">
@@ -118,6 +106,31 @@
                 </view>
             </view>
         </view>
+        <!-- 工作经历 -->
+        <view class="experience" @click="navigateTo('/pages/user/resume/workExperience/index')">
+            <view class="flex-between">
+                <text class="gradient-title">工作经历</text>
+            </view>
+            <view class="list">
+                <view class="item" v-for="(item, index) in resumeData.workExperience" :key="index">
+                    <view class="name-date flex-between">
+                        <text class="name">·{{ item.companyName }}</text>
+                        <text class="date">{{ item.startDate }} ~ {{ item.endDate }}</text>
+                    </view>
+                    <view class="postion">·{{ item.position }}</view>
+                    <view class="content" style="white-space: pre-wrap">{{ item.content }} </view>
+                </view>
+            </view>
+        </view>
+        <!-- 个人优势 -->
+        <view class="advantage">
+            <view class="flex-between">
+                <text class="gradient-title">个人优势</text>
+            </view>
+            <view class="content">
+                {{ resumeData.personalAdvantage }}
+            </view>
+        </view>
         <!-- {{ status }} -->
 
         <div class="footer" v-if="pageType !== 'application'">
@@ -232,7 +245,9 @@ const getUserResume = ({ userId, jobId, applicationId }) => {
             positionNames,
             educationExperience,
             operator,
-            cityCode
+            cityCode,
+            needAccommodation,
+            workMode
         } = res.data.userResume;
         const {
             workAge,
@@ -271,6 +286,10 @@ const getUserResume = ({ userId, jobId, applicationId }) => {
         applicationData.value.userPhone = phone;
 
         /* 个人信息 */
+        resumeData.positionNames = positionNames;
+
+        resumeData.workModeText = await getEnumText("EnumWorkMode", workMode);
+        resumeData.needAccommodationText = await getEnumText("EnumAccommodation", needAccommodation);
         resumeData.realName = name;
         resumeData.workExperienceYear = workAge;
         resumeData.educationLevel = await getEnumText("EnumEducation", education);
@@ -278,7 +297,14 @@ const getUserResume = ({ userId, jobId, applicationId }) => {
         resumeData.avatarPath = avatarPath;
         resumeData.age = calculateAge(birthday);
         resumeData.sex = sex;
-        resumeData.identityTypes = await getEnumText2("EnumIdentityType", identityTypes.split(","));
+        console.log("identityTypesidentityTypes:", identityTypes);
+
+        resumeData.identityTypes = await getEnumText2(
+            "EnumIdentityType",
+            identityTypes.split(",").map(v => v * 1)
+        );
+        console.log(resumeData.identityTypes);
+
         resumeData.birthday = dayjs(birthday).format("YYYY-MM-DD");
 
         resumeData.major = major;
@@ -542,6 +568,14 @@ const callPhone = () => {
         line-height: 36rpx;
         color: #1b2026;
     }
+    .salary-postion {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        .text {
+            margin-top: 16rpx;
+        }
+    }
 }
 .experience {
     padding: 32rpx;