diff --git a/pages/index/index.js b/pages/index/index.js index a721832..dd7fcef 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -571,7 +571,7 @@ Page({ const arr = decodeURIComponent(res.result).split('/') const roomCode = arr[arr.length - 1] wx.navigateTo({ - url: `/subpages/family/pages/editHouseInfo/editHouseInfo?roomCode=${roomCode}` + url: `/subpages/family/pages/index/index?roomCode=${roomCode}` }) } } diff --git a/subpages/family/images/edit_info.png b/subpages/family/images/edit_info.png new file mode 100644 index 0000000..51d6097 Binary files /dev/null and b/subpages/family/images/edit_info.png differ diff --git a/subpages/family/pages/editHouseInfo/editHouseInfo.js b/subpages/family/pages/editHouseInfo/editHouseInfo.js index f6cb4a3..142b75d 100644 --- a/subpages/family/pages/editHouseInfo/editHouseInfo.js +++ b/subpages/family/pages/editHouseInfo/editHouseInfo.js @@ -1,8 +1,7 @@ // @ts-nocheck import { - wxShowToast, - wxRequestPost, - wxNavigateTo, + getHouseInfo, + updateHouseInfo } from '../../utils/api.js'; import validate from "../../utils/validate/index.js"; Page({ @@ -11,19 +10,11 @@ Page({ */ data: { submitBtnIsAllowed: false, - iniLoaded: false, - info: { - icResiUserId: '', - houseName: '', - houseCode: '3702030050150000700002', - qrCodeUrl: '', - }, fmData: { houseId:'', ownerName:'', // 房主姓名 - ownerIdCard: '', // 身份证 - ownerPhone:'', // 房主电话 - remark:'' // 备注 + idCard: '', // 身份证 + mobile:'', // 房主电话 }, buildingunitlist: [], // 单元 houseType: [ // 房屋类型 @@ -59,42 +50,28 @@ Page({ * 生命周期函数--监听页面加载 */ async onLoad(options) { + wx.showLoading({ + title: "加载中", + mask: true, + }); this.setData({ - fmData: options, - iniLoaded: true, + fmData: options }); await this.getBuildingunitlist(); + wx.hideLoading() }, // 单元 async getBuildingunitlist() { const { fmData } = this.data; - if (!fmData.buildingId) return - const { - data: { - data: { code, data }, - }, - msg, - } = await wxRequestPost( - `gov/org/building/buildingunitlist`, - {buildingId: fmData.buildingId}, - { - // isMock: true, - isQuiet: false, - } - ); + if (!fmData.roomCode) return + const res = await getHouseInfo({roomCode: fmData.roomCode}); - if (msg === 'success' && code === 0) { - let buildingunitlist = [] - data.forEach(element => { - buildingunitlist.push({ - value: element.id, - label: element.unitName - }) - }); + if (res.msg === 'success' && res.code === 0) { this.setData({ - buildingunitlist: buildingunitlist + fmData: res.data }) + console.log(this.data.fmData); } }, ownerNameSync(e){ @@ -120,19 +97,19 @@ Page({ // 房屋类型 houseTypePicker(e){ this.setData({ - 'fmData.houseTypeName' : this.data.houseType[e.detail.value].label + 'fmData.roomType' : this.data.houseType[e.detail.value].label }) }, // 房屋途径 housePurposePicker(e){ this.setData({ - 'fmData.purposeName' : this.data.purposeArr[e.detail.value].label + 'fmData.roomUse' : this.data.purposeArr[e.detail.value].label }) }, // 房屋状态 houseStatePicker(e){ this.setData({ - 'fmData.rentName' : this.data.rentFlagArr[e.detail.value].label + 'fmData.livingStatus' : this.data.rentFlagArr[e.detail.value].label }) }, @@ -218,32 +195,19 @@ Page({ title: "提交中", mask: true, }); - const { - data: { - data: { code, data }, - }, - msg, - } = await wxRequestPost( - "gov/org/house/houseupdate", - { - ...fmData, - }, - { - // isMock: true, - isQuiet: false, - } - ); + const res = await updateHouseInfo({...fmData}); wx.hideLoading(); - if (msg === "success" && code === 0) { - wxShowToast({ + if (res.msg === "success" && res.code === 0) { + wx.showToast({ title: "修改成功", duration: 2000, }); setTimeout(()=>{ - wx.navigateBack() + wx.reLaunch({ + url: `../index/index?roomCode=${!this.data.fmData.roomCode ? this.data.fmData.roomNo : this.data.fmData.roomCode}` + }) },2000) - } }, // 更新data数据后需主动触发 diff --git a/subpages/family/pages/editHouseInfo/editHouseInfo.wxml b/subpages/family/pages/editHouseInfo/editHouseInfo.wxml index 838ae21..7d2e129 100644 --- a/subpages/family/pages/editHouseInfo/editHouseInfo.wxml +++ b/subpages/family/pages/editHouseInfo/editHouseInfo.wxml @@ -1,4 +1,4 @@ - + 家庭房屋基本信息 @@ -12,7 +12,7 @@ - {{fmData.agencyName ? fmData.agencyName : ''}} + {{fmData.communityName ? fmData.communityName : ''}} @@ -37,7 +37,7 @@ - {{fmData.neighborHoodName ? fmData.neighborHoodName : ''}} + {{fmData.plotName ? fmData.plotName : ''}} @@ -59,7 +59,7 @@ - {{fmData.unitName ? fmData.unitName : ''}} + {{fmData.unit ? fmData.unit : ''}} @@ -86,7 +86,7 @@ - {{fmData.doorName ? fmData.doorName : ''}} + {{fmData.roomNo ? fmData.roomNo : ''}} @@ -125,7 +125,7 @@ range="{{houseType}}" range-key="label" bindchange="houseTypePicker"> - {{fmData.houseTypeName}} + {{fmData.roomType}} 请选择 @@ -142,24 +142,24 @@ range="{{purposeArr}}" range-key="label" bindchange="housePurposePicker"> - {{fmData.purposeName}} + {{fmData.roomUse}} 请选择 - + * - 房屋状态 + 居住情况 - {{fmData.rentName}} + {{fmData.livingStatus}} 请选择 @@ -190,7 +190,7 @@ - + - 确认修改 + 确认修改 - - \ No newline at end of file + \ No newline at end of file diff --git a/subpages/family/pages/editHouseInfo/editHouseInfo.wxss b/subpages/family/pages/editHouseInfo/editHouseInfo.wxss index 7858cfc..177d50c 100644 --- a/subpages/family/pages/editHouseInfo/editHouseInfo.wxss +++ b/subpages/family/pages/editHouseInfo/editHouseInfo.wxss @@ -1 +1 @@ -@import '../../assets/wxss/familyInfo.wxss'; \ No newline at end of file +@import '../../wxss/familyInfo.wxss'; \ No newline at end of file diff --git a/subpages/family/pages/index/index.js b/subpages/family/pages/index/index.js index 3e2c5a6..b63a97b 100644 --- a/subpages/family/pages/index/index.js +++ b/subpages/family/pages/index/index.js @@ -57,7 +57,6 @@ Page({ if(res.msg === 'success' && res.code === 0){ this.setData({ 'familyInfo':res.data, - 'roomCode':res.data.members }) } }, @@ -113,9 +112,8 @@ Page({ }) }, handlePreview() { - if (!this.data.familyInfo.maUrl) return; - this.setData({ - showQr: false, - }); + wx.navigateTo({ + url: `/subpages/family/pages/editHouseInfo/editHouseInfo?roomCode=`+this.data.roomCode + }) }, }) \ No newline at end of file diff --git a/subpages/family/pages/index/index.wxml b/subpages/family/pages/index/index.wxml index 193d9dc..9402177 100644 --- a/subpages/family/pages/index/index.wxml +++ b/subpages/family/pages/index/index.wxml @@ -4,25 +4,23 @@ - {{ familyInfo.plotName + familyInfo.buildingName + familyInfo.unit + familyInfo.roomNo}} + {{ familyInfo.plotName }} - {{familyInfo.buildingName}} - {{familyInfo.unit}} - {{familyInfo.roomNo}} No.{{ familyInfo.roomCode }} - + - - + - 我的"e家码" No.{{ familyInfo.roomCode }} - + @@ -61,22 +59,3 @@ 暂无家庭信息 - - \ No newline at end of file diff --git a/subpages/family/pages/index/index.wxss b/subpages/family/pages/index/index.wxss index fd626a4..776a384 100644 --- a/subpages/family/pages/index/index.wxss +++ b/subpages/family/pages/index/index.wxss @@ -1,3 +1,13 @@ @import '../../wxss/family.wxss'; -@import '../../wxss/c-popForm.wxss'; \ No newline at end of file +@import '../../wxss/c-popForm.wxss'; + +.card-qr { + width: 30rpx; + height: 30rpx; +} +.card-qr image { + display: block; + width: 100%; + height: 100%; +} \ No newline at end of file diff --git a/subpages/family/utils/api.js b/subpages/family/utils/api.js index ba995a9..72fadf4 100644 --- a/subpages/family/utils/api.js +++ b/subpages/family/utils/api.js @@ -1,71 +1,45 @@ const request = require('../../../utils/request') -/** - * 绑定我的家庭房屋 - */ -export function bindingFamily (param) { - return request.post('custom/family/bindingFamily',param) -} - -/** - * 获取小区下拉列表 - */ -export function getPlotOption (param) { - return request.get('custom/personroom/getPlotOption',param) -} - -/** - * 获取楼栋下拉列表 - */ -export function getBuildingOption (param) { - return request.get('custom/personroom/getBuildingOption',param) -} -/** - * 获取单元下拉列表 - */ -export function getUnitOption (param) { - return request.get('custom/personroom/getUnitOption',param) -} - -/** - * 获取房屋下拉列表 - */ -export function getHouseOption (param) { - return request.get('custom/personroom/getHouseOption', param) -} /** * 添加成员信息 */ export function addFamilyMember (param) { - return request.post('custom/personroom/addFamilyMember', param) + return request.post('work/custom/personroom/addFamilyMember', param) } /** * 修改成员信息 */ export function updateFamilyMember (param) { - return request.post('custom/personroom/updateFamilyMember',param) + return request.post('work/custom/personroom/updateFamilyMember',param) } /** * 获取成员信息 */ export function getFamilyMember (param) { - return request.get('custom/personroom/getFamilyMember',param) + return request.get('work/custom/personroom/getFamilyMember',param) } /** * 获取房屋信息 */ export function getHouseInfo (param) { - return request.get('custom/personroom/getHouseInfo',param) + return request.get('work/custom/personroom/getHouseInfo',param) +} + +/** + * 修改房屋信息 + */ + export function updateHouseInfo (param) { + return request.post('work/custom/personroom/updateHouseInfo',param) } /** * 获取与户主关系 */ export function householderRelation () { - return request.get('imgconfig/heartImgType/householder_relation') + return request.get('work/custom/personroom/heartImgType/householder_relation') } diff --git a/subpages/family/wxss/family.wxss b/subpages/family/wxss/family.wxss index 4dae7a5..23a82af 100644 --- a/subpages/family/wxss/family.wxss +++ b/subpages/family/wxss/family.wxss @@ -1 +1 @@ -page{background:#fff;box-sizing:border-box}.f-container{width:100%;box-sizing:border-box}.f-top{position:relative;width:100%;height:200rpx;background:#e3271c;border-radius:0 0 30rpx 30rpx;-webkit-border-radius:0 0 30rpx 30rpx;-moz-border-radius:0 0 30rpx 30rpx;-ms-border-radius:0 0 30rpx 30rpx;-o-border-radius:0 0 30rpx 30rpx}.f-top .flex-view{display:flex;justify-content:space-between;}.f-top .f-card{position:absolute;left:50%;bottom:-64rpx;width:690rpx;height:200rpx;margin-left:-345rpx;background-color:#fff;box-sizing:border-box;padding:28rpx 30rpx 18rpx;box-shadow: rgba(184,184,184,.25) 0px 0px 30px 5px;overflow:hidden;border-radius:14rpx;-moz-border-radius:14rpx;-ms-border-radius:14rpx;-o-border-radius:14rpx;-webkit-border-radius:14rpx}.f-top .f-card .card-right{flex-shrink:0;margin-left:30rpx}.f-top .f-card .card-title{height:96rpx;font-family:PingFang-SC-Bold;font-size:34rpx;letter-spacing:1rpx;color:#333;overflow:hidden}.f-top .f-card .card-num{display:flex;align-items:center;font-family:PingFang-SC-Medium;font-size:28rpx;letter-spacing:1rpx;color:#333;overflow:hidden}.f-top .f-card .card-num image{flex-shrink:0;width:32rpx;height:18rpx}.f-top .f-card .card-qr{width:140rpx;height:140rpx;margin: auto;position: relative;top: -5px;}.f-top .f-card .card-qr image{display:block;width:100%;height:100%;border-radius: 10px;}.f-top .f-card .card-qr-long{width:100rpx;height:100rpx}.f-top .f-card .card-qr-name{font-family:PingFang-SC-Regular;font-size:22rpx;font-weight:400;font-stretch:normal;letter-spacing:1rpx;color:#333}.f-wr{width:100%;box-sizing:border-box;padding:100rpx 20rpx 0}.title-right,.title-wr{display:flex;align-items:center}.title-wr{justify-content:space-between;padding:28rpx 0;border-bottom:1rpx solid #e7eeee}.title-wr .title-label{position:relative;padding-left:25rpx;font-family:PingFang-SC-Bold;font-size:34rpx;font-weight:400;font-stretch:normal;letter-spacing:0;color:#333}.title-wr .title-label::after{content:'';position:absolute;top:50%;left:0;width:6rpx;height:30rpx;margin-top:-15rpx;background-color:#e60000;border-radius:3rpx;-webkit-border-radius:3rpx;-moz-border-radius:3rpx;-ms-border-radius:3rpx;-o-border-radius:3rpx}.title-wr .title-right-label{font-family:PingFang-SC-Light;font-size:26rpx;font-weight:400;font-stretch:normal;color:#999}.title-wr .right-icon{width:30rpx;height:30rpx}.f-table{background-color:#fbfbfb}.f-table .table-cell{display:flex;align-items:center;padding:26rpx 0;border:solid 1rpx #e3e3e3;border-top:0;font-family:PingFang-SC-Regular;font-size:30rpx;color:#000003}.f-table .table-cell .table-col{flex:1;text-align:center;line-height:1}.f-table .table-cell .table-col-4{color:#dd2a2a}.f-table .table-header{background:#f1f1f1;border:0;font-family:PingFang-SC-Regular;font-size:28rpx;color:#666}.f-btns{display:flex;align-items:center;padding:30rpx 0}.f-btns .f-btns-icon{width:30rpx;height:30rpx;font-size:28rpx;color:#dd2a2a;text-align:center;line-height:30rpx;border:1rpx solid #dd2a2a;border-radius:50%;-webkit-border-radius:50%;-moz-border-radius:50%;-ms-border-radius:50%;-o-border-radius:50%}.f-btns .f-btns-label{margin-left:10rpx;font-size:28rpx;color:#dd2a2a}.mt40{margin-top:40rpx}.mt16{margin-top:16rpx}.no-data{font-size:28rpx;color:#999;text-align:center;line-height:300rpx}.m-fm .fm{top:500rpx;width:600rpx;padding:0 0 40rpx 0;background:#fff;overflow:hidden}.m-fm .fm .btn-close{top:27rpx;padding:0 30rpx;font-size:36rpx;color:#fff;line-height:90rpx}.m-fm .fm .btn-close image{display:block;width:36rpx;height:36rpx}.m-fm .fm .fm-btn{width:240rpx;height:54rpx;margin:20rpx auto 0;font-family:PingFang-SC-Medium;font-size:28rpx;font-weight:400;font-stretch:normal;letter-spacing:0;color:#999;text-align:center;line-height:54rpx;border-radius:27rpx;border:solid 1rpx #eee;-webkit-border-radius:27rpx;-moz-border-radius:27rpx;-ms-border-radius:27rpx;-o-border-radius:27rpx}.m-fm .fm-header{width:100%;height:90rpx;margin-bottom:20rpx;text-align:center;line-height:90rpx;font-family:PingFang-SC-Bold;font-size:32rpx;color:#fff;background-image:linear-gradient(90deg,#ca151d 0,#e11c13 100%)}.m-fm .fm-qr{width:400rpx;height:400rpx;box-sizing:border-box;margin:0 auto}.m-fm .fm-qr image{display:block;width:100%;height:100%}.no-family{padding-top:200rpx}.no-family image{display:block;width:506rpx;margin:0 auto}.no-family .no-btn{width:220rpx;height:66rpx;margin:60rpx auto 0;font-size:32rpx;color:#fff;text-align:center;line-height:66rpx;background-image:linear-gradient(90deg,#ca151d 0,#e11c13 100%);border-radius:30rpx;-webkit-border-radius:30rpx;-moz-border-radius:30rpx;-ms-border-radius:30rpx;-o-border-radius:30rpx} \ No newline at end of file +page{background:#fff;box-sizing:border-box}.f-container{width:100%;box-sizing:border-box}.f-top{position:relative;width:100%;height:200rpx;background:#e3271c;border-radius:0 0 30rpx 30rpx;-webkit-border-radius:0 0 30rpx 30rpx;-moz-border-radius:0 0 30rpx 30rpx;-ms-border-radius:0 0 30rpx 30rpx;-o-border-radius:0 0 30rpx 30rpx}.f-top .flex-view{display:flex;justify-content:space-between;}.f-top .f-card{position:absolute;left:50%;bottom:-64rpx;width:690rpx;height:200rpx;margin-left:-345rpx;background-color:#fff;box-sizing:border-box;padding:28rpx 30rpx 18rpx;box-shadow: rgba(184,184,184,.25) 0px 0px 30px 5px;overflow:hidden;border-radius:14rpx;-moz-border-radius:14rpx;-ms-border-radius:14rpx;-o-border-radius:14rpx;-webkit-border-radius:14rpx}.f-top .f-card .card-right{flex-shrink:0;margin-left:30rpx}.f-top .f-card .card-title{height:96rpx;font-family:PingFang-SC-Bold;font-size:34rpx;letter-spacing:1rpx;color:#333;overflow:hidden}.f-top .f-card .card-num{display:flex;align-items:center;font-family:PingFang-SC-Medium;font-size:28rpx;letter-spacing:1rpx;color:#333;overflow:hidden}.f-top .f-card .card-num image{flex-shrink:0;width:32rpx;height:18rpx}.f-top .f-card .card-qr{width:30rpx;height:30rpx;}.f-top .f-card .card-qr image{display:block;width:100%;height:100%;}.f-top .f-card .card-qr-long{width:100rpx;height:100rpx}.f-top .f-card .card-qr-name{font-family:PingFang-SC-Regular;font-size:22rpx;font-weight:400;font-stretch:normal;letter-spacing:1rpx;color:#333}.f-wr{width:100%;box-sizing:border-box;padding:100rpx 20rpx 0}.title-right,.title-wr{display:flex;align-items:center}.title-wr{justify-content:space-between;padding:28rpx 0;border-bottom:1rpx solid #e7eeee}.title-wr .title-label{position:relative;padding-left:25rpx;font-family:PingFang-SC-Bold;font-size:34rpx;font-weight:400;font-stretch:normal;letter-spacing:0;color:#333}.title-wr .title-label::after{content:'';position:absolute;top:50%;left:0;width:6rpx;height:30rpx;margin-top:-15rpx;background-color:#e60000;border-radius:3rpx;-webkit-border-radius:3rpx;-moz-border-radius:3rpx;-ms-border-radius:3rpx;-o-border-radius:3rpx}.title-wr .title-right-label{font-family:PingFang-SC-Light;font-size:26rpx;font-weight:400;font-stretch:normal;color:#999}.title-wr .right-icon{width:30rpx;height:30rpx}.f-table{background-color:#fbfbfb}.f-table .table-cell{display:flex;align-items:center;padding:26rpx 0;border:solid 1rpx #e3e3e3;border-top:0;font-family:PingFang-SC-Regular;font-size:30rpx;color:#000003}.f-table .table-cell .table-col{flex:1;text-align:center;line-height:1}.f-table .table-cell .table-col-4{color:#dd2a2a}.f-table .table-header{background:#f1f1f1;border:0;font-family:PingFang-SC-Regular;font-size:28rpx;color:#666}.f-btns{display:flex;align-items:center;padding:30rpx 0}.f-btns .f-btns-icon{width:30rpx;height:30rpx;font-size:28rpx;color:#dd2a2a;text-align:center;line-height:30rpx;border:1rpx solid #dd2a2a;border-radius:50%;-webkit-border-radius:50%;-moz-border-radius:50%;-ms-border-radius:50%;-o-border-radius:50%}.f-btns .f-btns-label{margin-left:10rpx;font-size:28rpx;color:#dd2a2a}.mt40{margin-top:40rpx}.mt16{margin-top:16rpx}.no-data{font-size:28rpx;color:#999;text-align:center;line-height:300rpx}.m-fm .fm{top:500rpx;width:600rpx;padding:0 0 40rpx 0;background:#fff;overflow:hidden}.m-fm .fm .btn-close{top:27rpx;padding:0 30rpx;font-size:36rpx;color:#fff;line-height:90rpx}.m-fm .fm .btn-close image{display:block;width:36rpx;height:36rpx}.m-fm .fm .fm-btn{width:240rpx;height:54rpx;margin:20rpx auto 0;font-family:PingFang-SC-Medium;font-size:28rpx;font-weight:400;font-stretch:normal;letter-spacing:0;color:#999;text-align:center;line-height:54rpx;border-radius:27rpx;border:solid 1rpx #eee;-webkit-border-radius:27rpx;-moz-border-radius:27rpx;-ms-border-radius:27rpx;-o-border-radius:27rpx}.m-fm .fm-header{width:100%;height:90rpx;margin-bottom:20rpx;text-align:center;line-height:90rpx;font-family:PingFang-SC-Bold;font-size:32rpx;color:#fff;background-image:linear-gradient(90deg,#ca151d 0,#e11c13 100%)}.m-fm .fm-qr{width:400rpx;height:400rpx;box-sizing:border-box;margin:0 auto}.m-fm .fm-qr image{display:block;width:100%;height:100%}.no-family{padding-top:200rpx}.no-family image{display:block;width:506rpx;margin:0 auto}.no-family .no-btn{width:220rpx;height:66rpx;margin:60rpx auto 0;font-size:32rpx;color:#fff;text-align:center;line-height:66rpx;background-image:linear-gradient(90deg,#ca151d 0,#e11c13 100%);border-radius:30rpx;-webkit-border-radius:30rpx;-moz-border-radius:30rpx;-ms-border-radius:30rpx;-o-border-radius:30rpx} \ No newline at end of file