bug修复

src/pages.json

@@ -245,7 +245,7 @@
                 "pagePath": "pages/postionList/index",
                 "iconPath": "static/image/tabBar/home.png",
                 "selectedIconPath": "static/image/tabBar/homeActive.png",
-                "text": "首页"
+                "text": "求职"
             },
             {
                 "pagePath": "pages/policy/index",

src/pages/dynamic/index.vue

@@ -19,7 +19,7 @@ import articleList from "@/components/articleList/index.vue";
 import { getArticleListApi, getArticleTypesApi } from "@/api/article.js";
 import { reactive, ref } from "vue";
 const active = ref("");
-const typeList = ref([{ id: "", name: "全部" },{ id: -1, name: "招聘会" }]);
+const typeList = ref([{ id: -1, name: "招聘会" }]);
 getArticleTypesApi(2).then(res => {
     typeList.value.push(...res.data);
 });

src/pages/postionList/positionDetails/index.vue

@@ -36,7 +36,8 @@
             <view class="experience-and-education flex-align-center">
                 <view class="flex-align-center">
                     <img src="@/static/image/postion/experience.png" alt="" />
-                    <text>{{partTimeJobData.minAgeRequirement}}-{{partTimeJobData.maxAgeRequirement  }}</text>
+                    <text v-if="partTimeJobData.minAgeRequirement>0">{{partTimeJobData.minAgeRequirement}}-{{partTimeJobData.maxAgeRequirement  }}</text>
+                    <text v-else>不限</text>
                 </view>
                 <view class="flex-align-center">
                     <img src="@/static/image/postion/education.png" alt="" />

src/pages/user/deliveryFeedback/index.vue

@@ -38,7 +38,8 @@
             <view class="pos-card">
                 <view class="pos-name flex-between">
                     <text class="name">{{ postionData.position.name }}</text>
-                    <view>{{ postionData.position.minSalary<1000?postionData.position.minSalary:postionData.position.minSalary / 1000 +'k'}}-{{ postionData.position.maxSalary<1000?postionData.position.maxSalary:postionData.position.maxSalary / 1000 +'k' }}<text>/{{ postionData.company }}</text></view>
+                    <view v-if="postionData.position.minSalary>0">{{ postionData.position.minSalary<1000?postionData.position.minSalary:postionData.position.minSalary / 1000 +'k'}}-{{ postionData.position.maxSalary<1000?postionData.position.maxSalary:postionData.position.maxSalary / 1000 +'k' }}<text>/{{ postionData.company }}</text></view>
+                    <view v-else class="salary2">面议</view>
                 </view>
                 <view class="com-name">{{ postionData.position.companyName }}</view>
                 <view class="tags">

src/pages/user/resume/essentialInformation/index.vue

@@ -29,12 +29,7 @@
                 <view class="my-info-title label">
                     <text>昵称</text>
                 </view>
-                <input
-                    class="my-info-form"
-                    v-model="userInfo.name"
-                    placeholder="请输入"
-                    placeholder-class="placeholder-style"
-                />
+                <input class="my-info-form" v-model="userInfo.name" placeholder="请输入" placeholder-class="placeholder-style" />
             </view>
             <!-- 性别 -->
             <view class="my-info-list pd-b-38">
@@ -76,7 +71,7 @@
                     <text>身份</text>
                 </view>
                 <wd-checkbox-group v-model="userInfo.identityTypes" shape="dot" inline>
-                    <wd-checkbox :modelValue="v.code" :key="v.code" v-for="v in identityTypeOpstion">{{ v.text }}</wd-checkbox >
+                    <wd-checkbox :modelValue="v.code" :key="v.code" v-for="v in identityTypeOpstion">{{ v.text }}</wd-checkbox>
                 </wd-checkbox-group>
             </view>
             <!-- 户籍地* -->
@@ -239,9 +234,10 @@
                             style="flex: 1"
                         >
                             <view class="picker">
-												<view :class="['my-info-form', userInfo.professionalCertificatesTwo ? '' : 'placeholder-style']">{{
-														userInfo.professionalCertificatesTwo || "请选择职业资格等级"
-												}}</view>
+                                <view
+                                    :class="['my-info-form', userInfo.professionalCertificatesTwo ? '' : 'placeholder-style']"
+                                    >{{ userInfo.professionalCertificatesTwo || "请选择职业资格等级" }}</view
+                                >
                             </view>
                         </wd-picker>
                         <view class="arrow"></view>
@@ -274,9 +270,7 @@
                     type="number"
                 />
             </view>
-            <view class="tips">
-                *注：以下用户证件信息及联系方式将进行严格保密。
-            </view>
+            <view class="tips"> *注：以下用户证件信息及联系方式将进行严格保密。 </view>
             <!-- 身份证号 -->
             <view class="my-info-list flex-column">
                 <view class="my-info-title label">
@@ -331,18 +325,18 @@ import { getEumData, navigateTo } from "@/utils/utils.js";
 import { uploadFiles } from "@/utils/fileUpload.js";
 import evn from "@/utils/config.js";
 import dayjs from "dayjs";
-import { useColPickerData } from '@/hooks/useColPickerData'
-const { colPickerData, findChildrenByCode } = useColPickerData()
-const value = ref([])
+import { useColPickerData } from "@/hooks/useColPickerData";
+const { colPickerData, findChildrenByCode } = useColPickerData();
+const value = ref([]);
 const area = ref([
-  colPickerData.map((item) => {
+    colPickerData.map(item => {
         return {
             value: item.value,
             label: item.text
-    }
+        };
     })
-])
-const value2 = ref([])
+]);
+const value2 = ref([]);
 let verified = ref(0);
 const cropperFlag = 0;
 const identityCode = 0;
@@ -363,65 +357,68 @@ const userInfo = ref({
     loginTime: "",
     jobStatus: 1,
     completeResume: false,
-    user: null
+    user: null,
+    positionalTitleOne: null,
+    positionalTitleTwo: null,
+    professionalCertificatesOne: null,
+    professionalCertificatesTwo: null
 });
 onMounted(() => {
-    getEumDataFn()
+    getEumDataFn();
     getData();
 });
 
 // 户籍地
-const provinceCityDistrict = ref("")
-const provinceCityDistrictArray = []
+const provinceCityDistrict = ref("");
+const provinceCityDistrictArray = [];
 const columnChange = ({ selectedItem, index, resolve, finish }) => {
-	provinceCityDistrictArray.splice(index,1,selectedItem.label)
-	const areaData = findChildrenByCode(colPickerData, selectedItem.value)
+    provinceCityDistrictArray.splice(index, 1, selectedItem.label);
+    const areaData = findChildrenByCode(colPickerData, selectedItem.value);
     if (areaData && areaData.length) {
         resolve(
-      areaData.map((item) => {
+            areaData.map(item => {
                 return {
                     value: item.value,
                     label: item.text
-        }
+                };
             })
-		)
+        );
     } else {
-		finish()
-		provinceCityDistrict.value = provinceCityDistrictArray.join('')
+        finish();
+        provinceCityDistrict.value = provinceCityDistrictArray.join("");
     }
-}
+};
 
 // 常住地
-const provinceCityDistrict2 = ref("")
-const provinceCityDistrictArray2 = []
+const provinceCityDistrict2 = ref("");
+const provinceCityDistrictArray2 = [];
 const columnChange2 = ({ selectedItem, index, resolve, finish }) => {
-	provinceCityDistrictArray2.splice(index,1,selectedItem.label)
-	const areaData = findChildrenByCode(colPickerData, selectedItem.value)
+    provinceCityDistrictArray2.splice(index, 1, selectedItem.label);
+    const areaData = findChildrenByCode(colPickerData, selectedItem.value);
     if (areaData && areaData.length) {
         resolve(
-      areaData.map((item) => {
+            areaData.map(item => {
                 return {
                     value: item.value,
                     label: item.text
-        }
+                };
             })
-		)
+        );
     } else {
-		finish()
-		provinceCityDistrict2.value = provinceCityDistrictArray2.join('')
+        finish();
+        provinceCityDistrict2.value = provinceCityDistrictArray2.join("");
     }
-}
+};
 
-let residenceCodes = ref('');
+let residenceCodes = ref("");
 function handleConfirm({ value }) {
-	
-	residenceCodes.value = value.join()
+    residenceCodes.value = value.join();
 }
 
-let birthCodes = ref('');
+let birthCodes = ref("");
 function handleConfirm2({ value }) {
-	console.log(value)
-	birthCodes.value = value.join()
+    console.log(value);
+    birthCodes.value = value.join();
 }
 
 // 页面跳转
@@ -470,7 +467,7 @@ getEumData("EnumIdentityType").then(res => {
         v.code = v.code * 1;
     });
     identityTypeOpstion.value = res;
-	console.log('identityTypeOpstionidentityTypeOpstion',identityTypeOpstion.value );
+    console.log("identityTypeOpstionidentityTypeOpstion", identityTypeOpstion.value);
 });
 /* 学历 */
 const educationText = ref("");
@@ -510,19 +507,23 @@ const getData = async () => {
             return;
         }
         userInfo.value = data;
-			const residence = data.residenceAddress.split('-')
-			const birth = data.birthAddress.split('-')
-			residenceCodes.value = data.residenceCodes
-			birthCodes.value = data.birthCodes
-			userInfo.value.identityTypes = data.identityTypes.split(',').map(item => item * 1);
-			userInfo.value.positionalTitleOne = data.positionalTitle.split('-')[0]
-			userInfo.value.positionalTitleTwo = data.positionalTitle.split('-')[1]
-			userInfo.value.professionalCertificatesOne = data.professionalCertificates.split('-')[1]
-			userInfo.value.professionalCertificatesTwo = data.professionalCertificates.split('-')[1]
-			provinceCityDistrict.value = residence[0]
-			provinceCityDistrict2.value = birth[0]
-			userInfo.value.residenceAddress = residence[1]
-			userInfo.value.birthAddress = birth[1]
+        const residence = data.residenceAddress.split("-");
+        const birth = data.birthAddress.split("-");
+        residenceCodes.value = data.residenceCodes;
+        birthCodes.value = data.birthCodes;
+        userInfo.value.identityTypes = data.identityTypes.split(",").map(item => item * 1);
+        if (data.positionalTitle) {
+            userInfo.value.positionalTitleOne = data.positionalTitle.split("-")[0];
+            userInfo.value.positionalTitleTwo = data.positionalTitle.split("-")[1];
+        }
+        if (data.professionalCertificates) {
+            userInfo.value.professionalCertificatesOne = data.professionalCertificates.split("-")[0];
+            userInfo.value.professionalCertificatesTwo = data.professionalCertificates.split("-")[1]; 
+        }
+        provinceCityDistrict.value = residence[0];
+        provinceCityDistrict2.value = birth[0];
+        userInfo.value.residenceAddress = residence[1];
+        userInfo.value.birthAddress = birth[1];
         educationText.value = educationOpstion.value[data.education - 1].text;
     }
 };
@@ -530,16 +531,35 @@ const getData = async () => {
 /* 提交 */
 const submit = () => {
     console.log(userInfo);
-    const {citizenId,positionalTitleOne,positionalTitleTwo,professionalCertificatesOne,professionalCertificatesTwo,specialCertificates,major,birthAddress,residenceAddress, avatarPath, name, sex, phone, email, birthday, identityTypes, education, workAge, personalTags } =
-		userInfo.value;
-	saveUserInfoApi({
+    const {
+        citizenId,
+        positionalTitleOne,
+        positionalTitleTwo,
+        professionalCertificatesOne,
+        professionalCertificatesTwo,
+        specialCertificates,
+        major,
+        birthAddress,
+        residenceAddress,
+        avatarPath,
+        name,
+        sex,
+        phone,
+        email,
+        birthday,
+        identityTypes,
+        education,
+        workAge,
+        personalTags
+    } = userInfo.value;
+    const params = {
         residenceCodes: residenceCodes.value,
-		birthCodes:birthCodes.value,
+        birthCodes: birthCodes.value,
         residenceAddress: provinceCityDistrict.value + "-" + residenceAddress,
-		birthAddress:provinceCityDistrict2.value + "-" + birthAddress ,
+        birthAddress: provinceCityDistrict2.value + "-" + birthAddress,
         major,
-		positionalTitle: positionalTitleOne + '-' + positionalTitleTwo,
-		professionalCertificates: professionalCertificatesOne + '-' + professionalCertificatesTwo,
+        positionalTitle: positionalTitleOne + "-" + positionalTitleTwo,
+        professionalCertificates: professionalCertificatesOne + "-" + professionalCertificatesTwo,
         citizenId,
         specialCertificates,
         avatarPath,
@@ -548,11 +568,19 @@ const submit = () => {
         phone,
         email,
         birthday,
-		identityTypes:identityTypes.join(),
+        identityTypes: identityTypes.join(),
         education,
         workAge,
         personalTags
-    }).then(res => {
+    };
+    if (!positionalTitleOne || !positionalTitleTwo) {
+        params.positionalTitle = null;
+    }
+    if (!professionalCertificatesOne || !professionalCertificatesTwo) {
+        params.professionalCertificates = null;
+    }
+    console.log("params", params);
+    saveUserInfoApi(params).then(res => {
         if (res.code == 200) {
             uni.showToast({
                 title: "保存成功",
@@ -569,24 +597,24 @@ const submit = () => {
 };
 </script>
 <style lang="scss" scoped>
-.col-picker{
+.col-picker {
     border-bottom: 1rpx solid #e9e9e9;
     padding: 32rpx 0;
-	::v-deep .wd-col-picker__cell{
+    ::v-deep .wd-col-picker__cell {
         padding: 0;
     }
-	::v-deep .wd-col-picker__label{
+    ::v-deep .wd-col-picker__label {
         color: #77818f;
         font-size: 24rpx;
         margin: 0;
-		min-width:200rpx !important;
-		max-width:200rpx !important;
+        min-width: 200rpx !important;
+        max-width: 200rpx !important;
     }
-	::v-deep .wd-col-picker__arrow{
+    ::v-deep .wd-col-picker__arrow {
         font-size: 32rpx;
         color: #000;
     }
-	::v-deep .wd-col-picker__value{
+    ::v-deep .wd-col-picker__value {
         font-weight: 600;
     }
 }
@@ -597,7 +625,7 @@ const submit = () => {
 .essential-information {
     box-sizing: border-box;
     background: #ffffff;
-		padding-bottom:calc(env(safe-area-inset-bottom) + 160rpx)
+    padding-bottom: calc(env(safe-area-inset-bottom) + 160rpx);
 }
 .real-name-authentication {
     padding: 12rpx 20rpx;
@@ -844,10 +872,10 @@ const submit = () => {
 }
 .my-info {
     padding: 0 32rpx;
-    .tips{
+    .tips {
         font-size: 24rpx;
-			color: #CCCCCC;
-			margin-top:24rpx ;
+        color: #cccccc;
+        margin-top: 24rpx;
     }
     .my-info-list {
         position: relative;
@@ -920,27 +948,27 @@ const submit = () => {
             }
         }
     }
-    .two-rows{
+    .two-rows {
         display: flex;
         flex-direction: column;
         padding-top: 24rpx;
-        .title{
+        .title {
             font-size: 24rpx;
-            color: #77818F;
+            color: #77818f;
             font-family: 苹方-简;
         }
-        .bottom-row{
+        .bottom-row {
             display: flex;
             align-items: center;
             justify-content: space-between;
-            .bottom-one{
+            .bottom-one {
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
                 width: 45%;
                 border-bottom: 1rpx solid #e9e9e9;
                 height: 100rpx;
-                .write-icon{
+                .write-icon {
                     width: 28rpx;
                     height: 28rpx;
                 }

src/pages/user/resume/index.vue

@@ -43,11 +43,11 @@
             </view>
             <view class="information">
                 <text class="label">专业技术职称</text>
-                <text class="value">{{resumeData.positionalTitle.split('-')[1] === 'undefined'?'无':resumeData.positionalTitle}}</text>
+                <text class="value">{{resumeData.positionalTitle || '无'}}</text>
             </view>
             <view class="information">
                 <text class="label">职业资格/技能等级证书</text>
-                <text class="value">{{resumeData.professionalCertificates.split('-')[1] === 'undefined'?'无':resumeData.professionalCertificates || '无'}}</text>
+                <text class="value">{{resumeData.professionalCertificates || '无'}}</text>
             </view>
             <view class="information">
                 <text class="label">特种作业证</text>