diff --git a/api/baseurl.js b/api/baseurl.js index 0064f96..ae6db54 100644 --- a/api/baseurl.js +++ b/api/baseurl.js @@ -1,10 +1,12 @@ // var baseurl = "https://quanyidaojia.xinelu.cn"; -// var baseurl = "http://192.168.16.48:8088"; +var baseurl = "http://192.168.16.48:8088"; // 蒙 // var baseurl = "http://8.131.93.145:54088"; // 郝 // var baseurl = "http://8.131.93.145:54010"; -var baseurl = "http://192.168.16.30:8088"; +// var baseurl = "http://192.168.16.76:8080"; +// var baseurl = "http://192.168.16.212:8088"; + export default baseurl diff --git a/components/protocol/protocol.vue b/components/protocol/protocol.vue index a3396ad..a08b5de 100644 --- a/components/protocol/protocol.vue +++ b/components/protocol/protocol.vue @@ -12,7 +12,28 @@

乙方：

{{list.residentName}}

- + + + 姓名 + 性别 + 年龄 + 身份证号 + 现住址 + 选择签约基础服务包 + 选择签约个性服务包 + + + {{list.residentName}} + {{list.gender === '1' ? '男' : '女'}} + {{list.age?list.age:''}} + {{list.identity?list.identity:''}} + {{list.address?list.address:''}} + {{list.phone?list.phone:''}} + {{list.BasePackage?list.BasePackage:''}} + {{list.PersonalityPack?list.PersonalityPack:''}} + + +

甲乙双方本着平等、尊重和自愿的原则，签订此协议，接受以下条款的约定

甲乙双方共同确定 diff --git a/pagesB/AddMembers/AddMembers.vue b/pagesB/AddMembers/AddMembers.vue index 411577c..daaeb64 100644 --- a/pagesB/AddMembers/AddMembers.vue +++ b/pagesB/AddMembers/AddMembers.vue @@ -71,7 +71,7 @@ 请选择出生日期 {{form.birthDate}} - + --> @@ -98,6 +98,13 @@ + + 所在位置 + + 请选择所在位置 + {{form.locationName}} + + 手机号 @@ -115,11 +122,12 @@ - - - - - + + + + + @@ -130,7 +138,7 @@ import { registerdata } from '@/api/pages/register/register.js' - + // import { // bindFamilyUser, // getDictByType @@ -176,13 +184,15 @@ address: '', phone: '', birthDate: '', - householdRelationship: '', + locationName: '', + homeLongitude: '', + homeLatitude: '', }, - householdRelationship:'', - userinfo:{}, - - nation:'', + householdRelationship: '', + userinfo: {}, + + nation: '', actions: [{ value: '1', label: '汉族' @@ -290,10 +300,10 @@ trigger: ['blur', 'change'] }], householdRelationship: [{ - min: 1, - required: true, - message: '请选择与户主关系', - trigger: ['blur', 'change'] + min: 1, + required: true, + message: '请选择与户主关系', + trigger: ['blur', 'change'] }], address: [{ required: true, @@ -358,6 +368,20 @@ }) }, methods: { + //获取所在位置 + getAddress() { + var that = this; + uni.chooseLocation({ + success: function(location) { + that.form.locationName = location.address + that.form.homeLongitude = location.longitude; + that.form.homeLatitude = location.latitude; + }, + fail(err) { + console.log(err) + } + }); + }, //选择出生日期 timechange(e) { this.form.birthDate = e.year + '-' + e.month + '-' + e.day @@ -367,7 +391,7 @@ const _this = this _this.userinfo = uni.getStorageSync('userinfo'); _this.form.openid = uni.getStorageSync('openid'); - _this.form.cityCode= uni.getStorageSync('region'); + _this.form.cityCode = uni.getStorageSync('region'); console.log(_this.form, '000') if (_this.form.sexname == '男') { _this.form.sex = 'MALE'; @@ -380,7 +404,7 @@ type: 'error' }) } - + _this.$refs.uForm.validate(valid => { if (valid) { registerdata(_this.form).then(res => { @@ -389,7 +413,7 @@ title: res.data.msg, type: 'error' }) - }else{ + } else { _this.$refs.uToast.show({ title: '添加成功', type: 'success' @@ -398,7 +422,7 @@ delta: 1 }) // this.back() - + } }) @@ -419,13 +443,13 @@ } else if (e == '女') { this.form.sex = 'FEMALE'; } - + }, // 民族 nationSelect(e) { this.form.nation = e[0].value this.nation = e[0].label - + }, // 与户主关系 relationshipSelect(e) { @@ -472,7 +496,8 @@ } } - .u-form-item{ + + .u-form-item { padding: 0 0 !important; } @@ -491,7 +516,7 @@ display: flex; // align-items: center; // justify-content: center; - // + // width: 47%; margin: 23rpx 30rpx 0 55rpx; @@ -535,8 +560,8 @@ left: 50%; transform: translateX(-50%); margin-top: 100rpx; - bottom: 27rpx; - + bottom: 27rpx; + } .contentbottom { @@ -624,6 +649,51 @@ } + // .selectdata{ + + // } + .selectdata { + width: 636rpx; + height: 63rpx; + background: #F6F6F6; + margin: 12rpx auto; + border-radius: 5rpx; + display: flex; + position: relative; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + + + .testitem { + font-size: 26rpx; + font-family: Source Han Sans CN; + font-weight: 400; + color: #000000; + + + } + + text { + padding-left: 20rpx; + line-height: 63rpx; + font-size: 20rpx; + font-family: Source Han Sans CN; + font-weight: 400; + color: #8E8E8E; + } + + image { + width: 9rpx; + height: 17rpx; + position: absolute; + right: 40rpx; + top: 50%; + -webkit-transform: translateY(-50%); + transform: translateY(-50%); + } + } + .select { width: 636rpx; height: 63rpx; @@ -632,13 +702,14 @@ border-radius: 5rpx; display: flex; position: relative; + .testitem { font-size: 26rpx; font-family: Source Han Sans CN; font-weight: 400; color: #000000; - - + + } text { @@ -749,4 +820,4 @@ } } } - \ No newline at end of file + diff --git a/pagesB/performancedetails/performancedetails.vue b/pagesB/performancedetails/performancedetails.vue index bef89b2..3c2b029 100644 --- a/pagesB/performancedetails/performancedetails.vue +++ b/pagesB/performancedetails/performancedetails.vue @@ -24,6 +24,7 @@ data() { return { itemlist: [], + userinfo:{}, }; }, watch: {}, @@ -33,7 +34,10 @@ }, info() { // getPerformance(uni.getStorageSync('userinfo').cardNo, '1').then(res => { - getPerformance('372424194703207523', '1').then(res => { + this.cityCode = uni.getStorageSync('region'); + this.userinfo = uni.getStorageSync('userinfo') + var identity=this.userinfo.cardNo + getPerformance(identity).then(res => { res.data.forEach(e => { e.check = false }) @@ -105,4 +109,4 @@ margin-bottom: 20rpx; } } - \ No newline at end of file +