Merge branch 'master' of…

src/components/filter/index.vue

@@ -63,7 +63,7 @@
                 </div>
             </div>
             <!-- 专业要求 -->
-            <div class="filter-item major">
+            <div class="filter-item major" v-if="false">
                 <p class="title">专业要求</p>
                 <div class="filter-select">
                     <div
@@ -136,8 +136,8 @@ const initData = async () => {
         { active: true, name: "学历", className: "education" },
         { active: false, name: "年龄", className: "age" },
         { active: false, name: "性别", className: "gender" },
-        { active: false, name: "工作年限", className: "workYear" },
-        { active: false, name: "专业", className: "major" }
+        { active: false, name: "工作年限", className: "workYear" }
+        // { active: false, name: "专业", className: "major" }
     ];
     /* 初始化数据 */
     educationList.value = await getEumData("EnumEducationRequirement");

src/pages/recommend/index.vue

@@ -328,6 +328,7 @@ const filterConfirm = data => {
     });
 
     getResumeRecommendListParams.value.recommend = false;
+    getResumeRecommendListParams.value.positionId = "";
     showOtherFilter.value = false;
     resetPageParams();
     getResumeRecommendList();

src/pages/user/resume/index.vue

@@ -94,7 +94,7 @@
                         <text class="date">{{ item.startDate }} ~ {{ item.endDate }}</text>
                     </view>
                     <view class="postion">·{{ item.position }}</view>
-                    <view class="content"> ·{{ item.content }} </view>
+                    <view class="content" style="white-space: pre-wrap">{{ item.content }} </view>
                 </view>
             </view>
         </view>
@@ -123,7 +123,7 @@
         <div class="footer" v-if="pageType !== 'application'">
             <template v-if="status == 0 || status == 1">
                 <div class="f-btn-box">
-                    <button class="b1" @click="refuse">不合适</button>
+                    <button class="b1" @click="refuse" v-if="jobIdTemp">不合适</button>
                     <button class="b2" @click="invitation">邀请面试</button>
                 </div>
             </template>
@@ -142,7 +142,7 @@
         <div class="footer" v-else>
             <template v-if="applicationData.status == 0 || applicationData.status == 1">
                 <div class="f-btn-box">
-                    <button class="b1" @click="refuse">不合适</button>
+                    <button class="b1" @click="refuse" v-if="jobIdTemp">不合适</button>
                     <button class="b2" @click="invitation">邀请面试</button>
                 </div>
             </template>
@@ -172,15 +172,15 @@ import {
     getApplicationByIdApi,
     getUserResumeByApplicationIdApi
 } from "@/api/postion";
-import { getCityNameByCodeApi,getDistNameByCodeApi } from "@/api/common";
+import { getCityNameByCodeApi, getDistNameByCodeApi } from "@/api/common";
 
-import { getEnumText, getEumData,getEnumText2} from "@/utils/utils.js";
+import { getEnumText, getEumData, getEnumText2 } from "@/utils/utils.js";
 import evn from "@/utils/config.js";
 import { useMessage } from "wot-design-uni";
 // 投递id
 let id = null;
 //工作id
-let jobIdTemp = null;
+let jobIdTemp = ref(null);
 //用户id
 let userIdTemp = null;
 const resumeData = reactive({
@@ -275,13 +275,13 @@ const getUserResume = ({ userId, jobId, applicationId }) => {
         resumeData.age = calculateAge(birthday);
         resumeData.sex = sex;
         resumeData.identityTypes = await getEnumText2("EnumIdentityType", identityTypes.split(","));
-        resumeData.birthday = formatTimestamp(28800000);
+        resumeData.birthday = formatTimestamp(birthday);
         resumeData.major = major;
         resumeData.positionalTitle = positionalTitle;
         resumeData.professionalCertificates = professionalCertificates;
         resumeData.specialCertificates = specialCertificates;
 
-        console.log('ascsacsacsa',residenceCodes);
+        console.log("ascsacsacsa", residenceCodes);
 
         getDistNameByCodeApi(residenceCodes.split(",")[2]).then(res => {
             resumeData.residenceCodes = res.data.provinceName + res.data.cityName + res.data.districtName;
@@ -323,7 +323,8 @@ const pageType = ref(null);
 onLoad(({ userId, jobId, applicationId, type }) => {
     pageType.value = type;
     id = applicationId;
-    jobIdTemp = jobId;
+
+    jobIdTemp.value = Number(jobId) || null;
     userIdTemp = userId;
     getUserResume({ userId, jobId, applicationId });
 });
@@ -393,7 +394,9 @@ const refuse = () => {
         })
         .then(() => {
             console.log(id);
-            const result = id ? rejectApplicationApi(id) : resumeInappropriateApi({ userId: userIdTemp, positionId: jobIdTemp });
+            const result = id
+                ? rejectApplicationApi(id)
+                : resumeInappropriateApi({ userId: userIdTemp, positionId: jobIdTemp.value });
 
             result.then(res => {
                 if (res.code === 200) {
@@ -415,7 +418,7 @@ const invitation = () => {
         id = applicationData.value.id;
     }
     uni.navigateTo({
-        url: `/pages/recommend/invitation/index?id=${id}&jobId=${jobIdTemp}&userId=${userIdTemp}`
+        url: `/pages/recommend/invitation/index?id=${id}&jobId=${jobIdTemp.value}&userId=${userIdTemp}`
     });
 };
 </script>