bug修复

src/components/postionCard1/index.vue

@@ -3,7 +3,7 @@
         <view class="flex-between">
             <view class="postion-name">{{ data.name }}</view>
             <view v-if="data.minSalary > 0" class="salary"
-                >{{ data.minSalary / 1000 }}k-{{ data.maxSalary / 1000 }}k<text>/月</text></view
+                >{{ data.minSalary<1000?data.minSalary:data.minSalary / 1000 +'k'}}-{{ data.maxSalary<1000?data.maxSalary:data.maxSalary / 1000 +'k' }}<text>/{{ company }}</text></view
             >
             <view v-else class="salary2">面议</view>
         </view>
@@ -19,6 +19,7 @@
 
 <script setup>
 import { defineProps } from "vue";
+import { getEnumText } from "@/utils/utils.js";
 const props = defineProps({
     data: {
         type: Object,
@@ -29,6 +30,11 @@ const props = defineProps({
         default: true
     }
 });
+const company = ref('');
+onShow(async() => {
+    console.log(props.data);
+    company.value = await getEnumText("EnumSettlementType", props.data.settlementType);
+});
 const jump = id => {
     if (props.jump) {
         uni.navigateTo({

src/pages.json

@@ -7,15 +7,15 @@
     },
     "pages": [
         {
-            "path": "pages/postionList/index",
+            "path": "pages/login/index",
             "style": {
-                "navigationBarTitleText": "职位",
                 "navigationStyle": "custom"
             }
         },
         {
-            "path": "pages/login/index",
+            "path": "pages/postionList/index",
             "style": {
+                "navigationBarTitleText": "职位",
                 "navigationStyle": "custom"
             }
         },

src/pages/login/index.vue

@@ -7,8 +7,8 @@
                 <template #title>   <text class="student">登录</text> </template>
             </nav-bar>
             <view class="title">
-                <text class="t1">乐业观山湖</text>
-                <text class="t2">您最贴心的求职小伙伴</text>
+                <img src="@/static/image/icon/login.png" alt="">
+                <text class="t2">安全、便捷的就业、创业服务平台</text>
             </view>
             <button class="login-btn" @click="login">授权手机号登录</button>
         </view>
@@ -23,12 +23,12 @@ import { setToken, getToken } from "@/utils/token";
 const res = ref("");
 
 onLoad(() => {
-    const token = getToken();
-    if (token) {
-        uni.switchTab({
-            url: "/pages/postionList/index"
-        });
-    }
+    // const token = getToken();
+    // if (token) {
+    //     uni.switchTab({
+    //         url: "/pages/postionList/index"
+    //     });
+    // }
 });
 const login = () => {
     xma.xh.getUserProfile({
@@ -38,7 +38,7 @@ const login = () => {
                 .then(data => {
                     res.value = data;
                     console.log("datadatadata", data);
-                    setToken(data.data.token);
+                    setToken(data.data);
                     uni.switchTab({
                         url: "/pages/postionList/index"
                     });
@@ -79,14 +79,14 @@ const login = () => {
         flex-direction: column;
         margin-top: 176rpx;
         text-align: center;
-        .t1 {
-            font-size: 80rpx;
-            font-weight: normal;
-            color: #0e2761;
+        img{
+            width: 368rpx;
+            margin: 0 auto;
         }
         .t2 {
             font-size: 24rpx;
             color: #1b2026;
+            margin-top:28rpx ;
         }
     }
     .login-btn {

src/pages/postionList/positionDetails/index.vue

@@ -19,9 +19,9 @@
                     <view class="salary" v-else>
                         <view v-if="partTimeJobData.minSalary > 0">
                             <text class="number"
-                                >{{ partTimeJobData.minSalary / 1000 }}k-{{ partTimeJobData.maxSalary / 1000 }}k</text
+                                >{{ partTimeJobData.minSalary<1000?partTimeJobData.minSalary:partTimeJobData.minSalary / 1000 +'k'}}-{{ partTimeJobData.maxSalary<1000?partTimeJobData.maxSalary:partTimeJobData.maxSalary / 1000 +'k' }}</text
                             >
-                            <text class="unit">/月</text>
+                            <text class="unit">/{{ partTimeJobData.company }}</text>
                         </view>
                         <text v-else class="number">面议</text>
                     </view>
@@ -223,6 +223,7 @@ const getJobDetail = id => {
         partTimeJobData.value.application = data.application;
         partTimeJobData.value.educationRequirement = await getEnumText("EnumEducationRequirement", data.position.educationRequirement);
         partTimeJobData.value.workMode = await getEnumText("EnumWorkMode", data.position.workMode);
+        partTimeJobData.value.company = await getEnumText("EnumSettlementType", data.position.settlementType)
         partTimeJobData.value.benefits = partTimeJobData.value.benefits.split(',')
         // 设置地图点
         markers[0].latitude = data.locationLatitude;

src/pages/user/deliveryFeedback/index.vue

@@ -38,7 +38,7 @@
             <view class="pos-card">
                 <view class="pos-name flex-between">
                     <text class="name">{{ postionData.position.name }}</text>
-                    <view>{{ postionData.position.minSalary / 1000 }}k-{{ postionData.position.maxSalary / 1000 }}k/<text>/月</text></view>
+                    <view>{{ 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>
                 <view class="com-name">{{ postionData.position.companyName }}</view>
                 <view class="tags">
@@ -59,12 +59,15 @@
 import steps from "@/components/steps/index.vue";
 import { reactive, ref } from "vue";
 import { getJobDetailApi } from "@/api/postion";
+import { getEnumText} from "@/utils/utils";
 import dayjs from "dayjs";
 const postionData = ref({});
 onLoad(({ id }) => {
-    getJobDetailApi(id).then(res => {
+    getJobDetailApi(id).then(async res => {
         console.log(res);
         postionData.value = res.data;
+        postionData.value.company = await getEnumText("EnumSettlementType", res.data.position.settlementType)
+        
     });
 });
 </script>

src/pages/user/index.vue

@@ -56,7 +56,7 @@ const navigateTo = url => {
         uni.navigateTo({
             url
         });
-    if (url === "/pages/login/index") {
+    if (url === "/pages/login/index" || url === "/pages/login/test") {
         removeToken();
         uni.removeStorageSync("userInfo");
     }
@@ -87,19 +87,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("");

src/pages/user/myDelivery/index.vue

@@ -18,7 +18,6 @@
                 <view v-if="v.status == 3" class="state success"> 已面试 </view>
                 <view v-if="v.status == 4" class="state warning"> 已拒绝 </view>
             </view>
-            
         </view>
     </div>
 </template>

src/pages/user/resume/index.vue

@@ -43,11 +43,11 @@
             </view>
             <view class="information">
                 <text class="label">专业技术职称</text>
-                <text class="value">{{resumeData.positionalTitle || '无'}}</text>
+                <text class="value">{{resumeData.positionalTitle.split('-')[1] === 'undefined'?'无':resumeData.positionalTitle}}</text>
             </view>
             <view class="information">
                 <text class="label">职业资格/技能等级证书</text>
-                <text class="value">{{resumeData.professionalCertificates || '无'}}</text>
+                <text class="value">{{resumeData.professionalCertificates.split('-')[1] === 'undefined'?'无':resumeData.professionalCertificates || '无'}}</text>
             </view>
             <view class="information">
                 <text class="label">特种作业证</text>
@@ -83,7 +83,7 @@
         <view class="advantage" @click="toPage(0)">
             <view class="flex-between">
                 <text class="gradient-title">个人优势</text>
-                <view class="arrow" bind:tap="navigateTo"></view>
+                <view class="arrow"></view>
             </view>
             <view class="content">
                 {{ resumeData.personalAdvantage }}
@@ -137,7 +137,7 @@
                     <view class="flex-between">
                         <view>
                             <view class="postion">·{{ item.position }}</view>
-                            <view class="content"> ·{{ item.content }} </view>
+                            <textarea auto-height class="content" :value="item.content"/>
                         </view>
                         <wd-icon name="error-fill" size="36rpx" style="color: red" @tap.stop="deleteItem(index)"></wd-icon>
                     </view>
@@ -377,15 +377,10 @@ const changeJobStatus = async e => {
     const { code, message } = await saveJobStatusApi({ jobStatus: e.value });
     if (code == 200) {
         resumeData.jobStatusText = e.selectedItems.text;
-        uni.showToast({
-            message: "保存成功",
-            icon: "none"
-        });
-    } else {
-        uni.showToast({
-            message: message,
-            icon: "none"
-        });
+        // uni.showToast({
+        //     message: "保存成功",
+        //     icon: "none"
+        // });
     }
 };
 

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

@@ -21,9 +21,8 @@ import { saveAdvantageApi } from "@/api/user.js";
 const inputvalue = ref("");
 
 onLoad(options => {
-    if (options.data) {
+    if (options.data === 'null') return
     inputvalue.value = options.data;
-    }
 });
 const save = () => {
     saveAdvantageApi({ personalAdvantage: inputvalue.value }).then(res => {

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

@@ -65,7 +65,7 @@
             <view class="form-item">
                 <view class="form-info">
                     <view class="label">工作内容</view>
-                    <textarea :maxlength="500" v-model="params.content" placeholder="请输入" placeholder-class="placeholder"/>
+                    <textarea class="input-textarea" :maxlength="500" cursor-spacing="500" v-model="params.content" placeholder="请输入" placeholder-class="placeholder"/>
                 </view>
             </view>
         </view>
@@ -201,7 +201,7 @@ const save = () => {
 .form-item {
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    // justify-content: space-between;
     padding: 36rpx 0;
     border-bottom: 1rpx solid #e9e9e9;
 }
@@ -212,6 +212,10 @@ const save = () => {
     font-size: 24rpx;
     color: #616c7a;
 }
+.input-textarea{
+    width: 100%;
+    padding:20rpx 0 100rpx ;
+}
 .form-item .form-info .cont {
     font-size: 28rpx;
     // font-weight: 600;

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