Merge branch 'master' of…

.vscode/settings.json

@@ -8,7 +8,7 @@
     "files.eol": "\n",
     "typescript.tsdk": "node_modules/typescript/lib",
     "[vue]": {
-        "editor.defaultFormatter": "esbenp.prettier-vscode"
+        "editor.defaultFormatter": "octref.vetur"
     },
     "[typescript]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"

src/api/article.js

@@ -8,8 +8,4 @@ export const getArticleDetailApi = id => instance.post(`/article/detail/${id}`);
 export const getArticleTypesApi = type => instance.post(`/article/category/list/${type}`);
 
 //招聘会报名状态
-export const registerStatus = articleId => instance.post(`/jobFair/register/status/${articleId}`);
-
-// 参加招聘会
-
-export const jobFairRegisterApi = params => instance.post(`/jobFair/register`, params);
+export const registerStatus = articleId => instance.post(`/article/jobFair/check/${articleId}`);
\ No newline at end of file

src/api/user.js

@@ -49,6 +49,17 @@ export const companyReviewInfo = params => instance.post("/b/company/review/info
 export const companyReviewUpdate = params => instance.post("/b/company/review/update", params);
 //职位列表
 export const positionList = params => instance.post("/b/position/list", params);
+//批量创建岗位
+export const positionAddList = params => instance.post("/b/position/addList", params);
+//批量更新职位
+export const positionuUdateList = params => instance.post("/b/position/updateList", params);
 
 //根据id获取反馈信息
 export const feedbackById = params => instance.post(`/feedback/${params}`);
+//根据id获取反馈信息
+export const jobFair = params => instance.post(`/jobFair/${params}`);
+
+
+// 参加招聘会
+
+export const jobFairRegisterApi = params => instance.post(`/jobFair/register`, params);

src/components/form/form-item.vue

@@ -39,6 +39,7 @@ const iconPath = new URL(`../../static/image/icon/${props.icon}.png`, import.met
         font-size: 32rpx;
         font-weight: 600;
         line-height: 36rpx;
+        white-space: nowrap;
     }
     .icon {
         position: absolute;

src/components/form/selectbox.vue

@@ -39,7 +39,7 @@ const props = defineProps({
         default: () => []
     }
 });
-const emit = defineEmits(["update:modelValue"]);
+const emit = defineEmits(["update:modelValue", "update"]);
 // 激活类名
 const isActive = e => {
     if (props.multiple) {
@@ -61,6 +61,8 @@ const onClickItem = e => {
     } else {
         emit("update:modelValue", value);
     }
+
+    emit("update");
 };
 </script>
 

src/pages/articleDetails/index.vue

@@ -26,10 +26,14 @@
             placeholder
             safeAreaInsetBottom
         >
-            <wd-button @tap="next" :disabled="data.bmStutas || !data.bm" round="false" class="foot-btn">{{
+            <!-- <wd-button @tap="next" :disabled="data.bmStutas || !data.bm" round="false" class="foot-btn">{{
                 !data.bmStutas && data.bm ? "立即报名" : data.bmStutas ? "已报名" : "报名结束"
+            }}</wd-button> -->
+            <wd-button @tap="next" :disabled="!data.bm" round="false" class="foot-btn">{{
+                data.bm ? "立即报名" : "报名结束"
             }}</wd-button>
         </wd-tabbar>
+        <wd-action-sheet v-model="show" :actions="actions" @close="close" @select="select" />
     </div>
 </template>
 
@@ -39,6 +43,15 @@ import evn from "@/utils/config.js";
 import { ref } from "vue";
 import dayjs from "dayjs";
 const data = ref({});
+const show = ref(false);
+const actions = ref([
+    {
+        name: "更新岗位"
+    },
+    {
+        name: "新增岗位"
+    }
+]);
 let articleId = ref(null);
 onLoad(({ id }) => {
     articleId.value = id;
@@ -53,12 +66,27 @@ onLoad(({ id }) => {
             data.value.bm = false;
         }
 
-        registerStatus(id).then(Res => {
-            data.value.bmStutas = Res.data;
-        });
+        // registerStatus(id).then(Res => {
+        //     data.value.bmStutas = Res.data;
+        // });
     });
-    console.log("data.value", data.value.bm, data.value.bmStutas);
 });
+function showActions() {}
+
+function close() {
+    show.value = false;
+}
+function select({ item, index }) {
+    if (index == 0) {
+        xma.navigateTo({
+            url: `/pages/signUp/addPost?articleId=${articleId.value}&type=update`
+        });
+    } else {
+        xma.navigateTo({
+            url: `/pages/signUp/addPost?articleId=${articleId.value}&type=add`
+        });
+    }
+}
 onShow(() => {
     const currentTime = Date.now();
     getArticleDetailApi(articleId.value).then(res => {
@@ -71,16 +99,14 @@ onShow(() => {
             data.value.bm = false;
         }
 
-        registerStatus(articleId.value).then(Res => {
-            data.value.bmStutas = Res.data;
-        });
+        // registerStatus(articleId.value).then(Res => {
+        //     data.value.bmStutas = Res.data;
+        // });
     });
 });
-
+const form = ref();
 function next() {
-    xma.navigateTo({
-        url: `/pages/signUp/index?articleId=${articleId.value}`
-    });
+    show.value = true;
 }
 </script>
 

src/pages/login/index.vue

@@ -43,7 +43,7 @@ const login = () => {
                             });
                         } else {
                             uni.navigateTo({
-                                url: "/pages/user/businessLicense/fillIn"
+                                url: "/pages/user/businessLicense/fillIn?steps=1"
                             });
                         }
                     });

src/pages/login/test.vue

@@ -25,12 +25,10 @@ const login = async () => {
         // 已经判断是否注册过企业
         if (userInfoRes.data) {
             const { status } = userInfoRes.data;
-            console.log("status", typeof status);
-
             switch (status) {
                 case 0:
                     uni.navigateTo({
-                        url: `/pages/user/businessLicense/fillIn`
+                        url: `/pages/user/businessLicense/fillIn?steps=1`
                     });
                     break;
                 default:
@@ -41,7 +39,7 @@ const login = async () => {
             }
         } else {
             uni.navigateTo({
-                url: `/pages/user/businessLicense/fillIn`
+                url: `/pages/user/businessLicense/fillIn?steps=1`
             });
         }
     }

src/pages/signUp/index.vue

@@ -38,14 +38,16 @@ import { getCompanyInfoApi } from "@/api/user";
 import { useStore } from "./store";
 const pinias = useStore();
 const enterpriseInformation = ref({});
-onLoad(options => {
+const articleIds = ref("");
+onLoad(({ articleId }) => {
+    articleIds.value = articleId;
     getCompanyInfoApi().then(res => {
         enterpriseInformation.value = res.data;
     });
 });
 const next = () => {
     uni.navigateTo({
-        url: "/pages/signUp/addPost"
+        url: `/pages/signUp/addPost?articleId=${articleIds.value}`
     });
 };
 </script>

src/pages/user/businessLicense/fillIn.vue

@@ -178,13 +178,6 @@ const nextStep = () => {
         default:
             break;
     }
-    if (flag) {
-        uni.showToast({
-            title: "请先完成操作",
-            icon: "none"
-        });
-        return;
-    }
 };
 /* 选择图片 */
 const chooseImage = sourceType => {

src/pages/user/index.vue

@@ -29,7 +29,7 @@
     <wd-overlay :show="displayExpired">
         <view class="popup-display-expired">
             <view class="sumbit-error">
-                <image src="@/static/image/user/displayExpired.png"></image> <view class="title">企业信息已失效</view>
+                <image class="a" src="@/static/image/user/displayExpired.png"></image> <view class="title">企业信息已失效</view>
                 <view class="txt"
                     >由于您超过 <text style="color: #1f86ff">1</text> 月未登录 现已将您的账号禁用 您可完成申述后继续使用</view
                 >
@@ -40,6 +40,17 @@
             >
         </view>
     </wd-overlay>
+    <wd-overlay :show="showOut">
+        <view class="popup-display-expired">
+            <view class="sumbit-error">
+                <image class="u" src="@/static/image/user/user-out.png"></image> <view class="title"></view>
+                <view class="txt">您的大堂经理职位 匹配的人员已超过7天未处理</view>
+                <view class="btn-box1">
+                    <view class="tz-btn btn" @tap="goToHome('/pages/recommend/index')">去看看</view>
+                </view></view
+            >
+        </view>
+    </wd-overlay>
     <div class="user-container">
         <view class="bg"></view>
         <!-- 用户信息 -->
@@ -81,6 +92,7 @@ import { getEnumText } from "@/utils/utils";
 import { ref, reactive } from "vue";
 import evn from "@/utils/config.js";
 const show = ref(false);
+const showOut = ref(false);
 const displayExpired = ref(false);
 let name = ref("");
 let id = ref("");
@@ -95,6 +107,16 @@ const navigateTo = (url, fn) => {
             url
         });
 };
+const goToHome = (url, fn) => {
+    showOut.value = false;
+    if (fn) {
+        fn();
+    }
+    url &&
+        xma.switchTab({
+            url
+        });
+};
 const navList = reactive([
     {
         icon: new URL("@/static/image/user/history.png", import.meta.url).href,
@@ -104,14 +126,14 @@ const navList = reactive([
         auditStatus: ""
     },
     {
-        icon: new URL("@/static/image/user/history.png", import.meta.url).href,
+        icon: new URL("@/static/image/user/post.png", import.meta.url).href,
         url: "/pages/user/positionManagement/index",
         text: "职位管理",
         subText: "",
         auditStatus: ""
     },
     {
-        icon: new URL("@/static/image/user/history.png", import.meta.url).href,
+        icon: new URL("@/static/image/user/position.png", import.meta.url).href,
         url: "/pages/recommend/releasePostion/step1",
         text: "岗位发布",
         subText: "",
@@ -129,20 +151,20 @@ const navList = reactive([
             removeToken();
         },
         text: "退出登录"
-    },
-    {
-        icon: new URL("@/static/image/user/loginout.png", import.meta.url).href,
-        url: "/pages/login/test",
-        fn: () => {
-            removeToken();
-        },
-        text: "退出登录(去测试登录)"
-    },
-    {
-        icon: new URL("@/static/image/user/loginout.png", import.meta.url).href,
-        url: "/pages/user/businessLicense/fillIn",
-        text: "企业认证"
     }
+    // {
+    //     icon: new URL("@/static/image/user/loginout.png", import.meta.url).href,
+    //     url: "/pages/login/test",
+    //     fn: () => {
+    //         removeToken();
+    //     },
+    //     text: "退出登录(去测试登录)"
+    // },
+    // {
+    //     icon: new URL("@/static/image/user/loginout.png", import.meta.url).href,
+    //     url: "/pages/user/businessLicense/fillIn",
+    //     text: "企业认证"
+    // }
 ]);
 /* 个人信息 */
 const userInfo = ref({});
@@ -246,6 +268,13 @@ onShow(() => {
             width: 30rpx;
             height: 30rpx;
         }
+        .u {
+            width: 274rpx;
+            height: 192rpx;
+            position: absolute;
+            top: 20rpx;
+            right: 20rpx;
+        }
         .title {
             padding: 32rpx 0;
             font-size: 36rpx;
@@ -303,11 +332,18 @@ onShow(() => {
         padding: 0 32rpx 32rpx;
         background-color: #ffffff;
         border-radius: 10rpx;
-        image {
+
+        .a {
             position: absolute;
             width: 448rpx;
             height: 448rpx;
         }
+        .u {
+            width: 274rpx;
+            height: 192rpx;
+            position: absolute;
+            top: 120rpx;
+        }
         .title {
             padding: 32rpx 0;
             margin-top: 300rpx;
@@ -342,6 +378,25 @@ onShow(() => {
                 background: #1f86ff;
             }
         }
+        .btn-box1 {
+            display: flex;
+            align-items: center;
+            margin-top: 40rpx;
+            justify-content: center;
+            .btn {
+                box-sizing: border-box;
+                padding: 14rpx 34rpx;
+                border-radius: 12rpx;
+            }
+            .cancel-button {
+                color: #1f86ff;
+                background: rgb(31 134 255 / 10%);
+            }
+            .tz-btn {
+                color: #ffffff;
+                background: #1f86ff;
+            }
+        }
     }
 }
 .nav-bar {

src/utils/utils.js

@@ -71,6 +71,7 @@ export const formatTimestamp = (timestamp, formatString = "YYYY-MM-DD hh:mm:ss")
 export const validateForm = (formData, requiredFields) => {
     const phoneRegex = /^1[3-9]\d{9}$/; // 正则表达式匹配中国大陆手机号码
     for (const field of requiredFields) {
+        const fieldValue = formData[field];
         if (field === "contactPhone" || field === "phone") {
             if (!formData[field] || !phoneRegex.test(formData[field])) {
                 uni.showToast({
@@ -80,7 +81,7 @@ export const validateForm = (formData, requiredFields) => {
                 });
                 return false;
             }
-        } else if (!formData[field]) {
+        } else if (fieldValue === null || fieldValue === undefined || fieldValue === "") {
             console.log(field);
 
             uni.showToast({