diff --git a/api/resume.js b/api/resume.js
index d670155..0a1150c 100644
--- a/api/resume.js
+++ b/api/resume.js
@@ -1,98 +1,106 @@
-import {request} from '@/untils/AxiosUtils.js';
+import { request } from "@/untils/AxiosUtils.js";
 /*我的简历-查看*/
 export const myResume = () => {
   return request({
-    url: '/api/jobslink-api/user/user/resume/find',
-    method: 'get'
-  })
-}
+    url: "/api/jobslink-api/user/user/resume/find",
+    method: "get",
+  });
+};
 
 /*我的简历-查看-我的职业技能*/
 export const mySkills = () => {
   return request({
-    url: '/api/jobslink-api/user/user/skills/find',
-    method: 'get'
-  })
-}
+    url: "/api/jobslink-api/user/user/skills/find",
+    method: "get",
+  });
+};
 
 /*我的简历-删除-我的职业技能*/
 export const removeSkills = (id) => {
   return request({
-    url: '/api/jobslink-api/user/user/skills/remove',
-    method: 'post',
-	params:{
-		id
-	}
-  })
-}
+    url: "/api/jobslink-api/user/user/skills/remove",
+    method: "post",
+    params: {
+      id,
+    },
+  });
+};
 
 /*我的简历-设置我想工作的地点*/
-export const setCity = (id,cityId) => {
+export const setCity = (id, cityId) => {
   return request({
-    url: '/api/jobslink-api/user/user/resume/update',
-    method: 'post',
-	data:{
-		id,
-		cityId
-	}
-  })
-}
+    url: "/api/jobslink-api/user/user/resume/update",
+    method: "post",
+    data: {
+      id,
+      workplace: cityId,
+    },
+  });
+};
 
 /*我的简历-设置我想学习的技能*/
-export const setLearn = (id,learnSkill) => {
+export const setLearn = (id, learnSkill) => {
   return request({
-    url: '/api/jobslink-api/user/user/resume/update',
-    method: 'post',
-	data:{
-		id,
-		learnSkill
-	}
-  })
-}
+    url: "/api/jobslink-api/user/user/resume/update",
+    method: "post",
+    data: {
+      id,
+      learnSkill,
+    },
+  });
+};
 
 /*行业库*/
 export const getTrade = () => {
   return request({
-    url: '/api/jobslink-api/tenant/base/config/trade',
-    method: 'get'
-  })
-}
+    url: "/api/jobslink-api/tenant/base/config/trade",
+    method: "get",
+  });
+};
 
 /*工种库*/
 export const getWorktypes = (id) => {
   return request({
-    url: '/api/jobslink-api/tenant/base/config/worktypes',
-    method: 'get',
-	params:{
-		id
-	}
-  })
-}
-
+    url: "/api/jobslink-api/tenant/base/config/worktypes",
+    method: "get",
+    params: {
+      id,
+    },
+  });
+};
 
 /*技能库*/
 export const getSkills = (id) => {
   return request({
-    url: '/api/jobslink-api/tenant/base/config/skills',
-    method: 'get',
-	params:{
-		id
-	}
-  })
-}
+    url: "/api/jobslink-api/tenant/base/config/skills",
+    method: "get",
+    params: {
+      id,
+    },
+  });
+};
 
 /*新增职业技能*****/
-export const addSkills = (trade,worktypes,skills) => {
+export const addSkills = (trade, worktypes, skills, type) => {
   return request({
-    url: '/api/jobslink-api/user/user/skills/save',
-    method: 'post',
-	params:{
-		trade,
-		worktypes,
-		skills
-	}
-  })
-}
-
-
-
+    url: "/api/jobslink-api/user/user/skills/save",
+    method: "post",
+    data: {
+      trade,
+      worktypes,
+      skills,
+      type,
+    },
+  });
+};
+/*工种/岗位列表*****/
+export const getWorktypesList = (type) => {
+  console.log(type, "=================");
+  return request({
+    url: "/api/jobslink-api/tenant/worktypes/base/list",
+    method: "get",
+    params: {
+      type,
+    },
+  });
+};
diff --git a/components/vertical-menu/classifyData.js b/components/vertical-menu/classifyData.js
index f410f94..37218ab 100644
--- a/components/vertical-menu/classifyData.js
+++ b/components/vertical-menu/classifyData.js
@@ -1,301 +1,125 @@
 export default [
-  {
-    name: "年龄",
-    foods: [
-      {
-        name: "不限年龄",
-        key: "不限年龄",
-        cat: 10,
-      },
-      {
-        name: "30以下",
-        key: "30",
-        cat: 10,
-      },
-      {
-        name: "35以下",
-        key: "35",
-        cat: 10,
-      },
-      {
-        name: "40以下",
-        key: "40",
-        cat: 10,
-      },
-      {
-        name: "45以下",
-        key: "45",
-        cat: 10,
-      },
-      {
-        name: "50以下",
-        key: "50",
-        cat: 10,
-      },
-      {
-        name: "55以下",
-        key: "55",
-        cat: 10,
-      },
-      {
-        name: "60以下",
-        key: "60",
-        cat: 10,
-      },
-    ],
-  },
   {
     name: "学历",
-    foods: [
+    data: [
       {
         name: "学历不限",
-        key: "学历不限",
-        cat: 6,
+        id: "学历不限",
       },
       {
         name: "初中及以下",
-        key: "初中及以下",
-        cat: 6,
+        id: "初中及以下",
       },
       {
         name: "中专及中技",
-        key: "中专及中技",
-        cat: 6,
+        id: "中专及中技",
       },
       {
         name: "高中",
-        key: "高中",
-        cat: 6,
+        id: "高中",
       },
       {
         name: "大专",
-        key: "大专",
-        cat: 6,
+        id: "大专",
       },
       {
         name: "本科及以上",
-        key: "本科及以上",
-        cat: 6,
+        id: "本科及以上",
       },
     ],
   },
   {
     name: "工资",
-    foods: [
+    data: [
       {
         name: "薪资不限",
-        key: "薪资不限",
-        cat: 3,
+        id: "薪资不限",
       },
       {
         name: "100-150/天",
-        key: "100-150/天",
-        cat: 3,
+        id: "100-150/天",
       },
       {
         name: "151-200/天",
-        key: "151-200/天",
-        cat: 3,
+        id: "151-200/天",
       },
       {
         name: "201-250/天",
-        key: "201-250/天",
-        cat: 3,
+        id: "201-250/天",
       },
       {
         name: "251-300/天",
-        key: "251-300/天",
-        cat: 3,
+        id: "251-300/天",
       },
       {
         name: "300元/天以上",
-        key: "300元/天以上",
-        cat: 3,
+        id: "300元/天以上",
       },
     ],
   },
   {
-    name: "工资",
-    foods: [
-      {
-        name: "薪资不限",
-        key: "薪资不限",
-        cat: 3,
-      },
-      {
-        name: "100-150/天",
-        key: "100-150/天",
-        cat: 3,
-      },
-      {
-        name: "151-200/天",
-        key: "151-200/天",
-        cat: 3,
-      },
-      {
-        name: "201-250/天",
-        key: "201-250/天",
-        cat: 3,
-      },
-      {
-        name: "251-300/天",
-        key: "251-300/天",
-        cat: 3,
-      },
-      {
-        name: "300元/天以上",
-        key: "300元/天以上",
-        cat: 3,
-      },
-    ],
-  },
-  {
-    name: "年龄",
-    foods: [
+    name: "行业",
+    data: [
       {
         name: "不限年龄",
-        key: "不限年龄",
-        cat: 10,
+        id: "不限年龄",
       },
       {
         name: "30以下",
-        key: "30",
-        cat: 10,
+        id: "30",
       },
       {
         name: "35以下",
-        key: "35",
-        cat: 10,
+        id: "35",
       },
       {
         name: "40以下",
-        key: "40",
-        cat: 10,
+        id: "40",
       },
       {
         name: "45以下",
-        key: "45",
-        cat: 10,
+        id: "45",
       },
       {
         name: "50以下",
-        key: "50",
-        cat: 10,
+        id: "50",
       },
       {
         name: "55以下",
-        key: "55",
-        cat: 10,
+        id: "55",
       },
       {
         name: "60以下",
-        key: "60",
-        cat: 10,
+        id: "60",
       },
     ],
   },
   {
-    name: "学历",
-    foods: [
-      {
-        name: "学历不限",
-        key: "学历不限",
-        cat: 6,
-      },
-      {
-        name: "初中及以下",
-        key: "初中及以下",
-        cat: 6,
-      },
-      {
-        name: "中专及中技",
-        key: "中专及中技",
-        cat: 6,
-      },
-      {
-        name: "高中",
-        key: "高中",
-        cat: 6,
-      },
-      {
-        name: "大专",
-        key: "大专",
-        cat: 6,
-      },
-      {
-        name: "本科及以上",
-        key: "本科及以上",
-        cat: 6,
-      },
-    ],
-  },
-  {
-    name: "工资",
-    foods: [
+    name: "省市区县",
+    data: [
       {
         name: "薪资不限",
-        key: "薪资不限",
-        cat: 3,
+        id: "薪资不限",
       },
       {
         name: "100-150/天",
-        key: "100-150/天",
-        cat: 3,
+        id: "100-150/天",
       },
       {
         name: "151-200/天",
-        key: "151-200/天",
-        cat: 3,
+        id: "151-200/天",
       },
       {
         name: "201-250/天",
-        key: "201-250/天",
-        cat: 3,
+        id: "201-250/天",
       },
       {
         name: "251-300/天",
-        key: "251-300/天",
-        cat: 3,
+        id: "251-300/天",
       },
       {
         name: "300元/天以上",
-        key: "300元/天以上",
-        cat: 3,
-      },
-    ],
-  },
-  {
-    name: "工资",
-    foods: [
-      {
-        name: "薪资不限",
-        key: "薪资不限",
-        cat: 3,
-      },
-      {
-        name: "100-150/天",
-        key: "100-150/天",
-        cat: 3,
-      },
-      {
-        name: "151-200/天",
-        key: "151-200/天",
-        cat: 3,
-      },
-      {
-        name: "201-250/天",
-        key: "201-250/天",
-        cat: 3,
-      },
-      {
-        name: "251-300/天",
-        key: "251-300/天",
-        cat: 3,
-      },
-      {
-        name: "300元/天以上",
-        key: "300元/天以上",
-        cat: 3,
+        id: "300元/天以上",
       },
     ],
   },
diff --git a/components/vertical-menu/vertical-menu.vue b/components/vertical-menu/vertical-menu.vue
index e03c633..5977e5c 100644
--- a/components/vertical-menu/vertical-menu.vue
+++ b/components/vertical-menu/vertical-menu.vue
@@ -16,27 +16,51 @@
                             <text>{{ item.name }}</text>
                         </view>
                         <view class="item-container">
-                            <view @click="clickFunc" class="thumb-box" v-for="(item1, index1) in item.foods" :key="index1">
+                            <view @click="clickFunc({ 'type': 'address' })" v-if="item.name === `省市区县`"
+                                class="thumb-box thumb-box1">
+                                <u-cell-group>
+                                    <u-cell icon="map" :title="areaModal.address" :isLink="true"
+                                        arrow-direction="down"></u-cell>
+                                </u-cell-group>
+                            </view>
+                            <view @click="clickFunc({ 'type': 'industry' })" v-else-if="item.name === `行业`"
+                                class="thumb-box thumb-box1">
+                                <u-cell-group>
+                                    <u-cell icon="map" :title="areaModal.industry" :isLink="true"
+                                        arrow-direction="down"></u-cell>
+                                </u-cell-group>
+                            </view>
+                            <view @click="clickFunc({
+                                'type': 'normal', 'bigObj': item, 'smallObj': item1
+                            })" v-else
+                                :class="submitData[item.name] === item1.id ? `selected-box thumb-box` : `thumb-box`"
+                                v-for="(item1, index1) in item.data" :key="index1">
                                 <view class="item-menu-name">{{ item1.name }}</view>
                             </view>
                         </view>
                     </view>
                 </view>
+
             </scroll-view>
+
         </view>
-        <!-- <view class="text-area">
-			<text class="title" @click="areaModal.addressShow=true">{{areaModal.address}}</text>
-		</view> -->
+        <view class="buttonWrapper">
+            <view class="cancelButton">取消</view>
+            <view class="sureButton">确定</view>
+        </view>
+        <!-- 省市 -->
         <data-picker :show="areaModal.addressShow" @confirm='confirmAddress' @cancel='areaModal.addressShow = false'
             @close='areaModal.addressShow = false' :defaultNames="areaModal.defaultNames" :indexs="areaModal.indexs"
             :defaultIds="areaModal.defaultIds" :showToolbar="false" :showBottombar="true"
             :labelName="areaModal.labelName"></data-picker>
+        <!-- 行业 -->
+        <u-picker :show="industryModal.industryShow" :columns="industryModal.industry"></u-picker>
     </view>
 </template>
 
 <script>
 import classifyData from './classifyData.js';
-import { mapGetters } from 'vuex'
+import { getTrade } from '@/api/resume.js'
 export default {
     components: {
         // vTabs,
@@ -63,24 +87,43 @@ export default {
                 title: 'Hello',
                 // indexs: [0, 0, 8],
                 // defaultIds: [1, 110000, 110106],
-                defaultNames: ['北京市', '北京市', '房山区'],
+                defaultNames: ['北京市', '北京市', '东城区'],
                 labelName: "areaName"
 
-            }
+            },
+            industryModal: {
+                industry: [['中国', '美国', '日本']],
+                industryShow: false,
+
+
+            },
+
+            submitData: {},
 
         }
     },
-    computed: {
-        ...mapGetters(['area'])
-    },
-    onLoad: function () {
-        console.log("0000000000000000000");
+    created: function () {
+        this.getData()
         this.getMenuItemTop()
-        console.log(this.area, '--------------------');
     },
 
 
     methods: {
+        getData: function () {
+            getTrade().then(res => {
+                console.log(res.data.data);
+                const newData = this.tabbar;
+
+                newData.map(item => {
+                    if (item.name === "行业") {
+                        item.data = res.data.data
+                    }
+                })
+                this.tabbar = newData;
+
+            })
+        },
+
         // 点击左边的栏目切换
         async swichMenu(index) {
             if (this.arr.length == 0) {
@@ -148,7 +191,7 @@ export default {
                 await this.getElRect('menu-scroll-view', 'menuHeight');
                 await this.getElRect('u-tab-item', 'menuItemHeight');
             }
-            console.log(index, this.arr[index]);
+            // console.log(index, this.arr[index]);
             // 将菜单活动item垂直居中
             this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
         },
@@ -202,10 +245,21 @@ export default {
                 }).exec()
             })
         },
-        clickFunc(e) {
-            console.log(e);
-            this.show = true;
-            this.areaModal.addressShow = true
+        clickFunc({ type, bigObj, smallObj }) {
+            switch (type) {
+                case "industry":
+                    this.industryModal.industryShow = true;
+                    break;
+                case "address":
+                    this.areaModal.addressShow = true
+                    break;
+
+                default:
+                    this.$set(this.submitData, bigObj.name, smallObj.id);
+                    console.log(this.submitData);
+                    break;
+            }
+
         },
         changeHandler(e) {
             const {
@@ -226,7 +280,8 @@ export default {
         confirmAddress(val) {
             console.log(val);
             var valArr = val.value;
-            this.areaModal.address = [...new Set(val.value)].join('')
+            this.areaModal.address = [...new Set(val.value)].join(' / ')
+            console.log(this.areaModal.address);
             this.areaModal.addressShow = false
         }
 
@@ -329,14 +384,14 @@ export default {
 }
 
 .item-title {
-    font-size: 26rpx;
+    font-size: 28rpx;
     font-weight: bold;
 }
 
 .item-menu-name {
     font-weight: normal;
-    font-size: 24rpx;
-    color: #666666;
+    font-size: 26rpx;
+
 }
 
 .item-container {
@@ -346,19 +401,55 @@ export default {
 
 .thumb-box {
     width: 43%;
-    line-height: 70rpx;
+    line-height: 80rpx;
     display: flex;
     flex-wrap: wrap;
     align-items: center;
     justify-content: center;
     flex-direction: column;
-    margin-top: 20rpx;
+    margin-top: 25rpx;
     margin-left: 20rpx;
     background-color: #f3f4f8;
+    border: 1px solid #f3f4f8;
+    color: #666666;
+}
+
+.thumb-box1 {
+    width: 90%;
+
+}
+
+.selected-box {
+    background-color: #e3eafe;
+    border: 1px solid #92adfb;
+    color: #92adfb !important;
 }
 
 .item-menu-image {
     width: 120rpx;
     height: 120rpx;
 }
+
+.buttonWrapper {
+    // position: absolute;
+    // bottom: 10px;
+    display: flex;
+    justify-content: space-around;
+    margin-bottom: -10px;
+    margin-top: 10px;
+}
+
+.cancelButton {
+    padding: 15rpx 30rpx;
+    background-color: #f3f4f8;
+    border-radius: 5px;
+    color: #9b9b9b;
+}
+
+.sureButton {
+    padding: 15rpx 150rpx;
+    background-color: #4171f9;
+    color: #fff;
+    border-radius: 5px;
+}
 </style>
diff --git a/pageMy/my/resume/addSkill.vue b/pageMy/my/resume/addSkill.vue
index 3539c0f..b43e8c4 100644
--- a/pageMy/my/resume/addSkill.vue
+++ b/pageMy/my/resume/addSkill.vue
@@ -11,7 +11,7 @@
 				<view class="jobAddress">
 					我从事的行业
 				</view>
-				<view v-if="tradeName" class="jobText">{{tradeName}}</view>
+				<view v-if="tradeName" class="jobText">{{ tradeName }}</view>
 				<view v-else class="jobText nochoose">请选择</view>
 			</view>
 			<image src="../../../static/img/right.svg" mode=""></image>
@@ -22,7 +22,7 @@
 				<view class="jobAddress">
 					我具备的技能
 				</view>
-				<view v-if="worktypesName" class="jobText">{{worktypesName}}</view>
+				<view v-if="worktypesName" class="jobText">{{ worktypesName }}</view>
 				<view v-else class="jobText nochoose">请选择</view>
 			</view>
 			<image src="../../../static/img/right.svg" mode=""></image>
@@ -33,265 +33,274 @@
 				<view class="jobAddress">
 					我的技能水平
 				</view>
-				<view v-if="skillsName" class="jobText">{{skillsName}}</view>
+				<view v-if="skillsName" class="jobText">{{ skillsName }}</view>
 				<view v-else class="jobText nochoose">请选择</view>
 			</view>
 			<image src="../../../static/img/right.svg" mode=""></image>
 		</view>
 		<view class="border"></view>
 		<view class="btn">
-			<view v-if="skillsId " class="bottombtn" @click="submit">确定</view>
+			<view v-if="skillsName" class="bottombtn" @click="submit">确定</view>
 			<view v-else class="bottombtn disabledBtn">确定</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import {
-		addSkills
-	} from '@/api/resume.js'
+import {
+	addSkills
+} from '@/api/resume.js'
 
-	export default {
-		data() {
-			return {
-				tradeId: '',
-				tradeName: '',
-				worktypesId: '',
-				worktypesName: '',
-				skillsId: '',
-				skillsName: '',
-			}
-		},
-		onLoad(query) {
-			uni.$off('setInd')
-			uni.$on('setInd', ({
-				id,
-				name
-			}) => {
-				this.tradeId = id
-				this.tradeName = name
-				this.worktypesId = ''
-				this.worktypesName = ''
-				this.skillsId = ''
-				this.skillsName = ''
-			})
-			uni.$off('setworkTypes')
-			uni.$on('setworkTypes', ({
-				id,
-				name
-			}) => {
-				this.worktypesId = id
-				this.worktypesName = name
-				this.skillsId = ''
-				this.skillsName = ''
-			})
-			uni.$off('setSkill')
-			uni.$on('setSkill', ({
-				id,
-				name
-			}) => {
-				this.skillsId = id
-				this.skillsName = name
+export default {
+	data() {
+		return {
+			tradeId: '',
+			tradeName: '',
+			worktypesId: '',
+			worktypesName: '',
+			skillsId: '',
+			skillsName: '',
+		}
+	},
+	onLoad(query) {
+		uni.$off('setInd')
+		uni.$on('setInd', ({
+			id,
+			name
+		}) => {
+			this.tradeId = id
+			this.tradeName = name
+			this.worktypesId = ''
+			this.worktypesName = ''
+			this.skillsId = ''
+			this.skillsName = ''
+		})
+		uni.$off('setworkTypes')
+		uni.$on('setworkTypes', ({
+			detail
+		}) => {
+			console.log(detail, "id,name");
+			// this.worktypesId = id
+			this.worktypesName = detail.parentLabel + "-" + detail.label
+			// this.skillsId = ''
+			// this.skillsName = ''
+		})
+		uni.$off('setSkill')
+		uni.$on('setSkill', ({
+			detail
+		}) => {
+			// this.skillsId = id
+			this.skillsName = detail.parentLabel + "-" + detail.label
+		})
+	},
+	methods: {
+		goAddind: function () {
+			uni.navigateTo({
+				url: './addInd?id=' + this.tradeId
 			})
 		},
-		methods: {
-			goAddind: function() {
+		skill: function () {
+			if (this.tradeId) {
 				uni.navigateTo({
-					url: './addInd?id=' + this.tradeId
+					url: `./skill?id=${this.worktypesId}&tradeId=${this.tradeId}&maxLayer=2&type=1`
 				})
-			},
-			skill: function() {
-				if (this.tradeId) {
-					uni.navigateTo({
-						url: `./skill?id=${this.worktypesId}&tradeId=${this.tradeId}`
-					})
-				} else {
-					uni.showToast({
-						title: '请先选择从事的行业',
-						icon: 'none'
-					});
-				}
-			},
-			skillLevel: function() {
-				if (!this.tradeId) {
-					uni.showToast({
-						title: '请先选择从事的行业',
-						icon: 'none'
-					});
-				} else if (!this.worktypesId) {
-					uni.showToast({
-						title: '请先选择具备的技能',
-						icon: 'none'
-					});
-				} else {
-					uni.navigateTo({
-						url: `./skillLevel?id=${this.skillsId}&worktypesId=${this.worktypesId}`
-					})
-				}
-			},
-			submit: function() {
-				addSkills(this.tradeName, this.worktypesName, this.skillsName).then(res => {
-					uni.navigateBack()
+			} else {
+				uni.showToast({
+					title: '请先选择从事的行业',
+					icon: 'none'
+				});
+			}
+		},
+		skillLevel: function () {
+			if (!this.tradeId) {
+				uni.showToast({
+					title: '请先选择从事的行业',
+					icon: 'none'
+				});
+			} else if (!this.worktypesName) {
+				uni.showToast({
+					title: '请先选择具备的技能',
+					icon: 'none'
+				});
+			} else {
+				uni.navigateTo({
+					url: `./skillLevel?id=${this.skillsId}&worktypesId=${this.worktypesId}&maxLayer=2&type=2`
 				})
 			}
+		},
+		submit: function () {
+			console.log(this.tradeName, this.worktypesName, this.skillsName);
+			let result = this.worktypesName.split('-');
+			let result1 = this.skillsName.split('-');
+			console.log(result, result1);
+			
+			// 工种
+			addSkills(this.tradeName, result[0], result[1], 0).then(res => {
+				uni.navigateBack()
+			})
+			// 岗位
+			addSkills(this.tradeName, result1[0], result1[1], 1).then(res => {
+				uni.navigateBack()
+			})
 		}
 	}
+}
 </script>
 
 <style>
-	.slo {
-		font-family: PingFangSC-Regular;
-		font-size: 28rpx;
-		color: #999999;
+.slo {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #999999;
 
-		padding: 0 30rpx;
-		padding-top: 10rpx;
-	}
+	padding: 0 30rpx;
+	padding-top: 10rpx;
+}
 
-	.titles {
-		font-family: PingFangSC-Medium;
-		font-size: 36rpx;
-		color: #333333;
-		padding: 0 30rpx;
-		padding-top: 30rpx;
-	}
+.titles {
+	font-family: PingFangSC-Medium;
+	font-size: 36rpx;
+	color: #333333;
+	padding: 0 30rpx;
+	padding-top: 30rpx;
+}
 
-	.border {
-		margin-left: 30rpx;
-		width: 720rpx;
-		border-bottom: 2rpx solid #ddd;
-		opacity: 0.6;
-	}
+.border {
+	margin-left: 30rpx;
+	width: 720rpx;
+	border-bottom: 2rpx solid #ddd;
+	opacity: 0.6;
+}
 
-	.jobText {
-		font-family: PingFangSC-Regular;
-		font-size: 32rpx;
-		color: #666666;
-	}
+.jobText {
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #666666;
+}
 
-	.nochoose {
-		color: #ccc;
-	}
+.nochoose {
+	color: #ccc;
+}
 
-	.jobAddress {
-		font-family: PingFangSC-Regular;
-		font-size: 32rpx;
-		color: #999999;
-	}
+.jobAddress {
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #999999;
+}
 
-	.jobcontent {
-		padding: 30rpx;
+.jobcontent {
+	padding: 30rpx;
 
-		background: #fefefe;
-		display: flex;
-		/* align-items: center; */
-		align-items: flex-end;
-		justify-content: space-between;
-		line-height: 63rpx;
-	}
+	background: #fefefe;
+	display: flex;
+	/* align-items: center; */
+	align-items: flex-end;
+	justify-content: space-between;
+	line-height: 63rpx;
+}
 
-	.jobcontent image {
-		width: 40rpx;
-		height: 40rpx;
-		margin-bottom: 5px;
+.jobcontent image {
+	width: 40rpx;
+	height: 40rpx;
+	margin-bottom: 5px;
 
-	}
+}
 
-	.listBody {}
+.listBody {}
 
-	.list_text {
-		font-family: PingFangSC-Regular;
-		font-size: 32rpx;
-		color: #666666;
-	}
+.list_text {
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #666666;
+}
 
-	.list image {
-		width: 40rpx;
-		height: 40rpx;
-		margin-left: auto;
-	}
+.list image {
+	width: 40rpx;
+	height: 40rpx;
+	margin-left: auto;
+}
 
-	.list {
-		padding: 0 30rpx;
-		height: 126rpx;
-		background: #fefefe;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-	}
+.list {
+	padding: 0 30rpx;
+	height: 126rpx;
+	background: #fefefe;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
 
-	.title image {
-		width: 40rpx;
-		height: 40rpx;
-	}
+.title image {
+	width: 40rpx;
+	height: 40rpx;
+}
 
-	.title {
-		font-family: PingFangSC-Regular;
-		font-size: 28rpx;
-		color: #999999;
-		display: flex;
-		padding: 10rpx 30rpx;
-		background-color: #fefefe;
-		align-items: center;
-		justify-content: space-between;
-	}
+.title {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #999999;
+	display: flex;
+	padding: 10rpx 30rpx;
+	background-color: #fefefe;
+	align-items: center;
+	justify-content: space-between;
+}
 
-	.userInfo {
-		font-family: PingFangSC-Regular;
-		font-size: 24rpx;
-		color: #999999;
-	}
+.userInfo {
+	font-family: PingFangSC-Regular;
+	font-size: 24rpx;
+	color: #999999;
+}
 
-	.name {
-		margin-left: 20rpx;
-		font-family: PingFangSC-Medium;
-		font-size: 36rpx;
-		color: #333333;
-		line-height: 50rpx;
-	}
+.name {
+	margin-left: 20rpx;
+	font-family: PingFangSC-Medium;
+	font-size: 36rpx;
+	color: #333333;
+	line-height: 50rpx;
+}
 
-	.head image:last-child {
-		width: 40rpx;
-		height: 40rpx;
-		margin-left: auto;
-	}
+.head image:last-child {
+	width: 40rpx;
+	height: 40rpx;
+	margin-left: auto;
+}
 
-	.head image {
-		width: 100rpx;
-		height: 100rpx;
-	}
+.head image {
+	width: 100rpx;
+	height: 100rpx;
+}
 
-	.head {
-		padding: 30rpx;
-		width: 690rpx;
-		background-color: #fefefe;
-		display: flex;
-		align-items: center;
-		justify-content: flex-start;
-	}
+.head {
+	padding: 30rpx;
+	width: 690rpx;
+	background-color: #fefefe;
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+}
 
-	.bottombtn {
-		background-color: #1b66ff;
-		color: #fff;
-		text-align: center;
-		border-radius: 10rpx;
-		font-family: PingFangSC-Medium;
-		font-size: 32rpx;
-		height: 90rpx;
-		line-height: 90rpx;
-	}
+.bottombtn {
+	background-color: #1b66ff;
+	color: #fff;
+	text-align: center;
+	border-radius: 10rpx;
+	font-family: PingFangSC-Medium;
+	font-size: 32rpx;
+	height: 90rpx;
+	line-height: 90rpx;
+}
 
-	.btn {
-		background-color: #fefefe;
-		width: 690rpx;
-		padding: 30rpx;
-		padding-bottom: 80rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-	}
+.btn {
+	background-color: #fefefe;
+	width: 690rpx;
+	padding: 30rpx;
+	padding-bottom: 80rpx;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+}
 
-	.disabledBtn {
-		background-color: #c8c9cc;
-	}
+.disabledBtn {
+	background-color: #c8c9cc;
+}
 </style>
diff --git a/pageMy/my/resume/index.vue b/pageMy/my/resume/index.vue
index 6ecc7a8..d547526 100644
--- a/pageMy/my/resume/index.vue
+++ b/pageMy/my/resume/index.vue
@@ -6,7 +6,7 @@
 
 			<view class="name">
 				<view class="userName">
-					{{auth.authInfo.realName}}
+					{{ auth.authInfo.realName }}
 				</view>
 				<view class="userInfo">
 					个人基本信息
@@ -19,16 +19,17 @@
 			<view class="title_text">
 				我的职业技能
 			</view>
-			<image v-if="mySkills.length<10" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image>
+			<image v-if="mySkills.length < 10" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image>
 		</view>
 
 		<view class="listBody">
-			<m-slide-list @controller-reg="controller.reg" @controller-moving="controller.moving" @controller-opened="controller.opened"
-			 @controller-closed="controller.closed" @remove="removeSkills(item.id,index)" v-for="(item,index) in mySkills" :key="item.id"
-			 :button="buttonList">
+			<m-slide-list @controller-reg="controller.reg" @controller-moving="controller.moving"
+				@controller-opened="controller.opened" @controller-closed="controller.closed"
+				@remove="removeSkills(item.id, index)" v-for="(item, index) in mySkills" :key="item.id"
+				:button="buttonList">
 				<view class="list">
 					<view class="list_text">
-						{{item.trade}}·{{item.worktypes}}·{{item.skills}}
+						{{ item.trade }}·{{ item.worktypes }}·{{ item.skills }}
 					</view>
 				</view>
 			</m-slide-list>
@@ -38,12 +39,56 @@
 				<view class="jobAddress">
 					您想工作的地点
 				</view>
-				<view v-bind:class="['jobText',{nochoose: !myResume.cityId}]">
-					{{myResume.cityId ? getCity(myResume.cityId) : '请选择'}}
+				<view v-bind:class="['jobText', { nochoose: !myResume.cityId }]">
+					{{ myResume.cityId ? getCity(myResume.cityId) : '请选择' }}
 				</view>
 			</view>
 			<image src="../../../static/img/right.svg" mode=""></image>
 		</view>
+		<view class="jobcontent" @click="showPickerFunc('education')">
+			<view class="jobinfo">
+				<view class="jobAddress">
+					您的学历
+				</view>
+				<view v-bind:class="['jobText', { nochoose: !myResume.cityId }]">
+					{{ myResume.education ? this.myResume.education : '请选择' }}
+				</view>
+			</view>
+			<image src="../../../static/img/right.svg" mode=""></image>
+		</view>
+		<view class="jobcontent" @click="showPickerFunc('wage')">
+			<view class="jobinfo">
+				<view class="jobAddress">
+					您的期望薪资
+				</view>
+				<view v-bind:class="['jobText', { nochoose: !myResume.cityId }]">
+					{{ myResume.wage ? this.myResume.wage : '请选择' }}
+				</view>
+			</view>
+			<image src="../../../static/img/right.svg" mode=""></image>
+		</view>
+		<!-- <view class="jobcontent" @click="goSetCity">
+			<view class="jobinfo">
+				<view class="jobAddress">
+					您的期望薪资
+				</view>
+				<view v-bind:class="['jobText', { nochoose: !myResume.cityId }]">
+					{{ myResume.cityId ? getCity(myResume.cityId) : '请选择' }}
+				</view>
+			</view>
+			<image src="../../../static/img/right.svg" mode=""></image>
+		</view>
+		<view class="jobcontent" @click="goSetCity">
+			<view class="jobinfo">
+				<view class="jobAddress">
+					您的联系方式
+				</view>
+				<view v-bind:class="['jobText', { nochoose: !myResume.cityId }]">
+					{{ myResume.cityId ? getCity(myResume.cityId) : '请选择' }}
+				</view>
+			</view>
+			<image src="../../../static/img/right.svg" mode=""></image>
+		</view> -->
 		<view class="border"></view>
 		<!--<view class="jobcontent" @click="goWantSkill">
 			<view class="jobinfo">
@@ -56,244 +101,284 @@
 			</view>
 			<image src="../../../static/img/right.svg" mode=""></image>
 		</view>-->
+
+		<u-picker @confirm="pickerButtonFunc" @cancel="showPicker = false" :show="showPicker" :columns="columns"></u-picker>
 	</view>
 </template>
 
 <script>
-	import {
-		mapGetters
-	} from 'vuex'
-	import {
-		mySkills,
-		myResume,
-		removeSkills,
-		setCity,
-		setLearn
-	} from '@/api/resume.js';
-	import mSlideList from '@/components/mark-slide-list/mark-slide-list.vue';
-	import controller from '@/components/mark-slide-list/controller';
+import {
+	mapGetters
+} from 'vuex'
+import {
+	mySkills,
+	myResume,
+	removeSkills,
+	setCity,
+	setLearn
+} from '@/api/resume.js';
+import mSlideList from '@/components/mark-slide-list/mark-slide-list.vue';
+import controller from '@/components/mark-slide-list/controller';
 
-	export default {
-		components: {
-			mSlideList
+export default {
+	components: {
+		mSlideList
+	},
+	data() {
+		return {
+			controller: new controller(),
+			myResume: {},
+			mySkills: [],
+			id: '',
+			buttonList: [{
+				title: '删除',
+				background: '#ff3b32',
+				clickName: 'remove'
+			}],
+			showPicker: false,
+			showType: "",
+			columns: [
+				['MBA/EMBA', '博士', '硕士', '本科', '大专', '高中', '中专/中技'
+					, '初中及以下', '不限'
+				]
+			],
+		}
+	},
+	onShow() {
+		this.getResume()
+		this.getSkill()
+	},
+	computed: {
+		...mapGetters(['userInfo', 'auth'])
+	},
+	methods: {
+		getResume() {
+			myResume().then(res => {
+				const data = res.data.data
+				this.myResume = data
+				if (data && data.id) {
+					this.id = data.id
+				}
+			});
 		},
-		data() {
-			return {
-				controller: new controller(),
-				myResume: {},
-				mySkills: [],
-				id: '',
-				buttonList: [{
-					title: '删除',
-					background: '#ff3b32',
-					clickName: 'remove'
-				}]
-			}
+		getSkill() {
+			mySkills().then(res => {
+				this.mySkills = res.data.data;
+			})
 		},
-		onShow() {
-			this.getResume()
-			this.getSkill()
-		},
-		computed: {
-			...mapGetters(['userInfo', 'auth'])
-		},
-		methods: {
-			getResume() {
-				myResume().then(res => {
-					const data = res.data.data
-					this.myResume = data
-					if (data && data.id) {
-						this.id = data.id
-					}
-				});
-			},
-			getSkill() {
-				mySkills().then(res => {
-					this.mySkills = res.data.data;
+		goWantSkill: function () {
+			uni.$off('getWantSkill')
+			uni.$once('getWantSkill', (cb) => {
+				cb(this.myResume.learnSkill)
+			})
+			uni.$off('setWantSkill')
+			uni.$once('setWantSkill', ({
+				skill,
+				done
+			}) => {
+				setLearn(this.id, skill).then(res => {
+					uni.navigateBack()
+				}).catch(() => {
+					done && done()
 				})
-			},
-			goWantSkill: function() {
-				uni.$off('getWantSkill')
-				uni.$once('getWantSkill', (cb) => {
-					cb(this.myResume.learnSkill)
-				})
-				uni.$off('setWantSkill')
-				uni.$once('setWantSkill', ({
-					skill,
-					done
-				}) => {
-					setLearn(this.id, skill).then(res => {
-						uni.navigateBack()
-					}).catch(() => {
-						done && done()
-					})
+				this.getResume()
+			})
+			uni.navigateTo({
+				url: './setWskill?id=' + this.id
+			})
+		},
+		goSetCity: function () {
+			uni.$off('setCity')
+			uni.$on('setCity', ({ detail }) => {
+				console.log(detail, '---------------');
+
+				setCity(this.id, detail.parentLabel + '-' + detail.label).then(res => {
+					this.myResume.cityId = detail.id
 					this.getResume()
 				})
-				uni.navigateTo({
-					url: './setWskill?id=' + this.id
-				})
-			},
-			goSetCity: function() {
-				uni.$off('setCity')
-				uni.$on('setCity', (id) => {
-					setCity(this.id, id).then(res => {
-						this.myResume.cityId = id
-						this.getResume()
-					})
-				})
-				uni.navigateTo({
-					url: `/pages/setCity/setCity?maxLayer=2`
-				})
-			},
-			goAdd: function() {
-				uni.navigateTo({
-					url: './addSkill'
-				})
-			},
-			goUserBase: function() {
-				uni.navigateTo({
-					url: '../userBase'
-				})
-			},
-			getCity: function(val) {
-				if (val) {
-					let areas = this.$store.getters.getAreaParents(val)
-					if (areas.length) {
-						return areas[0].label + '-' + areas[1].label
-					}
+			})
+			uni.navigateTo({
+				url: `/pages/setCity/setCity?maxLayer=2`
+			})
+		},
+		goAdd: function () {
+			uni.navigateTo({
+				url: './addSkill'
+			})
+		},
+		goUserBase: function () {
+			uni.navigateTo({
+				url: '../userBase'
+			})
+		},
+		getCity: function (val) {
+			if (val) {
+				let areas = this.$store.getters.getAreaParents(val)
+				if (areas.length) {
+					return areas[0].label + '-' + areas[1].label
 				}
-			},
-			removeSkills: function(id, index) {
-				removeSkills(id).then(res => {
-					uni.showToast({
-						title: '操作成功',
-						icon: 'none'
-					});
-					this.mySkills.splice(index, 1)
-				})
 			}
+		},
+		removeSkills: function (id, index) {
+			removeSkills(id).then(res => {
+				uni.showToast({
+					title: '操作成功',
+					icon: 'none'
+				});
+				this.mySkills.splice(index, 1)
+			})
+		},
+		showPickerFunc(type) {
+			this.showType = type;
+			switch (type) {
+				case "education":
+					this.columns =
+						[['MBA/EMBA', '博士', '硕士', '本科', '大专', '高中', '中专/中技'
+							, '初中及以下', '不限'
+						]]
+					break;
+				case "wage":
+					this.columns =[['10-15元/小时', '16-20元/小时', '21-25元/小时', '26-30元/小时', '30元/小时以上', '100-150元/天', '151-200元/天'
+							, '201-250元/天', '251-300元/天',"300元/天以上","2000元（含）以下/月","2000-5000元（含）/月","5000-8000元（含）/月",
+							"8000-10000元（含）/月","10000-15000元（含）/月","15000-20000元（含）/月","20000-25000元（含）/月","25000-30000元（含）/月","30000元以上/月","面议、暂无要求"
+						]]
+						
+					
+					break;
+
+				default:
+					
+					break;
+			}
+			this.showPicker = true;
+		},
+		pickerButtonFunc(e) {
+			console.log(e, this.myResume, this.myResume[this.showType]);
+			this.myResume[this.showType] = e.value[0];
+			this.showPicker = false;
 		}
 	}
+}
 </script>
 
 <style>
-	.border {
-		margin-left: 30rpx;
-		width: 720rpx;
-		border: 1rpx solid #f2f2f2;
+.border {
+	margin-left: 30rpx;
+	width: 720rpx;
+	border: 1rpx solid #f2f2f2;
 
-		/* 	height: 1rpx;
+	/* 	height: 1rpx;
 		background-color: #ddd; */
-	}
+}
 
-	.jobText {
-		font-family: PingFangSC-Regular;
-		font-size: 32rpx;
-		color: #666666;
-	}
+.jobText {
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #666666;
+}
 
-	.jobAddress {
-		font-family: PingFangSC-Regular;
-		font-size: 28rpx;
-		color: #999999;
-	}
+.jobAddress {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #999999;
+}
 
-	.nochoose {
-		color: #ccc;
-	}
+.nochoose {
+	color: #ccc;
+}
 
-	.jobcontent {
-		padding: 30rpx;
-		background: #fff;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		line-height: 63rpx;
-	}
+.jobcontent {
+	padding: 30rpx;
+	background: #fff;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	line-height: 63rpx;
+}
 
-	.jobcontent image {
-		width: 40rpx;
-		height: 40rpx;
-	}
+.jobcontent image {
+	width: 40rpx;
+	height: 40rpx;
+}
 
-	.listBody {}
+.listBody {}
 
-	.list_text {
-		font-family: PingFangSC-Regular;
-		font-size: 32rpx;
-		color: #666666;
-		background: #ffffff;
-		overflow-y: auto;
-		white-space: nowrap;
-	}
+.list_text {
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #666666;
+	background: #ffffff;
+	overflow-y: auto;
+	white-space: nowrap;
+}
 
-	.list image {
-		width: 40rpx;
-		height: 40rpx;
-		margin-left: auto;
-	}
+.list image {
+	width: 40rpx;
+	height: 40rpx;
+	margin-left: auto;
+}
 
-	.list {
-		padding: 0 15px 0 30rpx;
-		height: 126rpx;
-		line-height: 126rpx;
-		background: #fff;
-		border-bottom: 1px solid #f2f2f2;
-	}
+.list {
+	padding: 0 15px 0 30rpx;
+	height: 126rpx;
+	line-height: 126rpx;
+	background: #fff;
+	border-bottom: 1px solid #f2f2f2;
+}
 
-	.title image {
-		width: 40rpx;
-		height: 40rpx;
-	}
+.title image {
+	width: 40rpx;
+	height: 40rpx;
+}
 
-	.title {
-		font-family: PingFangSC-Regular;
-		font-size: 28rpx;
-		color: #999999;
-		display: flex;
-		padding: 25rpx 30rpx;
-		/* 		padding-top: 30rpx; */
-		background-color: #fff;
-		align-items: center;
-		justify-content: space-between;
-		border: 1rpx solid #f2f2f2;
-	}
+.title {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #999999;
+	display: flex;
+	padding: 25rpx 30rpx;
+	/* 		padding-top: 30rpx; */
+	background-color: #fff;
+	align-items: center;
+	justify-content: space-between;
+	border: 1rpx solid #f2f2f2;
+}
 
-	.userInfo {
-		font-family: PingFangSC-Regular;
-		font-size: 24rpx;
-		color: #999999;
-	}
+.userInfo {
+	font-family: PingFangSC-Regular;
+	font-size: 24rpx;
+	color: #999999;
+}
 
-	.name {
-		margin-left: 20rpx;
-		font-family: PingFangSC-Medium;
-		font-size: 36rpx;
-		color: #333333;
-		line-height: 50rpx;
-	}
+.name {
+	margin-left: 20rpx;
+	font-family: PingFangSC-Medium;
+	font-size: 36rpx;
+	color: #333333;
+	line-height: 50rpx;
+}
 
-	.head image:last-child {
-		width: 40rpx;
-		height: 40rpx;
-		margin-left: auto;
-	}
+.head image:last-child {
+	width: 40rpx;
+	height: 40rpx;
+	margin-left: auto;
+}
 
-	.head image {
-		width: 100rpx;
-		height: 100rpx;
-	}
+.head image {
+	width: 100rpx;
+	height: 100rpx;
+}
 
-	page {
-		background-color: #f6f6f6;
-	}
+page {
+	background-color: #f6f6f6;
+}
 
-	.head {
-		padding: 30rpx;
-		width: 690rpx;
-		background-color: #fff;
-		display: flex;
-		align-items: center;
-		justify-content: flex-start;
-	}
+.head {
+	padding: 30rpx;
+	width: 690rpx;
+	background-color: #fff;
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+}
 </style>
diff --git a/pageMy/my/resume/skill copy.vue b/pageMy/my/resume/skill copy.vue
new file mode 100644
index 0000000..a08c432
--- /dev/null
+++ b/pageMy/my/resume/skill copy.vue	
@@ -0,0 +1,51 @@
+<template>
+	<select-template ref="select" title="请选择技能" slo="请选择最符合你能力的标签，标签会帮你定制个性化推荐任务信息" :list="skillLevel" search @submit="goAdd"></select-template>
+</template>
+
+<script>
+	import {
+		getWorktypes
+	} from '@/api/resume.js'
+	import selectTemplate from './selectTemplate.vue'
+
+	export default {
+		components: {
+			selectTemplate
+		},
+		data() {
+			return {
+				skillLevel: [],
+				tradeId: '',
+				id: ''
+			}
+		},
+		onLoad: function({
+			id,
+			tradeId
+		}) {
+			this.tradeId = tradeId
+		},
+		onShow: function() {
+			this.getData()
+		},
+		mounted() {
+			this.$refs.select.setActiveId(this.tradeId)
+		},
+		methods: {
+			getData: function() {
+				if (this.tradeId) {
+					getWorktypes(this.tradeId).then(res => {
+						this.skillLevel = res.data.data
+					})
+				}
+			},
+			goAdd(res) {
+				uni.$emit('setworkTypes', res)
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pageMy/my/resume/skill.vue b/pageMy/my/resume/skill.vue
index a08c432..b96971d 100644
--- a/pageMy/my/resume/skill.vue
+++ b/pageMy/my/resume/skill.vue
@@ -1,51 +1,182 @@
 <template>
-	<select-template ref="select" title="请选择技能" slo="请选择最符合你能力的标签，标签会帮你定制个性化推荐任务信息" :list="skillLevel" search @submit="goAdd"></select-template>
+	<view>
+		<view class="title">
+			全部
+		</view>
+		<block v-for="(item, index) in city" :key="index">
+			<view class="cityList" @click="cityClick(item)">
+				{{ item.name }}
+				<image src="../../../static/img/correct.svg" v-if="id === item.id" mode=""></image>
+				<image v-else-if="layer !== maxLayer" src="../../../static/img/right.svg" mode=""></image>
+			</view>
+		</block>
+		<view class="" v-if="layer === maxLayer" style="height: 230rpx;background-color: #f6f6f6;"></view>
+		<view class="btn" v-if="layer === maxLayer" @click="comfirm">
+			<view class="bottombtn">
+				确定
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-	import {
-		getWorktypes
-	} from '@/api/resume.js'
-	import selectTemplate from './selectTemplate.vue'
+import {
+	getWorktypesList
+} from '@/api/resume.js'
 
-	export default {
-		components: {
-			selectTemplate
-		},
-		data() {
-			return {
-				skillLevel: [],
-				tradeId: '',
-				id: ''
-			}
-		},
-		onLoad: function({
-			id,
-			tradeId
-		}) {
-			this.tradeId = tradeId
-		},
-		onShow: function() {
-			this.getData()
-		},
-		mounted() {
-			this.$refs.select.setActiveId(this.tradeId)
-		},
-		methods: {
-			getData: function() {
-				if (this.tradeId) {
-					getWorktypes(this.tradeId).then(res => {
-						this.skillLevel = res.data.data
-					})
+export default {
+	data() {
+		return {
+			workTypeList: [],
+
+			choose: false,
+			chooseIndex: '',
+			parentId: undefined,
+			layer: 1,
+			maxLayer: 2,
+			id: '',
+			label: '',
+
+			tradeId: '',
+		}
+	},
+	computed: {
+		city() {
+			if (this.parentId) {
+				const parentItem = this.workTypeList.find(item => item.id == this.parentId);
+				if (parentItem) {
+					return parentItem.child;
 				}
-			},
-			goAdd(res) {
-				uni.$emit('setworkTypes', res)
-				uni.navigateBack()
+			} else {
+				return this.workTypeList;
 			}
 		}
+	},
+	mounted() {
+		getWorktypesList(1).then(res => {
+			this.workTypeList = res.data.data;
+
+		})
+	},
+
+	onLoad({
+		tradeId,
+		parentId,
+		layer,
+		maxLayer
+	}) {
+		this.parentId = parentId
+		this.tradeId = tradeId || 0
+		this.layer = parseInt(layer || 1)
+		this.maxLayer = parseInt(maxLayer || 2)
+	},
+	onShow: function () { },
+	methods: {
+		cityClick(item) {
+			if (this.layer === this.maxLayer) {
+				this.selectCity(item)
+			} else {
+				this.goCityInfo(item)
+			}
+		},
+		selectCity(item) {
+			console.log(item, "item");
+			this.id = item.id;
+			this.label = item.name;
+
+		},
+		goCityInfo(item) {
+			uni.navigateTo({
+				url: `./skill?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.id}&parentLabel=${item.name}`
+			})
+		},
+		comfirm: function () {
+			if (this.id) {
+				uni.$emit('setworkTypes', { detail: { id: this.id, label: this.label, parentLabel: this.$route.query.parentLabel } })
+				uni.navigateBack({
+					delta: this.layer
+				})
+			} else {
+				uni.showToast({
+					title: "请选择地点",
+					icon: "none"
+				})
+			}
+		},
+
 	}
+}
 </script>
 
 <style>
+.bottombtn {
+	background-color: #1B66FF;
+	color: #fff;
+	text-align: center;
+	border-radius: 10rpx;
+	font-family: PingFangSC-Medium;
+	font-size: 32rpx;
+	height: 90rpx;
+	line-height: 90rpx;
+}
+
+.btn {
+	background-color: #fefefe;
+	width: 690rpx;
+	padding: 30rpx;
+	padding-bottom: 80rpx;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+}
+
+.cityList image {
+	width: 32rpx;
+	height: 32rpx;
+}
+
+.cityList {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #333333;
+	padding: 30rpx;
+	padding-left: 0;
+	margin-left: 30rpx;
+	width: 690rpx;
+	border-bottom: 1rpx solid #dddddd;
+}
+
+.location {
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #333333;
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+	padding: 30rpx;
+}
+
+.comfirm {
+	margin-left: auto;
+}
+
+.location image {
+	width: 40rpx;
+	height: 40rpx;
+}
+
+.title {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #999999;
+	background-color: #f6f6f6;
+	padding: 30rpx;
+}
+
+page {
+	background-color: #fefefe;
+}
 </style>
diff --git a/pageMy/my/resume/skillLevel.vue b/pageMy/my/resume/skillLevel.vue
index 0aa76e9..8a24c34 100644
--- a/pageMy/my/resume/skillLevel.vue
+++ b/pageMy/my/resume/skillLevel.vue
@@ -1,55 +1,182 @@
 <template>
-	<select-template ref="select" title="请选择技能水平" slo="请选择最符合你能力的标签，标签会帮你定制个性化推荐任务信息" :list="skillLevel" @submit="goAdd"></select-template>
+	<view>
+		<view class="title">
+			全部
+		</view>
+		<block v-for="(item, index) in city" :key="index">
+			<view class="cityList" @click="cityClick(item)">
+				{{ item.name }}
+				<image src="../../../static/img/correct.svg" v-if="id === item.id" mode=""></image>
+				<image v-else-if="layer !== maxLayer" src="../../../static/img/right.svg" mode=""></image>
+			</view>
+		</block>
+		<view class="" v-if="layer === maxLayer" style="height: 230rpx;background-color: #f6f6f6;"></view>
+		<view class="btn" v-if="layer === maxLayer" @click="comfirm">
+			<view class="bottombtn">
+				确定
+			</view>
+		</view>
+	</view>
 </template>
 
 <script>
-	import testData from '@/common/textdata.js';
-	import {
-		getSkills
-	} from '@/api/resume.js'
-	import selectTemplate from './selectTemplate.vue'
+import {
+	getWorktypesList
+} from '@/api/resume.js'
 
-	export default {
-		components: {
-			selectTemplate
-		},
-		data() {
-			return {
-				skillLevel: [],
-				worktypesId: null,
-				activeName: '',
-				activeId: '',
-				id: ''
+export default {
+	data() {
+		return {
+			workTypeList: [],
+
+			choose: false,
+			chooseIndex: '',
+			parentId: undefined,
+			layer: 1,
+			maxLayer: 2,
+			id: '',
+			label: '',
+
+			tradeId: '',
+		}
+	},
+	computed: {
+		city() {
+			if (this.parentId) {
+				const parentItem = this.workTypeList.find(item => item.id == this.parentId);
+				if (parentItem) {
+					return parentItem.child;
+				}
+			} else {
+				return this.workTypeList;
+			}
+		}
+	},
+	mounted() {
+		getWorktypesList(2).then(res => {
+			this.workTypeList = res.data.data;
+
+		})
+	},
+
+	onLoad({
+		tradeId,
+		parentId,
+		layer,
+		maxLayer
+	}) {
+		this.parentId = parentId
+		this.tradeId = tradeId || 0
+		this.layer = parseInt(layer || 1)
+		this.maxLayer = parseInt(maxLayer || 2)
+	},
+	onShow: function () { },
+	methods: {
+		cityClick(item) {
+			if (this.layer === this.maxLayer) {
+				this.selectCity(item)
+			} else {
+				this.goCityInfo(item)
 			}
 		},
-		onLoad({
-			id,
-			worktypesId
-		}) {
-			this.id = id
-			this.worktypesId = worktypesId
+		selectCity(item) {
+			console.log(item, "item");
+			this.id = item.id;
+			this.label = item.name;
+
 		},
-		onShow: function() {
-			this.getData()
+		goCityInfo(item) {
+			uni.navigateTo({
+				url: `./skillLevel?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.id}&parentLabel=${item.name}`
+			})
 		},
-		mounted() {
-			this.$refs.select.setActiveId(this.id)
+		comfirm: function () {
+			if (this.id) {
+				uni.$emit('setSkill', { detail: { id: this.id, label: this.label, parentLabel: this.$route.query.parentLabel } })
+				uni.navigateBack({
+					delta: this.layer
+				})
+			} else {
+				uni.showToast({
+					title: "请选择地点",
+					icon: "none"
+				})
+			}
 		},
-		methods: {
-			getData: function() {
-				if (this.worktypesId) {
-					getSkills(this.worktypesId).then(res => {
-						this.skillLevel = res.data.data
-					})
-				}
-			},
-			goAdd(res) {
-				uni.$emit('setSkill', res)
-				uni.navigateBack()
-			},
-		}
+
 	}
+}
 </script>
 
 <style>
+.bottombtn {
+	background-color: #1B66FF;
+	color: #fff;
+	text-align: center;
+	border-radius: 10rpx;
+	font-family: PingFangSC-Medium;
+	font-size: 32rpx;
+	height: 90rpx;
+	line-height: 90rpx;
+}
+
+.btn {
+	background-color: #fefefe;
+	width: 690rpx;
+	padding: 30rpx;
+	padding-bottom: 80rpx;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+}
+
+.cityList image {
+	width: 32rpx;
+	height: 32rpx;
+}
+
+.cityList {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #333333;
+	padding: 30rpx;
+	padding-left: 0;
+	margin-left: 30rpx;
+	width: 690rpx;
+	border-bottom: 1rpx solid #dddddd;
+}
+
+.location {
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #333333;
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+	padding: 30rpx;
+}
+
+.comfirm {
+	margin-left: auto;
+}
+
+.location image {
+	width: 40rpx;
+	height: 40rpx;
+}
+
+.title {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #999999;
+	background-color: #f6f6f6;
+	padding: 30rpx;
+}
+
+page {
+	background-color: #fefefe;
+}
 </style>
diff --git a/pages.json b/pages.json
index 4f53ee7..786410e 100644
--- a/pages.json
+++ b/pages.json
@@ -39,7 +39,7 @@
         {
             "path" : "pages/project/project",
             "style" : {
-                "navigationBarTitleText" : "抢任务",
+                "navigationBarTitleText" : "德阳市灵活就业平台",
                 "navigationBarBackgroundColor" : "#FFFFFF",
                 "enablePullDownRefresh" : true
             }
diff --git a/pages/project/project.vue b/pages/project/project.vue
index c8764d7..ac4a4a4 100644
--- a/pages/project/project.vue
+++ b/pages/project/project.vue
@@ -1,21 +1,32 @@
 <template>
 	<view>
+		<view class="titleSearch">
+			<view class="searchName">抢任务</view>
+
+			<u-search @focus="goSeach" shape="round" :showAction="false"></u-search>
+		</view>
+		<view>
+			<view>任务</view>
+			<view>岗位</view>
+			<view>推荐</view>
+		</view>
+
 
 		<!-- 筛选 -->
 		<view class="screenButton" @click="showPopUp = true">
 			筛选
-			<view class="arrow-up-right">
-
-			</view>
+			<view class="arrow-up-right"> </view>
 		</view>
-		<u-popup :show="showPopUp" mode="right" @close="closePopUp" @open="openPopUp">
+		<u-popup closeable :show="showPopUp" mode="right" @close="closePopUp" @open="openPopUp">
 			<view class="popUpWrapper">
 				<verticalMenu></verticalMenu>
 			</view>
 		</u-popup>
-		<v-tabs :tabs="['最新', '附近', '推荐']" height="45px" v-model="activeTab" color="#999" activeColor="#000"
+		<!-- <v-tabs :tabs="['最新', '附近', '推荐']" height="45px" v-model="activeTab" color="#999" activeColor="#000"
 			fontSize="36rpx" activeFontSize="36rpx" @change='changeTab' />
-		<image src="../../static/img/search.svg" @click="goSeach" class="topseach" mode=""></image>
+		<image src="../../static/img/search.svg" @click="goSeach" class="topseach" mode=""></image> -->
+
+
 
 		<block v-if="activeTab == 0">
 			<view v-if="newList.length > 0">
@@ -363,6 +374,19 @@ export default {
 </script>
 
 <style>
+.titleSearch{
+	display: flex;
+	width: 80%;
+	margin: 0 auto;
+	font-size: 22px;
+	font-weight: bold;
+	padding: 10rpx;
+	
+}
+.searchName{
+	margin-right: 15rpx;
+}
+
 .screenButton {
 	position: absolute;
 	top: 10px;
@@ -460,6 +484,6 @@ export default {
 }
 
 .popUpWrapper {
-	width: 300px;
+	width: 100%;
 }
 </style>
diff --git a/pages/setCity/setCity.vue b/pages/setCity/setCity.vue
index 02e84f3..6695271 100644
--- a/pages/setCity/setCity.vue
+++ b/pages/setCity/setCity.vue
@@ -5,7 +5,7 @@
 		</view>
 		<block v-for="item in city" :key="item.value">
 			<view class="cityList" @click="cityClick(item)">
-				{{item.label}}
+				{{ item.label }}
 				<image src="../../static/img/correct.svg" v-if='id === item.value' mode=""></image>
 				<image v-else-if="layer !== maxLayer" src="../../static/img/right.svg" mode=""></image>
 			</view>
@@ -20,147 +20,150 @@
 </template>
 
 <script>
-	import {
-		getcoder
-	} from "@/api/map.js";
+import {
+	getcoder
+} from "@/api/map.js";
 
-	import {
-		mapGetters
-	} from 'vuex'
-	export default {
-		data() {
-			return {
-				choose: false,
-				chooseIndex: '',
-				parentId: undefined,
-				layer: 1,
-				maxLayer: 3,
-				id: '',
-			}
-		},
-		computed: {
-			...mapGetters(['area']),
-			city() {
-				if (this.parentId) {
-					return this.area.children[this.parentId]
-				} else {
-					return []
-				}
-			}
-		},
-		created() {},
-		onLoad({
-			parentId,
-			layer,
-			maxLayer
-		}) {
-			this.parentId = parentId || '0'
-			this.layer = parseInt(layer || 1)
-			this.maxLayer = parseInt(maxLayer || 3)
-		},
-		onShow: function() {},
-		methods: {
-			cityClick(item) {
-				if (this.layer === this.maxLayer) {
-					this.selectCity(item)
-				} else {
-					this.goCityInfo(item)
-				}
-			},
-			selectCity(item) {
-				this.id = item.value
-			},
-			goCityInfo(item) {
-				uni.navigateTo({
-					url: `./setCity?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.value}`
-				})
-			},
-			comfirm: function() {
-				if (this.id) {
-					uni.$emit("setCity", this.id)
-					uni.navigateBack({
-						delta: this.layer
-					})
-				} else {
-					uni.showToast({
-						title: "请选择地点",
-						icon: "none"
-					})
-				}
-			},
+import {
+	mapGetters
+} from 'vuex'
+export default {
+	data() {
+		return {
+			choose: false,
+			chooseIndex: '',
+			parentId: undefined,
+			layer: 1,
+			maxLayer: 3,
+			id: '',
+			label: '',
 		}
+	},
+	computed: {
+		...mapGetters(['area']),
+		city() {
+			if (this.parentId) {
+				return this.area.children[this.parentId]
+			} else {
+				return []
+			}
+		}
+	},
+	created() { },
+	onLoad({
+		parentId,
+		layer,
+		maxLayer
+	}) {
+		this.parentId = parentId || '0'
+		this.layer = parseInt(layer || 1)
+		this.maxLayer = parseInt(maxLayer || 3)
+	},
+	onShow: function () { },
+	methods: {
+		cityClick(item) {
+			if (this.layer === this.maxLayer) {
+				this.selectCity(item)
+			} else {
+				this.goCityInfo(item)
+			}
+		},
+		selectCity(item) {
+			this.id = item.value;
+			this.label = item.label;
+
+		},
+		goCityInfo(item) {
+			uni.navigateTo({
+				url: `./setCity?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.value}&parentLabel=${item.label}`
+			})
+		},
+		comfirm: function () {
+			if (this.id) {
+				uni.$emit("setCity", { detail: { id: this.id, label: this.label, parentLabel: this.$route.query.parentLabel } })
+				uni.navigateBack({
+					delta: this.layer
+				})
+			} else {
+				uni.showToast({
+					title: "请选择地点",
+					icon: "none"
+				})
+			}
+		},
 	}
+}
 </script>
 
 <style>
-	.bottombtn {
-		background-color: #1B66FF;
-		color: #fff;
-		text-align: center;
-		border-radius: 10rpx;
-		font-family: PingFangSC-Medium;
-		font-size: 32rpx;
-		height: 90rpx;
-		line-height: 90rpx;
-	}
+.bottombtn {
+	background-color: #1B66FF;
+	color: #fff;
+	text-align: center;
+	border-radius: 10rpx;
+	font-family: PingFangSC-Medium;
+	font-size: 32rpx;
+	height: 90rpx;
+	line-height: 90rpx;
+}
 
-	.btn {
-		background-color: #fefefe;
-		width: 690rpx;
-		padding: 30rpx;
-		padding-bottom: 80rpx;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-	}
+.btn {
+	background-color: #fefefe;
+	width: 690rpx;
+	padding: 30rpx;
+	padding-bottom: 80rpx;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+}
 
-	.cityList image {
-		width: 32rpx;
-		height: 32rpx;
-	}
+.cityList image {
+	width: 32rpx;
+	height: 32rpx;
+}
 
-	.cityList {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		font-family: PingFangSC-Regular;
-		font-size: 32rpx;
-		color: #333333;
-		padding: 30rpx;
-		padding-left: 0;
-		margin-left: 30rpx;
-		width: 690rpx;
-		border-bottom: 1rpx solid #dddddd;
-	}
+.cityList {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #333333;
+	padding: 30rpx;
+	padding-left: 0;
+	margin-left: 30rpx;
+	width: 690rpx;
+	border-bottom: 1rpx solid #dddddd;
+}
 
-	.location {
-		font-family: PingFangSC-Regular;
-		font-size: 32rpx;
-		color: #333333;
-		display: flex;
-		align-items: center;
-		justify-content: flex-start;
-		padding: 30rpx;
-	}
+.location {
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #333333;
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+	padding: 30rpx;
+}
 
-	.comfirm {
-		margin-left: auto;
-	}
+.comfirm {
+	margin-left: auto;
+}
 
-	.location image {
-		width: 40rpx;
-		height: 40rpx;
-	}
+.location image {
+	width: 40rpx;
+	height: 40rpx;
+}
 
-	.title {
-		font-family: PingFangSC-Regular;
-		font-size: 28rpx;
-		color: #999999;
-		background-color: #f6f6f6;
-		padding: 30rpx;
-	}
+.title {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #999999;
+	background-color: #f6f6f6;
+	padding: 30rpx;
+}
 
-	page {
-		background-color: #fefefe;
-	}
+page {
+	background-color: #fefefe;
+}
 </style>
diff --git a/pages/setEducation/setEducation.vue b/pages/setEducation/setEducation.vue
new file mode 100644
index 0000000..6695271
--- /dev/null
+++ b/pages/setEducation/setEducation.vue
@@ -0,0 +1,169 @@
+<template>
+	<view>
+		<view class="title">
+			全部
+		</view>
+		<block v-for="item in city" :key="item.value">
+			<view class="cityList" @click="cityClick(item)">
+				{{ item.label }}
+				<image src="../../static/img/correct.svg" v-if='id === item.value' mode=""></image>
+				<image v-else-if="layer !== maxLayer" src="../../static/img/right.svg" mode=""></image>
+			</view>
+		</block>
+		<view class="" v-if="layer === maxLayer" style="height: 230rpx;background-color: #f6f6f6;"></view>
+		<view class="btn" v-if="layer === maxLayer" @click="comfirm">
+			<view class="bottombtn">
+				确定
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import {
+	getcoder
+} from "@/api/map.js";
+
+import {
+	mapGetters
+} from 'vuex'
+export default {
+	data() {
+		return {
+			choose: false,
+			chooseIndex: '',
+			parentId: undefined,
+			layer: 1,
+			maxLayer: 3,
+			id: '',
+			label: '',
+		}
+	},
+	computed: {
+		...mapGetters(['area']),
+		city() {
+			if (this.parentId) {
+				return this.area.children[this.parentId]
+			} else {
+				return []
+			}
+		}
+	},
+	created() { },
+	onLoad({
+		parentId,
+		layer,
+		maxLayer
+	}) {
+		this.parentId = parentId || '0'
+		this.layer = parseInt(layer || 1)
+		this.maxLayer = parseInt(maxLayer || 3)
+	},
+	onShow: function () { },
+	methods: {
+		cityClick(item) {
+			if (this.layer === this.maxLayer) {
+				this.selectCity(item)
+			} else {
+				this.goCityInfo(item)
+			}
+		},
+		selectCity(item) {
+			this.id = item.value;
+			this.label = item.label;
+
+		},
+		goCityInfo(item) {
+			uni.navigateTo({
+				url: `./setCity?layer=${this.layer + 1}&maxLayer=${this.maxLayer}&parentId=${item.value}&parentLabel=${item.label}`
+			})
+		},
+		comfirm: function () {
+			if (this.id) {
+				uni.$emit("setCity", { detail: { id: this.id, label: this.label, parentLabel: this.$route.query.parentLabel } })
+				uni.navigateBack({
+					delta: this.layer
+				})
+			} else {
+				uni.showToast({
+					title: "请选择地点",
+					icon: "none"
+				})
+			}
+		},
+	}
+}
+</script>
+
+<style>
+.bottombtn {
+	background-color: #1B66FF;
+	color: #fff;
+	text-align: center;
+	border-radius: 10rpx;
+	font-family: PingFangSC-Medium;
+	font-size: 32rpx;
+	height: 90rpx;
+	line-height: 90rpx;
+}
+
+.btn {
+	background-color: #fefefe;
+	width: 690rpx;
+	padding: 30rpx;
+	padding-bottom: 80rpx;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+}
+
+.cityList image {
+	width: 32rpx;
+	height: 32rpx;
+}
+
+.cityList {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #333333;
+	padding: 30rpx;
+	padding-left: 0;
+	margin-left: 30rpx;
+	width: 690rpx;
+	border-bottom: 1rpx solid #dddddd;
+}
+
+.location {
+	font-family: PingFangSC-Regular;
+	font-size: 32rpx;
+	color: #333333;
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+	padding: 30rpx;
+}
+
+.comfirm {
+	margin-left: auto;
+}
+
+.location image {
+	width: 40rpx;
+	height: 40rpx;
+}
+
+.title {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #999999;
+	background-color: #f6f6f6;
+	padding: 30rpx;
+}
+
+page {
+	background-color: #fefefe;
+}
+</style>
diff --git a/vue.config.js b/vue.config.js
index 5d62507..667d0bd 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,6 +5,7 @@ module.exports = {
             '/api': {
                 // target: 'http://127.0.0.1:8000', // 本地服务接口地址
 				target: "http://39.98.184.58:8000",  // 阿里云后台地址
+				// target: "http://192.168.0.100:8000",  // 本地网关
                 ws: true,
                 pathRewrite: {
                     '^/api': '/'