From 0953e6f43402b4ea9be97f808478a8281d2d0837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E5=A8=81=E5=A8=81?= <1834256911@qq.com> Date: Fri, 6 Jun 2025 21:06:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 12 +++ pages/wy-home.vue | 15 +-- pages/wy-mine.vue | 6 +- pagesMain/pages/bxbs_lsgd.vue | 22 ++++- pagesMain/pages/fkdj.vue | 22 +++-- pagesMain/pages/jnzd.vue | 17 +++- pagesMain/pages/jnzd_ccs.vue | 166 ++++++++++++++++++++++++++++++++ pagesMain/pages/jnzd_czf.vue | 34 +++++-- pagesMain/pages/jnzd_tcf.vue | 171 +++++++++++++++++++++++++++++++++ pagesMain/pages/jnzd_tcfmx.vue | 64 ++++++++---- pagesMain/pages/jnzd_wyf.vue | 15 ++- pagesMain/pages/jnzd_wyfmx.vue | 24 ++--- pagesMain/pages/shjf.vue | 2 +- pagesMain/pages/tsby_lsgd.vue | 20 +++- pagesMine/pages/dk_submit.vue | 3 +- pagesMine/pages/dkpz.vue | 71 ++++++++++---- pagesMine/pages/fwxx.vue | 77 ++++++++------- pagesMine/pages/jtcy.vue | 3 +- pagesMine/pages/wdfw.vue | 1 - pagesMine/pages/wx_lsgd.vue | 16 ++- pagesMine/pages/zlbj.vue | 29 ++++-- 21 files changed, 655 insertions(+), 135 deletions(-) create mode 100644 pagesMain/pages/jnzd_ccs.vue create mode 100644 pagesMain/pages/jnzd_tcf.vue diff --git a/pages.json b/pages.json index d91a9db..e8deb85 100644 --- a/pages.json +++ b/pages.json @@ -131,6 +131,18 @@ "navigationBarTitleText": "缴纳账单" } }, + { + "path": "pages/jnzd_tcf", + "style": { + "navigationBarTitleText": "缴纳账单" + } + }, + { + "path": "pages/jnzd_ccs", + "style": { + "navigationBarTitleText": "缴纳账单" + } + }, { "path": "pages/jnzd_qt", "style": { diff --git a/pages/wy-home.vue b/pages/wy-home.vue index d4f0ef4..591e358 100644 --- a/pages/wy-home.vue +++ b/pages/wy-home.vue @@ -27,9 +27,8 @@ - - + 选择小区 @@ -39,13 +38,13 @@ - - 下一步 + + 下一步 - + 楼栋号/单元号/户号 @@ -54,8 +53,9 @@ - - 完成 + + 完成 @@ -203,6 +203,7 @@ } this.$request(params).then(res => { this.$wskj.toast("设置成功") + this.userInfo() }) }, userInfo() { diff --git a/pages/wy-mine.vue b/pages/wy-mine.vue index 64cb66a..509fce8 100644 --- a/pages/wy-mine.vue +++ b/pages/wy-mine.vue @@ -69,13 +69,13 @@ getUserInfo() { const params = { url: '/api/login/userInfo', - loadingTip: '', method: 'GET', data: {} } this.$request(params).then(res => { - this.userInfo = res.data uni.setStorageSync('userInfo', res.data) + this.userInfo = res.data + }) }, onClick(index) { @@ -92,7 +92,7 @@ return } if (index == 1) { - this.$wskj.to("/pagesMain/pages/bxbs") + this.$wskj.to("/pagesMain/pages/bxbs_lsgd") return } if (index == 2) { diff --git a/pagesMain/pages/bxbs_lsgd.vue b/pagesMain/pages/bxbs_lsgd.vue index fe0f2b2..d199705 100644 --- a/pagesMain/pages/bxbs_lsgd.vue +++ b/pagesMain/pages/bxbs_lsgd.vue @@ -10,7 +10,7 @@ style="flex: 1;background: #FFFFFF;" :style="{ color: index==0?'#FF682D':index==1?'#EEA616':index==2?'#1FCA7C':'#23BBEE'}" v-for="(item, index) in 4" :key="index"> - 25 + {{numberList[(index+1)]}} {{index==0?'待处理':index==1?'待支付':index==2?'已完成':index==3?'已取消':''}} @@ -21,7 +21,7 @@ - + @@ -49,7 +49,12 @@ + + + + + @@ -62,6 +67,7 @@ type: 0, tabIndex: 0, list: [], + numberList: '', }; }, onLoad(e) { @@ -69,6 +75,7 @@ }, onShow() { this.getList() + this.getNumberList() }, methods: { onClick(index) { @@ -89,6 +96,16 @@ return } }, + getNumberList() { + const params = { + url: '/api/repairs/userCountAll', + method: 'GET', + } + this.$request(params).then(res => { + this.numberList = res.data + + }) + }, getList() { const params = { url: '/api/repairs/userListAll?state=' + (this.tabIndex + 1), @@ -106,6 +123,7 @@ } this.$request(params).then(res => { this.getList() + this.getNumberList() }) } diff --git a/pagesMain/pages/fkdj.vue b/pagesMain/pages/fkdj.vue index 1953cff..b1ef093 100644 --- a/pagesMain/pages/fkdj.vue +++ b/pagesMain/pages/fkdj.vue @@ -40,13 +40,13 @@ - + * 手机号 - + @@ -78,10 +78,10 @@ - 提交 + 提交 - + 选择小区 @@ -91,8 +91,8 @@ - - 下一步 + + 完成 @@ -180,6 +180,7 @@ const params = { url: '/api/login/sendSmsCode', method: 'GET', + loadingTip: '', data: { mobile: this.data.guestPhone } @@ -216,11 +217,14 @@ } const params = { url: '/api/guest/add', - loadingTip: '加载中...', + loadingTip: '', data: this.data } this.$request(params).then(res => { - + this.$wskj.toast('提交成功') + setTimeout(() => { + this.$wskj.goBack(1) + }, 600) }) }, open() { diff --git a/pagesMain/pages/jnzd.vue b/pagesMain/pages/jnzd.vue index ff2d4f0..fce04b9 100644 --- a/pagesMain/pages/jnzd.vue +++ b/pagesMain/pages/jnzd.vue @@ -32,7 +32,8 @@ ￥ - + 立即缴费 @@ -48,9 +49,9 @@ return { indexTab: 0, type: 1, - money: 20, + money: '20', userinfo: '', - + price: '', }; }, onLoad(options) { @@ -59,6 +60,16 @@ }, methods: { + input(e) { + if (this.$wskj.isNull(e.detail.value)) { + this.indexTab = 0 + this.money = "20" + } else { + this.indexTab = -1 + this.money = e.detail.value + } + console.log(this.money) + }, onClickPrice(index) { this.indexTab = index this.money = (index + 1) * 20 diff --git a/pagesMain/pages/jnzd_ccs.vue b/pagesMain/pages/jnzd_ccs.vue new file mode 100644 index 0000000..10234a3 --- /dev/null +++ b/pagesMain/pages/jnzd_ccs.vue @@ -0,0 +1,166 @@ + + + + + \ No newline at end of file diff --git a/pagesMain/pages/jnzd_czf.vue b/pagesMain/pages/jnzd_czf.vue index 4b8da41..33f79fb 100644 --- a/pagesMain/pages/jnzd_czf.vue +++ b/pagesMain/pages/jnzd_czf.vue @@ -14,7 +14,7 @@ 缴费金额 - ￥0 + ￥{{money||0}} @@ -34,19 +34,25 @@ show: false, carShow: false, list: [ - ['1', '2', '3', '4', '5'] + [] ], columns: [ ['1个月', '3个月', '6个月', '9个月', '12个月'] ], monthsNumber: '', carNumber: '', + userinfo: '', + carportId: '', + money: '0', }; }, onLoad(options) { this.type = options.type - + this.userinfo = uni.getStorageSync("userInfo") + this.userinfo.carportVoList.forEach(item => { + this.list[0].push(item.carportNumber) + }) }, methods: { open() { @@ -66,14 +72,27 @@ confirm(e) { this.show = false this.monthsNumber = e.value[0] - console.log("LMG", e.value[0]) + this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.carportVoList[e + .indexs[0]].monthMoney); + this.money = this.money.toFixed(2) + console.log("LMG", this.money) + }, confirmCar(e) { this.carShow = false this.carNumber = e.value[0] console.log("LMG", e.value[0]) + this.carportId = this.userinfo.carportVoList[e.indexs[0]].carportId }, onSubmit() { + if (this.$wskj.isNull(this.carportId)) { + this.$wskj.toast('请选择车位号') + return + } + if (this.$wskj.isNull(this.money)) { + this.$wskj.toast('请选择缴费时长') + return + } this.onCjdd() }, onCjdd() { @@ -81,9 +100,10 @@ url: '/api/liveBill/add', loadingTip: '', data: { - money: this.monthsNumber.replace('个月', ''), + money: this.money, type: 5, //类型（1电费 2水费 3物业费 4车位管理费 5车位出租费 6储藏室出租 7其他费用） - duration: this.monthsNumber.replace('个月', '') //缴费时长（月） + duration: this.monthsNumber.replace('个月', ''), //缴费时长（月） + carportId: this.carportId } } this.$request(params).then(res => { @@ -96,7 +116,7 @@ loadingTip: '', data: { orderId: orderId, - amount: this.monthsNumber.replace('个月', ''), + amount: this.money, payBizCode: "PRESTORE", } } diff --git a/pagesMain/pages/jnzd_tcf.vue b/pagesMain/pages/jnzd_tcf.vue new file mode 100644 index 0000000..925b30c --- /dev/null +++ b/pagesMain/pages/jnzd_tcf.vue @@ -0,0 +1,171 @@ + + + + + \ No newline at end of file diff --git a/pagesMain/pages/jnzd_tcfmx.vue b/pagesMain/pages/jnzd_tcfmx.vue index 02cd8f9..241b691 100644 --- a/pagesMain/pages/jnzd_tcfmx.vue +++ b/pagesMain/pages/jnzd_tcfmx.vue @@ -39,42 +39,42 @@ - 未缴金额\n￥1355.04 + 未缴金额\n￥0.00 - + - 2025年01月 - ￥108.23 + {{item.month}} + ￥{{item.money}} - 缴费项目：物业管理费 - 房屋面积：72.15 - 单价/平米：￥1.3 - 金额：93.8 + 缴费项目：车位管理费 + 单价/月：￥{{item.price}} + 金额：{{item.money}} - + - 2024年6月 + {{item.updateTime.slice(0, 7)}} 缴费渠道：线上缴费 - 1355.04 + {{item.payAmount}} - 06-06 14:29 + {{item.updateTime.slice(5)}} + - @@ -87,22 +87,28 @@ type: 0, show: false, columns: [ - ['T01', 'T02', 'T03', 'T04', 'T05'] + [] ], carNumber: '', userinfo: '', + jfjlList: [], + djList: [], + carportId: '', }; }, onLoad(options) { this.type = options.type this.userinfo = uni.getStorageSync("userInfo") - + this.userinfo.carportVoList.forEach(item => { + this.columns[0].push(item.carportNumber) + }) + this.getJfjlList() }, methods: { onTabClick(index) { if (index == 0) { - this.$wskj.to("/pagesMain/pages/jnzd_czf") + this.$wskj.to("/pagesMain/pages/jnzd_tcf") return } this.indexTab = index @@ -119,8 +125,28 @@ confirm(e) { this.show = false this.carNumber = e.value[0] - console.log("LMG", e.value[0]) - } + this.carportId = this.userinfo.carportVoList[e.indexs[0]].carportId + this.getDjList() + }, + //类型（1电费 2水费 3物业费 4车位管理费 5车位出租费 6储藏室出租 7其他费用） + getDjList() { + const params = { + url: '/api/liveBill/listAll?type=4&carportId=' + this.carportId, + method: 'GET', + } + this.$request(params).then(res => { + this.djList = res.data + }) + }, + getJfjlList() { + const params = { + url: '/api/payRecord/listAll?type=4', + method: 'GET', + } + this.$request(params).then(res => { + this.jfjlList = res.data + }) + }, } }; diff --git a/pagesMain/pages/jnzd_wyf.vue b/pagesMain/pages/jnzd_wyf.vue index 006b0cd..9535ac2 100644 --- a/pagesMain/pages/jnzd_wyf.vue +++ b/pagesMain/pages/jnzd_wyf.vue @@ -18,7 +18,7 @@ 缴费金额 - ￥0 + ￥{{money}} @@ -40,6 +40,7 @@ ], monthsNumber: '', userinfo: '', + money: 0, }; }, onLoad(options) { @@ -57,9 +58,15 @@ confirm(e) { this.show = false this.monthsNumber = e.value[0] - console.log("LMG", e.value[0]) + this.money = parseFloat(this.monthsNumber.replace('个月', '')) * parseFloat(this.userinfo.monthMoney); + this.money = this.money.toFixed(2) + console.log(this.money) }, onSubmit() { + if (this.$wskj.isNull(this.money)) { + this.$wskj.toast('请选择缴费时长') + return + } this.onCjdd() }, onCjdd() { @@ -67,7 +74,7 @@ url: '/api/liveBill/add', loadingTip: '', data: { - money: this.monthsNumber.replace('个月', ''), + money: this.money, type: 3, //类型（1电费 2水费 3物业费 4车位管理费 5车位出租费 6储藏室出租 7其他费用） duration: this.monthsNumber.replace('个月', '') //缴费时长（月） } @@ -82,7 +89,7 @@ loadingTip: '', data: { orderId: orderId, - amount: this.monthsNumber.replace('个月', ''), + amount: this.money, payBizCode: "PRESTORE", } } diff --git a/pagesMain/pages/jnzd_wyfmx.vue b/pagesMain/pages/jnzd_wyfmx.vue index 81b6138..870a330 100644 --- a/pagesMain/pages/jnzd_wyfmx.vue +++ b/pagesMain/pages/jnzd_wyfmx.vue @@ -18,41 +18,41 @@ - 未缴金额\n￥1355.04 + 未缴金额\n￥0.00 - + - 2025年01月 - ￥{{item.payAmount}} + {{item.month}} + ￥{{item.money}} 缴费项目：物业管理费 - 房屋面积：72.15 - 单价/平米：￥1.3 - 金额：{{item.payAmount}} + 房屋面积：{{item.sqm}} + 单价/平米：￥{{item.price}} + 金额：{{item.money}} - {{item.month}} + {{item.updateTime.slice(0, 7)}} 缴费渠道：线上缴费 {{item.payAmount}} - {{item.month}} + {{item.updateTime.slice(5)}} - @@ -90,7 +90,7 @@ //类型（1电费 2水费 3物业费 4车位管理费 5车位出租费 6储藏室出租 7其他费用） getDjList() { const params = { - url: '/api/liveBill/listAll?type=1', + url: '/api/liveBill/listAll?type=3', method: 'GET', } this.$request(params).then(res => { @@ -99,7 +99,7 @@ }, getJfjlList() { const params = { - url: '/api/payRecord/listAll?type=1', + url: '/api/payRecord/listAll?type=3', method: 'GET', } this.$request(params).then(res => { diff --git a/pagesMain/pages/shjf.vue b/pagesMain/pages/shjf.vue index dbe21dd..35d87e2 100644 --- a/pagesMain/pages/shjf.vue +++ b/pagesMain/pages/shjf.vue @@ -106,7 +106,7 @@ return } if (index == 5) { - this.$wskj.to("/pagesMain/pages/jnzd_czf?type=1") + this.$wskj.to("/pagesMain/pages/jnzd_ccs") return } if (index == 6) { diff --git a/pagesMain/pages/tsby_lsgd.vue b/pagesMain/pages/tsby_lsgd.vue index 3216924..30174ef 100644 --- a/pagesMain/pages/tsby_lsgd.vue +++ b/pagesMain/pages/tsby_lsgd.vue @@ -10,7 +10,7 @@ style="flex: 1;background: #FFFFFF;" :style="{ color: index==0?'#FF682D':index==1?'#EEA616':index==2?'#1FCA7C':'#23BBEE'}" v-for="(item, index) in 3" :key="index"> - 25 + {{numberList[(index+1)]}} {{index==0?'待处理':index==1?'已完成':index==2?'已取消':''}} @@ -21,7 +21,7 @@ - + @@ -49,6 +49,9 @@ + + + @@ -61,6 +64,7 @@ type: 0, tabIndex: 0, list: [], + numberList: '', }; }, onLoad(e) { @@ -68,6 +72,7 @@ }, onShow() { this.getList() + this.getNumberList() }, methods: { onClick(index) { @@ -84,6 +89,16 @@ return } }, + getNumberList() { + const params = { + url: '/api/comment/userCountAll', + method: 'GET', + } + this.$request(params).then(res => { + this.numberList = res.data + + }) + }, getList() { const params = { url: '/api/comment/userListAll?state=' + (this.tabIndex + 1), @@ -100,6 +115,7 @@ } this.$request(params).then(res => { this.getList() + this.getNumberList() }) } diff --git a/pagesMine/pages/dk_submit.vue b/pagesMine/pages/dk_submit.vue index 4cca9e6..6f622e7 100644 --- a/pagesMine/pages/dk_submit.vue +++ b/pagesMine/pages/dk_submit.vue @@ -82,7 +82,8 @@ }, methods: { onPz() { - this.$wskj.to("/pagesMine/pages/dkpz") + const name = this.userInfo.name + '(' + (this.type == 0 ? '安保' : '保洁') + ')' + this.$wskj.to("/pagesMine/pages/dkpz?address=" + this.address + "&name=" + name) }, onDw() { const _this = this; diff --git a/pagesMine/pages/dkpz.vue b/pagesMine/pages/dkpz.vue index 01b9aad..b39f70c 100644 --- a/pagesMine/pages/dkpz.vue +++ b/pagesMine/pages/dkpz.vue @@ -1,6 +1,5 @@