修改搜索条件被截掉的问题，新增电表列表

pages/home/index.wxml

@@ -62,19 +62,19 @@
         <view class="cardItemValue" style="position: relative;">
           <view class="text"  wx:if="{{user.id}}"> {{meter.money}} </view>
           <view class="text"  wx:else> --- </view>
-            <!--    bind:click="jumpToMeterList"  -->
+            <!--     bind:click="refreshMeter" -->
           <van-button 
             type="info" 
             size="small" 
             plain="{{true}}" 
             custom-style="position: absolute; right: -20rpx; bottom: -20rpx;z-index: 99;" 
             wx:if="{{user.id}}"
-            bind:click="refreshMeter"
+            bind:click="jumpToMeterList"
           >
             <view style="width: 160rpx;display: flex;justify-content: center;">
-            <van-icon name="replay" />
+            <!-- <van-icon name="replay" /> -->
-            <!-- 查看全部 -->
+            查看全部
-            刷新
+            <!-- 刷新 -->
             </view>
           </van-button>
         </view>

pages/invoiceList/components/notyet/index.js

@@ -14,7 +14,7 @@ Component({
   },
   lifetimes: {
     attached() {
-      this.init();
+      loadingFunc(() => this.init())
     }
   },
   /**

pages/invoiceList/components/notyet/index.wxml

@@ -23,14 +23,15 @@
     </view>
   </view>
 </van-checkbox-group>
+<view style="height: 60rpx"></view>
 
 <view class="allSelect">
   <van-checkbox value="{{ allChecked }}" bind:change="onAllChecked">
     全选
   </van-checkbox>
-  <view style="flex: 1; display: flex; align-items: center; justify-content: flex-end;">
+  <view style="flex: 1; display: flex; align-items: center; justify-content: flex-end;white-space: normal;word-break: keep-all;">
     <view class="allNumber"> {{ selectCount }} </view>
-    笔订单，共
+    笔，共
     <view class="allMoney"> ￥ {{selectMoney}} </view>
     <van-button size="small" type="info" bind:click="next" disabled="{{!selectCount}}"> 下一步 </van-button>
   </view>

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 {

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 })
+    })
   },
 
   /**

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)}`);
 }
 
 

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)}`);
 }

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)}`)
 }
 
 // 对公审核

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)}`);
 }
 
 // 获取名下所有的商户

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("#"))
 }