diff --git a/src/manifest.json b/src/manifest.json index c4fad60..e8ad3c2 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -90,7 +90,7 @@ // 与vue中的proxyTable配置大致上一致,此处我同时代理了两个 "/pre" : { // 预发布 - "target" : "http://10.0.0.61:8080/h5/api", // 目标接口域名 + "target" : "http://192.168.1.85:8080/h5/api", // 目标接口域名 // "target" : "https://yxx.ydool.net/h5/api", // 目标接口域名 "changeOrigin" : true, // 是否跨域 diff --git a/src/pagesB/PersonalCenter/PersonalCenter.vue b/src/pagesB/PersonalCenter/PersonalCenter.vue index c83419e..4255cb8 100644 --- a/src/pagesB/PersonalCenter/PersonalCenter.vue +++ b/src/pagesB/PersonalCenter/PersonalCenter.vue @@ -16,10 +16,10 @@ - - 出生日期 + + 出生年月 - {{userInfoObj.birthDay}} + {{userInfoObj.dateBirth}} diff --git a/src/pagesB/PersonalCenter/ReEditSingleInfo.vue b/src/pagesB/PersonalCenter/ReEditSingleInfo.vue index 7816182..d56f241 100644 --- a/src/pagesB/PersonalCenter/ReEditSingleInfo.vue +++ b/src/pagesB/PersonalCenter/ReEditSingleInfo.vue @@ -28,7 +28,7 @@ + v-if="Edkey=='出生年月'||Edkey=='入会时间'||Edkey=='服务开始时间'||Edkey=='服务结束时间'"> @@ -124,7 +124,7 @@ :columns="Edkey=='政治面貌'? Zhengcolumns : Edkey=='会员级别'? peopleSkillColums:Edkey=='所属协会'? xiecolumns:Edkey=='学历'? educolumns:[]"> @@ -159,7 +159,7 @@ '人才类型': 'rcType', // '所属协会':, '身份证号码': 'idCard', - '出生日期': 'birthDay', + '出生年月': 'dateBirth', '入会时间': 'comeTime', '服务开始时间': 'timeStart', '服务结束时间': 'timeEnd', @@ -228,8 +228,10 @@ } } // 日期选择器模式的转换 - if (this.Edkey == '出生日期' || this.Edkey == '入会时间') { + if (this.Edkey == '入会时间') { this.timeMode = 'date' + }else if (this.Edkey == '出生年月') { + this.timeMode = 'year-month' } else { this.timeMode = 'time' } @@ -398,9 +400,11 @@ }, birthdayConfirm(e) { this.showBirthday = false - if (this.Edkey == '出生日期' || this.Edkey == '入会时间') { + if (this.Edkey == '入会时间') { this.Edvalue = uni.$u.timeFormat(e.value, 'yyyy-mm-dd') - } else { + } else if(this.Edkey == '出生年月') { + this.Edvalue = uni.$u.timeFormat(e.value, 'yyyy.mm') + }else { this.Edvalue = e.value } }, diff --git a/src/pagesB/improveData/improveData.vue b/src/pagesB/improveData/improveData.vue index 738326b..adaf003 100644 --- a/src/pagesB/improveData/improveData.vue +++ b/src/pagesB/improveData/improveData.vue @@ -18,8 +18,8 @@ - *出生日期 - *出生年月 + @@ -220,7 +220,7 @@ @@ -338,6 +338,7 @@ name: '', sex: '', birthday: "2000-01-01", + dateBirth: "2000.01", idCOde: '', phoneNum: '', meeting: '', @@ -487,7 +488,8 @@ this.model1.userInfo.officeTel = this.userData.officeTel this.model1.userInfo.unitName = this.userData.unitName this.model1.userInfo.mailAddress = this.userData.mailAddress - this.model1.userInfo.birthday = this.userData.birthDay + this.model1.userInfo.birthday = this.userData.birthDay + this.model1.userInfo.dateBirth = this.userData.dateBirth } }, onReady() { @@ -562,7 +564,7 @@ }, birthdayConfirm(e) { this.showBirthday = false - this.model1.userInfo.birthday = uni.$u.timeFormat(e.value, 'yyyy-mm-dd') + this.model1.userInfo.dateBirth = uni.$u.timeFormat(e.value, 'yyyy.mm') // this.$refs.form1.validateField('userInfo.birthday') }, ServeTimeConfirm(e) { @@ -747,6 +749,7 @@ associationId: this.xiehuiId, base: this.jiguan, birthDay: that.birthday, + dateBirth: that.dateBirth, cfPhoto: fl4, comeTime: that.jionTime, greats: rongyujx, @@ -779,7 +782,7 @@ member: that.member, } console.log(data) - if (!data.userName || !data.sex || !data.birthDay || !data.images || !data.password || !data.education || ! + if (!data.userName || !data.sex || !data.dateBirth || !data.images || !data.password || !data.education || ! data.mailAddress || !data.politics) { this.upLoadReady = false console.log(zyz) diff --git a/src/pagesD/xskz/index.vue b/src/pagesD/xskz/index.vue index dafdef2..76f3a05 100644 --- a/src/pagesD/xskz/index.vue +++ b/src/pagesD/xskz/index.vue @@ -26,7 +26,7 @@ - + --> {{ item.title }} @@ -71,7 +71,7 @@ export default { playback: "40.123", like: "8.112.490", collect: "8.112.490", - video: "../../static/a1.mp4", + // video: "../../static/a1.mp4", play: true, }, diff --git a/src/request/interface.js b/src/request/interface.js index ec83fef..ed4e372 100644 --- a/src/request/interface.js +++ b/src/request/interface.js @@ -5,7 +5,7 @@ export default { config: { - baseUrl: "http://10.0.0.61:8080/h5/api", //俞燕红-小程序不能配跨域 + baseUrl: "http://192.168.1.85:8080/h5/api", //俞燕红-小程序不能配跨域 // baseUrl: "/pre", //俞燕红-跨域 // baseUrl: "https://yxx.ydool.net/h5/api", //线上 // baseUrl: "/h5/api", //h5 diff --git a/src/static/a1.mp4 b/src/static/a1.mp4 deleted file mode 100644 index 140e3d3..0000000 Binary files a/src/static/a1.mp4 and /dev/null differ