bug

src/api/user.js

@@ -18,7 +18,7 @@ export const saveJobStatusApi = params => instance.post("/user/resume/saveJobSta
 export const saveUserInfoApi = params => instance.post("/c/user/save", params);
 
 // 保存身份证信息
-export const saveIdCardApi = params => instance.post("/personal/user/saveIdCard", params);
+export const saveIdCardApi = params => instance.post("/c/user/citizen/save", params);
 // 保存求职意向
 export const saveJobIntentionApi = params => instance.post("/user/resume/saveJobIntention", params);
 // 保存工作经历
@@ -32,6 +32,9 @@ export const getInterviewListApi = params => instance.post("/job/getInterviewLis
 
 //更具code码获取城市名称
 export const getCityNameByCodeApi = code => instance.post(`/dict/dictProvinceCityDistrict/find/dist/${code}`);
+
+//根据任意code码获取城市名称
+export const getCityNameByCodeApi2 = code => instance.post(`/dict/area/find/${code}`);
 // 专业目录
 export const getMajorTreeApi = () => instance.post(`/dict/major/tree`);
 

src/components/postionCard1/index.vue

@@ -12,7 +12,7 @@
         </view>
         <view class="flex-between">
             <text class="company-name">{{ data.companyName }}</text>
-            <text class="address">{{ data.cityName + "-" + data.street }}</text>
+            <text class="address" v-show="data.cityName && data.street">{{ data.cityName + "-" + data.street }}</text>
         </view>
     </view>
 </template>

src/pages/dynamic/index.vue

@@ -19,12 +19,14 @@ 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: -1, name: "招聘会岗位报名" }]);
+// const typeList = ref([{ id: -1, name: "招聘会岗位查看" }]);
+const typeList = ref([]);
 getArticleTypesApi(2).then(res => {
     typeList.value.push(...res.data);
+    changeType({id:typeList.value[0].id})
 });
 onShow(() => {
-    changeType({ id: "" });
+    // changeType({ id: -1 });
 });
 
 const changeType = type => {

src/pages/login/index.vue

@@ -23,22 +23,21 @@
 import NavBar from "@/components/navBar/index.vue";
 import { xinhuaMpLogin } from "@/api/user.js";
 import { setToken, getToken } from "@/utils/token";
+import { removeToken } from "@/utils/token";
 const res = ref("");
 
 onLoad(() => {
-    // const token = getToken();
-    // if (token) {
-    //     uni.switchTab({
-    //         url: "/pages/postionList/index"
-    //     });
-    // }
+    removeToken();
+    uni.removeStorageSync("userInfo");
 });
 const login = () => {
     xma.xh.getUserProfile({
-        range: ["ACCOUNT", "MOBILE"],
+        range: ["ACCOUNT", "MOBILE",'CITIZEN'],
         success(info) {
-            xinhuaMpLogin({ encryptedData: info.data.uMobile, userType: "consumer" })
+            console.log('infoinfoinfo',info);
+            xinhuaMpLogin({ encryptedData: info.data.uMobile, userType: "consumer",name: info.data.uName,citizenId:info.data.uIdCardNo })
                 .then(data => {
+                    if(data.code !== 200) return
                     res.value = data;
                     console.log("datadatadata", data);
                     setToken(data.data);

src/pages/login/test.vue

@@ -18,7 +18,8 @@ const login = async () => {
     const a = await getSmsCode({ username: phone.value });
     testLogin({
         username: phone.value,
-        code: "000000"
+        code: "000000",
+        userType: "consumer",
     }).then(res => {
         console.log(res);
         if (res.code === 200) {

src/pages/postionList/demandRegistration/index.vue

 <template>
-    <NavBar :showIcon="true" backgroundBox="#ffffff" :showTitle="true" title="职业指导"></NavBar>
+    <NavBar :showIcon="true" backgroundBox="#ffffff" :showTitle="true" title="需求登记"></NavBar>
     <div class="page">
         <scroll-view scroll-y="{{true}}" @scrolltolower="getData">
             <view class="item" v-for="(item, index) in list" :key="item.id">

src/pages/user/deliveryFeedback/index.vue

@@ -4,8 +4,8 @@
         <!-- <view v-if="v.status == 2" class="state success"> 待面试 </view>
         <view v-if="v.status == 4" class="state warning"> 已拒绝 </view> -->
         <view class="card" v-if="postionData.application?.status == 4">
-            <view class="t1">不合适</view>
-            <view class="t2">很遗憾，您没有得到本岗位的面试邀约感谢您的投递!</view>
+            <view class="t1">很遗憾</view>
+            <view class="t2">您没有得到本岗位的面试邀约，感谢您的投递!</view>
             <view class="shadow"></view>
         </view>
         <view class="card success" v-if="postionData.application?.status == 2">
@@ -13,6 +13,20 @@
             <view class="t2">恭喜您获得本岗位的面试邀约，注意保持电话畅通或可以主动联系我们</view>
             <view class="shadow"></view>
         </view>
+        <view class="pos-card">
+            <view class="pos-name flex-between">
+                <text class="name">{{ postionData.position.name }}</text>
+                <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">
+                <text class="item" v-for="v in postionData.position.benefits?.split(',') || []" :key="v">{{ v }}</text>
+            </view>
+        </view>
+        <view class="pos-detail">
+            {{ postionData.position.positionDesc }}
+        </view>
 
         <template v-if="postionData.application?.status == 2">
             <div class="interview-info">
@@ -34,22 +48,7 @@
                 </div>
             </div>
         </template>
-        <template v-else>
-            <view class="pos-card">
-                <view class="pos-name flex-between">
-                    <text class="name">{{ postionData.position.name }}</text>
-                    <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">
-                    <text class="item" v-for="v in postionData.position.benefits?.split(',') || []" :key="v">{{ v }}</text>
-                </view>
-            </view>
-            <view class="pos-detail">
-                {{ postionData.position.positionDesc }}
-            </view>
-        </template>
+
         <view class="steps-wrap">
             <steps :data="postionData.application"></steps>
         </view>
@@ -120,7 +119,7 @@ onLoad(({ id }) => {
     flex-direction: column;
     gap: 32rpx;
     padding: 0 32rpx;
-    margin-top: 168rpx;
+    margin-top: 100rpx;
     div {
         display: flex;
         p {

src/pages/user/feedbackDetails/index.vue

@@ -34,9 +34,7 @@
             placeholderW
             safeAreaInsetBottom
         >
-            <wd-button :round="false" class="foot-btn" :disabled="params.questionDesc == '' || params.imagesPath == ''"
-                >投诉建议</wd-button
-            >
+            <wd-button :round="false" class="foot-btn" :disabled="params.questionDesc == ''">投诉建议</wd-button>
         </wd-tabbar>
     </view>
 </template>
@@ -56,7 +54,7 @@ const params = reactive({
 onLoad(option => {
     if (option.id) {
         id.value = option.id;
-        feedbackByIdFn(option.id);  
+        feedbackByIdFn(option.id);
     }
 });
 const feedbackByIdFn = id => {
@@ -92,9 +90,8 @@ const chooseImage = () => {
 };
 
 const feedbackAddFn = () => {
-    xma.showLoading();
-    if (params.questionDesc == "" || params.imagesPath == "") {
-    } else {
+    if (params.questionDesc !== "") {
+        xma.showLoading();
         feedbackAdd(params).then(res => {
             if (res.code == 200) {
                 xma.hideLoading();

src/pages/user/index.vue

@@ -3,15 +3,14 @@
     <div class="user-container">
         <view class="bg"></view>
         <!-- 用户信息 -->
-        <view class="user-info flex-align-center">
+        <view class="user-info flex-align-center" @click="navigateTo('/pages/user/resume/essentialInformation/index')">
             <view class="avatar">
-                <!-- <image wx:if="{{avatarPath}}" src="{{imgPrefix}}/{{avatarPath}}" mode="" />
-                <image wx:else="" class="userinfo-avatar" src="{{ossImgPrefix}}/user/default-avatar.png"></image> -->
-                <img v-if="avatarPath" :src="evn.APP_IMAGE_BASE_API + avatarPath" />
-                <img v-else src="@/static/image/user/default-avatar.png" alt="" />
+                <!-- <img v-if="avatarPath" :src="evn.APP_IMAGE_BASE_API + avatarPath" />
+                <img v-else src="@/static/image/user/default-avatar.png" alt="" /> -->
+                <img src="@/static/image/user/default-avatar.png" alt="" />
             </view>
-            <view class="name"  @click="navigateTo('/pages/user/resume/essentialInformation/index')">
-                <text >{{ realName || "未实名" }}</text>
+            <view class="name">
+                <text >{{ realName || "姓名" }}</text>
                 <img src="@/static/image/user/write.png" />
             </view>
             <view class="education">{{ schoolName || '暂未写入' }} | {{ educationLevelText || "无" }}</view>
@@ -95,19 +94,19 @@ const navList = [
         url: "/pages/login/index",
         text: "退出登录"
     },
-    {
-        icon: new URL("@/static/image/user/loginout.png", import.meta.url).href,
-        url: "/pages/test",
-        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/test",
+    //     text: "测试页面"
+    // },
+    // {
+    //     icon: new URL("@/static/image/user/loginout.png", import.meta.url).href,
+    //     url: "/pages/login/test",
+    //     fn: () => {
+    //         removeToken();
+    //     },
+    //     text: "退出登录(去测试登录)"
+    // }
 ];
 /* 个人信息 */
 const realName = ref("");
@@ -118,17 +117,17 @@ const educationLevelText = ref("");
 const getUserInfo = () => {
     getLoginUserApi().then(async res => {
         const { avatarPath: _avatarPath, name: _realName, education } = res.data;
-        realName.value = _realName;
-        avatarPath.value = _avatarPath;
+        realName.value = _realName || null;
+        avatarPath.value = _avatarPath || null;
         /* this.setData({
             avatarPath,
             realName,
             }); */
-        educationLevelText.value = await getEnumText("EnumEducation", education);
+        educationLevelText.value = await getEnumText("EnumEducation", education) || null;
     });
     getUserResumeApi().then(res => {
         const { educationExperience } = res.data;
-        schoolName.value = JSON.parse(educationExperience)[0].schoolName;
+        schoolName.value = JSON.parse(educationExperience)[0].schoolName || null;
     });
 };
 </script>

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

 <template>
     <NavBar :showIcon="true" :showTitle="true" title="教育经历" backgroundBox="#ffffff"></NavBar>
     <view class="item">
-        <view class="label">学校名称</view>
+        <view class="label"><span style="color: red;">*</span>学校名称</view>
         <input
             v-model="params.schoolName"
             placeholder-style="font-size: 24rpx;color: #77818f;"
@@ -10,12 +10,12 @@
         />
     </view>
     <view class="item">
-        <view class="label">专业名称</view>
+        <view class="label"><span style="color: red;">*</span>专业名称</view>
         <input v-model="params.major" placeholder-style="font-size: 24rpx;color: #77818f;" placeholder="请输入专业名称" border="{{ false }}" />
     </view>
 
     <view class="item">
-        <view class="label">开始时间</view>
+        <view class="label"><span style="color: red;">*</span>开始时间</view>
         <wd-datetime-picker
             :default-value="new Date().getTime()"
             :maxDate="new Date().getTime()"
@@ -31,7 +31,7 @@
         </wd-datetime-picker>
     </view>
     <view class="item">
-        <view class="label">结束时间</view>
+        <view class="label"><span style="color: red;">*</span>结束时间</view>
         <wd-datetime-picker
             :default-value="new Date().getTime()"
             :minDate="params.startDate"
@@ -90,7 +90,7 @@ const submit = () => {
     }
     if (!really) {
         uni.showToast({
-            title: `请完善表单！`,
+            title: `请完善相关信息`,
             icon: "none"
         });
         return;

src/pages/user/resume/index.vue

@@ -2,21 +2,22 @@
     <NavBar :showIcon="true" backgroundBox="#ffffff" :showTitle="true" title="我的简历"></NavBar>
     <div class="resume-page">
         <!-- 个人信息 -->
-        <view  class="user-info flex-between">
+        <view  class="user-info flex-between" @click="navigateTo('/pages/user/resume/essentialInformation/index')">
             <view>
                 <view class="name"
                     >{{ resumeData.realName || "未实名" }}
-                    <!-- <img src="@/static/image/icon/edit.png" /> -->
+                    <img src="@/static/image/icon/edit.png" />
                 </view>
                 <view class="other"
                     >{{ resumeData.workExperienceYear }}年经验·{{ resumeData.age }}岁·{{ resumeData.educationLevel }}</view
                 >
             </view>
-            <image v-if="resumeData.avatarPath" class="avatar" :src="evn.APP_IMAGE_BASE_API + resumeData.avatarPath" mode="" />
-            <image v-else class="avatar" src="@/static/image/user/default-avatar.png" mode="" />
+            <!-- <image v-if="resumeData.avatarPath" class="avatar" :src="evn.APP_IMAGE_BASE_API + resumeData.avatarPath" mode="" /> -->
+            <!-- <image v-else class="avatar" src="@/static/image/user/default-avatar.png" mode="" /> -->
+            <image class="avatar" src="@/static/image/user/default-avatar.png" mode="" />
         </view>
         <!-- 个人信息 -->
-        <view class="basics" v-if="userInfoActive">
+        <view class="basics" v-if="userInfoActive.workAge">
             <text class="gradient-title">个人信息</text>
             <view class="basics-top">
                 <view class="item" >
@@ -34,7 +35,7 @@
                 </view> 
             </view>
             <view class="information">
-                <text class="label">身份</text>
+                <text class="label">人员类别</text>
                 <text class="value">{{resumeData.identityTypes}}</text>
             </view>
             <view class="information">
@@ -103,7 +104,10 @@
         <!-- 教育经历 -->
         <view class="experience">
             <view class="flex-between">
-                <text class="gradient-title">教育经历</text>
+                <view>
+                    <text class="gradient-title">教育经历</text>
+                    <span style="font-size: 22rpx;color: #77818f;margin-left: 16rpx;">(点击+号可添加多条)</span>   
+                </view>
                 <wd-icon
                     name="add"
                     size="24rpx"
@@ -141,7 +145,10 @@
         <!-- 工作经历 -->
         <view class="experience">
             <view class="flex-between">
-                <text class="gradient-title">工作经历</text>
+                <view>
+                    <text class="gradient-title">工作经历</text>
+                    <span style="font-size: 22rpx;color: #77818f;margin-left: 16rpx;">(点击+号可添加多条)</span>  
+                </view>
                 <wd-icon
                     name="add"
                     size="24rpx"
@@ -338,7 +345,7 @@ const getOpstion = async () => {
 };
 
 const toPage = (index) => {
-    if (!userInfoActive.value) {
+    if (!userInfoActive.value.workAge) {
         uni.showToast({
             title: "请先完善个人基本信息",
             icon: "none"
@@ -368,7 +375,7 @@ const toPage = (index) => {
 }
 
 const changeJobStatus = async e => {
-    if (!userInfoActive.value) {
+    if (!userInfoActive.value.workAge) {
         uni.showToast({
             title: "请先完善个人基本信息",
             icon: "none"

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

@@ -81,7 +81,7 @@ const submit = () => {
     }
     if (!release) {
         uni.showToast({
-            title: "请完善信息",
+            title: "请完善相关信息",
             icon: "none"
         });
         return;

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

@@ -9,14 +9,14 @@
             <!-- 单位名称 -->
             <view class="form-item">
                 <view class="form-info">
-                    <view class="label">单位名称</view>
+                    <view class="label"><span style="color: red;">*</span>单位名称</view>
                     <input type="text" v-model="params.companyName" placeholder="请输入" placeholder-class="placeholder" />
                 </view>
             </view>
             <!-- 在职时间 -->
             <view class="form-item" bindtap="goToSelectJobType">
                 <view class="form-info">
-                    <view class="label">在职时间</view>
+                    <view class="label"><span style="color: red;">*</span>在职时间</view>
                     <view class="time-wrapper flex-r-c mt20">
                         <wd-datetime-picker
                             :default-value="new Date().getTime()"
@@ -53,7 +53,7 @@
             >
                 <view class="form-item">
                     <view class="form-info">
-                        <view class="label">职位类型</view>
+                        <view class="label"><span style="color: red;">*</span>职位类型</view>
                         <view :class="['cont', 'mt20', !jobTypeText ? 'placeholder-style' : '']">{{
                             jobTypeText || "请选择"
                         }}</view>
@@ -64,7 +64,7 @@
             <!-- 工作内容 -->
             <view class="form-item">
                 <view class="form-info">
-                    <view class="label">工作内容</view>
+                    <view class="label"><span style="color: red;">*</span>工作内容</view>
                     <textarea class="input-textarea" :maxlength="500" cursor-spacing="500" v-model="params.content" placeholder="请输入" placeholder-class="placeholder"/>
                 </view>
             </view>
@@ -153,7 +153,7 @@ const save = () => {
     }
     if (!really) {
         uni.showToast({
-            title: `请完善表单！`,
+            title: `请完善相关信息`,
             icon: "none"
         });
         return;

src/utils/request.js

 import axios from "axios";
 import { getToken } from "./token";
 const baseURL = "https://lygsh-api.wjzpgz.com/";
-// const baseURL = "http://192.168.11.48:8080/";
+// const baseURL = "http://192.168.11.82:8080/";
 // 创建一个 axios 实例
 const instance = axios.create({
     baseURL, // 设置基础 URL
@@ -66,8 +66,8 @@ instance.interceptors.response.use(
                     content: '请等待审核，无需重复提交',
                     success: function (confirm) {
                         if (confirm.confirm) {
-                            xma.navigateTo({
-                                url: '/pages/postionList/appeal/index'
+                            xma.reLaunch({
+                                url: '/pages/login/index'
                             })
                         }
     
@@ -89,6 +89,17 @@ instance.interceptors.response.use(
                     }
                 }); 
             }
+        } else if (code === 14) {
+            uni.showModal({
+                title: '提示',
+                content: '您的账号已被禁用',
+                success: function (confirm) {
+                    if (confirm.confirm) {
+                        // console.log('已禁用');
+                    }
+
+                }
+            })
         }
         uni.hideLoading()
         // 在这里可以对响应数据进行预处理