From cc268ab49a779c44f73c874b1d67ba6fc3d6984a Mon Sep 17 00:00:00 2001
From: dengxin <2390584170@qq.com>
Date: Mon, 19 Feb 2024 10:35:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/vertical-menu/vertical-menu.vue | 4 ++--
 pageMy/my/resume/index.vue                 | 2 +-
 vue.config.js                              | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/vertical-menu/vertical-menu.vue b/components/vertical-menu/vertical-menu.vue
index 29c91a7..2d1929b 100644
--- a/components/vertical-menu/vertical-menu.vue
+++ b/components/vertical-menu/vertical-menu.vue
@@ -387,7 +387,7 @@ export default {
 }
 
 .page-view {
-    padding: 16rpx;
+    padding: 8rpx;
 }
 
 .class-item {
@@ -398,7 +398,7 @@ export default {
 }
 
 .class-item:last-child {
-    // min-height: 100vh;
+    min-height: 100vh;
 }
 
 .item-title {
diff --git a/pageMy/my/resume/index.vue b/pageMy/my/resume/index.vue
index 95de7d1..4dc1c7a 100644
--- a/pageMy/my/resume/index.vue
+++ b/pageMy/my/resume/index.vue
@@ -19,7 +19,7 @@
 			<view class="title_text">
 				我的职业技能
 			</view>
-			<image v-if="mySkills.length < 5" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image>
+			<image v-if="mySkills.length < 2" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image>
 		</view>
 
 		<view class="listBody">
diff --git a/vue.config.js b/vue.config.js
index 1af8282..211fb92 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -4,8 +4,8 @@ module.exports = {
         proxy: {
             '/api': {
                 // target: 'http://192.168.0.102:8000', // 本地服务接口地址
-				target: "http://39.98.184.58:8000",  // 阿里云后台地址
-				// target: "http://192.168.0.100:8000",  // 本地网关
+				// target: "http://39.98.184.58:8000",  // 阿里云后台地址
+				target: "http://192.168.0.101:8000",  // 本地网关
                 ws: true,
                 pathRewrite: {
                     '^/api': '/'

From 33e8b77665095270875ccad9b525fff383133182 Mon Sep 17 00:00:00 2001
From: dengxin <2390584170@qq.com>
Date: Mon, 19 Feb 2024 11:35:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AE=80=E5=8E=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageMy/my/resume/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pageMy/my/resume/index.vue b/pageMy/my/resume/index.vue
index 4dc1c7a..7919840 100644
--- a/pageMy/my/resume/index.vue
+++ b/pageMy/my/resume/index.vue
@@ -37,11 +37,11 @@
 		<view class="jobcontent" @click="goSetCity">
 			<view class="jobinfo">
 				<view
-					v-bind:class="['jobAddress', { 'input-error': (!myResume.city.id || !myResume.city.workplace) && isShowBorder }]">
+					v-bind:class="['jobAddress', { 'input-error':!myResume.city.id && !myResume.city.workplace && isShowBorder }]">
 					您想工作的地点
 				</view>
 				<view v-bind:class="['jobText']">
-					{{ myResume.city == {} ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace : '请选择'
+					{{ myResume.city !== "{}" ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace : '请选择'
 					}}
 				</view>
 			</view>
@@ -53,7 +53,7 @@
 					您的学历
 				</view>
 				<view v-bind:class="['jobText']">
-					{{ myResume.education == {} ? myResume.education.label : '请选择' }}
+					{{ myResume.education !== "{}" ? myResume.education.label : '请选择' }}
 				</view>
 			</view>
 			<image src="../../../static/img/right.svg" mode=""></image>
@@ -306,7 +306,7 @@ export default {
 				// 电话号码格式正确
 				console.log(phone, "电话号码格式正确");
 				setResume({
-					id: this.id, education: education.label, workplace: city.parentLabel + '-' + city.label, telephone: phone, wage
+					id: this.id, education: education.label, workplace:city.workplace?city.workplace: city.parentLabel + '-' + city.label, telephone: phone, wage
 				}).then(res => {
 					this.isShowButton = false;
 					this.getResume()