改

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: -1, name: "招聘会" }]);
+const typeList = ref([{ id: -1, name: "招聘会岗位报名" }]);
 getArticleTypesApi(2).then(res => {
     typeList.value.push(...res.data);
 });

src/pages/login/index.vue

@@ -7,10 +7,13 @@
                 <template #title>   <text class="student">登录</text> </template>
             </nav-bar>
             <view class="title">
-                <img src="@/static/image/icon/login.png" alt="">
+                <img src="@/static/image/icon/login.png" alt="" />
                 <text class="t2">安全、便捷的就业、创业服务平台</text>
             </view>
-            <button class="login-btn" @click="login">授权手机号登录</button>
+            <view class="box">
+                <text class="box-text">观山湖区人力资源和社会保障局</text>
+                <button class="login-btn" @click="login">授权手机号登录</button>
+            </view>
         </view>
         {{ res }}
     </div>
@@ -79,27 +82,36 @@ const login = () => {
         flex-direction: column;
         margin-top: 176rpx;
         text-align: center;
-        img{
+        img {
             width: 368rpx;
             margin: 0 auto;
         }
         .t2 {
             font-size: 24rpx;
             color: #1b2026;
-            margin-top:28rpx ;
+            margin-top: 28rpx;
         }
     }
-    .login-btn {
-        position: absolute;
+    .box {
+        position: fixed;
         bottom: 336rpx;
-        left: 50%;
-        width: 640rpx;
-        height: 96rpx;
-        font-size: 34rpx;
-        line-height: 96rpx;
-        color: #ffffff;
-        background-color: #1f86ff;
-        transform: translate(-50%, 0);
+        left: 0;
+        text-align: center;
+        width: 100%;
+        .box-text{
+            font-size: 28rpx;
+            color: #0E2761;
+            font-family: 苹方-简;
+        }
+        .login-btn {
+            width: 640rpx;
+            height: 96rpx;
+            font-size: 34rpx;
+            line-height: 96rpx;
+            color: #ffffff;
+            background-color: #1f86ff;
+            margin-top:60rpx ;
+        }
     }
 }
 </style>

src/pages/postionList/companyDetails/index.vue

@@ -47,12 +47,12 @@
             @select="navigationSelect"
         /> -->
         <!-- 公司介绍 -->
-        <view class="pos-introduce pos-padding-top0" v-if="partTimeJobData.introduction">
+        <view class="pos-introduce pos-padding-top0">
             <view class="title">
                 <text class="text">公司介绍</text>
             </view>
             <view class="pos-duty activeClass">
-                <text>{{ partTimeJobData.introduction }}</text>
+                <text>{{ partTimeJobData.introduction || '无'}}</text>
             </view>
         </view>
         <!-- 公司基本信息 -->
@@ -78,14 +78,14 @@
             </view>
         </view>
         <!-- 企业简介 -->
-        <view class="pos-introduce pos-padding-top0">
+        <!-- <view class="pos-introduce pos-padding-top0">
             <view class="title">
                 <text class="text">企业简介</text>
             </view>
             <view class="pos-int">
                 <text class="pos-label">{{partTimeJobData.introduction || '无'}}</text>
             </view>
-        </view>
+        </view> -->
         <!-- 职位推荐 -->
         <view
             class="pos-recommend"

src/pages/postionList/index.vue

@@ -7,9 +7,8 @@
                     placeholder="请输入要查询的内容"
                     placeholder-class="log-input-p"
                     type="text"
-                    @confirm="confirm"
                 />
-                <wd-icon class="search-icon" name="search"></wd-icon>
+                <wd-icon class="search-icon" name="search" @tap="confirm"></wd-icon>
             </view>
         </NavBar>
         <!-- 轮播区 -->
@@ -59,10 +58,12 @@
                         @confirm="handleConfirmMajor"
                         use-default-slot
                     >
-                        <view class="item">{{ majorText || "全部" }} <view class="arrow"></view> </view>
+                        <view class="item">{{ majorText || "不限" }} <view class="arrow"></view> </view>
                     </wd-col-picker>
                 </view>
-                <view class="item" :class="{ active: maskType == 'other' }" @tap="openMask('other')">更多筛选<view class="arrow"></view></view>
+                <view class="item" :class="{ active: maskType == 'other' }" @tap="openMask('other')"
+                    >更多筛选<view class="arrow"></view
+                ></view>
             </view>
         </view>
         <!-- 蒙版弹框 -->
@@ -313,9 +314,11 @@ const handleConfirmCity = ({ value, selectedItems }) => {
         cityText.value = selectedItems[textIndex].name;
     }
     const [provinceCode1, cityCode1, districtCode1] = value;
-    provinceCode = provinceCode1 || ""
-    cityCode = cityCode1 || ""; 
-    districtCode = districtCode1 || "" 
+    provinceCode = provinceCode1 || "";
+    cityCode = cityCode1 || "";
+    districtCode = districtCode1 || "";
+    pageNo = 1;
+    positionListData.value = [];
     getListData();
 };
 
@@ -415,16 +418,27 @@ const getColumnsCity = () => {
 const majorValue = ref([]);
 const majorOpstion = ref([]);
 const columnChangeMajor = ({ selectedItem, resolve, finish }) => {
-    if (selectedItem.children) {
-        resolve(selectedItem.children);
-    } else {
+    if (selectedItem.name === "不限") {
         finish();
+    } else {
+        if (selectedItem.children) {
+            resolve(selectedItem.children);
+        } else {
+            finish();
+        }
     }
 };
 const handleConfirmMajor = ({ value }) => {
-    majorText.value = value[1];
-    majorName = value[0] + '-' + value[1];
-    getListData()
+    if (value[0] === "不限") {
+        majorText.value = "不限";
+        majorRequirement = null;
+    } else {
+        majorText.value = value[1];
+        majorRequirement = value[0] + "-" + value[1];
+    }
+    pageNo = 1;
+    positionListData.value = [];
+    getListData();
 };
 const majorText = ref("");
 getMajorTreeApi().then(res => {
@@ -435,6 +449,10 @@ getMajorTreeApi().then(res => {
                 children: res.data[key]
             }))
         );
+        majorOpstion.value[0].unshift({
+            name: "不限",
+            children: []
+        });
     }
 });
 
@@ -549,7 +567,7 @@ let pageNo = 1,
     pageSize = 10,
     provinceCode = null,
     cityCode = null,
-    majorName = null,
+    majorRequirement = null,
     districtCode = null,
     minSalary = null,
     maxSalary = null,
@@ -639,14 +657,16 @@ const resetParams = () => {
     accommodation = null;
     identityRequirement = null;
     jobTypePid = null;
+    pageNo = 1;
+    positionListData.value = [];        
+    getListData();
 };
 
 // 职位搜索
 const confirm = e => {
-    reset().then(res => {
-        keyword.value = e.detail.value;
-        getListData();
-    });
+    pageNo = 1;
+    positionListData.value = [];        
+    getListData();
 };
 // 职位筛选搜索
 const confirmParameters = () => {
@@ -662,7 +682,7 @@ const getListData = () => {
         keyword: keyword.value || null,
         provinceCode: provinceCode || null,
         cityCode: cityCode || null,
-        majorName:majorName || null,
+        majorRequirement: majorRequirement || null,
         districtCode: districtCode || null,
         minSalary: minSalary || null,
         maxSalary: maxSalary || null,
@@ -671,7 +691,6 @@ const getListData = () => {
         identityRequirement: identityRequirement || null,
         jobTypePid: jobTypePid || null
     };
-    console.log("data", data);
     getjobListApi(data).then(res => {
         if (res.code == 200) {
             positionListData.value = [...positionListData.value, ...res.data];
@@ -782,6 +801,7 @@ const getListData = () => {
 
 .search-form {
     display: flex;
+    justify-content: space-between;
     align-items: center;
     width: 452rpx;
     height: 72rpx;
@@ -792,7 +812,7 @@ const getListData = () => {
     .search-icon {
         width: 28rpx;
         height: 28rpx;
-        margin-left: 32rpx;
+        margin-right: 32rpx;
         color: #86909c;
     }
     input {

src/pages/user/index.vue

@@ -10,11 +10,14 @@
                 <img v-if="avatarPath" :src="evn.APP_IMAGE_BASE_API + avatarPath" />
                 <img v-else src="@/static/image/user/default-avatar.png" alt="" />
             </view>
-            <view class="name">{{ realName || "未实名" }}</view>
-            <view class="education">{{ schoolName }} | {{ educationLevelText || "无" }}</view>
+            <view class="name"  @click="navigateTo('/pages/user/resume/essentialInformation/index')">
+                <text >{{ realName || "未实名" }}</text>
+                <img src="@/static/image/user/write.png" />
+            </view>
+            <view class="education">{{ schoolName || '暂未写入' }} | {{ educationLevelText || "无" }}</view>
         </view>
         <!-- 我的简历 -->
-        <view class="my-resume">
+        <!-- <view class="my-resume">
             <img src="@/static/image/user/resume.png" mode="" />
             <view>
                 <view class="flex-between">
@@ -23,7 +26,7 @@
                 </view>
                 <view class="t1">完善简历可获得更多机会哦~</view>
             </view>
-        </view>
+        </view> -->
         <!-- 导航 -->
         <view class="nav">
             <view class="item flex-between" v-for="(v, i) in navList" :key="i" @click="navigateTo(v.url)">
@@ -64,14 +67,19 @@ const navigateTo = url => {
 const navList = [
     {
         icon: new URL("@/static/image/user/bag.png", import.meta.url).href,
-        url: "/pages/user/matching/index",
-        text: "系统匹配岗位"
+        url: "/pages/user/resume/index",
+        text: "我的简历"
     },
     {
         icon: new URL("@/static/image/user/history.png", import.meta.url).href,
         url: "/pages/user/myDelivery/index?type=我的投递",
         text: "我的投递"
     },
+    {
+        icon: new URL("@/static/image/user/bag.png", import.meta.url).href,
+        url: "/pages/user/matching/index",
+        text: "系统匹配岗位"
+    },
     // {
     //     icon: new URL("@/static/image/user/feedback.png", import.meta.url).href,
     //     url: "/pages/user/myDelivery/index?type=我的面试",
@@ -87,19 +95,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("");
@@ -148,6 +156,7 @@ const getUserInfo = () => {
 .user-info {
     flex-direction: column;
     margin-top: 20rpx;
+    margin-bottom: 100rpx;
     .avatar {
         margin-bottom: 32rpx;
         img {
@@ -157,9 +166,17 @@ const getUserInfo = () => {
         }
     }
     .name {
-        font-size: 36rpx;
-        font-weight: 600;
+        display: flex;
+        align-items: center;
         color: #1b2026;
+        text{
+            font-size: 36rpx;
+            font-weight: 600;
+        }
+        img{
+            width: 24rpx;
+            margin-left:10rpx ;
+        }
     }
     .education {
         margin-top: 12rpx;

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

@@ -266,7 +266,7 @@
             <!-- 特种作业证 -->
             <view class="my-info-list flex-column">
                 <view class="my-info-title label">
-                    <text>特种作业证</text>
+                    <text>特种作业证(选填)</text>
                 </view>
                 <input
                     class="my-info-form"
@@ -318,7 +318,7 @@
                 />
             </view>
             <!-- 邮箱 -->
-            <view class="my-info-list flex-column">
+            <!-- <view class="my-info-list flex-column">
                 <view class="my-info-title label">
                     <text>邮箱</text>
                 </view>
@@ -329,7 +329,7 @@
                     placeholder="请填写邮箱"
                     placeholder-class="placeholder-style"
                 />
-            </view>
+            </view> -->
         </view>
         <view class="my-form-submit" v-if="!cropperFlag">
             <button class="my-form-button" @tap="submit">保 存</button>
@@ -499,14 +499,22 @@ const levelOpstion = ref([]);
 const majorValue = ref([]);
 const majorOpstion = ref([]);
 const columnChangeMajor = ({ selectedItem, resolve, finish }) => {
-    if (selectedItem.children) {
-        resolve(selectedItem.children);
-    } else {
+    if (selectedItem.name === "不限") {
         finish();
+    } else {
+        if (selectedItem.children) {
+            resolve(selectedItem.children);
+        } else {
+            finish();
+        }
     }
 };
 const handleConfirmMajor = ({ value }) => {
-    userInfo.value.major = value[0] + '-' + value[1]
+    if (value[0] === "不限") {
+        userInfo.value.major = "不限";
+    } else {
+        userInfo.value.major = value[0] + '-' + value[1]
+    }
 };
 getMajorTreeApi().then(res => {
     console.log(res);
@@ -517,6 +525,10 @@ getMajorTreeApi().then(res => {
                 children: res.data[key]
             }))
         );
+        majorOpstion.value[0].unshift({
+            name: "不限",
+            children: []
+        });
     }
 });
 
@@ -559,6 +571,9 @@ const getData = async () => {
         residenceCodes.value = data.residenceCodes;
         birthCodes.value = data.birthCodes;
         userInfo.value.identityTypes = data.identityTypes.split(",").map(item => item * 1);
+        if (!data.major) {
+            userInfo.value.major = "不限";
+        }
         if (data.positionalTitle) {
             userInfo.value.positionalTitleOne = data.positionalTitle.split("-")[0];
             userInfo.value.positionalTitleTwo = data.positionalTitle.split("-")[1];
@@ -604,7 +619,7 @@ const submit = () => {
         birthCodes: birthCodes.value,
         residenceAddress: provinceCityDistrict.value + "-" + residenceAddress,
         birthAddress: provinceCityDistrict2.value + "-" + birthAddress,
-        major,
+        major:major==="不限"?null:major,
         positionalTitle: positionalTitleOne + "-" + positionalTitleTwo,
         professionalCertificates: professionalCertificatesOne + "-" + professionalCertificatesTwo,
         citizenId,

src/pages/user/resume/index.vue

@@ -2,11 +2,11 @@
     <NavBar :showIcon="true" backgroundBox="#ffffff" :showTitle="true" title="我的简历"></NavBar>
     <div class="resume-page">
         <!-- 个人信息 -->
-        <view  class="user-info flex-between" @click="navigateTo('/pages/user/resume/essentialInformation/index')">
+        <view  class="user-info flex-between">
             <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

src/utils/request.js

@@ -36,7 +36,7 @@ instance.interceptors.request.use(
 // 响应拦截器
 instance.interceptors.response.use(
     response => {
-        let { code, message } = response.data;
+        let { code, message,data } = response.data;
         if (code === 4 || code === 8) {
             uni.showToast({
                 title: message,
@@ -60,20 +60,35 @@ instance.interceptors.response.use(
                 }
             });
         } else if (code === 13) {
-            uni.showModal({
-                title: '您的帐号已失效',
-                content: '由于您超过1月未登录现已将您的账号禁用您可完成申述后继续使用',
-                showCancel: true,
-                confirmText: '立即申述',
-                success: function (confirm) {
-                    if (confirm.confirm) {
-                        xma.navigateTo({
-                            url: '/pages/postionList/appeal/index'
-                        })
+            if (data > 0) {
+                uni.showModal({
+                    title: '您的申诉已提交',
+                    content: '请等待审核，无需重复提交',
+                    success: function (confirm) {
+                        if (confirm.confirm) {
+                            xma.navigateTo({
+                                url: '/pages/postionList/appeal/index'
+                            })
+                        }
+    
                     }
-
-                }
-            });
+                })
+            } else {
+                uni.showModal({
+                    title: '您的帐号已失效',
+                    content: '由于您超过1月未登录现已将您的账号禁用您可完成申述后继续使用',
+                    showCancel: true,
+                    confirmText: '立即申述',
+                    success: function (confirm) {
+                        if (confirm.confirm) {
+                            xma.navigateTo({
+                                url: '/pages/postionList/appeal/index'
+                            })
+                        }
+    
+                    }
+                }); 
+            }
         }
         uni.hideLoading()
         // 在这里可以对响应数据进行预处理