bug修复

src/components/postionCard1/index.vue

@@ -2,7 +2,10 @@
     <view class="postion-card1" @tap="jump(data.id)">
         <view class="flex-between">
             <view class="postion-name">{{ data.jobName }}</view>
-            <view class="salary">{{ data.minSalary / 1000 }}k-{{ data.maxSalary / 1000 }}k<text>/月</text></view>
+            <view v-if="data.minSalary > 0" class="salary"
+                >{{ data.minSalary / 1000 }}k-{{ data.maxSalary / 1000 }}k<text>/月</text></view
+            >
+            <view v-else class="salary2">面议</view>
         </view>
         <view class="benefits">
             <text v-for="(v, i) in data.benefits?.split(',')" :key="i">{{ v }}</text>
@@ -59,6 +62,17 @@ const jump = id => {
             font-size: 14px;
         }
     }
+    .salary2 {
+        font-size: 16px;
+        font-weight: 500;
+        line-height: 12px;
+        color: #1f86ff;
+        text-align: center;
+        letter-spacing: 0;
+        text {
+            font-size: 14px;
+        }
+    }
     .benefits {
         display: flex;
         gap: 4px;

src/pages.json

@@ -6,6 +6,12 @@
         }
     },
     "pages": [
+        {
+            "path": "pages/login/index",
+            "style": {
+                "navigationStyle": "custom"
+            }
+        },
         {
             "path": "pages/postionList/index",
             "style": {
@@ -155,12 +161,7 @@
                 "navigationStyle": "custom"
             }
         },
-        {
-            "path": "pages/login/index",
-            "style": {
-                "navigationStyle": "custom"
-            }
-        },
+
         {
             "path": "pages/login/test",
             "style": {

src/pages/dynamic/index.vue

 <template>
-    <view style="padding-bottom: 40px">
+    <view style="height: 100%; padding-bottom: 40px">
         <NavBar :showIcon="false" backgroundBox="#ffffff" :showTitle="true" title="动态"></NavBar>
         <div class="policy">
             <div class="tab-name" :enable-flex="true" :scroll-x="true">

src/pages/login/index.vue

@@ -19,8 +19,18 @@
 <script setup>
 import NavBar from "@/components/navBar/index.vue";
 import { xinhuaMpLogin } from "@/api/user.js";
-import { setToken } from "@/utils/token";
+import { setToken, getToken } from "@/utils/token";
+import { getLoginUserApi } from "@/api/user";
 const res = ref("");
+
+onLoad(() => {
+    const token = getToken();
+    if (token) {
+        uni.switchTab({
+            url: "/pages/postionList/index"
+        });
+    }
+});
 const login = () => {
     xma.xh.getUserProfile({
         range: ["ACCOUNT", "MOBILE"],
@@ -28,7 +38,14 @@ const login = () => {
             xinhuaMpLogin({ encryptedData: info.data.uMobile, userType: "consumer" })
                 .then(data => {
                     res.value = data;
-                    setToken(data.token);
+                    console.log("datadatadata", data);
+                    setToken(data.data.token);
+                    getLoginUserApi().then(res => {
+                        uni.setStorageSync("userInfo", res.data);
+                    });
+                    uni.switchTab({
+                        url: "/pages/postionList/index"
+                    });
                 })
                 .catch(err => {
                     res.value = err;

src/pages/messageList/index.vue

 <template>
-    <view style="padding-bottom: 40px">
+    <view style="height: 100%; padding-bottom: 40px">
         <NavBar :showIcon="false" backgroundBox="#ffffff" :showTitle="true" title="消息"></NavBar>
         <div class="message-list">
             <scroll-view :scroll-y="true" @scrolltolower="getList">
                 <view class="system">
-                    <view class="item flex-between" v-for="(v, i) in list" :key="i">
+                    <view class="item flex-between" v-for="(v, i) in list" :key="i" @tap="toDetail(v.id)">
                         <img src="@/static/image/user/default-avatar.png" alt="" />
                         <view class="content">
                             <view class="name-date flex-between">
@@ -59,6 +59,12 @@ const getList = () => {
         list.value = _.concat(list.value, res.data);
     });
 };
+
+const toDetail = id => {
+    uni.navigateTo({
+        url: `/pages/user/feedbackDetails/index?id=${id}`
+    });
+};
 onReachBottom(() => {
     pageNo++;
     getList();

src/pages/policy/index.vue

 <template>
-    <view style="padding-bottom: 40px">
+    <view style="height: 100%; padding-bottom: 40px">
         <NavBar :showIcon="false" backgroundBox="#ffffff" :showTitle="true" title="政策"></NavBar>
         <div class="policy">
             <div class="tab-name" :enable-flex="true" :scroll-x="true">

src/pages/postionList/demandRegistration/index.vue

@@ -54,6 +54,19 @@ const showPopup = item => {
     show.value = true;
 };
 const submit = () => {
+    const userInfo = uni.getStorageSync("userInfo");
+    if (!userInfo.citizenId) {
+        uni.showToast({
+            title: "请先实名认证",
+            icon: "none"
+        });
+        setTimeout(() => {
+            uni.navigateTo({
+                url: "/pages/user/resume/realNameAuthentication/index"
+            });
+        }, 1500);
+        return;
+    }
     needRegisterApi(tempItem.needId).then(res => {
         if (res.code == 200) {
             tempItem.userId = true;

src/pages/postionList/index.vue

@@ -7,7 +7,7 @@
     <input placeholder="搜索职位，公司" placeholder-class="log-input-p" type="text"></input>
   </view>
 </nav-bar> -->
-    <view style="padding-bottom: 40px">
+    <view style="height: 100%; padding-bottom: 40px">
         <NavBar :showIcon="false" backgroundBox="#ffffff">
             <view class="search-form">
                 <wd-icon class="search-icon" name="search"></wd-icon>
@@ -168,11 +168,13 @@ import { getjobListApi } from "@/api/postion.js";
 import { getTreeListApi, dictJobTypeApi, getBannerListApi } from "@/api/common.js";
 import postionCard1 from "@/components/postionCard1/index.vue";
 import { getEumData } from "@/utils/utils.js";
+import { getToken } from "@/utils/token";
 import evn from "@/utils/config.js";
 /* 轮播 */
 const swiperList = ref([]);
 let swiperListData = [];
 let contentHeight = ref(null);
+
 onShow(() => {
     getTreeData();
     dictJobType();

src/pages/postionList/positionDetails/index.vue

@@ -17,10 +17,13 @@
                         <text class="unit">元/{{ partTimeJobData.paymentType }}</text>
                     </view>
                     <view class="salary" v-else>
-                        <text class="number"
-                            >{{ partTimeJobData.minSalary / 1000 }}k-{{ partTimeJobData.maxSalary / 1000 }}k</text
-                        >
-                        <text class="unit">/月</text>
+                        <view v-if="partTimeJobData.minSalary > 0">
+                            <text class="number"
+                                >{{ partTimeJobData.minSalary / 1000 }}k-{{ partTimeJobData.maxSalary / 1000 }}k</text
+                            >
+                            <text class="unit">/月</text>
+                        </view>
+                        <text v-else class="number">面议</text>
                     </view>
                 </view>
                 <view v-if="partTimeJobData.isSalaryNego == 1">

src/pages/user/index.vue

@@ -45,6 +45,7 @@ import { getUserResumeApi, getLoginUserApi } from "@/api/user";
 import { ref } from "vue";
 import { getEnumText } from "@/utils/utils.js";
 import evn from "@/utils/config.js";
+import { removeToken } from "@/utils/token";
 const test = ref();
 
 onShow(() => {
@@ -55,6 +56,10 @@ const navigateTo = url => {
         uni.navigateTo({
             url
         });
+    if (url === "/pages/login/index") {
+        removeToken();
+        uni.removeStorageSync("userInfo");
+    }
 };
 const navList = [
     {

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

@@ -133,7 +133,6 @@ const submit = () => {
     }
     .inner {
         height: 88rpx;
-        padding: 0 32rpx;
         font-size: 24rpx;
         line-height: 88rpx;
     }

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

@@ -186,7 +186,7 @@ const userInfo = ref({
     birthDate: "",
     identityType: 2,
     educationLevel: 6,
-    workExperience: 11,
+    workExperience: null,
     personalTags: null,
     verified: 1,
     loginTime: "",

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

@@ -162,13 +162,7 @@ const salaryValue = ref([]);
 const salaryText = ref("");
 let salarySelectedItems = [];
 const initSalaryOpstion = () => {
-    let temp = [
-        {
-            label: "面议",
-            value: "",
-            next: false
-        }
-    ];
+    let temp = [];
     for (let i = 1; i < 50; i++) {
         temp.push({
             value: i * 1000,

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.181:8080/";
+const baseURL = "https://lygsh-api.wjzpgz.com/";
+// const baseURL = "http://192.168.11.181:8080/";
 // 创建一个 axios 实例
 const instance = axios.create({
     baseURL, // 设置基础 URL