diff --git a/src/pages/PersonalCenter/PersonalCenter.vue b/src/pages/PersonalCenter/PersonalCenter.vue
index 5b805e3..3500443 100644
--- a/src/pages/PersonalCenter/PersonalCenter.vue
+++ b/src/pages/PersonalCenter/PersonalCenter.vue
@@ -5,14 +5,14 @@
姓名
- {{userInfoObj.userName}}
+ {{userInfoObj.userName}}
性别
- {{userInfoObj.sex}}
+ {{userInfoObj.sex}}
@@ -73,6 +73,13 @@
-->
+
+ 密码
+
+ {{userInfoObj.pasw}}
+
+
+
头像
@@ -190,11 +197,13 @@
-
-
- 服务内容介绍
+
+
+ 服务内容介绍
+
-
+
+
@@ -208,31 +217,40 @@
服务开始时间
- 09:00 {{userInfoObj.timeStart}}
+ {{userInfoObj.timeStart}}
-
+
服务结束时间
- 22:00 {{userInfoObj.timeEnd}}
+ {{userInfoObj.timeEnd}}
-
+
+
+ 密码
+
+ {{userInfoObj.pasw}}
+
+
+
@@ -284,9 +310,15 @@
background-color: #FFFFFF;
margin-bottom: 24rpx;
padding: 24rpx;
-.textAreaCss{
- font-weight: 700; margin-bottom: 16rpx; display: flex; justify-content: space-between;align-items: center;
-}
+
+ .textAreaCss {
+ font-weight: 700;
+ margin-bottom: 16rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+
.person_itm_sign {
display: flex;
justify-content: space-between;
diff --git a/src/pages/PersonalCenter/ReEditSingleInfo.vue b/src/pages/PersonalCenter/ReEditSingleInfo.vue
index c5be9c4..deff391 100644
--- a/src/pages/PersonalCenter/ReEditSingleInfo.vue
+++ b/src/pages/PersonalCenter/ReEditSingleInfo.vue
@@ -1,143 +1,156 @@
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+ mode="">
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
-
-
+
+
+
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
-
-
- 保存
-
@@ -152,9 +165,36 @@
export default {
data() {
return {
+ postListObj: {
+ '服务名称': 'serviceName',
+ '姓名': 'userName',
+ '负责人姓名': 'fzr',
+ '服务名称': 'serviceName',
+ '地址': 'serviceAddress',
+ '性别': 'sex',
+ '政治面貌': 'politics',
+ '民族': 'nation',
+ '籍贯': 'base',
+ '人才类型': 'rcType',
+ // '所属协会':,
+ '身份证号码': 'idCard',
+ '出生日期': 'birthDay',
+ '入会时间': 'comeTime',
+ '服务开始时间': 'timeStart',
+ '服务结束时间': 'timeEnd',
+ // '头像':'images',
+ // '实景照':'photo',
+ // '资质证':'cfPhoto',
+ '服务内容介绍': 'info',
+ '艺术成就': 'artAtt',
+ '荣誉奖项': 'greats',
+ '密码': 'password'
+
+ },
+ timeMode: 'date', //时间选择器模式 date tiem
postFileList2: [], //用来上传的数组
- baseurl: 'http://192.168.0.9:8080',
- fileList4: [], //资质照片上传
+ baseurl: http.config.baseUrl.replace('/h5/api', ''),
+ fileList4: [], //头像上传
fileList1: [],
fileList2: [], //代表作照片
StandradList: [], //代表作名称
@@ -163,12 +203,9 @@
isSubmit: true,
tempValue: '',
zhengzhiShow: false,
- model1: {
- userInfo: {
- Edkey: '',
- Edvalue: '',
- }
- },
+ Edkey: '',
+ Edvalue: '',
+
xiecolumns: [],
Zhengcolumns: [
["群众", "党员", '共青团员'],
@@ -183,36 +220,25 @@
peopleSkillColums: [
["书法家", "画家", "雕塑家"]
],
- // 校验规则
- rules: {
- 'userInfo.Edvalue': [{
- required: true,
- message: '不能为空',
- trigger: ['blur', 'change']
- }, {
- // 此为同步验证，可以直接返回true或者false，如果是异步验证，稍微不同，见下方说明
- validator: (rule, value, callback) => {
- // 调用uView自带的js验证规则，详见：
- return uni.$u.test.isEmpty(value);
- },
- message: "不能为空",
- // 触发器可以同时用blur和change，二者之间用英文逗号隔开
- trigger: ["change", "blur"],
- }],
- }
- // 校验规则ed
};
},
onLoad(opt) {
console.log("===opt", opt);
- this.model1.userInfo.Edkey = JSON.parse(opt.key)
- this.model1.userInfo.Edvalue = JSON.parse(opt.value)
+ this.Edkey = JSON.parse(opt.key)
+ this.Edvalue = JSON.parse(opt.value)
this.tempValue = JSON.parse(opt.value)
- console.log("optvalue", this.model1.userInfo.Edvalue);
+ console.log("optvalue", this.Edvalue);
uni.setNavigationBarTitle({
title: JSON.parse(opt.key)
})
- if (this.model1.userInfo.Edkey == '所属协会') {
+ // 日期选择器模式的转换
+ if (this.Edkey == '出生日期' || this.Edkey == '入会时间') {
+ this.timeMode = 'date'
+ } else {
+ this.timeMode = 'time'
+ }
+
+ if (this.Edkey == '所属协会') {
this.http.request('/association/list', {}, "GET").then((res) => {
let xieList = res.data.records.map((v, i) => {
return v.name
@@ -228,17 +254,17 @@
})
}
- if (this.model1.userInfo.Edkey == '头像') {
- console.log("ll", JSON.parse(this.model1.userInfo.Edvalue)[0]);
+ if (this.Edkey == '头像') {
+ // console.log("ll", JSON.parse(this.Edvalue)[0]);
this.fileList4.push({
- url: this.baseurl + JSON.parse(this.model1.userInfo.Edvalue)[0]
+ url: this.baseurl + JSON.parse(this.Edvalue)[0]
})
}
- if (this.model1.userInfo.Edkey == '实景照' || this.model1.userInfo.Edkey == '资质证') {
+ if (this.Edkey == '实景照' || this.Edkey == '资质证') {
let urL = this.baseurl
- let arr = JSON.parse(this.model1.userInfo.Edvalue).map((vv, ii) => {
+ let arr = JSON.parse(this.Edvalue).map((vv, ii) => {
return urL + vv
})
@@ -251,17 +277,17 @@
console.log("this.fileList1", this.fileList1);
}
- if (this.model1.userInfo.Edkey == '代表作') {
+ if (this.Edkey == '代表作') {
this.isSubmit = true
// 分化为 stanlist 和fileList2
- this.model1.userInfo.Edvalue.map((v, i) => {
+ this.Edvalue.map((v, i) => {
this.StandradList.push(v.name)
this.fileList2.push(v.value)
})
console.log("flieList2", this.fileList2);
- console.log("this.model1.userInfo.Edvalue==", this.model1.userInfo.Edvalue);
+ console.log("this.Edvalue==", this.Edvalue);
// 代表作 提交用的 数组
- this.postFileList2 = this.model1.userInfo.Edvalue.map((v, i) => {
+ this.postFileList2 = this.Edvalue.map((v, i) => {
return v.value
})
console.log(" this.postFileList2===", this.postFileList2);
@@ -293,59 +319,60 @@
onReady() {
- this.$refs.form1.setRules(this.rules);
+ // this.$refs.form1.setRules(this.rules);
+
},
methods: {
AddItem() {
- if (this.model1.userInfo.Edkey == '代表作') {
+ if (this.Edkey == '代表作') {
this.StandradList.push('')
this.fileList2.push([])
this.postFileList2.push([])
} else {
- this.model1.userInfo.Edvalue.push("")
+ this.Edvalue.push("")
}
},
delItem(num) {
- if (this.model1.userInfo.Edkey == '代表作') {
+ if (this.Edkey == '代表作') {
// 是用来 显示 作品名称 和 列数的
this.StandradList.splice(num, 1)
// 是用来显示
this.fileList2.splice(num, 1, [''])
// 是用来 提交修改数据用的
this.postFileList2.splice(num, 1)
-
-
+
+
} else {
- this.model1.userInfo.Edvalue.splice(num, 1)
+ this.Edvalue.splice(num, 1)
}
},
CheckId() {
- var value = this.model1.userInfo.Edvalue
+ var value = this.Edvalue
const reg =
/^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
if (reg.test(value) === false && value) {
- this.isSubmit = true
+ this.isSubmit = false
uni.showToast({
icon: "none",
title: '请输入正确格式的身份证号码',
})
} else {
- this.isSubmit = false
+ this.isSubmit = true
console.log('身份证号码格式正确')
}
},
CheckNumber() {
- var tele = this.model1.userInfo.Edvalue
+ var tele = this.Edvalue
let reg = /^[1][3,4,5,7,8,9][0-9]{9}$/ //正则表达式定义手机号正确格式
if (!tele) { //判断如果手机号（this.tele）为空，提示用户输入手机号
this.isSubmit = true
@@ -372,7 +399,7 @@
},
confimZheng(e) {
this.zhengzhiShow = false
- this.model1.userInfo.Edvalue = e.value[0]
+ this.Edvalue = e.value[0]
},
DatePicker() {
this.showBirthday = true
@@ -385,28 +412,60 @@
birthdayConfirm(e) {
this.showBirthday = false
- if (this.model1.userInfo.Edkey == '出生日期' || this.model1.userInfo.Edkey == '入会时间' || this.model1.userInfo
- .Edkey ==
- '服务时间') {
- this.model1.userInfo.Edvalue = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
+ if (this.Edkey == '出生日期' || this.Edkey == '入会时间') {
+ this.Edvalue = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
} else {
- this.model1.userInfo.Edvalue = e.value
+ this.Edvalue = e.value
}
},
submit() {
+ var baseStr = http.config.baseUrl.replace('/h5/api', '')
+ if (this.Edkey == '头像') {
+ if (this.fileList4[0]) {
+ var str = JSON.stringify(this.fileList4.map((v, i) => {
+ return v.url.replace(baseStr, '')
+ }))
+ console.log('str===', str);
+ this.PostChangerRequest({
+ 'images': str
+ })
+ } else {
+ uni.showToast({
+ icon: 'error',
+ title: '头像不能为空'
+ })
+ }
+
+ } else if (this.Edkey == '资质证' || this.Edkey == '实景照') {
+
+ if (this.fileList1[0]) {
+ var str = JSON.stringify(this.fileList1.map((v, i) => {
+ return v.url.replace(baseStr, '')
+ }))
+ console.log('str===', str);
+ if (this.Edkey == '资质证') {
+ this.PostChangerRequest({
+ 'cfPhoto': str
+ })
+ } else if (this.Edkey == '实景照') {
+ this.PostChangerRequest({
+ 'photo': str
+ })
+ }
+
+ } else {
+ uni.showToast({
+ icon: 'error',
+ title: '照片不应少于一张'
+ })
+ }
- /* this.$refs.form1.validate().then(res => {
- uni.$u.toast('Thanks your helping')
- }).catch(errors => {
- uni.$u.toast('您的资料还未补充完整')
- }) */
- /* uni.navigateBack({
- delta:1
- }) */
- if (this.model1.userInfo.Edkey == '代表作') {
+
+
+ } else if (this.Edkey == '代表作') {
console.log("submit", this.postFileList2);
// this.StandradList
var opsArr = []
@@ -419,26 +478,52 @@
})
}
console.log("opsArr", opsArr);
- this.http.request('/user', {
+ this.PostChangerRequest({
'opus': opsArr
- }, "POST").then((res) => {
- console.log("ressss", res.data);
- }).catch((error) => {
- uni.showToast({
- title: error
- })
+ })
+ } else {
+ // postListObj 通过对应列表 来发起修改请求
+ this.PostChangerRequest({
+ [this.postListObj[this.Edkey]]: this.Edvalue
})
}
+
+
+
+ /* if (this.Edkey == '姓名') {
+ this.PostChangerRequest({
+ 'userName': this.Edvalue
+ })
+ }
+ */
+
+
+ },
+ // 提交修改的方法
+ PostChangerRequest(obj) {
+ this.http.request('/user', obj, "POST").then((res) => {
+ uni.showToast({
+ title: "修改成功"
+ })
+ uni.navigateBack({
+ delta: 1
+ })
+ }).catch((error) => {
+ uni.showToast({
+ title: "修改失败",
+ icon: 'error'
+ })
+ })
},
CheckValue() {
// console.log("event",event);
- // console.log("dddd",this.model1.userInfo.Edkey);
- if (this.model1.userInfo.Edkey) {
+ // console.log("dddd",this.Edkey);
+ if (this.Edkey) {
// uni.$u.toast('不能为空')
// console.log(this.tempValue);
- // this.model1.userInfo.Edvalue=this.tempValue
+ // this.Edvalue=this.tempValue
}
@@ -457,9 +542,9 @@
this.fileList2[event.name].splice(event.index, 1)
this.postFileList2[event.name].splice(event.index, 1)
// 如果图片为零 且 名称为无 时 删除项目
- /* if(xx){
- delItem(xx)
- } */
+ /* if(xx){
+ delItem(xx)
+ } */
},
// 新增图片
async afterRead(event) {
@@ -511,7 +596,7 @@
fileListLen++
}
// console.log("postFileList2", this.postFileList2);
- // console.log("this.model1.userInfo.Edvalue", this.model1.userInfo.Edvalue );
+ // console.log("this.Edvalue", this.Edvalue );
},
uploadFilePromise(url) {
return new Promise((resolve, reject) => {
@@ -530,13 +615,11 @@
// upload ed
},
watch: {
- 'model1.userInfo.Edvalue': function(n, o) {
+ 'Edvalue': function(n, o) {
console.log("n", n);
-
if (!n) {
- // console.log(this);
uni.$u.toast('不能为空')
- // this.model1.userInfo.Edvalue = this.tempValue
+ this.isSubmit=false
}
}
},
@@ -548,6 +631,31 @@
background-color: #f5f5f5;
}
*/
+ .flc-top {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-top: 16rpx;
+ }
+
+ .m16 {
+ margin: 0 32rpx;
+ }
+
+ .gray {
+ background-color: #F8F8F8 !important;
+ }
+
+ .textAreaInfo {
+ margin-top: 8px;
+ width: calc(100% - 64rpx);
+ margin: 16rpx auto;
+ }
+
+ .nameClass {
+ background-color: #F8F8F8 !important;
+ }
+
.sexBox {
.sexItm {
display: flex;
diff --git a/src/pages/improveData/improveData.vue b/src/pages/improveData/improveData.vue
index e782eb7..f5e20aa 100644
--- a/src/pages/improveData/improveData.vue
+++ b/src/pages/improveData/improveData.vue
@@ -255,7 +255,7 @@
服务开始时间
-
@@ -263,7 +263,7 @@
服务结束时间
-
@@ -280,6 +280,11 @@
-->
+
+ 密码
+
+
@@ -805,6 +810,7 @@
"timeStart": that.serveTime,
"userName": that.name,
"userType": this.pageTypeId,
+ "fzr":that.DutyPeopleName
}
console.log("dataddddddddd", data);
this.http.request('/auth/init', data, "POST").then(res => {
diff --git a/src/request/interface.js b/src/request/interface.js
index 09bc024..0750a7a 100644
--- a/src/request/interface.js
+++ b/src/request/interface.js
@@ -7,7 +7,7 @@ export default {
config: {
// baseUrl: "http://192.168.0.57:8090/h5/api", //王锡
// baseUrl: "http://192.168.124.110:8088/api", //周源
- baseUrl: "http://192.168.0.9:8080/h5/api", //俞燕红
+ baseUrl: "http://192.168.0.29:8080/h5/api", //俞燕红
// baseUrl: "https://wlsq.ydool.com.cn/api", //线上
header: {
'Content-Type': 'application/json;charset=UTF-8',