diff --git a/components/vertical-menu/classifyData.js b/components/vertical-menu/classifyData.js
index 37218ab..90787e5 100644
--- a/components/vertical-menu/classifyData.js
+++ b/components/vertical-menu/classifyData.js
@@ -95,7 +95,7 @@ export default [
],
},
{
- name: "省市区县",
+ name: "区域",
data: [
{
name: "薪资不限",
diff --git a/components/vertical-menu/vertical-menu.vue b/components/vertical-menu/vertical-menu.vue
index 2d1929b..475923c 100644
--- a/components/vertical-menu/vertical-menu.vue
+++ b/components/vertical-menu/vertical-menu.vue
@@ -16,7 +16,7 @@
{{ item.name }}
-
我的职业技能
-
+
@@ -34,14 +34,28 @@
-
+
+
+
+
+ 您想工作的地点
+
+
+ {{ myResume.city !== "{}" ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace :
+ '请选择'
}}
@@ -53,7 +67,7 @@
您的学历
- {{ myResume.education == {} ? myResume.education.label : '请选择' }}
+ {{ myResume.education !== "{}" ? myResume.education.label : '请选择' }}
@@ -89,6 +103,12 @@
keyName="label">
+
+
+
@@ -135,7 +155,18 @@ export default {
canSubMit: false,
isShowButton: false,
isShowBorder: false,
- isShowAddSkill: true
+ isShowAddSkill: true,
+
+ areaModal: {
+ address: '',
+ addressShow: false,
+ title: 'Hello',
+ // indexs: [0, 0, 8],
+ // defaultIds: [1, 110000, 110106],
+ defaultNames: ['北京市', '北京市', '东城区'],
+ labelName: "areaName"
+
+ },
}
},
onShow() {
@@ -217,6 +248,7 @@ export default {
})
},
goAdd: function () {
+
uni.navigateTo({
url: './addSkill'
})
@@ -306,7 +338,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()
@@ -321,7 +353,17 @@ export default {
- }
+ },
+
+ confirmAddress(val) {
+ console.log(val);
+ var valArr = val.value;
+ // this.areaModal.address = [...new Set(val.value)].join(' / ')
+ this.isShowButton = true
+ this.myResume.city.workplace = [...new Set(val.value)].join('/')
+ console.log(this.areaModal.address);
+ this.areaModal.addressShow = false
+ },
}
}
diff --git a/pages.json b/pages.json
index 6343150..4ed097f 100644
--- a/pages.json
+++ b/pages.json
@@ -174,14 +174,23 @@
"navigationBarTextStyle" : "white"
}
}
-
-
,{
"path" : "pages/user/policyContent",
"style" : {
"navigationBarTitleText" : "新政详情",
"navigationBarBackgroundColor" : "#FFFFFF"
}
+ },
+ {
+ "path" : "pages/project/projectList",
+ "style": {
+ "navigationBarTitleText": "位置",
+ "navigationBarBackgroundColor": "#FFFFFF",
+ "enablePullDownRefresh": true,
+ "navigationBarShadow": {
+ "colorType": "none"
+ }
+ }
}
],
"subPackages": [{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 741c466..ca1c1a1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -48,7 +48,7 @@
-
+
简历登记
@@ -59,7 +59,7 @@
-
+
最新任务
@@ -70,7 +70,7 @@