diff --git a/app.js b/app.js
index f992a35..dda01b8 100644
--- a/app.js
+++ b/app.js
@@ -12,7 +12,7 @@ App({
volunteerUrl: 'https://www.wgink.ink/volunteer',
venueUrl: 'https://www.wgink.ink/venuebooking',
activityUrl: 'https://www.wgink.ink/culturalactivity',
- volunteerUrl: 'https://www.wgink.ink/volunteer',
+ volunteerUrl: 'http://192.168.0.111:8888/volunteer',
liveUrl: 'https://www.wgink.ink/live',
liveRecordUrl: 'https://www.wgink.ink',
socialUrl: 'https://www.wgink.ink/social',
diff --git a/pages/volunteerRegister/volunteerRegister.js b/pages/volunteerRegister/volunteerRegister.js
index f8d17c6..a2a7c41 100644
--- a/pages/volunteerRegister/volunteerRegister.js
+++ b/pages/volunteerRegister/volunteerRegister.js
@@ -12,8 +12,8 @@ Page({
openExperience: 0,
tempObj: {}, // 用于临时存储字典表返回的数据
tempArray: [], // 用于临时存储字典表返回的数据
- serviceType: {}, // 服务类别
- serviceTypeValue: '', // 用户选择的服务类别ID
+ serviceType: {}, // 服务意向
+ serviceTypeValue: '', // 用户选择的服务意向ID
serviceIndustry: {}, // 服务领域或行业
serviceIndustryValue: '', // 用户选择的服务领域或行业ID
@@ -33,7 +33,17 @@ Page({
teamAreaArray: [], // 服务区域-乡镇村
countyShowStatus: true,
- areaShowStatus: true
+ areaShowStatus: true,
+
+ occupationIndex: 0,
+ occupationResult: '请选择职业',
+ occupation: {}, // 职业
+ occupationArray: [], // 职业
+
+ work: '', // 工作单位及职务
+ hobby: '', // 特长爱好
+ cv: '', // 个人简历
+ remark: '' // 备注
},
getToken: function() {
var self = this;
@@ -206,10 +216,19 @@ Page({
&& self.data.teamArea[self.data.teamAreaIndex] != 'undefined' ?
self.data.teamArea[self.data.teamAreaIndex].dictionaryId :
'',
+ occupation: self.data.occupation[self.data.occupationIndex] != ''
+ && self.data.occupation[self.data.occupationIndex] != null
+ && self.data.occupation[self.data.occupationIndex] != 'undefined' ?
+ self.data.occupation[self.data.occupationIndex].dictionaryId :
+ '',
serviceType: self.data.serviceTypeValue,
serviceIndustry: self.data.serviceIndustryValue,
agree: self.data.isAgree,
- openExperience : self.data.openExperience
+ openExperience : self.data.openExperience,
+ work: self.data.work,
+ hobby: self.data.hobby,
+ cv: self.data.cv,
+ remark: self.data.remark
};
var url;
var requ;
@@ -341,7 +360,11 @@ Page({
if('200' == code) {
console.log(data)
self.setData({
- volunteerMsg: data
+ volunteerMsg: data,
+ work: data.work,
+ hobby: data.hobby,
+ cv: data.cv,
+ remark: data.remark,
})
}
return resolve();
@@ -380,6 +403,15 @@ Page({
tempArray: []
})
})
+ }).then(result => {
+ this.getDataFromDict('3a2a6615-a4fe-465b-b56d-a2b7ae409b9d', 2).then(result => {
+ self.setData({
+ occupation: self.data.tempObj,
+ occupationArray: self.data.tempArray,
+ tempObj: {},
+ tempArray: []
+ })
+ })
})
})
})
diff --git a/pages/volunteerRegister/volunteerRegister.wxml b/pages/volunteerRegister/volunteerRegister.wxml
index eb1dfaf..3a126c3 100644
--- a/pages/volunteerRegister/volunteerRegister.wxml
+++ b/pages/volunteerRegister/volunteerRegister.wxml
@@ -50,11 +50,11 @@
- 服务类别:
+ 服务意向:
-
+
{{item.dictionaryName}}
@@ -73,6 +73,47 @@
+
+ 职业:
+
+
+
+
+ {{occupationArray[occupationIndex]}}
+
+
+
+
+
+
+
+ 工作单位及职务:
+
+
+
+
+
+
+ 特长爱好:
+
+
+
+
+
+
+ 个人简历:
+
+
+
+
+
+
+ 备注:
+
+
+
+
+
diff --git a/pages/volunteerRegister/volunteerRegister.wxss b/pages/volunteerRegister/volunteerRegister.wxss
index 4e47500..f2dba43 100644
--- a/pages/volunteerRegister/volunteerRegister.wxss
+++ b/pages/volunteerRegister/volunteerRegister.wxss
@@ -26,6 +26,13 @@
padding: 0 10rpx;
box-sizing: border-box;
}
+.info-text textarea{
+ width: 100%;
+ height: 150rpx;
+ padding: 10rpx;
+ box-sizing: border-box;
+ border: 1px solid #DDD;
+}
picker, .picker{
height: 55rpx;
line-height: 55rpx;