From fb9e727efd570dae1dea591ea4d34bee2316b152 Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Tue, 22 Apr 2025 18:00:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C=E5=8F=B0?= =?UTF-8?q?=E5=BC=80=E6=88=B7=E5=BB=BA=E7=AD=91=E5=BF=85=E5=A1=AB=E5=92=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E6=94=AF=E6=8C=81=E5=B3=B0=E8=B0=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- childPackage/pages/billDetail/index.js | 143 +++++++---- childPackage/pages/billDetail/index.wxml | 230 +++++++++++++++++- childPackage/pages/billDetail/index.wxss | 13 + pages/billList/index.js | 12 +- pages/invoiceList/components/notyet/index.js | 4 +- .../tenement/components/kaihu/index.wxml | 1 + project.private.config.json | 6 +- utils/index.js | 4 +- utils/request.js | 12 +- 9 files changed, 360 insertions(+), 65 deletions(-) diff --git a/childPackage/pages/billDetail/index.js b/childPackage/pages/billDetail/index.js index 91ac35b..8a8a364 100644 --- a/childPackage/pages/billDetail/index.js +++ b/childPackage/pages/billDetail/index.js @@ -1,5 +1,5 @@ import { getReportDetail } from "../../../service/report"; -import { alertInfo, alertSuccess, getPixelRatio } from "../../../utils/index"; +import { alertInfo, alertSuccess, getPixelRatio, loadingFunc } from "../../../utils/index"; import request from '../../../utils/request' import * as echarts from '../../components/echarts/echarts'; const { OK } = request @@ -15,20 +15,20 @@ Page({ time: "", detail: {}, meters: [], - header1: [ - { key: 'address', title: '电表地址' }, - { title: '起码',renderBody: (item) => { return item?.startNumber } }, - { title: '止码',renderBody: (item) => { return item?.endNumber } }, - { title: '倍率',renderBody: (item) => { return item?.displayRatio } }, - ], - header2: [ - { title: '用电量', renderBody: (item) => item?.overall?.amount }, - { title: '线损电量',renderBody: (item) => item?.loss?.amount }, - { title: '公摊电量',renderBody: (item) => item?.publicAmount }, - { title: '合计电量',renderBody: (item) => { + // header1: [ + // { key: 'address', title: '电表地址' }, + // { title: '起码',renderBody: (item) => { return item?.startNumber } }, + // { title: '止码',renderBody: (item) => { return item?.endNumber } }, + // { title: '倍率',renderBody: (item) => { return item?.displayRatio } }, + // ], + // header2: [ + // { title: '用电量', renderBody: (item) => item?.overall?.amount }, + // { title: '线损电量',renderBody: (item) => item?.loss?.amount }, + // { title: '公摊电量',renderBody: (item) => item?.publicAmount }, + // { title: '合计电量',renderBody: (item) => { - } }, - ] + // } }, + // ] }, /** @@ -36,7 +36,10 @@ Page({ */ onLoad(options) { const { id, time } = options; - this.init(id, time); + const that = this; + loadingFunc(async () => { + await that.init(id, time); + }) }, async init(id, time) { const { code, message, detail, amount } = await getReportDetail(id) @@ -55,40 +58,84 @@ Page({ return item; }) }) - const option = { - tooltip: { - trigger: 'item' - }, - legend: { - top: 10, - left: 'center' - }, - label: { - alignTo: 'edge', - formatter: '{name|{b}}\n{value|{c} }', - minMargin: 5, - edgeDistance: 10, - lineHeight: 15, - rich: { - time: { - fontSize: 10, - color: '#999' + if (detail?.park?.meter04kvType === 0) { + const option = { + tooltip: { + trigger: 'item' + }, + legend: { + top: 10, + left: 'center' + }, + label: { + alignTo: 'edge', + formatter: '{name|{b}}\n{value|{c} }', + minMargin: 5, + edgeDistance: 10, + lineHeight: 15, + rich: { + time: { + fontSize: 10, + color: '#999' + } } - } - }, - series: [ - { - type: 'pie', - radius: '50%', - data: [ - { value: detail.comprehensive.lossAmount, name: '本期线损电量', itemStyle: { color: 'rgb(104,187,196)' } }, - { value: detail.comprehensive.consumption, name: '本期用电量', itemStyle: { color: 'rgb(80,135,236)' } }, - - ], - } - ] - }; - this.init_pieCharts(option); + }, + series: [ + { + type: 'pie', + radius: '50%', + data: [ + { value: detail.comprehensive.lossAmount, name: '线损电量', itemStyle: { color: 'rgb(104,187,196)' } }, + { value: detail.comprehensive.consumption, name: '电度电量', itemStyle: { color: 'rgb(80,135,236)' } }, + + ], + } + ] + }; + this.init_pieCharts(option); + } else { + // const option = { + // tooltip: { + // trigger: 'item' + // }, + // legend: { + // top: 10, + // left: 'center' + // }, + // label: { + // alignTo: 'edge', + // formatter: '{name|{b}}\n{value|{c} }', + // minMargin: 5, + // edgeDistance: 10, + // lineHeight: 15, + // rich: { + // time: { + // fontSize: 10, + // color: '#999' + // } + // } + // }, + // series: [ + // { + // type: 'pie', + // radius: '50%', + // data: [ + // { + // value: detail.comprehensive.lossAmount, + // name: '线损电量', + // }, + // { + // value: detail.comprehensive.consumption, + // name: '电度电量', + // }, + + // ], + // } + // ] + // }; + // this.init_pieCharts(option); + } + const that = this; wx.getSystemInfo({ success: function (res) { diff --git a/childPackage/pages/billDetail/index.wxml b/childPackage/pages/billDetail/index.wxml index 4cfc7fe..845983c 100644 --- a/childPackage/pages/billDetail/index.wxml +++ b/childPackage/pages/billDetail/index.wxml @@ -25,14 +25,14 @@ 下载 - + 本期账单 本期用电量 - {{ amount }} 千瓦时 + {{ amount }} 千瓦时 @@ -86,7 +86,7 @@ - 用电量 + 电度电量 {{item.overall.amount}} @@ -106,4 +106,228 @@ + + + 本期账单 + + + + 本期用电量 + {{ amount }} 千瓦时 + + + + + 本期电费 + {{ detail.comprehensive.total }} 元 + + + + + 分时明细 + + + + + 分时电量 + （千瓦时） + + 尖： {{ detail.comprehensive.sharpAmount }} + 峰： {{ detail.comprehensive.peakAmount }} + 平： {{ detail.comprehensive.flatAmount }} + 谷： {{ detail.comprehensive.valleyAmount }} + + + + + + 分时单价 + （元/千瓦时） + + 尖： {{ detail.comprehensive.priceSharp }} + 峰： {{ detail.comprehensive.pricePeak }} + 平： {{ detail.comprehensive.priceFlat }} + 谷： {{ detail.comprehensive.priceValley }} + + + + + + 分时电费 + （元） + + 尖： {{ detail.comprehensive.sharpFee }} + 峰： {{ detail.comprehensive.peakFee }} + 平： {{ detail.comprehensive.flatFee }} + 谷： {{ detail.comprehensive.valleyFee }} + + + + + + （电量+线损电量）*单价+摊薄公摊电费+摊薄调整电费 + + + 分时电量明细 + + 尖 + + + + 电表地址 + {{item.address}} + + + 起码 + {{item.startNumber}} + + + 止码 + {{item.endNumber}} + + + 电度电量 + {{item.critical.amount}} + + + + + 线损电量 + {{item.lossSharp}} + + + 公摊电量 + {{item.poolSharp}} + + + 合计电量 + {{item.finalSharp}} + + + 合计电费 + {{item.chargeSharp}} + + + + 峰 + + + + 电表地址 + {{item.address}} + + + 起码 + {{item.startNumber}} + + + 止码 + {{item.endNumber}} + + + 电度电量 + {{item.peak.amount}} + + + + + 线损电量 + {{item.lossPeak}} + + + 公摊电量 + {{item.poolPeak}} + + + 合计电量 + {{item.finalPeak}} + + + 合计电费 + {{item.chargePeak}} + + + + 平 + + + + 电表地址 + {{item.address}} + + + 起码 + {{item.startNumber}} + + + 止码 + {{item.endNumber}} + + + 电度电量 + {{item.flat.amount}} + + + + + + + 线损电量 + {{item.lossFlat}} + + + 公摊电量 + {{item.poolFlat}} + + + 合计电量 + {{item.finalFlat}} + + + 合计电费 + {{item.chargeFlat}} + + + + 谷 + + + + 电表地址 + {{item.address}} + + + 起码 + {{item.startNumber}} + + + 止码 + {{item.endNumber}} + + + 电度电量 + {{item.valley.amount}} + + + + + 线损电量 + {{item.lossValley}} + + + 公摊电量 + {{item.poolValley}} + + + 合计电量 + {{item.finalValley}} + + + 合计电费 + {{item.chargeValley}} + + + + + \ No newline at end of file diff --git a/childPackage/pages/billDetail/index.wxss b/childPackage/pages/billDetail/index.wxss index f89f4f3..b84fb51 100644 --- a/childPackage/pages/billDetail/index.wxss +++ b/childPackage/pages/billDetail/index.wxss @@ -59,12 +59,25 @@ page { text-align: center; font-weight: 500; } + +.colContentTitle2 { + padding: 30rpx 0; + text-align: center; + font-weight: 500; +} + .colContentValue { padding-bottom: 30rpx; text-align: center; overflow: hidden; } +.colContentValue2 { + padding-bottom: 20rpx; + padding-left: 20rpx; + overflow: hidden; +} + .tooltip { font-size: 30rpx; color: rgb(136, 132, 132); diff --git a/pages/billList/index.js b/pages/billList/index.js index 9230ed4..30120f8 100644 --- a/pages/billList/index.js +++ b/pages/billList/index.js @@ -1,5 +1,5 @@ import { getBillList } from "../../service/accounting" -import { alertInfo } from "../../utils/index"; +import { alertInfo, loadingFunc } from "../../utils/index"; import request from '../../utils/request' const { OK } = request; @@ -17,11 +17,19 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - this.init(); + const that = this; + loadingFunc(async () => { + await that.init(); + }) + }, async init() { const { page, list } = this.data; const { code, data, message } = await getBillList(page) + if (code !== OK) { + alertInfo(message) + return; + } if (!data?.length) { alertInfo("没有更多了") return; diff --git a/pages/invoiceList/components/notyet/index.js b/pages/invoiceList/components/notyet/index.js index 9608c88..aa9fe41 100644 --- a/pages/invoiceList/components/notyet/index.js +++ b/pages/invoiceList/components/notyet/index.js @@ -14,7 +14,7 @@ Component({ }, lifetimes: { attached() { - loadingFunc(() => this.init()) + loadingFunc(async () => await this.init()) } }, /** @@ -42,7 +42,7 @@ Component({ this.setData({ list: data, selectList: new Array(data?.length).map(() => false), allChecked: false, }) }, onRefresh() { - loadingFunc(() => this.init()) + loadingFunc(async () => await this.init()) }, onChange(e) { const { id, index } = e.currentTarget.dataset; diff --git a/pages/workBench/components/tenement/components/kaihu/index.wxml b/pages/workBench/components/tenement/components/kaihu/index.wxml index db85302..04ff43a 100644 --- a/pages/workBench/components/tenement/components/kaihu/index.wxml +++ b/pages/workBench/components/tenement/components/kaihu/index.wxml @@ -69,6 +69,7 @@ use-button-slot readonly title-width="120rpx" + required > 选择 diff --git a/project.private.config.json b/project.private.config.json index aa91fce..fa793c0 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -11,9 +11,9 @@ "miniprogram": { "list": [ { - "name": "pages/discountCoupon/index", - "pathName": "pages/discountCoupon/index", - "query": "", + "name": "childPackage/pages/billDetail/index", + "pathName": "childPackage/pages/billDetail/index", + "query": "id=R00102714036256769&tiem=2025-03", "launchMode": "default", "scene": null }, diff --git a/utils/index.js b/utils/index.js index ebca6fc..1389446 100644 --- a/utils/index.js +++ b/utils/index.js @@ -45,9 +45,9 @@ export function getConfigByEnv() { switch (envVersion) { // 开发版 case 'develop': - // api = "http://localhost:8000" + api = "http://localhost:8000" + // api = "https://zgd.hbhcbn.com/api3" // api = "https://zgd.hbhcbn.com/api3" - api = "https://zgd.hbhcbn.com/api3" // api = "https://zgd.hbhcbn.com/wxApi" // api = "http://127.0.0.1:4523/m1/4143821-0-default" break; diff --git a/utils/request.js b/utils/request.js index 11b7f50..ed79254 100644 --- a/utils/request.js +++ b/utils/request.js @@ -35,10 +35,10 @@ const request = async function (options, config = {}) { try { response = await requestWithoutCookie(options); // 服务器没有返回200直接报错 - // if (!response || response.statusCode !== 200) { - // alertError(response?.data?.message || "发生错误，请稍后重试") - // return; - // } + if (!response || response.statusCode !== 200) { + alertError(response?.data?.message || "发生错误，请稍后重试") + return; + } // 处理cookie const setCookie = response.header['set-cookie'] || response.header['Set-Cookie']; @@ -78,9 +78,11 @@ const request = async function (options, config = {}) { // 处理返回结果，默认直接返回数据 const parseResponse = function (response, url) { + console.log('response', response) if (!response) { - alertError("服务异常") + alertError("服务无响应") return + } const { statusCode } = response; if (!statusCode) {