diff --git a/pages.json b/pages.json index 8003ffd6e657c8007df1549159d8adb50df6728d..39cfb403a814cb51c8798de4c7ba4bdab70313e5 100644 --- a/pages.json +++ b/pages.json @@ -107,6 +107,12 @@ "navigationStyle": "custom" } }, + { + "path": "pages/tsby_xq", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/tsby_lsgd", "style": { diff --git a/pages/wy-home.vue b/pages/wy-home.vue index fd6ad3c4ace91f5c1b0b5bf724b7045d8dbd04ce..beaf3e37f9dcdd4c2d4555e0b28174ae03aac7f5 100644 --- a/pages/wy-home.vue +++ b/pages/wy-home.vue @@ -236,7 +236,6 @@ } if (index == 4) { this.$wskj.toast("敬请期待") - this.$wskj.to("/pages/my/feedback") return } if (index == 5) { diff --git a/pagesMain/pages/bxbs_lsgd.vue b/pagesMain/pages/bxbs_lsgd.vue index 9f4db51c32cd10b49e24771dd626a1f73879bf0f..fe0f2b27008aa18b7c2897de52d087d204ff754e 100644 --- a/pagesMain/pages/bxbs_lsgd.vue +++ b/pagesMain/pages/bxbs_lsgd.vue @@ -27,7 +27,7 @@ style="box-shadow: 0px 0px 15px 1px rgba(142,142,142,0.16);background: white;"> - 居家报修 + {{item.type==1?'居家报修':'公区报事'}} {{item.state==1?'待处理':item.state==2?'待支付':item.state==3?'已完成':item.state==4?'已取消':''}} - - 居家报修 - 待支付 + + {{data.type==1?'居家报修':'公区报事'}} + {{data.state==1?'待处理':data.state==2?'待支付':data.state==3?'已完成':data.state==4?'已取消':''}} 业主姓名： - 张三 + {{$wskj.isNullStr(data.proprietorName)}} 业主房间号 - 利达国宾中心1栋2单元205室 + {{data.room}} 业主手机号 - 17778767876 + {{data.proprietorPhone}} - + 报修信息 - 利达国宾中心利达国宾中心1栋2单元205室卫生 - 间漏水，请物业及时查看 + {{data.repairsDescription}} - - + + 报修时间: - 2025-03-10 10:01:45 + {{data.repairsTime}} + + + 关闭报修 - + 负责人： - 张三 + {{data.accountName}} 手机号： - 利达国宾中心1栋2单元205室 + {{data.accountMobile}} 完成时间： - 17778767876 + {{data.completeTime}} - + + 关闭时间： + {{data.closeTime}} + - - - + 去支付 - + 取消报修 @@ -90,62 +97,50 @@ export default { data() { return { - title: '居家报修', type: 0, reason: '', submitShow: false, images: '', + id: '', + data: {}, }; }, onLoad(e) { - this.type = e.type - if (e.type == 0) { - this.title = "居家报修" - } else { - this.title = "公区报事" - } + this.id = e.id + this.getData() }, methods: { - onSubmit() { - this.$wskj.to("/pagesMain/pages/tjsq?type=" + this.type) - // if (!this.reason) { - // return this.$u.toast('请输入内容') - // } - // if (!this.images) { - // return this.$u.toast('请至少上传一张照片') - // } - // if (this.reason.length < 10) { - // return this.$u.toast('文字描述最低10个字') - // } - // this.submitShow = true + getData() { + const params = { + url: '/api/repairs/' + this.id, + method: 'GET', + } + this.$request(params).then(res => { + this.data = res.data + }) + }, + gb() { + const params = { + url: '/api/repairs/cancel/' + this.id, + method: 'PUT', + } + this.$request(params).then(res => { + this.$wskj.toast('关闭成功') + setTimeout(() => { + this.$wskj.goBack(1) + }, 600) + }) }, - // 提交 - onConfirmSubmit() { - // const params = { - // url: '/api/user/yijian', - // loadingTip: '', - // data: { - // content: this.reason, - // images: this.images - // } - // } - // // console.log(params); - // this.$request(params).then(res => { - // // console.log(res) - // this.submitShow = false - // if (res.code === 1) { - // this.$u.toast(res.msg || '提交成功') + onCz(e) { + if (e == "关闭报修") { + this.gb(); + return + } + if (e == "去支付") { - // this.reason = '' - // this.images = '' - // } else { - // this.$u.toast(res.msg || '提交失败') - // } - // }).catch(err => { - // this.submitShow = false - // this.$u.toast(err.msg || '提交失败') - // }) - } + return + } + }, }, }; diff --git a/pagesMain/pages/fwgz.vue b/pagesMain/pages/fwgz.vue index 35bce9f32f5c40ecdf9b81086b837c594e570fc2..2582332dfad4f83d25a7a0813d584e979758aa9f 100644 --- a/pagesMain/pages/fwgz.vue +++ b/pagesMain/pages/fwgz.vue @@ -37,7 +37,7 @@ }; }, onLoad(e) { - this.onGz(1) + this.onGz(e.type) }, methods: { onGz(type) { diff --git a/pagesMain/pages/jnzd.vue b/pagesMain/pages/jnzd.vue index 0bd81ed8eb6514a0aa238f1d4a7d2f9281ccc36d..ff2d4f05222b5114a26c051713f0c0c8d35ebbea 100644 --- a/pagesMain/pages/jnzd.vue +++ b/pagesMain/pages/jnzd.vue @@ -2,17 +2,17 @@ - - {{type==0?"电费缴纳":"水费缴纳"}} + + {{type==1?"电费缴纳":"水费缴纳"}} 户号信息 - 张三 + {{$wskj.isNullStr(userinfo.name)}} 住址信息 - 张三 + {{userinfo.communityName+userinfo.room}} 缴费单位 @@ -26,7 +26,7 @@ - 20 + {{(index+1)*20+'元'}} @@ -34,7 +34,7 @@ ￥ - + 立即缴费 @@ -47,36 +47,66 @@ data() { return { indexTab: 0, - type: 0, + type: 1, + money: 20, + userinfo: '', }; }, onLoad(options) { this.type = options.type + this.userinfo = uni.getStorageSync("userInfo") }, methods: { onClickPrice(index) { this.indexTab = index + this.money = (index + 1) * 20 }, - - onClick(index) { - if (index == 0) { - this.$wskj.to("/pagesMain/pages/tsby_submit?type=0") - return - } - if (index == 1) { - this.$wskj.to("/pagesMain/pages/tsby_submit?type=1") - return - } - if (index == 2) { - this.$wskj.to("/pagesMain/pages/tsby_lsgd") - return + onSubmit() { + this.onCjdd() + }, + onCjdd() { + const params = { + url: '/api/liveBill/add', + loadingTip: '', + data: { + money: this.money, + type: this.type, //类型（1电费 2水费 3物业费 4车位管理费 5车位出租费 6储藏室出租 7其他费用） + } } - if (index == 3) { - this.$wskj.to("/pagesMain/pages/fwgz") - return + this.$request(params).then(res => { + this.pay(res.data.billId) + }) + }, + pay(orderId) { + const params = { + url: '/api/payRecord/pay', + loadingTip: '', + data: { + orderId: orderId, + amount: this.money, + payBizCode: "PRESTORE", + } } + this.$request(params).then(res => { + uni.requestPayment({ + provider: 'wxpay', + appid: res.data.data.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致 + nonceStr: res.data.data.nonceStr, // 随机字符串 + package: res.data.data.package, // 固定值 + timeStamp: res.data.data.timeStamp, // 时间戳（单位：秒） + paySign: res.data.data.paySign, // 签名，这里用的 MD5/RSA 签名 + signType: 'MD5', + success: (res) => { + + }, + fail: (err) => { + console.log(err); + } + }); + + }) } } }; diff --git a/pagesMain/pages/jnzd_czf.vue b/pagesMain/pages/jnzd_czf.vue index d8c377e4408d84856865801c7bbcb1ede08b7c54..4b8da41300389afb62da749d9dcd7a20cdbe4280 100644 --- a/pagesMain/pages/jnzd_czf.vue +++ b/pagesMain/pages/jnzd_czf.vue @@ -17,7 +17,7 @@ ￥0 - + 立即缴费 { + this.pay(res.data.billId) + }) + }, + pay(orderId) { + const params = { + url: '/api/payRecord/pay', + loadingTip: '', + data: { + orderId: orderId, + amount: this.monthsNumber.replace('个月', ''), + payBizCode: "PRESTORE", + } + } + this.$request(params).then(res => { + uni.requestPayment({ + provider: 'wxpay', + appid: res.data.data.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致 + nonceStr: res.data.data.nonceStr, // 随机字符串 + package: res.data.data.package, // 固定值 + timeStamp: res.data.data.timeStamp, // 时间戳（单位：秒） + paySign: res.data.data.paySign, // 签名，这里用的 MD5/RSA 签名 + signType: 'MD5', + success: (res) => { + + }, + fail: (err) => { + console.log(err); + } + }); + }) + }, + } }; diff --git a/pagesMain/pages/jnzd_qt.vue b/pagesMain/pages/jnzd_qt.vue index 54dcc3729030fa6617424ffecdbeff19b79ca89b..55ed36492a65ca78890be6a6c2eedb860d02c4ff 100644 --- a/pagesMain/pages/jnzd_qt.vue +++ b/pagesMain/pages/jnzd_qt.vue @@ -5,11 +5,12 @@ 其他缴费 项目名称 - + 项目描述 -