1

.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/pages/recommend/index.vue

@@ -74,7 +74,7 @@ import { ref } from "vue";
 import jobSeekersCard from "@/components/jobSeekersCard/index.vue";
 import { getJobListApi, getApplicationListApi, getRecommendedResumeListApi, getPositionListApi } from "@/api/postion";
 import { getTreeListApi } from "@/api/common";
-import { getLoginUserApi } from "@/api/user";
+import { getLoginUserApi, companyReviewInfo } from "@/api/user";
 import { getEumData, getEnumText } from "@/utils/utils";
 import { useAsync } from "@/hooks/useAsync";
 import _ from "lodash";
@@ -95,7 +95,7 @@ const jobListColumns = ref([]);
 const positionConfirm = ({ selectedItems }) => {
     jobTypeText.value = selectedItems.name;
     resetPageParams();
-    getResumeRecommendListParams.value.recommend = true
+    getResumeRecommendListParams.value.recommend = true;
     getResumeRecommendList();
 };
 function getJobListApiFn() {
@@ -235,6 +235,16 @@ const getResumeRecommendList = () => {
         });
     }
 };
+companyReviewInfoFn = () => {
+    companyReviewInfo().then(res => {
+        if (!res.data) {
+            uni.navigateTo({
+                url: `/pages/user/businessLicense/fillIn?steps=3`
+            });
+        }
+    });
+};
+companyReviewInfoFn();
 onShow(() => {
     resetPageParams();
     getResumeRecommendList();

src/pages/user/businessLicense/submit.vue

@@ -165,6 +165,16 @@ function change({ value }) {
 const submit = () => {
     const params = { ...pinias.formData };
     const { name, creditCode } = pinias.formData;
+    if (isHumanResources.value == 1) {
+        if (params.humanResourcesLicensePath == "") {
+            xma.showToast({
+                title: "请上人力资源证"
+            });
+            return;
+        }
+    } else {
+        params.humanResourcesLicensePath == "";
+    }
     companyCheck({ name, creditCode }).then(company => {
         if (company.code == 200) {
             if (!company.data) {

src/pages/user/index.vue

@@ -182,6 +182,11 @@ const appealInfoFn = () => {
 };
 const companyReviewInfoFn = () => {
     companyReviewInfo().then(res => {
+        if (!res.data) {
+            uni.navigateTo({
+                url: `/pages/user/businessLicense/fillIn?steps=3`
+            });
+        }
         const { reviewType, status } = res.data;
         if (reviewType == 1) {
             navList[0].url = `/pages/user/myCompany/index?status=${status === 0 ? 2 : 3}`;

src/pages/user/myCompany/formItem.vue

@@ -33,6 +33,7 @@ const { title, border, arrow } = defineProps({
     padding: 32rpx 0;
     .form-title {
         width: 200rpx;
+        flex-shrink: 0;
         font-size: 24rpx;
         text-wrap: nowrap;
         font-weight: normal;

src/pages/user/myCompany/index.vue

-<template>
+    <template>
     <NavBar :showIcon="true" :showTitle="true" title="我的公司" backgroundBox="#FFFFFF"></NavBar>
     <div class="page">
         <div class="content">
@@ -30,7 +30,7 @@
                         v-model="params.industry"
                         @confirm="handleConfirm"
                     >
-                        <p style="color: #77818f">{{ params.industry == "" ? "请选择行业分类"  : params.industry }}</p>
+                        <p style="color: #77818f">{{ params.industry == "" ? "请选择行业分类" : params.industry }}</p>
                     </wd-picker>
                 </formItem>
                 <formItem title="信用代码">
@@ -52,9 +52,7 @@
                     </wd-col-picker>
                 </formItem>
                 <formItem title="详细地址" icon="">
-                    <p class="placeholder" style="margin-left: 100rpx">
-                        {{ params.location || "请选择公司所在地" }}
-                    </p>
+                    <p>{{ params.location || "请选择公司所在地" }}</p>
                 </formItem>
                 <div class="textarea-wrap" v-if="[1].includes(pageStatus)">
                     <p class="label">公司介绍</p>
@@ -75,7 +73,7 @@
     </div>
 </template>
 
-<script setup>
+    <script setup>
 import { reactive, ref } from "vue";
 import formItem from "./formItem.vue";
 import { getCompanyInfoApi, saveCompanyInfoApi, companyReviewInfo } from "@/api/user";
@@ -145,9 +143,10 @@ function getCompanyInfoApiFn() {
             creditCode,
             cityCode,
             districtCode,
-            provinceCode
+            provinceCode,
+            companyName
         } = res.data;
-        params.companyName = name;
+        params.companyName = companyName;
         params.introduction = introduction;
         params.logoPath = logoPath;
         params.creditCode = creditCode;
@@ -178,12 +177,11 @@ function companyReviewInfoFn() {
             creditCode,
             provinceCode,
             cityCode,
-            districtCode
+            districtCode,
+            companyName
         } = res.data;
         cityText.value = location;
-
-        params.address = selectedItems.map(v => v.name).join("-");
-        params.companyName = name;
+        params.companyName = companyName;
         params.introduction = introduction;
         params.logoPath = logoPath;
         params.creditCode = creditCode;
@@ -194,6 +192,7 @@ function companyReviewInfoFn() {
         cityText.value = [provinceName, cityName, districtName].join("-");
         // 审核状态
         auditStatus.value = await getEnumText("EnumReviewStatus", res.data.status);
+        console.log("auditStatus", auditStatus);
     });
 }
 function handleConfirm() {}
@@ -333,7 +332,7 @@ const validateForm = (formData, requiredFields) => {
 };
 </script>
 
-<style lang="scss" scoped>
+    <style lang="scss" scoped>
 .page {
     display: flex;
     flex-direction: column;

src/pages/user/myCompany/licenseInfo.vue

 <template>
     <NavBar :showIcon="true" :showTitle="true" title="营业执照认证" backgroundBox="#FFFFFF"></NavBar>
     <div class="page">
+        <wd-overlay :show="show" @click="show = false">
+            <view class="popup-wrapper">
+                <view class="block" @click.stop="">
+                    <view class="sumbit-error">
+                        <image src="@/static/image/icon/delete2.png" @tap="show = false" />
+                        <view class="title">企业已存在</view>
+                        <view class="info">
+                            您在注册的<text>“{{ companyName }}”</text>已在乐业观山湖认证，请核对企业名称是否正确
+                        </view>
+                        <view class="btn flex-between" @tap="navigateTo('/pages/user/businessLicense/fillIn')">
+                            <view class="text">
+                                <view class="t1">修改公司名称</view>
+                                <view class="t2">这不是我的企业</view>
+                            </view>
+                            <view class="arrow"></view>
+                        </view>
+                        <view
+                            class="btn flex-between"
+                            @tap="
+                                navigateTo(
+                                    `/pages/user/businessLicense/appeal?name=${companyName}&companyCreditCode=${companyCreditCode}`
+                                )
+                            "
+                        >
+                            <view class="text">
+                                <view class="t1">申述资质被冒用</view>
+                                <view class="t2">确定没有注册过乐业观山湖</view>
+                            </view>
+                            <view class="arrow"></view>
+                        </view>
+                    </view>
+                </view>
+            </view>
+        </wd-overlay>
         <div class="audit-message">
             <p class="title" :style="{ background: status == 2 ? '#ff5113' : '#1F86FF' }">
                 {{ status == 2 ? "审核拒绝" : status == 0 ? "待审核" : status == 1 ? "通过审核" : "" }}
@@ -63,10 +97,11 @@
 <script setup>
 import evn from "@/utils/config";
 import { uploadFiles } from "@/utils/fileUpload";
-import { getCompanyInfoApi, registerCompanyApi, companyReviewInfo, companyReviewUpdate } from "@/api/user";
+import { getCompanyInfoApi, registerCompanyApi, companyReviewInfo, companyCheck } from "@/api/user";
 import { ref } from "vue";
 import dayjs from "dayjs";
 const radio = ref(1);
+const show = ref(false);
 const companyName = ref("");
 const myCode = ref("");
 const myLicensePath = ref("");
@@ -94,12 +129,18 @@ onLoad(({ status }) => {
         companyReviewInfoFn();
     }
 });
+const navigateTo = url => {
+    uni.navigateTo({
+        url
+    });
+    show.value = false;
+};
 function getCompanyInfoApiFn() {
     getCompanyInfoApi().then(res => {
         companyInfo = res.data;
         status.value = res.data.status;
         myLicensePath.value = res.data.licensePath;
-        companyName.value = res.data.name;
+        companyName.value = res.data.companyName;
         myCode.value = res.data.creditCode;
         myLicenseValidityPeriod.value = res.data.licenseValidityPeriod;
     });
@@ -110,7 +151,7 @@ function companyReviewInfoFn() {
         companyInfo = res.data;
         status.value = res.data.status;
         myLicensePath.value = res.data.licensePath;
-        companyName.value = res.data.name;
+        companyName.value = res.data.companyName;
         myCode.value = res.data.creditCode;
         myLicenseValidityPeriod.value = res.data.licenseValidityPeriod;
     });
@@ -137,26 +178,34 @@ const handleChange = (event, type) => {
 };
 const submit = () => {
     let { id, location } = companyInfo;
-    registerCompanyApi({
-        location,
-        name: companyName.value,
-        creditCode: myCode.value,
-        licensePath: myLicensePath.value,
-        id
-    }).then(res => {
-        if (res.code == 200) {
-            uni.showToast({
-                title: "提交成功",
-                icon: "none"
-            });
-            uni.switchTab({
-                url: "/pages/user/index"
-            });
-        } else {
-            uni.showToast({
-                title: res.message,
-                icon: "error"
-            });
+    companyCheck({ name: companyName.value, creditCode: myCode.value }).then(company => {
+        if (company.code == 200) {
+            if (!company.data) {
+                registerCompanyApi({
+                    location,
+                    name: companyName.value,
+                    creditCode: myCode.value,
+                    licensePath: myLicensePath.value,
+                    id
+                }).then(res => {
+                    if (res.code == 200) {
+                        uni.showToast({
+                            title: "提交成功",
+                            icon: "none"
+                        });
+                        uni.switchTab({
+                            url: "/pages/user/index"
+                        });
+                    } else {
+                        uni.showToast({
+                            title: res.message,
+                            icon: "error"
+                        });
+                    }
+                });
+            } else {
+                show.value = true;
+            }
         }
     });
 };
@@ -168,6 +217,65 @@ const submit = () => {
     flex-direction: column;
     height: 100%;
 }
+.popup-wrapper {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    .sumbit-error {
+        position: relative;
+        box-sizing: border-box;
+        width: 600rpx;
+        padding: 0 32rpx 32rpx;
+        background-color: #ffffff;
+        border-radius: 10rpx;
+        image {
+            position: absolute;
+            top: 20rpx;
+            right: 20rpx;
+            width: 30rpx;
+            height: 30rpx;
+        }
+        .title {
+            padding: 32rpx 0;
+            font-size: 36rpx;
+            font-weight: 600;
+            line-height: 54rpx;
+            color: #1b2026;
+            text-align: center;
+        }
+        .info {
+            font-family: "PingFang SC";
+            font-size: 24rpx;
+            line-height: 48rpx;
+            text {
+                color: #1f86ff;
+            }
+        }
+        .btn {
+            padding: 24rpx;
+            padding-right: 36rpx;
+            margin-top: 32rpx;
+            border: 2rpx solid #dfe1e5;
+            border-radius: 8rpx;
+            .t1 {
+                font-size: 28rpx;
+                font-weight: 500;
+                line-height: 36rpx;
+                color: #1b2026;
+            }
+            .t2 {
+                margin-top: 8rpx;
+                font-size: 24rpx;
+                line-height: 36rpx;
+                color: #a3a7b3;
+            }
+            .arrow {
+                border-color: #77818f;
+            }
+        }
+    }
+}
 .foot-btn {
     position: fixed;
     display: flex;