From 2b653ea3edc86f54f951aa3898f2cd5b9bd175b3 Mon Sep 17 00:00:00 2001 From: qiaomu <3520484422@qq.com> Date: Tue, 14 Jan 2025 17:10:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=90=9C=E7=B4=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E8=A2=AB=E6=88=AA=E6=8E=89=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=94=B5=E8=A1=A8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/home/index.wxml | 10 +++++----- pages/invoiceList/components/notyet/index.js | 2 +- pages/invoiceList/components/notyet/index.wxml | 5 +++-- pages/invoiceList/components/notyet/index.wxss | 4 ++++ pages/meterList/index.js | 8 +++++--- service/meter.js | 5 +++-- service/park.js | 3 ++- service/recharge.js | 3 ++- service/tenement.js | 3 ++- utils/index.js | 8 ++++++-- 10 files changed, 33 insertions(+), 18 deletions(-) diff --git a/pages/home/index.wxml b/pages/home/index.wxml index 8eed4f2..dc81b19 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -62,19 +62,19 @@ {{meter.money}} --- - + - - - 刷新 + + 查看全部 + diff --git a/pages/invoiceList/components/notyet/index.js b/pages/invoiceList/components/notyet/index.js index f73ecad..9608c88 100644 --- a/pages/invoiceList/components/notyet/index.js +++ b/pages/invoiceList/components/notyet/index.js @@ -14,7 +14,7 @@ Component({ }, lifetimes: { attached() { - this.init(); + loadingFunc(() => this.init()) } }, /** diff --git a/pages/invoiceList/components/notyet/index.wxml b/pages/invoiceList/components/notyet/index.wxml index 5ab9525..2b6ec60 100644 --- a/pages/invoiceList/components/notyet/index.wxml +++ b/pages/invoiceList/components/notyet/index.wxml @@ -23,14 +23,15 @@ + 全选 - + {{ selectCount }} - 笔订单，共 + 笔，共 ￥ {{selectMoney}} 下一步 diff --git a/pages/invoiceList/components/notyet/index.wxss b/pages/invoiceList/components/notyet/index.wxss index 65e9424..52e2222 100644 --- a/pages/invoiceList/components/notyet/index.wxss +++ b/pages/invoiceList/components/notyet/index.wxss @@ -18,6 +18,10 @@ .middle { margin-top: 26rpx; font-size: 32rpx; + overflow: hidden; + width: 350rpx; + text-overflow: ellipsis; + white-space: nowrap; } .bottom { diff --git a/pages/meterList/index.js b/pages/meterList/index.js index 965e3b8..cda4f37 100644 --- a/pages/meterList/index.js +++ b/pages/meterList/index.js @@ -1,6 +1,6 @@ // pages/meterList/index.js import { getTenementMeterList } from "../../service/meter"; -import { alertInfo } from "../../utils/index"; +import { alertInfo, loadingFunc } from "../../utils/index"; import request from '../../utils/request'; const { OK } = request; Page({ @@ -12,7 +12,7 @@ Page({ header: [ { key: 'address', title: '电表地址' }, { key: "money", title: '电表余额', }, - { key: 'number', title: '电表总量' }, + { key: 'overall', title: '电表总量' }, ], list: [{}], }, @@ -36,7 +36,9 @@ Page({ */ onLoad(options) { console.log('options', options) - this.getMeters({ id: options?.id }) + loadingFunc(async () => { + await this.getMeters({ id: options?.id }) + }) }, /** diff --git a/service/meter.js b/service/meter.js index 3d1191e..efea844 100644 --- a/service/meter.js +++ b/service/meter.js @@ -1,4 +1,5 @@ import apis from '../utils/request'; +import { replaceSpecialIcon } from '../utils/index' const { GET, POST, PUT, DELETE } = apis // 获取电表列表 @@ -18,12 +19,12 @@ export const getTenementMeterList = async function(tid) { // 获取某一园区下的电表列表 export const getParkMeterList = async function({park = "", keyword = "", page = 1}) { - return await GET(`/equipment/getOperateMeterList?page=${page}&park=${park}&keyword=${escape(keyword)}`); + return await GET(`/equipment/getOperateMeterList?page=${page}&park=${park}&keyword=${replaceSpecialIcon(keyword)}`); } // 获取某一园区下的简洁电表列表 export const getParkSimpleMeterList = async function({park = "", keyword = "", page = 1}) { - return await GET(`/work/getWorkMeter?page=${page}&park=${park}&keyword=${escape(keyword)}`); + return await GET(`/work/getWorkMeter?page=${page}&park=${park}&keyword=${replaceSpecialIcon(keyword)}`); } diff --git a/service/park.js b/service/park.js index 6b8e536..ffec4e6 100644 --- a/service/park.js +++ b/service/park.js @@ -1,4 +1,5 @@ import apis from '../utils/request'; +import { replaceSpecialIcon } from '../utils/index' const { GET, POST, PUT, DELETE } = apis // 获取园区列表 @@ -8,5 +9,5 @@ export const getParkList = async function({ keyword = "" }) { // 获取未登录的园区列表 export const getLoginParkList = async function({ keyword }) { - return await GET(`/wx/getLoginParkList?keyword=${keyword}`); + return await GET(`/wx/getLoginParkList?keyword=${replaceSpecialIcon(keyword)}`); } \ No newline at end of file diff --git a/service/recharge.js b/service/recharge.js index 723990e..ed18b7b 100644 --- a/service/recharge.js +++ b/service/recharge.js @@ -1,4 +1,5 @@ import apis from '../utils/request'; +import { replaceSpecialIcon } from '../utils/index' const { GET, POST, PUT, DELETE } = apis // 获取充值记录 @@ -34,7 +35,7 @@ export const handleRecharge = async function(park, data) { // 获取后台审核列表 export const getRechargeApproveList = async function({park = "", page, keyword}) { - return await GET(`/wx/getTopExamineList?park=${park}&page=${page}&keyword=${escape(keyword)}`) + return await GET(`/wx/getTopExamineList?park=${park}&page=${page}&keyword=${replaceSpecialIcon(keyword)}`) } // 对公审核 diff --git a/service/tenement.js b/service/tenement.js index dbdfa46..efdc635 100644 --- a/service/tenement.js +++ b/service/tenement.js @@ -1,9 +1,10 @@ import apis from '../utils/request'; +import { replaceSpecialIcon } from '../utils/index' const { GET, POST, PUT, DELETE } = apis // 获取园区id模糊搜索商户列表 export const getTenementList = async function({ park, keyword }) { - return await GET(`/wx/getTenementList?park=${park}&keyword=${keyword}`); + return await GET(`/wx/getTenementList?park=${park}&keyword=${replaceSpecialIcon(keyword)}`); } // 获取名下所有的商户 diff --git a/utils/index.js b/utils/index.js index f023485..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; @@ -245,4 +245,8 @@ export function getPageUrl() { /** 根据文件路径获取文件名 */ export function getFileName(path) { return path.slice(path.lastIndexOf("/") + 1, -1) +} + +export function replaceSpecialIcon(str) { + return str.replace(/#/g, escape("#")) } \ No newline at end of file