diff --git a/epdc-resident-mp-yushan/pages/index/index.js b/epdc-resident-mp-yushan/pages/index/index.js index ebcd7a3..1d3ebad 100644 --- a/epdc-resident-mp-yushan/pages/index/index.js +++ b/epdc-resident-mp-yushan/pages/index/index.js @@ -412,7 +412,7 @@ Page({ // 绑定家庭入口 toFamily() { wx.navigateTo({ - url: '/subpages/family/pages/index/index', + url: '/subpages/family/pages/bindFamily/bindFamily', }) }, // 获取最新社区资讯 diff --git a/epdc-resident-mp-yushan/pages/index/index.wxml b/epdc-resident-mp-yushan/pages/index/index.wxml index 555acb7..19ee737 100644 --- a/epdc-resident-mp-yushan/pages/index/index.wxml +++ b/epdc-resident-mp-yushan/pages/index/index.wxml @@ -159,7 +159,7 @@ - + diff --git a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js index bee3e14..897745f 100644 --- a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js +++ b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ } }) let that = this - const versionNum = '1.2.31' + const versionNum = '1.2.32' api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data ? res.data.scanFlag : '1' diff --git a/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.js b/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.js index 9289a7c..f220150 100644 --- a/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.js +++ b/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.js @@ -27,10 +27,42 @@ Page({ district: "", buildingAddress: "", idNum: "", - mobile: '' + mobile: '', + roadRelationName:'', + villageRelationName:'', + buildRelationName:'', + unitRelationName:'', + houseRelationName:'', }, submitBtnIsAllowed: false, loadingHidden:false, + roadRelationList:[ + { + label:'111', + value:0 + }, + { + label:'222', + value:1 + }, + ], + villageRelationList:[ + { + label:'111', + value:0 + }, + { + label:'222', + value:1 + }, + ], + villageDisable:true, + buildRelationList:[], + buildDisable:true, + unitRelationList:[], + unitDisable:true, + houseRelationList:[], + houseDisable:true, }, /** @@ -61,6 +93,45 @@ Page({ } }) }, + getMember(){ + getFamilyMember().then((res) => { + + }) + }, + roadSyncPicker(e){ + this.setData({ + 'fmData.roadRelationName' : this.data.roadRelationList[e.detail.value].label + }) + }, + syncPicker(e){ + if(e.currentTarget.dataset.type ==='road' && !this.data.fmData.roadRelationName){ + wx.showToast({ + title: '请先选择路牌号', + icon: 'none', + duration: 1000//持续的时间 + }) + } + }, + villageSyncPicker(e){ + this.setData({ + 'fmData.villageRelationName' : this.data.villageRelationList[e.detail.value].label + }) + }, + buildSyncPicker(e){ + this.setData({ + 'fmData.buildRelationName' : e.detail.label + }) + }, + unitSyncPicker(e){ + this.setData({ + 'fmData.unitRelationName' : e.detail.label + }) + }, + houseSyncPicker(e){ + this.setData({ + 'fmData.houseRelationName' : e.detail.label + }) + }, submit(e){ let { nickname, surname,name,street,district,buildingAddress,idNum,mobile} = e.detail.value; this.setDate({ diff --git a/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.wxml b/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.wxml index b715a63..1748502 100644 --- a/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.wxml +++ b/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.wxml @@ -1,55 +1,31 @@ -
+ 基础信息 - * 昵称 - + - * - + - * - + @@ -58,49 +34,46 @@ 手机号 - + - * 身份证号 - + - + - 现居住地 + + + + 所属网格 + + + + {{fmData.sex}} + + + * 路牌号 - - + + + + {{fmData.roadRelationName}} + + 请选择 + + @@ -108,14 +81,14 @@ * 小区名称 - - + + + + {{fmData.villageRelationName}} + + 请选择 + + @@ -123,14 +96,14 @@ * 楼栋 - - + + + + {{fmData.buildRelationName}} + + 请选择 + + @@ -138,14 +111,14 @@ * 单元 - - + + + + {{fmData.unitRelationName}} + + 请选择 + + @@ -153,20 +126,18 @@ * 房屋 - - + + + + {{fmData.houseRelationName}} + + 请选择 + + - - - - + + \ No newline at end of file diff --git a/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.wxss b/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.wxss index 4e0764d..ed2fb63 100644 --- a/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.wxss +++ b/epdc-resident-mp-yushan/subpages/family/pages/bindFamily/bindFamily.wxss @@ -52,4 +52,15 @@ } .m-fm .submit-btn:active{ background-color:#ff1921 -} \ No newline at end of file +} +.menu-arrow{ + position:absolute; + top:20rpx; + right:0; + width:16rpx; + height:23rpx; +} +.item{ + position: relative; +} +.value{position:absolute;right:0;width:410rpx;display:flex;font-size:32rpx;font-family:Source Han Serif SC;font-weight:400;color:#333;line-height:60rpx}.value .picker{position:relative;width:100%;padding-right:40rpx;text-align:right}.value .picker .z-weak{color:#999}.value .picker .menu-arrow{position:absolute;top:20rpx;right:0;width:16rpx;height:23rpx} \ No newline at end of file