diff --git a/pages.json b/pages.json index e8deb85d5c67bdd270386a10449c92bd8b529074..a993d51deafaea589f1ec6995794728bc5d69329 100644 --- a/pages.json +++ b/pages.json @@ -166,6 +166,12 @@ "style": { "navigationBarTitleText": "缴纳账单" } + }, + { + "path": "pages/jfjl", + "style": { + "navigationBarTitleText": "缴费记录" + } } ] }, diff --git a/pages/wy-bmfw.vue b/pages/wy-bmfw.vue index 7ca735a6e0bfa1bb6e1dbf16ed41146982a44bcc..5505fdde743cd5459a72ba292a069dbdbb067a0e 100644 --- a/pages/wy-bmfw.vue +++ b/pages/wy-bmfw.vue @@ -73,6 +73,7 @@ onLoad(options) { this.getUserInfo() this.getXqList() + this.getHouseList() }, methods: { onXz() { @@ -142,6 +143,41 @@ this.listXq = res.data }) }, + getHouseList() { + uni.showLoading({ + title: '' + }) + const than = this; + const params = { + url: '/api/community/myRoomListAll', + method: 'GET', + } + than.$request(params).then(res => { + if (than.$wskj.isNull(res.data)) { + uni.hideLoading() + return + } + than.houseList = res.data + than.houseList.forEach(function(item, index) { + if (item.room == than.userInfo.room) { + than.selecteIndex = index + } + }); + //默认绑定房屋信息 + than.setHouse() + }) + }, + setHouse() { + const params = { + url: '/api/community/cut/' + this.houseList[this.selecteIndex].communityId + "/" + this.houseList[ + this.selecteIndex].proprietorId, + } + this.$request(params).then(res => { + uni.hideLoading() + uni.setStorageSync('fwInfo', res.data) + this.address = res.data.communityName + }) + }, } }; diff --git a/pages/wy-home.vue b/pages/wy-home.vue index 9dd4f3173aaef7b79a9485cb203203a18697b16b..88c45daf31f717fb8d0b2f587592a5eb8c6022e9 100644 --- a/pages/wy-home.vue +++ b/pages/wy-home.vue @@ -188,11 +188,12 @@ getBannerList() { const than = this; const params = { - url: '/api/slideshow/list', + url: '/api/slideshow/list?type=1', method: 'GET', data: {} } this.$request(params).then(res => { + than.bannerList = []; res.data.forEach(function(item, index) { than.bannerList.push(item.url) }); @@ -258,6 +259,9 @@ }) }, getHouseList() { + uni.showLoading({ + title: '' + }) const than = this; const params = { url: '/api/community/myRoomListAll', @@ -265,6 +269,7 @@ } than.$request(params).then(res => { if (than.$wskj.isNull(res.data)) { + uni.hideLoading() return } than.houseList = res.data @@ -283,6 +288,7 @@ this.selecteIndex].proprietorId, } this.$request(params).then(res => { + uni.hideLoading() uni.setStorageSync('fwInfo', res.data) this.address = res.data.communityName }) diff --git a/pages/wy-mine.vue b/pages/wy-mine.vue index 2bc226c80001fc534710c568e245ebc785bddc03..f9163675dd1375856add233605c08b148fb59d1a 100644 --- a/pages/wy-mine.vue +++ b/pages/wy-mine.vue @@ -74,11 +74,12 @@ getBannerList() { const than = this; const params = { - url: '/api/slideshow/list', + url: '/api/slideshow/list?type=1', method: 'GET', data: {} } this.$request(params).then(res => { + than.bannerList = []; res.data.forEach(function(item, index) { than.bannerList.push(item.url) }); diff --git a/pagesMain/pages/jfjl.vue b/pagesMain/pages/jfjl.vue new file mode 100644 index 0000000000000000000000000000000000000000..b0ddeacdff93e1ddd11d8390b02c23a962dcef70 --- /dev/null +++ b/pagesMain/pages/jfjl.vue @@ -0,0 +1,57 @@ + + + + + \ No newline at end of file diff --git a/pagesMain/pages/jnzd.vue b/pagesMain/pages/jnzd.vue index fce04b92da9a16605541a0e816c95aecf30af001..778ed4f005cde8d6b6e03aaa34b23f8132b6caaa 100644 --- a/pagesMain/pages/jnzd.vue +++ b/pagesMain/pages/jnzd.vue @@ -38,6 +38,9 @@ 立即缴费 + + 缴费记录 + @@ -74,6 +77,9 @@ this.indexTab = index this.money = (index + 1) * 20 }, + onJfjl() { + this.$wskj.to("/pagesMain/pages/jfjl?type=" + this.type) + }, onSubmit() { this.onCjdd() }, diff --git a/pagesMain/pages/jnzd_ccs.vue b/pagesMain/pages/jnzd_ccs.vue index f758f7a96a5c903627c592337295dec262134d75..9e7db0e3ab1142617816404d22b5c6c33460542c 100644 --- a/pagesMain/pages/jnzd_ccs.vue +++ b/pagesMain/pages/jnzd_ccs.vue @@ -20,6 +20,10 @@ 立即缴费 + + 缴费记录 + 立即缴费 + + 缴费记录 + - @@ -33,9 +37,6 @@ return { show: false, carShow: false, - list: [ - [] - ], columns: [ ['1个月', '3个月', '6个月', '9个月', '12个月'] ], @@ -45,18 +46,17 @@ carportId: '', money: '0', carIndex: 0, + listCar: [ + [] + ], + list: [], }; }, onLoad(options) { this.type = options.type this.userinfo = uni.getStorageSync("userInfo") - //1出售车库 2临时车辆 3固定车辆 4租赁车库） - this.userinfo.carportVoList.forEach(item => { - if (item.type == 4) { - this.list[0].push(item.carportNumber) - } - }) + this.getListCar() }, methods: { open() { @@ -74,10 +74,14 @@ }, confirm(e) { + if (this.$wskj.isNull(this.carportId)) { + this.$wskj.toast('请选择车位号') + return + } this.show = false this.monthsNumber = e.value[0] - this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.carportVoList[this - .carIndex].monthMoney); + this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.list[this.carIndex] + .monthMoney); this.money = this.money.toFixed(2) console.log("LMG", this.money) @@ -86,7 +90,7 @@ this.carShow = false this.carNumber = e.value[0] this.carIndex = e.indexs[0] - this.carportId = this.userinfo.carportVoList[e.indexs[0]].carportId + this.carportId = this.list[e.indexs[0]].carportId }, onSubmit() { if (this.$wskj.isNull(this.carportId)) { @@ -99,6 +103,25 @@ } this.onCjdd() }, + getListCar() { + const params = { + url: '/api/carport/listByType?type=2', + method: 'GET', + } + this.$request(params).then(res => { + if (this.$wskj.isNull(res.data)) { + return + } + this.list = res.data + res.data.forEach(item => { + this.listCar[0].push(item.carportNumber) + }) + //默认第一个车位 + this.carIndex = 0 + this.carNumber = res.data[0].carportNumber + this.carportId = res.data[0].carportId + }) + }, onCjdd() { const params = { url: '/api/liveBill/add', diff --git a/pagesMain/pages/jnzd_qt.vue b/pagesMain/pages/jnzd_qt.vue index 55ed36492a65ca78890be6a6c2eedb860d02c4ff..6bd5ff4364e8d328938889a5627ad6741a7288fe 100644 --- a/pagesMain/pages/jnzd_qt.vue +++ b/pagesMain/pages/jnzd_qt.vue @@ -30,7 +30,10 @@ 立即缴费 - + + 缴费记录 + diff --git a/pagesMain/pages/jnzd_tcf.vue b/pagesMain/pages/jnzd_tcf.vue index 150edd896ccac0d3aea3d01e76a32d844b83e9b9..812dc798557d17dffb44e216e1156ff9b3447fd6 100644 --- a/pagesMain/pages/jnzd_tcf.vue +++ b/pagesMain/pages/jnzd_tcf.vue @@ -22,7 +22,7 @@ - @@ -33,9 +33,6 @@ return { show: false, carShow: false, - list: [ - [] - ], columns: [ ['1个月', '3个月', '6个月', '9个月', '12个月'] ], @@ -45,18 +42,18 @@ carportId: '', money: '', carIndex: 0, + listCar: [ + [] + ], + list: [], }; }, onLoad(options) { this.type = options.type this.userinfo = uni.getStorageSync("userInfo") - //1出售车库 2临时车辆 3固定车辆 4租赁车库） - this.userinfo.carportVoList.forEach(item => { - if (item.type == 3) { - this.list[0].push(item.carportNumber) - } - }) + this.getListCar() + }, methods: { open() { @@ -74,19 +71,22 @@ }, confirm(e) { + if (this.$wskj.isNull(this.carportId)) { + this.$wskj.toast('请选择车位号') + return + } this.show = false this.monthsNumber = e.value[0] - this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.carportVoList[this - .carIndex].monthMoney); + this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.list[this.carIndex] + .monthMoney); this.money = this.money.toFixed(2) console.log("LMG", this.money) - }, confirmCar(e) { this.carShow = false this.carNumber = e.value[0] this.carIndex = e.indexs[0] - this.carportId = this.userinfo.carportVoList[e.indexs[0]].carportId + this.carportId = this.list[e.indexs[0]].carportId }, onSubmit() { if (this.$wskj.isNull(this.carportId)) { @@ -99,6 +99,25 @@ } this.onCjdd() }, + getListCar() { + const params = { + url: '/api/carport/listByType?type=1', + method: 'GET', + } + this.$request(params).then(res => { + if (this.$wskj.isNull(res.data)) { + return + } + this.list = res.data + res.data.forEach(item => { + this.listCar[0].push(item.carportNumber) + }) + //默认第一个车位 + this.carIndex = 0 + this.carNumber = res.data[0].carportNumber + this.carportId = res.data[0].carportId + }) + }, onCjdd() { const params = { url: '/api/liveBill/add', diff --git a/pagesMain/pages/jnzd_tcfmx.vue b/pagesMain/pages/jnzd_tcfmx.vue index 6192a10f0666c88ef8057f368c2282c0136e03aa..4bc6d4ec26bc5b1aa99935e335c763f0efb3186e 100644 --- a/pagesMain/pages/jnzd_tcfmx.vue +++ b/pagesMain/pages/jnzd_tcfmx.vue @@ -44,7 +44,8 @@ - + {{item.month}} @@ -60,7 +61,11 @@ - + + + + {{item.updateTime.slice(0, 7)}} @@ -71,8 +76,11 @@ {{item.updateTime.slice(5)}} + + + - @@ -86,27 +94,23 @@ indexNumber: 0, type: 0, show: false, - columns: [ - [] - ], carNumber: '', userinfo: '', jfjlList: [], djList: [], carportId: '', money: 0, + listCar: [ + [] + ], + list: [], }; }, onLoad(options) { this.type = options.type this.userinfo = uni.getStorageSync("userInfo") - //1出售车库 2临时车辆 3固定车辆 4租赁车库） - this.userinfo.carportVoList.forEach(item => { - if (item.type == 3) { - this.columns[0].push(item.carportNumber) - } - }) + this.getListCar() this.getJfjlList() }, methods: { @@ -116,6 +120,14 @@ return } this.indexTab = index + if (index == 1) { + this.getDjList() + return + } + if (index == 2) { + this.getJfjlList() + return + } }, onClick(index) { this.indexNumber = index @@ -129,9 +141,27 @@ confirm(e) { this.show = false this.carNumber = e.value[0] - this.carportId = this.userinfo.carportVoList[e.indexs[0]].carportId + this.carportId = this.list[e.indexs[0]].carportId this.getDjList() }, + getListCar() { + const params = { + url: '/api/carport/listByType?type=1', + method: 'GET', + } + this.$request(params).then(res => { + if (this.$wskj.isNull(res.data)) { + return + } + this.list = res.data + res.data.forEach(item => { + this.listCar[0].push(item.carportNumber) + }) + //默认第一个车位 + this.carNumber = res.data[0].carportNumber + this.carportId = res.data[0].carportId + }) + }, //类型（1电费 2水费 3物业费 4车位管理费 5车位出租费 6储藏室出租 7其他费用） getDjList() { const params = { @@ -139,9 +169,9 @@ method: 'GET', } this.$request(params).then(res => { + let money = 0 this.djList = res.data - const money = 0 - this.res.data.forEach(item => { + res.data.forEach(item => { money = money + parseFloat(item.money) }) this.money = money.toFixed(2) diff --git a/pagesMain/pages/jnzd_wyf.vue b/pagesMain/pages/jnzd_wyf.vue index 9535ac23e415b6b6b29a6e8b4e86a80abe79d62f..a147a8aa9f8e890973aba0a2d730b62c54900b88 100644 --- a/pagesMain/pages/jnzd_wyf.vue +++ b/pagesMain/pages/jnzd_wyf.vue @@ -5,11 +5,11 @@ 物业费 房屋 - {{userinfo.room}} + {{userInfo.room}} 房屋面积 - {{userinfo.sqm}}m² + {{userInfo.sqm}}m² 缴费时长 @@ -39,13 +39,13 @@ ['1个月', '3个月', '6个月', '9个月', '12个月'] ], monthsNumber: '', - userinfo: '', + userInfo: '', money: 0, }; }, onLoad(options) { this.type = options.type - this.userinfo = uni.getStorageSync("userInfo") + this.getUserInfo() }, methods: { @@ -58,7 +58,7 @@ confirm(e) { this.show = false this.monthsNumber = e.value[0] - this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.monthMoney); + this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userInfo.monthMoney); this.money = this.money.toFixed(2) console.log(this.money) }, @@ -69,6 +69,18 @@ } this.onCjdd() }, + getUserInfo() { + const params = { + url: '/api/login/userInfo', + method: 'GET', + data: {} + } + this.$request(params).then(res => { + this.userInfo = res.data + //uni.setStorageSync('userInfo', res.data) + + }) + }, onCjdd() { const params = { url: '/api/liveBill/add', diff --git a/pagesMain/pages/jnzd_wyfmx.vue b/pagesMain/pages/jnzd_wyfmx.vue index 77e7b25731da89b5a95301736110fe1f6681dabc..9e6243d288c0edd9c41128c81287738284f1d514 100644 --- a/pagesMain/pages/jnzd_wyfmx.vue +++ b/pagesMain/pages/jnzd_wyfmx.vue @@ -40,6 +40,9 @@ + + + {{item.updateTime.slice(5)}} + + + @@ -84,6 +90,14 @@ return } this.indexTab = index + if (index == 1) { + this.getDjList() + return + } + if (index == 2) { + this.getJfjlList() + return + } }, onClick(index) { this.indexNumber = index @@ -95,9 +109,9 @@ method: 'GET', } this.$request(params).then(res => { + let money = 0 this.djList = res.data - const money = 0 - this.res.data.forEach(item => { + res.data.forEach(item => { money = money + parseFloat(item.money) }) this.money = money.toFixed(2) diff --git a/pagesMine/pages/dkpz.vue b/pagesMine/pages/dkpz.vue index b39f70c7c4005733d85619d21d90f2b64fe47207..0e20ab85289267db4797b7783b16a3b0c6ec14c9 100644 --- a/pagesMine/pages/dkpz.vue +++ b/pagesMine/pages/dkpz.vue @@ -56,18 +56,18 @@ - - + + {{nowTimes}} - - + + {{nowTime}} - - - - {{addRess}} - - {{txtName}} + + + + {{addRess}} + + {{txtName}} @@ -189,6 +189,9 @@ }) }, takeCanvas(imginfo) { + uni.showLoading({ + title: "" + }) console.log(imginfo) var that = this // 获取图片信息 @@ -198,7 +201,6 @@ that.w = ress.width + 'px'; // 设置 canvas 元素宽度 that.h = ress.height + 'px'; // 设置 canvas 元素高度 console.log(that.w, that.h) - let ctx = uni.createCanvasContext('firstCanvas'); /** 创建画布 */ const maxWidth = 200; // 设置最大行宽 const lineHeight = 30; // 设置行高 @@ -255,6 +257,7 @@ //通过 eventChannel 发送数据 uni.$emit('imageSrc', that.imageSrc) setTimeout(() => { + uni.hideLoading() this.$wskj.goBack(1) }, 600) }, diff --git a/pagesMine/pages/wx_lsgd.vue b/pagesMine/pages/wx_lsgd.vue index 1e21597ea2311a4f63e143095cdbc41937c908ac..f5467f5a5f45e6bf86c68c3edf5fdc93de556bd6 100644 --- a/pagesMine/pages/wx_lsgd.vue +++ b/pagesMine/pages/wx_lsgd.vue @@ -55,7 +55,7 @@ - + 设置维修费用