From 5eb2fc84054e78e5166f5d88859c5d343e48cf55 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Wed, 14 Aug 2024 09:09:12 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=9C=AA=E7=9F=A5=E5=90=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project.config.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/project.config.json b/project.config.json
index a3f8e47..80d81ef 100644
--- a/project.config.json
+++ b/project.config.json
@@ -20,7 +20,9 @@
     "packNpmManually": true,
     "packNpmRelationList": [],
     "condition": false,
-    "compileWorklet": true
+    "compileWorklet": true,
+    "ignoreDevUnusedFiles": true,
+    "ignoreUploadUnusedFiles": false
   },
   "condition": {},
   "editorSetting": {

From 75dab4b1acd8ef27ffd676cc4d4adbad59e3ec43 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Fri, 30 Aug 2024 14:39:41 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9C=AA=E6=A0=B9=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 childPackage/pages/billDetail/index.js   | 12 ++++++++----
 childPackage/pages/billDetail/index.wxml |  2 +-
 utils/index.js                           |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/childPackage/pages/billDetail/index.js b/childPackage/pages/billDetail/index.js
index 7472ed6..be7ddf3 100644
--- a/childPackage/pages/billDetail/index.js
+++ b/childPackage/pages/billDetail/index.js
@@ -39,13 +39,17 @@ Page({
     this.init(id, time);
   },
   async init(id, time) {
-    const { code, message, detail } = await getReportDetail(id)
+    const { code, message, detail, amount } = await getReportDetail(id)
     if (code !== OK) {
       alertInfo(message)
       return;
     }
     this.setData({
-      id, time, detail, meters: detail?.meters?.map(item => {
+      id, 
+      time, 
+      detail, 
+      amount: amount,
+      meters: detail?.meters?.map(item => {
         const finalAmount = Number(item?.overall?.amount || 0) + Number(item?.loss?.amount || 0) + Number(item?.publicAmount || 0)
         item.finalAmount = Number(finalAmount).toFixed(2)
         return item;
@@ -77,8 +81,8 @@ Page({
           type: 'pie',
           radius: '50%',
           data: [
-            { value: 18.3, name: '本期线损电量', itemStyle: { color: 'rgb(104,187,196)' } },
-            { value: 187.56, name: '本期用电量', itemStyle: { color: 'rgb(80,135,236)' } },
+            { value: detail.comprehensive.lossAmount, name: '本期线损电量', itemStyle: { color: 'rgb(104,187,196)' } },
+            { value: detail.comprehensive.consumption, name: '本期用电量', itemStyle: { color: 'rgb(80,135,236)' } },
   
           ],
         }
diff --git a/childPackage/pages/billDetail/index.wxml b/childPackage/pages/billDetail/index.wxml
index d1057e1..fb72226 100644
--- a/childPackage/pages/billDetail/index.wxml
+++ b/childPackage/pages/billDetail/index.wxml
@@ -32,7 +32,7 @@
     <van-col span="8">
       <view class="colContent">
         <view class="colContentTitle">本期用电量</view>
-        <view class="colContentValue"> {{ detail.comprehensive.consumption }} 千瓦时 </view>
+        <view class="colContentValue"> {{ amount }} 千瓦时 </view>
       </view>
     </van-col>
     <van-col span="8">
diff --git a/utils/index.js b/utils/index.js
index 87f675e..2b00b4b 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -47,6 +47,7 @@ export function getConfigByEnv() {
     case 'develop':
       api = "http://localhost:8000"
       // 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;

From 2c952e71a38a693b6a1c4aef30e1aef674b2ecea Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Fri, 30 Aug 2024 17:31:35 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                        |   4 +-
 pages/home/index.js             |   7 +-
 pages/publicTransfer/index.js   | 119 ++++++++++++++++++++++++++++++++
 pages/publicTransfer/index.json |   9 +++
 pages/publicTransfer/index.wxml |  25 +++++++
 pages/publicTransfer/index.wxss |   1 +
 pages/recharge/index.js         | 113 ------------------------------
 pages/recharge/index.json       |  10 ---
 pages/recharge/index.wxml       |  51 --------------
 pages/recharge/index.wxss       |  62 -----------------
 pages/rechargeDetail/index.js   |  85 +++++++++++++----------
 pages/rechargeRecord/index.wxml |   8 ++-
 service/public.js               |  23 ++++++
 utils/index.js                  |   8 ++-
 utils/request.js                |   4 ++
 15 files changed, 250 insertions(+), 279 deletions(-)
 create mode 100644 pages/publicTransfer/index.js
 create mode 100644 pages/publicTransfer/index.json
 create mode 100644 pages/publicTransfer/index.wxml
 create mode 100644 pages/publicTransfer/index.wxss
 delete mode 100644 pages/recharge/index.js
 delete mode 100644 pages/recharge/index.json
 delete mode 100644 pages/recharge/index.wxml
 delete mode 100644 pages/recharge/index.wxss
 create mode 100644 service/public.js

diff --git a/app.json b/app.json
index 57ccd30..e20360c 100644
--- a/app.json
+++ b/app.json
@@ -14,11 +14,11 @@
     "pages/waitApprove/index",
     "pages/apply/index",
     "pages/qrCode/index",
-    "pages/recharge/index",
     "pages/questions/index",
     "pages/rechargeDetail/index",
     "pages/updateInvoice/index",
-    "pages/rechargeWay/index"
+    "pages/rechargeWay/index",
+    "pages/publicTransfer/index"
   ],
   "subPackages": [
     {
diff --git a/pages/home/index.js b/pages/home/index.js
index 2ce113b..25fae78 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -25,7 +25,7 @@ Page({
     rechargeVisible: false,
     actions: [
       { name: '微信支付', },
-      { name: '对公支付', disabled: true },
+      { name: '对公支付' },
     ],
   },
   
@@ -326,7 +326,10 @@ Page({
   onSelectRechargeWay(e) {
     switch(e.detail.name) {
       case "对公支付":
-        alertInfo("开发中")
+        const { user, money, meter, tenement, park } = this.data;
+        wx.navigateTo({
+          url: `/pages/publicTransfer/index?money=${money}&meterId=${meter.id}&tenementId=${tenement.id}&tenementName=${tenement.name}`,
+        })
         break;
       default:
         this.wxRecharge();
diff --git a/pages/publicTransfer/index.js b/pages/publicTransfer/index.js
new file mode 100644
index 0000000..0ff22e1
--- /dev/null
+++ b/pages/publicTransfer/index.js
@@ -0,0 +1,119 @@
+// pages/publicTransfer/index.js
+import { getMeterDetail, getMeterList, getTenementMeterList } from "../../service/meter";
+import { uploadFile } from "../../service/public";
+import { alertInfo, loadingFunc, getFileName } from "../../utils/index";
+import request from '../../utils/request';
+
+const { OK } = request;
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    const { money, meterId, tenementId, tenementName } = options;
+    console.log('money', money, 'meterId', meterId)
+    this.init({ money, meterId, tenementId, tenementName });
+  },
+  async init({ money, meterId, tenementId, tenementName }) {
+    const { code, message, data } = await getMeterDetail({ tenement: tenementId, id: meterId });
+    if (code !== OK) {
+      alertInfo(message);
+      return;
+    }
+    this.setData({
+      meter: data,
+      money,
+      tenementName,
+      tenementId,
+    })
+  },
+  onUpload() {
+    const that = this;
+    wx.chooseMedia({  
+      count: 1, // 可以选择文件的数量  
+      mediaType: ['image'], // 可以选择文件的类型，这里只允许上传文件  
+      sourceType: ['album', 'camera'],
+      success: (res) => {
+        (loadingFunc(async () => {
+          const result = await uploadFile(res.tempFiles[0]?.tempFilePath)
+          console.log('result', result)
+          if (result.statusCode !== 200) {
+            alertInfo("上传失败")
+            return;
+          }
+          const data = JSON.parse(result.data)
+          this.setData({
+            fileList: [{ url: data.data, name: getFileName(data.data) }]
+          })
+        }))()
+      }
+    }); 
+  },
+  handleSubmit() {
+    const { fileList } = this.data;
+    if (!fileList.length) {
+      alertInfo("请上传凭证")
+      return;
+    }
+  },
+  handleDelete() {
+    this.setData({ fileList: [] })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/publicTransfer/index.json b/pages/publicTransfer/index.json
new file mode 100644
index 0000000..c2a876c
--- /dev/null
+++ b/pages/publicTransfer/index.json
@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "navigator": "/components/navigator/index",
+    "van-field": "@vant/weapp/field/index",
+    "van-uploader": "@vant/weapp/uploader/index",
+    "van-button": "@vant/weapp/button/index"
+  },
+  "navigationStyle": "custom"
+}
\ No newline at end of file
diff --git a/pages/publicTransfer/index.wxml b/pages/publicTransfer/index.wxml
new file mode 100644
index 0000000..7d31d4f
--- /dev/null
+++ b/pages/publicTransfer/index.wxml
@@ -0,0 +1,25 @@
+<!--pages/publicTransfer/index.wxml-->
+<navigator title="对公转账" canBack="{{true}}" />
+<van-cell-group>
+    <van-field label="用户名称" value="{{ tenementName }}" border="{{ false }}" readonly />
+    <van-field label="电表编号" value="{{ meter.code }}" border="{{ false }}" readonly />
+    <van-field label="电表地址" value="{{ meter.address }}" border="{{ false }}" readonly />
+    <van-field label="付款方式" value="{{ '对公支付' }}" border="{{ false }}" readonly />
+    <van-field label="付款金额" value="{{ money }}" border="{{ false }}" readonly />
+    <van-field label="充值凭证" border="{{ false }}" use-input-slot type="textarea">
+        <van-button slot="input" size="small" type="info" bind:tap="onUpload">
+            点击上传
+        </van-button>
+    </van-field>
+</van-cell-group>
+
+<view style="padding: 20rpx;">
+    <van-uploader
+        file-list="{{ fileList }}"
+        show-upload="{{false}}"
+        bind:delete="handleDelete"
+        preview-size="220rpx"
+    />
+
+    <van-button bind:tap="handleSubmit" type="info" block style="margin-top: 20rpx;"> 提交 </van-button>
+</view>
\ No newline at end of file
diff --git a/pages/publicTransfer/index.wxss b/pages/publicTransfer/index.wxss
new file mode 100644
index 0000000..9e7911d
--- /dev/null
+++ b/pages/publicTransfer/index.wxss
@@ -0,0 +1 @@
+/* pages/publicTransfer/index.wxss */
\ No newline at end of file
diff --git a/pages/recharge/index.js b/pages/recharge/index.js
deleted file mode 100644
index 780ab6d..0000000
--- a/pages/recharge/index.js
+++ /dev/null
@@ -1,113 +0,0 @@
-import { getMeterDetail } from "../../service/meter";
-import { getGlobalData, showModal } from "../../utils/index";
-
-// pages/recharge/index.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    money: 0,
-    moneyIndex: -1,
-    primaryColor: getGlobalData().primaryColor,
-    defaultMoneyArray: [100, 200, 500, 1000, 2000],
-    customFlag: false,
-    detail: {}
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-    const { tenement, code } = options
-    this.init({ tenement, code })
-  },
-  async init(options) {
-    const { code, message, data = {}} = await getMeterDetail(options)
-    this.setData({
-      detail: data
-    })
-  },
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-  chooseMoney(e) {
-    const { money, index } = e.currentTarget.dataset;
-    this.setData({
-      money,
-      moneyIndex: Number(index),
-      customFlag: false,
-    });
-  },
-  onChangeCode(e) {
-    const { codes } = this.data;
-    const index = Number(e.detail.value);
-    this.setData({
-      code: codes[index]
-    })
-  },
-  custom() {
-    this.setData({
-      moneyIndex: -1,
-      customFlag: true,
-    })
-  },
-  onChangeCustomMoney(e) {
-    const money = e.detail.value;
-    this.setData({
-      money: money,
-    })
-  },
-  async recharge() {
-    const { detail = {}, money } = this.data;
-    const confirmResult = await showModal({ title: "充值确认", content: `确认充值表号为${detail?.meter?.code}的表计${money}元吗？` });
-    if (!confirmResult) {
-      return;
-    }
-  },
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})
\ No newline at end of file
diff --git a/pages/recharge/index.json b/pages/recharge/index.json
deleted file mode 100644
index 6618c57..0000000
--- a/pages/recharge/index.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "usingComponents": {
-    "navigator": "/components/navigator/index",
-    "van-grid": "@vant/weapp/grid/index",
-    "van-grid-item": "@vant/weapp/grid-item/index",
-    "van-row": "@vant/weapp/row/index",
-    "van-col": "@vant/weapp/col/index"
-  },
-  "navigationBarTitleText": "充值"
-}
\ No newline at end of file
diff --git a/pages/recharge/index.wxml b/pages/recharge/index.wxml
deleted file mode 100644
index c765007..0000000
--- a/pages/recharge/index.wxml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--pages/recharge/index.wxml-->
-
-<view class="wrapper">
-
-  <van-row gutter="10">
-    <van-col span="12">
-      <view class="title">充值表号：</view>
-      <view class="content">{{ detail.meter.code }}</view>
-    </van-col>
-    <van-col span="12">
-      <view class="title">表计地址：</view>
-      <view class="content">{{ detail.meter.address }}</view>
-    </van-col>
-  
-      <van-col span="12"  custom-class="colBottom">
-        <view class="title">剩余金额：</view>
-        <view class="content">{{ detail.money }}</view>
-      </van-col>
-      <van-col span="12" custom-class="colBottom">
-        <view class="title">公司名称：</view>
-        <view class="content">{{ detail.tenement.name }}</view>
-      </van-col>
-
-  </van-row>
-  <view class="moneyBoxs">
-    <view 
-      wx:for="{{defaultMoneyArray}}" 
-      class="moneyBox border radius12" 
-      style="background-color: {{moneyIndex === index ? primaryColor : ''}};" 
-      wx:key="index" 
-      bind:tap="chooseMoney" 
-      data-money="{{item}}" 
-      data-index="{{index}}"
-    > {{item}} </view>
-    <view class="moneyBox border radius12" bind:tap="custom"> 自定义 </view>
-  </view>
-  <view 
-    class="customInput border radius12" 
-    wx:if="{{customFlag}}"
-  > 
-    <input 
-      type="number" 
-      focus 
-      placeholder="请输入要充值的金额" 
-      bindinput="onChangeCustomMoney" 
-    />
-  </view>
-  <view class="operate">
-    <button type="primary" bind:tap="recharge" disabled="{{!money}}"> 充值 </button>
-  </view>
-</view>
\ No newline at end of file
diff --git a/pages/recharge/index.wxss b/pages/recharge/index.wxss
deleted file mode 100644
index a62e17e..0000000
--- a/pages/recharge/index.wxss
+++ /dev/null
@@ -1,62 +0,0 @@
-/* pages/recharge/index.wxss */
-.moneyBoxs {
-  margin-top: 32rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  flex-wrap: wrap;
-}
-
-.moneyBox {
-  width: 30%;
-  height: 140rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin-bottom: 24rpx;
-}
-
-.chooseMeter {
-  display: flex;
-  align-items: center;
-  margin-top: 10rpx;
-}
-
-.selectMeter {
-  margin-left: 24rpx;
-}
-
-.operate {
-  margin-top: 24rpx;
-}
-
-.input {
-  height: 40rpx;
-  width: 400rpx;
-  line-height: 40rpx;
-  border-radius: 20rpx;
-  padding: 12rpx 14rpx 16rpx;
-  /* border: 1rpx solid #ccc; */
-}
-
-.customInput {
-  padding: 16rpx 24rpx;
-}
-
-.gridTitle {
-  margin-bottom: 24rpx;
-}
-
-.colBottom {
-  margin-top: 40rpx;
-}
-
-.title {
-  font-weight: 600;
-  font-size: 40rpx;
-  margin-bottom: 20rpx;
-}
-
-.content {
-  font-size: 32rpx;
-}
\ No newline at end of file
diff --git a/pages/rechargeDetail/index.js b/pages/rechargeDetail/index.js
index cd5ec8a..b4be760 100644
--- a/pages/rechargeDetail/index.js
+++ b/pages/rechargeDetail/index.js
@@ -33,42 +33,57 @@ Page({
     })
   },
   record() {
-    const { detail } = this.data;
-    wx.showModal({
-      title: '提示',
-      content: '为了您更好的体验，请复制链接，通过电脑浏览器打开下载',
-      showCancel: true,
-      cancelText: '关闭',
-      confirmText: '复制链接',
-
-      complete: (res) => {
-        if (res.confirm) {
-          const result = wx.getAccountInfoSync();
-          const { envVersion } = result.miniProgram;
-          let api = ""
-          switch (envVersion) {
-            // 开发版
-            case 'develop':
-              wx.setClipboardData({
-                data: `http://1.92.72.5:8080/recharge-print/?id=${detail.id}`,
-              })
-              break;
-            // 体验版
-            case 'trial':
-              wx.setClipboardData({
-                data: `http://1.92.72.5:8080/recharge-print/?id=${detail.id}`,
-              })
-              break;
-            // 正式版
-            case 'release':
-              wx.setClipboardData({
-                data: `https://zgd.hbhcbn.com/recharge-print/?id=${detail.id}`,
-              })
-              break;
-          }
-         
+    const handleDownload = () => {
+      return new Promise((resolve, rej) => {
+        const { detail } = this.data;
+        const result = wx.getAccountInfoSync();
+        const { envVersion } = result.miniProgram;
+        let api = ""
+        switch (envVersion) {
+          // 开发版
+          case 'develop':
+            api = `http://localhost:9001`;
+            // api =  `https://zgd.hbhcbn.com/recharge-print-api-test`;
+            break;
+          // 体验版
+          case 'trial':
+            api =  `https://zgd.hbhcbn.com/recharge-print-api-test`;
+            break;
+          // 正式版
+          case 'release':
+            api = `https://zgd.hbhcbn.com/recharge-print-api`;
+            break;
         }
-      }
+        console.log("api", `${api}/${detail.id}`)
+        wx.downloadFile({
+          url: `${api}/${detail.id}`,
+          success: (res) => {
+            console.log('res', res)
+            if (res.statusCode === 200) {
+              if (!res.tempFilePath) {
+                alertError("获取文件失败")
+                rej()
+                return;
+              }
+              wx.openDocument({
+                filePath: res.tempFilePath,
+                fileType: [ "pdf"], // 3. 这个必须写合法类型，不然下载不了 ！！！
+                success: function (res) {
+                  resolve()
+                },
+                fail: function (e) {
+                  alertError("打开失败")
+                  console.log('打开失败错误为', e)
+                  rej()
+                }
+              })
+            }
+          }
+        })
+      })
+    }
+    loadingFunc(async () => {
+      await handleDownload();
     })
   },
   back() {
diff --git a/pages/rechargeRecord/index.wxml b/pages/rechargeRecord/index.wxml
index 73ac1df..dac645a 100644
--- a/pages/rechargeRecord/index.wxml
+++ b/pages/rechargeRecord/index.wxml
@@ -7,11 +7,13 @@
   </view>
   <view class="tenementPicker" bind:tap="clickMeter">
     <view wx:if="{{meterCode}}" class="tenementName"> {{ meterCode }} </view>
-    <view wx:else> 全部 </view>
+    <view wx:else> 全部电表 </view>
     <van-icon name="arrow-down" custom-class="down" />
   </view>
-  <view class="allMoney">
-    合计： {{amount}}元
+  <view class="tenementPicker" bind:tap="clickType">
+    <view wx:if="{{typeText}}" class="tenementName"> {{ typeText }} </view>
+    <view wx:else> 全部类型 </view>
+    <van-icon name="arrow-down" custom-class="down" />
   </view>
 </view>
 <view class="wrapper" wx:if="{{list.length}}"> 
diff --git a/service/public.js b/service/public.js
new file mode 100644
index 0000000..f2dd5eb
--- /dev/null
+++ b/service/public.js
@@ -0,0 +1,23 @@
+import apis from '../utils/request';
+import { getConfigByEnv } from "../utils/index"
+const { GET, POST, PUT, DELETE } = apis
+
+export const uploadFile = (filePath) => {
+    const { api } = getConfigByEnv();
+    return new Promise((resolve, reject) => {
+        wx.uploadFile({
+            filePath: filePath,
+            name: 'file',
+            url: `${api}/file/upload`,
+            header: {
+                authorization: 'Bearer ' + wx.getStorageSync("token")
+            },
+            success: (res) => {
+                resolve(res);
+            },
+            fail: (err) => {
+                reject(err);
+            }
+        })
+    })
+}
\ No newline at end of file
diff --git a/utils/index.js b/utils/index.js
index 87f675e..2cc3cbe 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -45,7 +45,8 @@ 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/wxApi"
       // api = "http://127.0.0.1:4523/m1/4143821-0-default"
@@ -247,4 +248,9 @@ export function getPageUrl() {
   const currentPage = pages[pages.length-1]    //获取当前页面的对象
   const url = currentPage.route    //当前页面url
   return url
+}
+
+/** 根据文件路径获取文件名 */
+export function getFileName(path) {
+  return path.slice(path.lastIndexOf("/") + 1, -1)
 }
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index 3b624fd..1d6ed2c 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -85,6 +85,10 @@ const parseResponse = function (response, url) {
   // const { statusCode } = response;
   const { code } = response?.data || {};
   console.log('url', url,'code', code,  'response.data', response.data)
+  if (!code) {   
+    alertError("服务异常")
+    return
+  }
   if (code === 401) {
     const currentUrl = getPageUrl()
     

From 17a72fd674406d5f273154b7f8ad34c3cd29e436 Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Tue, 3 Sep 2024 09:59:49 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/index.js b/utils/index.js
index 2cc3cbe..a9359ec 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -45,8 +45,8 @@ export function getConfigByEnv() {
   switch (envVersion) {
     // 开发版
     case 'develop':
-      // api = "http://localhost:8000"
-      api = "https://zgd.hbhcbn.com/api3"
+      api = "http://localhost:8000"
+      // 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"

From 9a6c4d30f46ef9adaae0e71507dcac4643e56cbd Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Thu, 5 Sep 2024 14:05:14 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=93=E5=8C=BA?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E5=88=86=E9=A1=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.json                                      |  11 +-
 assets/tabbar/special.png                     | Bin 0 -> 10317 bytes
 assets/tabbar/special_select.png              | Bin 0 -> 10662 bytes
 components/pagination/index.wxml              |   1 -
 pages/encyclopedia/components/item/index.js   |  59 +++++++++++
 pages/encyclopedia/components/item/index.json |   9 ++
 pages/encyclopedia/components/item/index.wxml |  15 +++
 pages/encyclopedia/components/item/index.wxss |   1 +
 pages/encyclopedia/index.js                   |  87 ++++++++++++++++
 pages/encyclopedia/index.json                 |   9 ++
 pages/encyclopedia/index.wxml                 |   7 ++
 pages/encyclopedia/index.wxss                 |   1 +
 pages/encyclopediaDetail/index.js             |  77 ++++++++++++++
 pages/encyclopediaDetail/index.json           |   6 ++
 pages/encyclopediaDetail/index.wxml           |   6 ++
 pages/encyclopediaDetail/index.wxss           |  14 +++
 pages/handleLogin/index.js                    |   6 +-
 pages/handleLogin/index.wxml                  |   2 +-
 pages/home/index.js                           |   4 +-
 pages/special/index.js                        |  96 ++++++++++++++++++
 pages/special/index.json                      |   9 ++
 pages/special/index.wxml                      |  11 ++
 pages/special/index.wxss                      |   6 ++
 service/system.js                             |  20 ++++
 24 files changed, 448 insertions(+), 9 deletions(-)
 create mode 100644 assets/tabbar/special.png
 create mode 100644 assets/tabbar/special_select.png
 create mode 100644 pages/encyclopedia/components/item/index.js
 create mode 100644 pages/encyclopedia/components/item/index.json
 create mode 100644 pages/encyclopedia/components/item/index.wxml
 create mode 100644 pages/encyclopedia/components/item/index.wxss
 create mode 100644 pages/encyclopedia/index.js
 create mode 100644 pages/encyclopedia/index.json
 create mode 100644 pages/encyclopedia/index.wxml
 create mode 100644 pages/encyclopedia/index.wxss
 create mode 100644 pages/encyclopediaDetail/index.js
 create mode 100644 pages/encyclopediaDetail/index.json
 create mode 100644 pages/encyclopediaDetail/index.wxml
 create mode 100644 pages/encyclopediaDetail/index.wxss
 create mode 100644 pages/special/index.js
 create mode 100644 pages/special/index.json
 create mode 100644 pages/special/index.wxml
 create mode 100644 pages/special/index.wxss

diff --git a/app.json b/app.json
index e20360c..124079b 100644
--- a/app.json
+++ b/app.json
@@ -18,7 +18,10 @@
     "pages/rechargeDetail/index",
     "pages/updateInvoice/index",
     "pages/rechargeWay/index",
-    "pages/publicTransfer/index"
+    "pages/publicTransfer/index",
+    "pages/special/index",
+    "pages/encyclopedia/index",
+    "pages/encyclopediaDetail/index"
   ],
   "subPackages": [
     {
@@ -38,6 +41,12 @@
         "iconPath": "/assets/tabbar/home.png",
         "selectedIconPath": "/assets/tabbar/home_select.png"
       },
+      {
+        "pagePath": "pages/special/index",
+        "text": "专区",
+        "iconPath": "/assets/tabbar/special.png",
+        "selectedIconPath": "/assets/tabbar/special_select.png"
+      },
       {
         "pagePath": "pages/my/index",
         "text": "我的",
diff --git a/assets/tabbar/special.png b/assets/tabbar/special.png
new file mode 100644
index 0000000000000000000000000000000000000000..475ff5e7802b4ea6df89aa1da6042ad4592fdd87
GIT binary patch
literal 10317
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

literal 0
HcmV?d00001

diff --git a/assets/tabbar/special_select.png b/assets/tabbar/special_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fb8c95c6b7b6edca131def662f9c97a82d24700
GIT binary patch
literal 10662
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
BjGO=f

literal 0
HcmV?d00001

diff --git a/components/pagination/index.wxml b/components/pagination/index.wxml
index 4005047..4d599db 100644
--- a/components/pagination/index.wxml
+++ b/components/pagination/index.wxml
@@ -14,4 +14,3 @@
     </view>
   </view>
 </view>
-{{totalPage}}
diff --git a/pages/encyclopedia/components/item/index.js b/pages/encyclopedia/components/item/index.js
new file mode 100644
index 0000000..ac915a0
--- /dev/null
+++ b/pages/encyclopedia/components/item/index.js
@@ -0,0 +1,59 @@
+import { getEncyclopediaList } from "../../../../service/system";
+import { alertInfo, alertSuccess, loadingFunc, wxLogin } from "../../../../utils/index";
+import request from "../../../../utils/request"
+const { OK } = request;
+// pages/encyclopedia/components/item/index.js
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    id: String
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    page: 1,
+    list: [],
+  },
+  lifetimes: {
+    attached() {
+      console.log('----------=========')
+      this.getData();
+    }
+  },
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    async getData() {
+      console.log(this.data.page, this.data.id, this.id)
+      const page = this.data.page;
+      const id = this.id;
+      const { code, data, message, total } = await getEncyclopediaList(id, page);
+      if (code !== OK) {
+        alertInfo(message)
+        return;
+      }
+      this.setData({ list: data, totalPage: Math.ceil(total / 20) });
+    },
+    jumpToDetail(e) {
+      console.log('e', e)
+      wx.navigateTo({
+        url: `/pages/encyclopediaDetail/index?id=${e.currentTarget.dataset.data.id}`,
+      })
+    },
+    async onChangePage(e) {
+      const page = e.detail.currentIndex;
+      const that = this;
+      this.setData({
+        page
+      }, () => {
+        that.getData();
+      })
+    },
+  }
+})
\ No newline at end of file
diff --git a/pages/encyclopedia/components/item/index.json b/pages/encyclopedia/components/item/index.json
new file mode 100644
index 0000000..be620b1
--- /dev/null
+++ b/pages/encyclopedia/components/item/index.json
@@ -0,0 +1,9 @@
+{
+  "component": true,
+  "usingComponents": {
+    "pagination": "/components/pagination/index",
+    "navigator": "/components/navigator/index",
+    "van-field": "@vant/weapp/field/index"
+  },
+  "navigationStyle": "custom"
+}
\ No newline at end of file
diff --git a/pages/encyclopedia/components/item/index.wxml b/pages/encyclopedia/components/item/index.wxml
new file mode 100644
index 0000000..1e33446
--- /dev/null
+++ b/pages/encyclopedia/components/item/index.wxml
@@ -0,0 +1,15 @@
+<!--pages/encyclopedia/components/item/index.wxml-->
+<van-field
+    wx:for="{{list}}"
+    value="{{ item.title }}"
+    readonly
+    border="{{ true }}"
+    wx:key="id"
+    bind:tap="jumpToDetail"
+    data-data="{{item}}"
+/>
+<pagination 
+    currentIndex="{{page}}" 
+    totalPage="{{totalPage}}" 
+    bind:pagingChange="onChangePage"  
+/>
\ No newline at end of file
diff --git a/pages/encyclopedia/components/item/index.wxss b/pages/encyclopedia/components/item/index.wxss
new file mode 100644
index 0000000..df85e8e
--- /dev/null
+++ b/pages/encyclopedia/components/item/index.wxss
@@ -0,0 +1 @@
+/* pages/encyclopedia/components/item/index.wxss */
\ No newline at end of file
diff --git a/pages/encyclopedia/index.js b/pages/encyclopedia/index.js
new file mode 100644
index 0000000..772df41
--- /dev/null
+++ b/pages/encyclopedia/index.js
@@ -0,0 +1,87 @@
+// pages/encyclopedia/index.js
+import { getCategoryList } from '../../service/system'
+import { alertInfo, alertSuccess, loadingFunc, wxLogin } from "../../utils/index";
+import request from "../../utils/request"
+const { OK } = request;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    categoryList: [],
+    active: 0,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.init();
+  },
+
+  async init() {
+    const { data, code, message } = await getCategoryList();
+    if (code !== OK) {
+      alertInfo(message);
+      return
+    }
+    this.setData({
+      categoryList: data
+    })
+  },
+  onChange(e) {
+    console.log('e', e)
+    this.setData({
+      active: e.detail.index,
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/encyclopedia/index.json b/pages/encyclopedia/index.json
new file mode 100644
index 0000000..306142e
--- /dev/null
+++ b/pages/encyclopedia/index.json
@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "navigator": "/components/navigator/index",
+    "van-tab": "@vant/weapp/tab/index",
+    "van-tabs": "@vant/weapp/tabs/index",
+    "item": "./components/item/index"
+  },
+  "navigationStyle": "custom"
+}
\ No newline at end of file
diff --git a/pages/encyclopedia/index.wxml b/pages/encyclopedia/index.wxml
new file mode 100644
index 0000000..93d41df
--- /dev/null
+++ b/pages/encyclopedia/index.wxml
@@ -0,0 +1,7 @@
+<!--pages/encyclopedia/index.wxml-->
+<navigator title="电力百科" canBack="{{true}}" />
+<van-tabs active="{{ active }}" bind:change="onChange">
+  <van-tab wx:for="{{categoryList}}" wx:key="id" title="{{item.name}}">
+    <item id="{{item.id}}" wx:if="{{index === active}}" />
+  </van-tab>
+</van-tabs>
\ No newline at end of file
diff --git a/pages/encyclopedia/index.wxss b/pages/encyclopedia/index.wxss
new file mode 100644
index 0000000..e67e696
--- /dev/null
+++ b/pages/encyclopedia/index.wxss
@@ -0,0 +1 @@
+/* pages/encyclopedia/index.wxss */
\ No newline at end of file
diff --git a/pages/encyclopediaDetail/index.js b/pages/encyclopediaDetail/index.js
new file mode 100644
index 0000000..2eacec4
--- /dev/null
+++ b/pages/encyclopediaDetail/index.js
@@ -0,0 +1,77 @@
+// pages/encyclopediaDetail/index.js
+import { getEncyclopediaDetail } from "../../service/system";
+import { alertInfo, alertSuccess, loadingFunc, wxLogin } from "../../utils/index";
+import request from "../../utils/request"
+const { OK } = request;
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    detail: {},
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.init(options.id)
+  },
+  async init(id) {
+    const { code, data, message } = await getEncyclopediaDetail(id);
+    if (code !== OK) {
+      alertInfo(message)
+      return;
+    }
+    this.setData({ detail: data });
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/encyclopediaDetail/index.json b/pages/encyclopediaDetail/index.json
new file mode 100644
index 0000000..a6d770b
--- /dev/null
+++ b/pages/encyclopediaDetail/index.json
@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "navigator": "/components/navigator/index"
+  },
+  "navigationStyle": "custom"
+}
\ No newline at end of file
diff --git a/pages/encyclopediaDetail/index.wxml b/pages/encyclopediaDetail/index.wxml
new file mode 100644
index 0000000..691d43d
--- /dev/null
+++ b/pages/encyclopediaDetail/index.wxml
@@ -0,0 +1,6 @@
+<!--pages/encyclopediaDetail/index.wxml-->
+<navigator title="百科详情" canBack="{{true}}" />
+<view class="contentWrapper">
+    <view class="title">{{detail.title}}</view>
+    <view class="content">{{detail.content}}</view>
+</view>
diff --git a/pages/encyclopediaDetail/index.wxss b/pages/encyclopediaDetail/index.wxss
new file mode 100644
index 0000000..c5e5a07
--- /dev/null
+++ b/pages/encyclopediaDetail/index.wxss
@@ -0,0 +1,14 @@
+/* pages/encyclopediaDetail/index.wxss */
+.contentWrapper {
+    padding: 30rpx
+}
+.title {
+    margin-top: 12rpx;
+    font-weight: 600;
+    font-size: 48rpx;
+}
+
+.content {
+    margin-top: 40rpx;
+
+}
\ No newline at end of file
diff --git a/pages/handleLogin/index.js b/pages/handleLogin/index.js
index 87ab42f..2ac8d9c 100644
--- a/pages/handleLogin/index.js
+++ b/pages/handleLogin/index.js
@@ -22,11 +22,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    const { canBack } = options
-    console.log('cnaback', canBack)
-    if (canBack === 'false') {
-      this.setData({ canBack: false })
-    }
+
   },
   onChangeName(e) {
     this.setData({
diff --git a/pages/handleLogin/index.wxml b/pages/handleLogin/index.wxml
index 67a3e47..d23c8a9 100644
--- a/pages/handleLogin/index.wxml
+++ b/pages/handleLogin/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/handleLogin/index.wxml-->
 <!-- <topbar /> -->
-<navigator title="绑定商户" canBack="{{canBack}}" />
+<navigator title="绑定商户" canBack="{{true}}" />
 <van-tabs>
   <van-tab title="扫码绑定">
     <view class="codeContent">
diff --git a/pages/home/index.js b/pages/home/index.js
index 25fae78..fa89ba1 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -269,9 +269,11 @@ Page({
     }
     if (!data?.length) {
       alertInfo("尚无信息")
+      
       setTimeout(() => {
+        wx.clearStorageSync()
         wx.redirectTo({
-          url: '/pages/handleLogin/index?back=false',
+          url: '/pages/login/index',
         })
       }, 500)
       return;
diff --git a/pages/special/index.js b/pages/special/index.js
new file mode 100644
index 0000000..6b17e42
--- /dev/null
+++ b/pages/special/index.js
@@ -0,0 +1,96 @@
+// pages/special/index.js
+import { getServicesList } from '../../service/system'
+import request from '../../utils/request'
+import { alertInfo } from '../../utils/index'
+const { OK } = request;
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    servicesList: []
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+  async init() {
+    const { code, message, data } = await getServicesList()
+    if (code !== OK) {
+      alertInfo(message);
+      return;
+    }
+    this.setData({ servicesList: data })
+  },
+  clickService(e) {
+    console.log('e', e)
+    const { type, value } = e.currentTarget.dataset.data;
+    switch(type) {
+      case 0:
+        const [appId, path] = value.split(",")
+        wx.navigateToMiniProgram({
+          appId: appId,
+          path: path
+          })
+        break;
+      case 1:
+        wx.navigateTo({
+          url: value,
+        })
+        break;
+    }
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    this.init()
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
\ No newline at end of file
diff --git a/pages/special/index.json b/pages/special/index.json
new file mode 100644
index 0000000..73912f2
--- /dev/null
+++ b/pages/special/index.json
@@ -0,0 +1,9 @@
+{
+  "usingComponents": {
+    "navigator": "/components/navigator/index",
+    "van-row": "@vant/weapp/row/index",
+    "van-col": "@vant/weapp/col/index",
+    "van-image": "@vant/weapp/image/index"
+  },
+  "navigationStyle": "custom"
+}
\ No newline at end of file
diff --git a/pages/special/index.wxml b/pages/special/index.wxml
new file mode 100644
index 0000000..feca8d5
--- /dev/null
+++ b/pages/special/index.wxml
@@ -0,0 +1,11 @@
+<!--pages/special/index.wxml-->
+<navigator title="专区" />
+<view class="servicesWrapper">
+    <van-row>
+        <van-col span="8" wx:for="{{ servicesList }}" wx:key="id">
+            <view class="image" bind:tap="clickService" data-data="{{item}}">
+                <van-image width="200rpx" height="200rpx" src="{{item.url}}"  />
+            </view>
+        </van-col>
+    </van-row>
+</view>
\ No newline at end of file
diff --git a/pages/special/index.wxss b/pages/special/index.wxss
new file mode 100644
index 0000000..4245294
--- /dev/null
+++ b/pages/special/index.wxss
@@ -0,0 +1,6 @@
+/* pages/special/index.wxss */
+.image {
+    width: 100%;
+    height: auto;
+    padding: 40rpx;
+}
\ No newline at end of file
diff --git a/service/system.js b/service/system.js
index b018172..db5407a 100644
--- a/service/system.js
+++ b/service/system.js
@@ -29,4 +29,24 @@ export const deleteOption = async function() {
 // 提交意见反馈
 export const aboutUs = async function() {
   return await GET(`/wx/aboutUs`);
+}
+
+// 获取特色服务列表
+export const getServicesList = async function() {
+  return await GET(`/wx/getServicesList?status=2`);
+}
+
+// 获取分类列表
+export const getCategoryList = async function() {
+  return await GET(`/wx/getCategoryList?status=2`);
+}
+
+// 获取分类列表
+export const getEncyclopediaList = async function(categoryId, page) {
+  return await GET(`/wx/getEncyclopedia?status=2&page=${page}&categoryId=${categoryId}`);
+}
+
+// 获取分类列表
+export const getEncyclopediaDetail = async function(id) {
+  return await GET(`/wx/getEncyclopediaDetail/${id}`);
 }
\ No newline at end of file

From 927b7a6470ac9338661f38f8332179a97caf2adc Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Mon, 9 Sep 2024 15:57:59 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=AF=B9=E5=85=AC?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E6=93=8D=E4=BD=9C=E5=92=8C=E4=B8=93=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/encyclopedia/components/item/index.js   |  1 -
 pages/encyclopedia/components/item/index.json |  3 +-
 pages/encyclopedia/components/item/index.wxml | 34 +++++-----
 pages/encyclopedia/index.wxml                 |  2 +-
 pages/home/index.js                           |  2 +-
 pages/publicTransfer/index.js                 | 63 ++++++++++++-------
 pages/rechargeDetail/index.js                 |  3 +-
 pages/special/index.js                        |  3 +-
 pages/special/index.wxml                      |  2 +-
 service/public.js                             | 20 ++++++
 service/recharge.js                           |  5 ++
 utils/system.js                               |  4 +-
 12 files changed, 97 insertions(+), 45 deletions(-)

diff --git a/pages/encyclopedia/components/item/index.js b/pages/encyclopedia/components/item/index.js
index ac915a0..46a8046 100644
--- a/pages/encyclopedia/components/item/index.js
+++ b/pages/encyclopedia/components/item/index.js
@@ -30,7 +30,6 @@ Component({
    */
   methods: {
     async getData() {
-      console.log(this.data.page, this.data.id, this.id)
       const page = this.data.page;
       const id = this.id;
       const { code, data, message, total } = await getEncyclopediaList(id, page);
diff --git a/pages/encyclopedia/components/item/index.json b/pages/encyclopedia/components/item/index.json
index be620b1..ad53950 100644
--- a/pages/encyclopedia/components/item/index.json
+++ b/pages/encyclopedia/components/item/index.json
@@ -3,7 +3,8 @@
   "usingComponents": {
     "pagination": "/components/pagination/index",
     "navigator": "/components/navigator/index",
-    "van-field": "@vant/weapp/field/index"
+    "van-field": "@vant/weapp/field/index",
+    "empty": "/components/empty/index"
   },
   "navigationStyle": "custom"
 }
\ No newline at end of file
diff --git a/pages/encyclopedia/components/item/index.wxml b/pages/encyclopedia/components/item/index.wxml
index 1e33446..e3ba148 100644
--- a/pages/encyclopedia/components/item/index.wxml
+++ b/pages/encyclopedia/components/item/index.wxml
@@ -1,15 +1,21 @@
 <!--pages/encyclopedia/components/item/index.wxml-->
-<van-field
-    wx:for="{{list}}"
-    value="{{ item.title }}"
-    readonly
-    border="{{ true }}"
-    wx:key="id"
-    bind:tap="jumpToDetail"
-    data-data="{{item}}"
-/>
-<pagination 
-    currentIndex="{{page}}" 
-    totalPage="{{totalPage}}" 
-    bind:pagingChange="onChangePage"  
-/>
\ No newline at end of file
+<view wx:if="{{list.length}}">
+    <van-field
+        wx:for="{{list}}"
+        value="{{ item.title }}"
+        readonly
+        border="{{ true }}"
+        wx:key="id"
+        bind:tap="jumpToDetail"
+        data-data="{{item}}"
+    />
+    <pagination 
+        currentIndex="{{page}}" 
+        totalPage="{{totalPage}}" 
+        bind:pagingChange="onChangePage"  
+    />
+</view>
+
+<view wx:else>
+    <empty bind:refresh="getData" />
+</view>
\ No newline at end of file
diff --git a/pages/encyclopedia/index.wxml b/pages/encyclopedia/index.wxml
index 93d41df..a00ca80 100644
--- a/pages/encyclopedia/index.wxml
+++ b/pages/encyclopedia/index.wxml
@@ -1,6 +1,6 @@
 <!--pages/encyclopedia/index.wxml-->
 <navigator title="电力百科" canBack="{{true}}" />
-<van-tabs active="{{ active }}" bind:change="onChange">
+<van-tabs active="{{ active }}" bind:change="onChange" swipeable> 
   <van-tab wx:for="{{categoryList}}" wx:key="id" title="{{item.name}}">
     <item id="{{item.id}}" wx:if="{{index === active}}" />
   </van-tab>
diff --git a/pages/home/index.js b/pages/home/index.js
index fa89ba1..c5c6793 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -330,7 +330,7 @@ Page({
       case "对公支付":
         const { user, money, meter, tenement, park } = this.data;
         wx.navigateTo({
-          url: `/pages/publicTransfer/index?money=${money}&meterId=${meter.id}&tenementId=${tenement.id}&tenementName=${tenement.name}`,
+          url: `/pages/publicTransfer/index?money=${money}&meterId=${meter.id}&tenementId=${tenement.id}&tenementName=${tenement.name}&park=${park.id}`,
         })
         break;
       default:
diff --git a/pages/publicTransfer/index.js b/pages/publicTransfer/index.js
index 0ff22e1..bdae1ef 100644
--- a/pages/publicTransfer/index.js
+++ b/pages/publicTransfer/index.js
@@ -1,7 +1,8 @@
 // pages/publicTransfer/index.js
 import { getMeterDetail, getMeterList, getTenementMeterList } from "../../service/meter";
-import { uploadFile } from "../../service/public";
-import { alertInfo, loadingFunc, getFileName } from "../../utils/index";
+import { createPublicTopUp } from '../../service/recharge'
+import { uploadFile, uploadPublicFile } from "../../service/public";
+import { alertInfo, loadingFunc, getFileName, alertSuccess } from "../../utils/index";
 import request from '../../utils/request';
 
 const { OK } = request;
@@ -19,11 +20,10 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    const { money, meterId, tenementId, tenementName } = options;
-    console.log('money', money, 'meterId', meterId)
-    this.init({ money, meterId, tenementId, tenementName });
+    const { money, meterId, tenementId, tenementName, park } = options;
+    this.init({ money, meterId, tenementId, tenementName, park });
   },
-  async init({ money, meterId, tenementId, tenementName }) {
+  async init({ money, meterId, tenementId, tenementName, park }) {
     const { code, message, data } = await getMeterDetail({ tenement: tenementId, id: meterId });
     if (code !== OK) {
       alertInfo(message);
@@ -34,36 +34,55 @@ Page({
       money,
       tenementName,
       tenementId,
+      park
+    })
+  },
+  async upload(res) {
+    const result = await uploadPublicFile(res.tempFiles[0]?.tempFilePath)
+    if (result.statusCode !== 200) {
+      alertInfo("上传失败")
+      return;
+    }
+    const data = JSON.parse(result.data)
+    this.setData({
+      fileList: [{ url: data.data, name: getFileName(data.data) }]
     })
   },
   onUpload() {
-    const that = this;
     wx.chooseMedia({  
       count: 1, // 可以选择文件的数量  
       mediaType: ['image'], // 可以选择文件的类型，这里只允许上传文件  
       sourceType: ['album', 'camera'],
       success: (res) => {
-        (loadingFunc(async () => {
-          const result = await uploadFile(res.tempFiles[0]?.tempFilePath)
-          console.log('result', result)
-          if (result.statusCode !== 200) {
-            alertInfo("上传失败")
-            return;
-          }
-          const data = JSON.parse(result.data)
-          this.setData({
-            fileList: [{ url: data.data, name: getFileName(data.data) }]
-          })
-        }))()
+        loadingFunc(async () => {
+          await this.upload(res)
+        })
       }
     }); 
   },
-  handleSubmit() {
-    const { fileList } = this.data;
-    if (!fileList.length) {
+  async handleSubmit() {
+    const { fileList, meter, money, park, tenementId } = this.data;
+    if (!fileList?.length) {
       alertInfo("请上传凭证")
       return;
     }
+    const { code, message } = await createPublicTopUp({ 
+      id: meter.id, 
+      tenement: tenementId, 
+      money: Number(money),
+      park,
+      vouch:  fileList[0].url
+    })
+    if (code !== OK) {
+      alertInfo(message)
+      return;
+    }
+    alertSuccess("已提交，待审核")
+    setTimeout(() => {
+      wx.redirectTo({
+        url: '/pages/home/index',
+      })
+    }, 600)
   },
   handleDelete() {
     this.setData({ fileList: [] })
diff --git a/pages/rechargeDetail/index.js b/pages/rechargeDetail/index.js
index b4be760..c36b4d3 100644
--- a/pages/rechargeDetail/index.js
+++ b/pages/rechargeDetail/index.js
@@ -42,7 +42,8 @@ Page({
         switch (envVersion) {
           // 开发版
           case 'develop':
-            api = `http://localhost:9001`;
+            // api = `http://localhost:9001`;
+            api =  `https://zgd.hbhcbn.com/recharge-print-api-test`;
             // api =  `https://zgd.hbhcbn.com/recharge-print-api-test`;
             break;
           // 体验版
diff --git a/pages/special/index.js b/pages/special/index.js
index 6b17e42..35069e2 100644
--- a/pages/special/index.js
+++ b/pages/special/index.js
@@ -35,7 +35,8 @@ Page({
         const [appId, path] = value.split(",")
         wx.navigateToMiniProgram({
           appId: appId,
-          path: path
+          path: path,
+          envVersion: "trial"
           })
         break;
       case 1:
diff --git a/pages/special/index.wxml b/pages/special/index.wxml
index feca8d5..1f0588e 100644
--- a/pages/special/index.wxml
+++ b/pages/special/index.wxml
@@ -4,7 +4,7 @@
     <van-row>
         <van-col span="8" wx:for="{{ servicesList }}" wx:key="id">
             <view class="image" bind:tap="clickService" data-data="{{item}}">
-                <van-image width="200rpx" height="200rpx" src="{{item.url}}"  />
+                <van-image fit="cover" width="200rpx" height="200rpx" src="{{item.url}}"  />
             </view>
         </van-col>
     </van-row>
diff --git a/service/public.js b/service/public.js
index f2dd5eb..54e2045 100644
--- a/service/public.js
+++ b/service/public.js
@@ -20,4 +20,24 @@ export const uploadFile = (filePath) => {
             }
         })
     })
+}
+
+export const uploadPublicFile = (filePath) => {
+    const { api } = getConfigByEnv();
+    return new Promise((resolve, reject) => {
+        wx.uploadFile({
+            filePath: filePath,
+            name: 'file',
+            url: `${api}/wx/public/upload`,
+            header: {
+                authorization: wx.getStorageSync("token")
+            },
+            success: (res) => {
+                resolve(res);
+            },
+            fail: (err) => {
+                reject(err);
+            }
+        })
+    })
 }
\ No newline at end of file
diff --git a/service/recharge.js b/service/recharge.js
index 014cd8a..4643df3 100644
--- a/service/recharge.js
+++ b/service/recharge.js
@@ -20,4 +20,9 @@ export const getRechargeDetail = async function(rid) {
 // 退费
 export const returnFee = async function(data) {
   return await POST(`/wx/return`, data);
+}
+
+// 创建对公
+export const createPublicTopUp = async function(data) {
+  return await POST(`/wx/createPublicTopUp`, data);
 }
\ No newline at end of file
diff --git a/utils/system.js b/utils/system.js
index c54ae76..c3e0002 100644
--- a/utils/system.js
+++ b/utils/system.js
@@ -11,11 +11,11 @@ export const getDot = async () => {
   const { code, message, data } = await getUnReadApproveNumber();
   if (data > 0) {
     wx.showTabBarRedDot({
-      index: 1,
+      index: 2,
     })
   } else {
     wx.hideTabBarRedDot({
-      index: 1,
+      index: 2,
     })
   }
   return data;