Merge branch 'master' of…

src/pages/recommend/releasePostion/step1.vue

@@ -70,12 +70,12 @@ import FormRow from "@/components/form/form-row.vue";
 import Selectbox from "@/components/form/selectbox.vue";
 const pinias = useReleasePostionStore();
 
-onLoad(option => {
+/* onLoad(option => {
     const { id } = option;
     if (!id) {
         pinias.resetForm();
     }
-});
+}); */
 /* 兼职全职枚举 */
 const EnumWorkMode = ref([]);
 const workModeValue = ref();
@@ -120,8 +120,6 @@ const handleConfirm = ({ selectedItems, value }) => {
 };
 const next = () => {
     xma.hideKeyboard();
-    console.log(pinias.formData);
-
     if (validateForm(pinias.formData, ["jobTypeId", "jobTypeName", "name", "positionDesc"], "post")) {
         /* uni.redirectTo({
             url: "/pages/recommend/releasePostion/step2"

src/pages/recommend/releasePostion/step2.vue

@@ -265,14 +265,14 @@ const next = () => {
 
 /* 初始化 */
 const initViewData = () => {
-    console.log(pinias.formData);
-    if (pinias.formData.id) {
-        // 福利
-        if (pinias.formData.benefits) {
-            benefits.value.forEach(v => {
-                v.active = pinias.formData.benefits.indexOf(v.text) !== -1;
-            });
-        }
+    // 福利
+    if (pinias.formData.benefits) {
+        benefits.value.forEach(v => {
+            v.active = pinias.formData.benefits.indexOf(v.text) !== -1;
+        });
+    }
+    const { negotiableSalary, maxSalary, minSalary } = pinias.formData;
+    if (negotiableSalary == 1 || maxSalary || minSalary) {
         salaryText.value = pinias.formData.negotiableSalary
             ? "面议"
             : `${pinias.formData.minSalary}~${pinias.formData.maxSalary}`;

src/pages/recommend/releasePostion/step3.vue

@@ -116,7 +116,7 @@ const handleConfirmCity = ({ selectedItems }) => {
 };
 // 数据回显
 const reviewData = () => {
-    if (pinias.formData.id) cityText.value = pinias.formData.address;
+    if (pinias.formData.address) cityText.value = pinias.formData.address;
 };
 onLoad(() => {
     reviewData();

src/pages/recommend/releasePostion/step4.vue

@@ -308,29 +308,27 @@ const certificateSelectValue = ref("");
 
 /* 初始化页面数据 */
 const initViewData = async () => {
-    if (pinias.formData.id) {
-        // 编辑
-        identityText.value = await getEnumText("EnumIdentityRequirement", pinias.formData.identityRequirement);
-        educationText.value = await getEnumText("EnumEducationRequirement", pinias.formData.educationRequirement);
-        // 年龄
-        if (pinias.formData.maxAgeRequirement) {
-            ageText.value = `${pinias.formData.minAgeRequirement}~${pinias.formData.maxAgeRequirement}岁`;
-        } else {
-            ageText.value = "不限";
-        }
-        // 证书
-        /*   positionalTitle majorInputValue.value + "-" + majorSelectValue.value
-        professionalCertificates certificateInputValue.value + "-" + certificateSelectValue.value */
-        const [majorInputValue1, majorSelectValue1] = pinias.formData.positionalTitle?.split("-") || [];
-        const [certificateInputValue1, certificateSelectValue1] = pinias.formData.professionalCertificates?.split("-") || [];
-        majorInputValue.value = majorInputValue1;
-        majorSelectValue.value = majorSelectValue1;
-        certificateInputValue.value = certificateInputValue1;
-        certificateSelectValue.value = certificateSelectValue1;
-        console.log(pinias.formData.majorRequirement);
-
-        majorText.value = pinias.formData.majorRequirement.split("-")[1] || "";
+    // 编辑
+    pinias.formData.identityRequirement &&
+        (identityText.value = await getEnumText("EnumIdentityRequirement", pinias.formData.identityRequirement));
+    pinias.formData.educationRequirement &&
+        (educationText.value = await getEnumText("EnumEducationRequirement", pinias.formData.educationRequirement));
+    // 年龄
+    if (pinias.formData.maxAgeRequirement) {
+        ageText.value = `${pinias.formData.minAgeRequirement}~${pinias.formData.maxAgeRequirement}岁`;
+    } else {
+        ageText.value = "";
     }
+    // 证书
+    /*   positionalTitle majorInputValue.value + "-" + majorSelectValue.value
+        professionalCertificates certificateInputValue.value + "-" + certificateSelectValue.value */
+    const [majorInputValue1, majorSelectValue1] = pinias.formData.positionalTitle?.split("-") || [];
+    const [certificateInputValue1, certificateSelectValue1] = pinias.formData.professionalCertificates?.split("-") || [];
+    majorInputValue.value = majorInputValue1;
+    majorSelectValue.value = majorSelectValue1;
+    certificateInputValue.value = certificateInputValue1;
+    certificateSelectValue.value = certificateSelectValue1;
+    majorText.value = pinias.formData.majorRequirement?.split("-")[1] || "";
 };
 initViewData();
 

src/pages/user/index.vue

@@ -90,6 +90,9 @@ import navBar from "@/components/navBar/index.vue";
 import { getLoginUserApi, getCompanyInfoApi, appealInfo, companyReviewInfo } from "@/api/user";
 import { getEnumText } from "@/utils/utils";
 import { ref, reactive } from "vue";
+import { useReleasePostionStore } from "@/pages/recommend/releasePostion/store";
+/* tab */
+const pinias = useReleasePostionStore();
 import evn from "@/utils/config.js";
 const show = ref(false);
 const showOut = ref(false);
@@ -130,7 +133,10 @@ const navList = reactive([
         url: "/pages/recommend/releasePostion/step1",
         text: "岗位发布",
         subText: "",
-        auditStatus: ""
+        auditStatus: "",
+        fn: () => {
+            pinias.resetForm();
+        }
     },
     {
         icon: new URL("@/static/image/user/post.png", import.meta.url).href,