diff --git a/pages/activites/activites.vue b/pages/activites/activites.vue index ff79b87..0f0fd62 100755 --- a/pages/activites/activites.vue +++ b/pages/activites/activites.vue @@ -73,7 +73,9 @@ let _objData = { page: 1, row: 15, - communityId: this.communityId + communityId: this.communityId, + defaultShow: 'Y', + clientType: 'H5' }; loadActivites(_objData) .then((_acts) => { diff --git a/pages/complaint/complaint.vue b/pages/complaint/complaint.vue index 2d5dfd6..d5027fc 100755 --- a/pages/complaint/complaint.vue +++ b/pages/complaint/complaint.vue @@ -183,9 +183,10 @@ }); }, deleteImage: function(e) { - console.log(e); let imageArr = this.$data.imgList; + let photoArr = this.$data.photos; imageArr.splice(e, 1); + photoArr.splice(e, 1); }, _changeComplaint:function(e){ this.typeName = this.columns[e.detail.value]; diff --git a/pages/family/family.vue b/pages/family/family.vue index 4fffbaa..8ba72af 100755 --- a/pages/family/family.vue +++ b/pages/family/family.vue @@ -15,7 +15,7 @@ 年龄 - + 身份证 diff --git a/pages/familyList/familyList.vue b/pages/familyList/familyList.vue index 53012c4..ef6d678 100755 --- a/pages/familyList/familyList.vue +++ b/pages/familyList/familyList.vue @@ -35,7 +35,7 @@ - + @@ -80,7 +80,8 @@ loading: false, communityId: '', ownerId: '', - curOwnerMember:{} + curOwnerMember:{}, + ownerTypeCd: '', }; }, components: { @@ -115,9 +116,9 @@ let that = this; that.owners = []; context.getOwner(function(_owner) { - console.log(_owner.communityId, 99999999); that.communityId = _owner.communityId; that.ownerId = _owner.memberId; + that.ownerTypeCd = _owner.ownerTypeCd; that.getTable(1); }); }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 47eeb47..e467135 100755 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -221,7 +221,9 @@ page: this.page, row: this.row, communityId: this.communityId, - typeCd: this.curTypeCd + typeCd: this.curTypeCd, + defaultShow: 'Y', + clientType: 'H5' }; //加载活动 loadActivites(_objData) diff --git a/pages/notice/index.vue b/pages/notice/index.vue index 01cb946..c6f7ddb 100755 --- a/pages/notice/index.vue +++ b/pages/notice/index.vue @@ -55,7 +55,8 @@ communityId: that.communityId, page: 1, row: 10, - noticeTypeCd:1000 + noticeTypeCd:1000, + clientType: 'H5' }, success: function(res) { // TODO 判断 diff --git a/pages/payParkingFeeList/payParkingFeeList.vue b/pages/payParkingFeeList/payParkingFeeList.vue index f6e706e..f7b0dee 100755 --- a/pages/payParkingFeeList/payParkingFeeList.vue +++ b/pages/payParkingFeeList/payParkingFeeList.vue @@ -2,15 +2,15 @@ - + + {{item.carNum}}({{item.num}}车位) @@ -19,7 +19,7 @@ {{parkingSpaces[0].carNum}}({{parkingSpaces[0].num}}车位) - + {{item.feeName}} @@ -237,6 +237,21 @@ .margin-header-top { height: 100upx; } + + .line-height { + line-height: 100rpx; + } + .cu-btn.lgplus { + padding: 0 20px; + font-size: 18px; + height: 100rpx; + } + .cu-btn.sharp { + border-radius: 0rpx; + } + .margin-bottom-100{ + margin-bottom: 100rpx; + } /* #ifdef APP-PLUS || MP-WEIXIN */ .header_fixed { diff --git a/pages/questionAnswer/questionAnswer.vue b/pages/questionAnswer/questionAnswer.vue index c29338d..3645c28 100644 --- a/pages/questionAnswer/questionAnswer.vue +++ b/pages/questionAnswer/questionAnswer.vue @@ -64,7 +64,7 @@ }) .then(_data=>{ _data.data.forEach(function(item, index) { - item.endTime = item.endTime.replaceAll("-","/"); + item.endTime = item.endTime.replace("-","/"); let _endTime = new Date(item.endTime); if(_endTime.getTime() > new Date().getTime()){ item.state = '1'; diff --git a/pages/register/register.vue b/pages/register/register.vue index 9da8571..7a6f97d 100755 --- a/pages/register/register.vue +++ b/pages/register/register.vue @@ -112,16 +112,28 @@ sendMsgCode: function() { var _that = this; let obj = { - tel: this.link + tel: this.link, + communityId: this.communityId, + appUserName: this.appUserName, + captchaType: 'ownerBinding' }; + let msg = ""; if (obj.tel == '') { + msg = '请输入手机号'; + } else if (!obj.communityId) { + msg = "请填写小区名称"; + } else if (!obj.appUserName) { + msg = "请填写业主名称"; + } + if (msg != "") { wx.showToast({ - title: '请输入手机号', + title: msg, icon: 'none', duration: 2000 }); return; } + console.log(obj); uni.showLoading({ title: '加载中', mask: true diff --git a/pages/repair/repair.vue b/pages/repair/repair.vue index c8fdfbb..cecc65f 100755 --- a/pages/repair/repair.vue +++ b/pages/repair/repair.vue @@ -320,7 +320,7 @@ } else if (obj.bindTime == "请选择") { msg = "请选择预约时间"; } else if (obj.context == "") { - msg = "请填写投诉内容"; + msg = "请填写报修内容"; } else if (obj.repairObjId == '') { msg = "请选择报修位置"; }