修改商城和充费跳转

暂存商城修改
缴费新增对公支付（但是功能不可操作）,开始调整首页
2024-08-14 09:07:37 +08:00 · 2024-07-17 17:05:58 +08:00 · 2024-07-16 08:52:36 +08:00 · 2024-07-15 14:16:06 +08:00 · 2024-07-10 08:28:53 +08:00 · 2024-06-26 17:15:37 +08:00
26 changed files with 681 additions and 525 deletions
--- a/app.json
+++ b/app.json
@@ -18,10 +18,10 @@
    "pages/qrCode/index",
    "pages/recharge/index",
    "pages/questions/index",
-    "pages/editInvoice/index",
    "pages/rechargeDetail/index",
    "pages/agreements/index",
-    "pages/updateInvoice/index"
+    "pages/updateInvoice/index",
+    "pages/rechargeWay/index"
  ],
  "tabBar": {
    "list": [
--- a/components/avatar/index.wxss
+++ b/components/avatar/index.wxss
@@ -1,7 +1,7 @@
 /* components/avatar/index.wxss */
 .wrapper {
-  width: 150rpx;
-  height: 150rpx;
+  width: 120rpx;
+  height: 120rpx;
  border-radius: 50%;
  background: radial-gradient(circle, var(--light-green), var(--middle-green),var(--deep-green) );
  display: flex;
@@ -14,4 +14,5 @@
  max-width: 100rpx;
  overflow: hidden;
  white-space: nowrap;
+  font-size: 30rpx;
 }
--- a/pages/billDetail/index.js
+++ b/pages/billDetail/index.js
@@ -130,19 +130,19 @@ Page({
            // 开发版
            case 'develop':
              wx.setClipboardData({
-                data: `https://zgd.hbhcbn.com/h5/?report=${id}&tenement=${tenement}`,
+                data: `https://zgd.hbhcbn.com/user-report/?report=${id}&tenement=${tenement}`,
              })
              break;
            // 体验版
            case 'trial':
              wx.setClipboardData({
-                data: `https://zgd.hbhcbn.com/h5/?report=${id}&tenement=${tenement}`,
+                data: `https://zgd.hbhcbn.com/user-report/?report=${id}&tenement=${tenement}`,
              })
              break;
            // 正式版
            case 'release':
              wx.setClipboardData({
-                data: `https://zgd.hbhcbn.com/reporth5/?report=${id}&tenement=${tenement}`,
+                data: `https://zgd.hbhcbn.com/user-report-h5/?report=${id}&tenement=${tenement}`,
              })
              break;
          }
--- a/pages/editInvoice/index.js
+++ b/pages/editInvoice/index.js
@@ -1,66 +0,0 @@
-// pages/editInvoice/index.js
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
-})
--- a/pages/editInvoice/index.wxml
+++ b/pages/editInvoice/index.wxml
@@ -1,2 +0,0 @@
-<!--pages/editInvoice/index.wxml-->
-<text>pages/editInvoice/index.wxml</text>
--- a/pages/handleLogin/index.js
+++ b/pages/handleLogin/index.js
@@ -68,7 +68,7 @@ Page({
      return
    }
    if (!phone) {
-      alertInfo("请输入联系人手机号")
+      alertInfo("请输入预留手机号")
      return
    }
    if (!name) {
--- a/pages/handleLogin/index.wxml
+++ b/pages/handleLogin/index.wxml
@@ -25,8 +25,8 @@
      <van-field
        required
        value="{{ phone }}"
-        label="联系人手机号"
-        placeholder="请输入联系人手机号"
+        label="预留手机号"
+        placeholder="请输入预留手机号"
        border="{{ true }}"
        bind:change="onChangePhone"
      />
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -4,7 +4,6 @@ import { alertInfo, alertSuccess } from "../../utils/index";
 import request from '../../utils/request';
 import { getDot } from "../../utils/system";
 import { getUserInfo } from "../../service/user"
-import { requestRecharge } from "../../service/recharge";
 const { OK } = request;
 // pages/home/index.js
 Page({
@@ -22,6 +21,8 @@ Page({
    pickerType: "",
    meterList: [],
    meterIndex: 0,
+    rechargeVisible: false,
+    background: ['demo-text-1', 'demo-text-2', 'demo-text-3'],
  },
  
  /**
@@ -52,18 +53,29 @@ Page({
  onReady() {

  },
-  async changeMeter() {
-    const { meterList = [] } = this.data;
-    const newColumns = meterList.map(item => { item.id = item.code; item.name = `${item.code} - ${item.address}`; return item; })
-    this.setData({
-      columns: newColumns,
-      show: true,
-      pickerType: "meter"
+  jumpToRecharge() {
+    const { user } = this.data;
+    if (!user || !user?.id) {
+      alertInfo("请先登录")
+      return;
+    }
+    wx.navigateTo({
+      url: '/pages/recharge/index',
    })
  },
-  async refreshMeter() {
-    const { meter } = this.data;
-    this.handleGetMeterDetail(meter.id);
+
+  async setUser() {
+    const result = await getUserInfo();
+    if (result.code !== OK) {
+      // alertInfo(result.message)
+      const user = wx.getStorageSync('user')
+      this.setData({ user: user })
+      return;
+    }
+    this.setData({ user: result.data })
+    wx.setStorageSync('user', result.data)
+    // const user = wx.getStorageSync('user')
+    // this.setData({ user: user })
  },
  onOk(e) {
    const { type, index, value } = e.detail;
@@ -95,10 +107,6 @@ Page({
          tenement: value
        })

-        break;
-      case "meter":
-        const { code, id } = e.detail.value;
-        this.handleGetMeterDetail(id)
        break;
    }
  },
@@ -119,67 +127,9 @@ Page({
      show: false,
    })
  },
-  changeMoney(e) {
-    const { money } = e.currentTarget.dataset;
-    this.setData({
-      money: money
-    })
-  },
-  onChangeMoney(e) {
-    this.setData({ money: e.detail })
-  },
-  async recharge() {
-    const { user, money, meter, tenement, park } = this.data;
-    const that  = this;
-    if (!user || !user.id) {
-      alertInfo("请先登录")
-      return
-    }
-    if (!money) {
-      alertInfo("请先输入金额")

-      return;
-    }
-    if (!meter?.code) {
-      alertInfo("没有选择表计")
-      return;
-    }
-    if (money < 0.01) {
-      alertInfo("最少为1分")
-      return
-    }
-    const { code, message, data } = await requestRecharge({ money: Number(money), id: meter.id, tenement: tenement.id, park: park.id })
-    if (code !== OK) {
-      alertInfo(message)
-      return;
-    }
-    wx.requestPayment({
-      timeStamp: data?.time,
-      nonceStr: data?.nonceStr,
-      package: "prepay_id=" + data?.prepay_id,
-      paySign: data?.paySign,
-      signType: 'RSA',
-      success: (res) => {
-        alertSuccess("充值成功")
-        that.setData({
-          money: null
-        })
-      },
-      fail: (res) => {
-        console.log('fail', res)
-        alertInfo("请稍后重试")
-      },
-      complete: (res) => {
-        console.log('complete')
-        that.handleGetMeterDetail(meter.id)
-      }
-    })
-  },
-  jumpToInvoice() {
-    wx.navigateTo({
-      url: '/pages/invoiceList/index',
-    })
-  },
+  
+
  jumpToLogin() {
    wx.navigateTo({
      url: '/pages/login/index',
@@ -189,7 +139,6 @@ Page({
   * 生命周期函数--监听页面显示
   */
  onShow() {
-
    this.getAllList();
    this.watchTenement();
    this.watchPark();
@@ -209,8 +158,8 @@ Page({
      set: function (newVal) {
        // const oldValue = value;
        wx.setStorageSync('tenement', newVal)
-        that.getMeters(newVal);
        that.setUser();
+        // that.getMeters(newVal);
        value = newVal;
      }
    });
@@ -267,24 +216,7 @@ Page({
      wx.setStorageSync('meter', data?.[0] || {} )
    // }
  },
-  jumpToElectric() {
-    wx.navigateTo({
-      url: '/pages/electricQuery/index',
-    })
-  },
-  async setUser() {
-    const result = await getUserInfo();
-    if (result.code !== OK) {
-      // alertInfo(result.message)
-      const user = wx.getStorageSync('user')
-      this.setData({ user: user })
-      return;
-    }
-    this.setData({ user: result.data })
-    wx.setStorageSync('user', result.data)
-    // const user = wx.getStorageSync('user')
-    // this.setData({ user: user })
-  },
+
  async getAllList() {
    const { code, message, data } = await getOwnTenementList()
    if (code !== OK) {
@@ -316,22 +248,11 @@ Page({
    updateDatas.all = data;
    this.setData({
      ...updateDatas
-    }, () => {
-      if (updateDatas?.tenement?.id) {
-        this.getMeters({ id: updateDatas?.tenement?.id })
-      }
    })
  },
-  jumpToRecord() {
-    wx.navigateTo({
-      url: '/pages/rechargeRecord/index',
-    })
-  },
-  jumpToOrder() {
-    // alertInfo("尚未完成")
-    wx.navigateTo({
-      url: '/pages/billList/index',
-    })
+
+  jumpToShop() {
+    alertInfo("开发中");
  },
  /**
   * 生命周期函数--监听页面隐藏
--- a/pages/home/index.json
+++ b/pages/home/index.json
@@ -8,7 +8,8 @@
    "van-field": "@vant/weapp/field/index",
    "picker": "/components/picker/index",
    "van-grid": "@vant/weapp/grid/index",
-    "van-grid-item": "@vant/weapp/grid-item/index"
+    "van-grid-item": "@vant/weapp/grid-item/index",
+    "van-action-sheet": "@vant/weapp/action-sheet/index"
  },
  "navigationStyle": "custom"
 }
--- a/pages/home/index.wxml
+++ b/pages/home/index.wxml
@@ -1,7 +1,9 @@
 <!--pages/home/index.wxml-->
 <page-meta page-style="{{ show ? 'overflow: hidden;' : '' }}" />
+
 <view>
  <view class="top">
+  
  <custom-status-bar transparent="{{true}}" />
  <view class="chooseParkWrapper">
    用电管理服务 · 
@@ -24,80 +26,27 @@
 <view class="logined" wx:else>
  <avatar text="{{ user.nickName }}" />
  <view>
-    <van-button type="info" size="small" plain="{{true}}" class="loginBtn" custom-style="font-size: 32rpx; max-width:300rpx; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;" bind:click="chooseTenement">{{tenement.name}}    <van-icon name="arrow-down" style="margin-left: 16rpx;" /></van-button>
+    <view class="company" bind:tap="chooseTenement">
+      <view class="companyName"> {{tenement.name}}   </view>
+      <van-icon name="arrow-down" style="margin-left: 16rpx;" />
+    </view>
    <view class="welcome"> 欢迎使用华昌宝能用电管理系统！ </view>
  </view>
 </view>
-<view class="rechargeWrapper">
-  <view class="card">
-    <view class="cardTop">
-      <view class="cardTopLeft">
-        <view wx:if="{{user.id}}"> {{  tenement.shortName}} - {{ meter.address }} </view>
-        <view wx:else> -- </view>
+<swiper indicator-dots="{{true}}" autoplay="{{true}}" interval="{{8000}}" duration="{{300}}">
+  <block wx:for="{{background}}" wx:key="*this">
+    <swiper-item>
+      <view class="swiper-item {{item}}">
+        {{item}}
      </view>
-      <van-button type="info" size="small" plain="{{true}}" class="loginBtn" bind:click="changeMeter" wx:if="{{user.id}}">
-        <van-icon name="exchange" />
-        切换电表
-      </van-button>
-    </view>
-    <view class="cardContent">
-      <view class="cardItem">
-        <view class="cardItemLabel"> 电表编号： </view>
-        <view class="cardItemValue" wx:if="{{user.id}}"> {{meter.code}} </view>
-        <view class="cardItemValue" wx:else> -- </view>
-      </view>
-      <view class="cardItem">
-        <view class="cardItemLabel"> 电表地址： </view>
-        <view class="cardItemValue" wx:if="{{user.id}}"> {{meter.address}} </view>
-        <view class="cardItemValue" wx:else> -- </view>
-      </view>
-      <view class="cardItem">
-        <view class="cardItemLabel"> 电表余额： </view>
-        <view class="cardItemValue" style="position: relative;">
-          <view class="text"  wx:if="{{user.id}}"> {{meter.money}} </view>
-          <view class="text"  wx:else> --- </view>
-          <van-button type="info" size="small" plain="{{true}}" custom-style="position: absolute; right: 0; bottom: 0;z-index: 99;" bind:click="refreshMeter"  wx:if="{{user.id}}">
-            <van-icon name="replay" />
-            刷新
-          </van-button>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class="recharge">
-    <view> 请输入金额： </view>
-    <view class="moneyBox">
-      <view class="money" bind:tap="changeMoney" data-money="30"> ￥30 </view>
-      <view class="money" bind:tap="changeMoney" data-money="50"> ￥50 </view>
-      <view class="money" bind:tap="changeMoney" data-money="100"> ￥100 </view>
-      <view class="money" style="margin-right: 0;" bind:tap="changeMoney" data-money="200"> ￥200 </view>
-    </view>
-    <view class="moneyInput">
-      <van-field
-        value="{{ money }}"
-        placeholder="请输入充值金额"
-        border="{{true}}"
-        bind:change="onChangeMoney"
-        size="large"
-        type="digit"
-      />
-    </view>
-  </view>
-  <view class="operate">
-    <van-button color="rgb(88, 165, 141)" block bind:click="recharge">去缴费</van-button>
-  </view>
-  <view class="others">
-    <van-grid direction="horizontal" column-num="2">
-      <van-grid-item icon="balance-list-o" text="电费账单" bind:click="jumpToOrder">
-        <!-- <view slot="icon"> 111 </view> -->
-        <!-- <van-icon slot="icom" name="balance-list-o" /> -->
-      </van-grid-item>
-      <van-grid-item icon="after-sale" text="缴费记录" bind:click="jumpToRecord" />
-      <van-grid-item icon="bar-chart-o" text="用电查询" bind:click="jumpToElectric" />
-      <van-grid-item icon="bill-o" text="去开票" bind:click="jumpToInvoice" />
-    </van-grid>
-  </view>
-
-</view>
+    </swiper-item>
+  </block>
+</swiper>
+<van-grid column-num="2" direction="horizontal">
+  <van-grid-item icon="balance-list-o" text="充值" bind:tap="jumpToRecharge" />
+  <van-grid-item icon="shop-o" text="商城" bind:tap="jumpToShop" />
+</van-grid>
 </view>
 <picker show="{{show}}" valueKey="name" columns="{{columns}}" bind:ok="onOk" bind:cancel="onCancel" type="{{pickerType}}" />
+
+
--- a/pages/home/index.wxss
+++ b/pages/home/index.wxss
@@ -41,76 +41,22 @@
  align-items: center;
 }

-.loginBtn {
+.loginBtn, .company {
  margin-left: 30rpx;
 }

-.rechargeWrapper {
-  background: linear-gradient(to bottom, var(--middle-green), #fff );
-  overflow: hidden;
-}
-
-.card {
-  margin-top: 0rpx;
-  margin-left: 46rpx;
-  margin-right: 46rpx;
-  border-radius: 30rpx;
-  padding: 22rpx 30rpx;
-  /* background-color: rgb(173, 217, 203); */
-  background: linear-gradient(to bottom right, rgb(212, 240, 231), rgb(145, 206, 185));
-}
-
-.cardTop {
-  display: flex;
-  align-items: center;
-}
-
-.cardTopLeft {
-  display: flex;
-  align-items: center;
-  flex: 1;
-  font-size: 33rpx;
-}
-
-.cardContent {
-  margin: 30rpx 20rpx 0;
-}
-
-.cardItem {
-  display: flex;
-  align-items: center;
-  margin-bottom: 30rpx;
+.company {
  font-size: 32rpx; 
-}
 
-.cardItem:last-child {
-  margin-bottom: 12rpx;
-}
-
-.cardItemValue {
  display: flex;
-  flex: 1;
-  align-items: center;
+  color: #fff;
 }

-.cardItemValue .text {
-  flex: 1;
-}
-
-.recharge {
-  background: #fff;
-  padding: 20rpx 30rpx;
-  margin-top: 24rpx;
-  margin-left: 46rpx;
-  margin-right: 46rpx;
-  margin-bottom: 30rpx;
-  border-radius: 30rpx;
-}
-
-.operate {
-  margin-left: 46rpx;
-  margin-right: 46rpx;
-  margin-bottom: 24rpx;
+.companyName {
+  max-width:300rpx; 
+  overflow: hidden; 
+  text-overflow: ellipsis; 
+  white-space: nowrap;
 }

 .welcome {
@@ -119,31 +65,3 @@
  font-size: 30rpx;
  color: rgba(255,255,255, .85);
 }
-
-.moneyBox {
-  display: flex;
-  justify-content: space-between;
-  margin-top: 30rpx;
-}
-
-.money {
-  flex: 1;
-  padding: 16rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  border: 1rpx solid #ccc;
-  margin-right: 30rpx;
-}
-
-.moneyInput {
-  margin-top: 24rpx;
-  margin-bottom: 24rpx;
-}
-
-.others {
-  margin-left: 46rpx;
-  margin-right: 46rpx;
-  margin-top: 10rpx;
-  margin-bottom: 40rpx;
-}
--- a/pages/invoiceList/components/info/index.wxml
+++ b/pages/invoiceList/components/info/index.wxml
@@ -17,25 +17,45 @@
          label="发票类型"
          readonly="{{true}}"
          autosize="{{true}}"
-          type="textarea"
+
          custom-style="padding-left: 0; padding-right: 0;"
          title-width="132rpx"
          border="{{ false }}"
-        >
-          <view slot="input" style="margin-top: -10rpx;"> 
-            <view wx:if="{{detail.type === 0}}"> 普通发票 </view>
-            <view wx:elif="{{detail.type === 1}}"> 增值税专用发票 </view>
-            <view wx:else>-</view>
-          </view>
-        </van-field>
+          value="普通发票"
+          wx:if="{{detail.type === 0}}"
+        />
+        <van-field
+          label="发票类型"
+          readonly="{{true}}"
+          autosize="{{true}}"
+
+          custom-style="padding-left: 0; padding-right: 0;"
+          title-width="132rpx"
+          border="{{ false }}"
+          value="增值税专用发票"
+          wx:elif="{{detail.type === 1}}"
+        />
+        <van-field
+          label="发票类型"
+          readonly="{{true}}"
+          autosize="{{true}}"
+
+          custom-style="padding-left: 0; padding-right: 0;"
+          title-width="132rpx"
+          border="{{ false }}"
+          value="-"
+          wx:elif="{{detail.type === 1}}"
+        />
        <van-field
          label="抬头类型"
          readonly="{{true}}"
          autosize="{{true}}"
-          type="textarea"
+
          custom-style="padding-left: 0; padding-right: 0;"
          title-width="132rpx"
          border="{{ false }}"
+          value="企业单位"
+          wx:if="{{detail.headerType === 0}}"
        >
          <view 
            slot="input" 
@@ -46,13 +66,36 @@
            <view wx:else>-</view>
          </view>
        </van-field>
+        <van-field
+          label="抬头类型"
+          readonly="{{true}}"
+          autosize="{{true}}"
+
+          custom-style="padding-left: 0; padding-right: 0;"
+          title-width="132rpx"
+          border="{{ false }}"
+          value="个人/非企业单位"
+          wx:elif="{{detail.headerType === 1}}"
+        />
+        <van-field
+          label="抬头类型"
+          readonly="{{true}}"
+          autosize="{{true}}"
+
+          custom-style="padding-left: 0; padding-right: 0;"
+          title-width="132rpx"
+          border="{{ false }}"
+          value="个人/非企业单位"
+          wx:else
+        />
+
        <van-field
          value="{{detail.name || '-'}}"
          label="发票抬头"
          custom-style="padding-left: 0; padding-right: 0;"
          readonly="{{true}}"
          autosize="{{true}}"
-          type="textarea"
+
          title-width="132rpx"
          border="{{ false }}"
        >
@@ -64,7 +107,7 @@
          custom-style="padding-left: 0; padding-right: 0;"
          readonly="{{editType === 'detail'}}"
          autosize="{{true}}"
-          type="textarea"
+
          title-width="132rpx"
          border="{{ editType === 'detail' ? false : true }}"
        >
@@ -76,7 +119,7 @@
          custom-style="padding-left: 0; padding-right: 0;"
          readonly="{{editType === 'detail'}}"
          autosize="{{true}}"
-          type="textarea"
+
          title-width="132rpx"
          border="{{ editType === 'detail' ? false : true }}"
        >
@@ -89,7 +132,7 @@
          custom-style="padding-left: 0; padding-right: 0;"
          readonly="{{editType === 'detail'}}"
          autosize="{{true}}"
-          type="textarea"
+
          title-width="132rpx"
          border="{{ editType === 'detail' ? false : true }}"
          bind:change="onChangeText"
@@ -103,7 +146,7 @@
          custom-style="padding-left: 0; padding-right: 0; height: auto;"
          readonly="{{editType === 'detail'}}"
          autosize="{{true}}"
-          type="textarea"
+
          title-width="132rpx"
          border="{{ editType === 'detail' ? false : true }}"
          bind:change="onChangeText"
@@ -118,7 +161,7 @@
          custom-style="padding-left: 0; padding-right: 0;"
          readonly="{{editType === 'detail'}}"
          autosize="{{true}}"
-          type="textarea"
+
          title-width="132rpx"
          border="{{ editType === 'detail' ? false : true }}"
          bind:change="onChangeText"
@@ -134,7 +177,6 @@
        <van-field
          label="发票类型"
          autosize="{{true}}"
-          type="textarea"
          custom-style="padding-left: 0; padding-right: 0;"
          title-width="132rpx"
          border="{{ true }}"
@@ -149,7 +191,6 @@
        <van-field
          label="抬头类型"
          autosize="{{true}}"
-          type="textarea"
          custom-style="padding-left: 0; padding-right: 0;"
          title-width="132rpx"
          border="{{ true }}"
@@ -230,8 +271,6 @@
          data-name="address"
        />
        
-       
-
        <van-field
          value="{{formData.remark}}"
          label="备注"
@@ -258,7 +297,6 @@
          custom-style="padding-left: 0; padding-right: 0;"
          readonly="{{editType === 'detail'}}"
          autosize="{{true}}"
-          type="textarea"
          title-width="132rpx"
          border="{{ editType === 'detail' ? false : true }}"
          bind:change="onChangeText"
@@ -288,7 +326,6 @@
        custom-style="padding-left: 0; padding-right: 0;"
        readonly="{{editType === 'detail'}}"
        autosize="{{true}}"
-        type="textarea"
        title-width="132rpx"
        border="{{ editType === 'detail' ? false : true }}"
        bind:change="onChangeText"
--- a/pages/invoiceList/components/notyet/index.js
+++ b/pages/invoiceList/components/notyet/index.js
@@ -96,7 +96,6 @@ Component({
      })
    },
    onAllChecked(e) {
-      // console.log('e', e.detail)
      const { list } = this.data;
      if (e.detail) {
        const newSelectList = Array.from({ length: list.length }, () => true)
--- a/pages/my/index.js
+++ b/pages/my/index.js
@@ -94,7 +94,11 @@ Page({
        url: '/pages/home/index',
      })
    });  
-    
+  },
+  jumpToQuestions() {
+    wx.navigateTo({
+      url: '/pages/questions/index',
+    })
  },
  bindTenement() {
    wx.navigateTo({
--- a/pages/my/index.wxml
+++ b/pages/my/index.wxml
@@ -17,6 +17,7 @@
 </van-cell>
 <van-cell title="发票抬头" value="" is-link bind:tap="jumpToUpdateInvoice" />
 <van-cell title="绑定企业" value="" is-link bind:tap="bindTenement" />
+<!-- <van-cell title="常见问题" value="" is-link bind:tap="jumpToQuestions" /> -->
 <van-cell title="退出登录" value="" is-link bind:tap="logout" />
 <!-- </van-cell-group> -->
 <!-- <van-cell-group title=" ">
--- a/pages/questions/index.json
+++ b/pages/questions/index.json
@@ -2,5 +2,6 @@
  "usingComponents": {
    "navigator": "/components/navigator/index",
    "scrollPageWrapper": "/components/scrollPageWrapper/index"
-  }
+  },
+  "navigationStyle": "custom"
 }
--- a/pages/questions/index.wxml
+++ b/pages/questions/index.wxml
@@ -9,17 +9,4 @@
      </view>
    </scroll-view>
  </view>  
-  <!-- <movable-area>
-    <movable-view x="{{x}}" y="{{y}}" direction="all">
-      <rich-text nodes="<div style='color:red;font-size:46px'>1234</div>"></rich-text>
-    </movable-view>
-  </movable-area> -->
-
-    <!-- <movable-area style="width: 500rpx; height: 500rpx;background-color: red;">
-        <movable-view  x="{{x}}" y="{{y}}" direction="all">
-          <view style="width: 100rpx; height: 100rpx;background-color: blue;"> 1111 </view>
-        </movable-view>
-      </movable-area> -->
-
-  
 </scrollPageWrapper>
--- a/pages/recharge/index.js
+++ b/pages/recharge/index.js
@@ -1,32 +1,202 @@
-import { getMeterDetail } from "../../service/meter";
-import { getGlobalData, showModal } from "../../utils/index";
+import { getMeterDetail, getTenementMeterList } from "../../service/meter";
+import request from '../../utils/request';
+import { getUserInfo } from "../../service/user"
+import { alertInfo, alertSuccess, loadingFunc } from "../../utils/index";
+import { requestRecharge } from "../../service/recharge";
+const { OK } = request;

 // pages/recharge/index.js
 Page({
-
  /**
   * 页面的初始数据
   */
  data: {
-    money: 0,
-    moneyIndex: -1,
-    primaryColor: getGlobalData().primaryColor,
-    defaultMoneyArray: [100, 200, 500, 1000, 2000],
-    customFlag: false,
-    detail: {}
+    meterList: [],
+    meter: {},
+    actions: [
+      { name: '微信支付', },
+      { name: '对公支付', disabled: true },
+    ],
+    user: {},
  },

  /**
   * 生命周期函数--监听页面加载
   */
-  onLoad(options) {
-    const { tenement, code } = options
-    this.init({ tenement, code })
-  },
-  async init(options) {
-    const { code, message, data = {}} = await getMeterDetail(options)
+  onLoad() {
+    const tenement = wx.getStorageSync('tenement')
+    const park = wx.getStorageSync('park')
    this.setData({
-      detail: data
+      tenement, park
+    })
+    this.init(park, tenement)
+  },
+  async changeMeter() {
+    const { meterList = [] } = this.data;
+    const newColumns = meterList.map(item => { item.id = item.code; item.name = `${item.code} - ${item.address}`; return item; })
+    this.setData({
+      columns: newColumns,
+      show: true,
+      pickerType: "meter"
+    })
+  },
+  onOk(e) {
+    const { type } = e.detail;
+    switch(type) {
+      case "meter":
+        const { id } = e.detail.value;
+        this.handleGetMeterDetail(id)
+        break;
+    }
+  },
+  async init(park, tenement) {
+    this.getMeters({ id: tenement?.id })
+  },
+  async refreshMeter() {
+    const { meter } = this.data;
+    this.handleGetMeterDetail(meter.id);
+  },
+  async handleGetMeterDetail(meterId) {
+    const { tenement } = this.data;
+    const { code, message, data } = await getMeterDetail({ tenement: tenement?.id, id: meterId });
+    if (code !== OK) {
+      alertInfo(message);
+      return;
+    }
+    this.setData({
+      meter: data,
+      show: false,
+    })
+  },
+  onCancel() {
+    this.setData({
+      show: false,
+    })
+  },
+  async setUser() {
+    const result = await getUserInfo();
+    if (result.code !== OK) {
+      const user = wx.getStorageSync('user')
+      this.setData({ user: user })
+      return;
+    }
+    this.setData({ user: result.data })
+    wx.setStorageSync('user', result.data)
+  },
+  async recharge() {
+    const { user, money, meter, tenement, park } = this.data;
+    if (!user || !user.id) {
+      alertInfo("请先登录")
+      return
+    }
+    if (!money) {
+      alertInfo("请先输入金额")
+      return;
+    }
+    if (!meter?.code) {
+      alertInfo("没有选择表计")
+      return;
+    }
+    if (money < 0.01) {
+      alertInfo("最少为1分")
+      return
+    }
+    // wx.navigateTo({
+    //   url: `/pages/rechargeWay/index?money=${money}&address=${meter.address}&id=${meter?.id}&tenement=${tenement?.id}&park=${park.id}`,
+    // })
+    this.setData({ rechargeVisible: true })
+  },
+  async getMeters({ id }) {
+    const { code, message, data } = await getTenementMeterList(id);
+    if (code !== OK) {
+      alertInfo(message)
+      this.setData({ meterList: [], meter: {} })
+      wx.setStorageSync('meter', {})
+      return;
+    }
+    this.setData({
+      meterList: data || [],
+      meter:  (data?.[0] || {})
+    })
+    // if (!storageMeter) {
+      wx.setStorageSync('meter', data?.[0] || {} )
+    // }
+  },
+  changeMoney(e) {
+    const { money } = e.currentTarget.dataset;
+    this.setData({
+      money: money
+    })
+  },
+  onChangeMoney(e) {
+    this.setData({ money: e.detail })
+  },
+  onCloseRechargeWay() {
+    this.setData({ rechargeVisible: false })
+  },
+  
+  onSelectRechargeWay(e) {
+    const that = this;
+    switch(e.detail.name) {
+      case "对公支付":
+        alertInfo("开发中")
+        break;
+      default:
+        loadingFunc(async () => {
+          await that.wxRecharge();
+        })
+        break;
+    }
+  },
+  jumpToRecord() {
+    wx.navigateTo({
+      url: '/pages/rechargeRecord/index',
+    })
+  },
+  jumpToOrder() {
+    // alertInfo("尚未完成")
+    wx.navigateTo({
+      url: '/pages/billList/index',
+    })
+  },
+  jumpToElectric() {
+    wx.navigateTo({
+      url: '/pages/electricQuery/index',
+    })
+  },
+  jumpToInvoice() {
+    wx.navigateTo({
+      url: '/pages/invoiceList/index',
+    })
+  },
+  async wxRecharge() {
+    const { money, meter, tenement, park } = this.data;
+    const that = this;
+    const { code, message, data } = await requestRecharge({ money: Number(money), id: meter?.id, tenement: tenement?.id, park: park?.id })
+    if (code !== OK) {
+      alertInfo(message)
+      return;
+    }
+    wx.requestPayment({
+      timeStamp: data?.time,
+      nonceStr: data?.nonceStr,
+      package: "prepay_id=" + data?.prepay_id,
+      paySign: data?.paySign,
+      signType: 'RSA',
+      success: (res) => {
+        alertSuccess("充值成功")
+        that.setData({
+          money: null
+        })
+      },
+      fail: (res) => {
+        console.log('fail', res)
+        alertInfo("请稍后重试")
+      },
+      complete: (res) => {
+        console.log('complete')
+        that.handleGetMeterDetail(meter.id)
+      }
    })
  },
  /**
@@ -40,7 +210,7 @@ Page({
   * 生命周期函数--监听页面显示
   */
  onShow() {
-
+    this.setUser();
  },
  chooseMoney(e) {
    const { money, index } = e.currentTarget.dataset;
@@ -69,13 +239,6 @@ Page({
      money: money,
    })
  },
-  async recharge() {
-    const { detail = {}, money } = this.data;
-    const confirmResult = await showModal({ title: "充值确认", content: `确认充值表号为${detail?.meter?.code}的表计${money}元吗？` });
-    if (!confirmResult) {
-      return;
-    }
-  },
  /**
   * 生命周期函数--监听页面隐藏
   */
--- a/pages/recharge/index.json
+++ b/pages/recharge/index.json
@@ -4,7 +4,12 @@
    "van-grid": "@vant/weapp/grid/index",
    "van-grid-item": "@vant/weapp/grid-item/index",
    "van-row": "@vant/weapp/row/index",
+    "van-button": "@vant/weapp/button/index",
+    "picker": "/components/picker/index",
+    "van-field": "@vant/weapp/field/index",
+    "van-action-sheet": "@vant/weapp/action-sheet/index",
    "van-col": "@vant/weapp/col/index"
  },
-  "navigationBarTitleText": "充值"
+  "navigationBarTitleText": "充值",
+  "navigationStyle": "custom"
 }
--- a/pages/recharge/index.wxml
+++ b/pages/recharge/index.wxml
@@ -1,76 +1,77 @@
-<!--pages/recharge/index.wxml-->
-
-<view class="wrapper">
-  <!-- <van-grid column-num="2" center="{{false}}">
-    <van-grid-item icon="photo-o" text="文字" use-slot>
-      <view>
-        <view class="gridTitle"> 充值表号： </view>
-        <view class="gridContent"> {{ detail.meter.code }} </view>
+<navigator title="充值" canBack="true" />
+<view class="rechargeWrapper">
+  <view class="card">
+    <view class="cardTop">
+      <view class="cardTopLeft">
+        <view wx:if="{{user.id}}"> {{  tenement.shortName}} - {{ meter.address }} </view>
+        <view wx:else> -- </view>
      </view>
-    </van-grid-item>
-    <van-grid-item icon="photo-o" text="文字" use-slot>
-      <view>
-        <view class="gridTitle"> 表计地址： </view>
-        <view class="gridContent"> {{ detail.meter.address }} </view>
+      <van-button type="info" size="small" plain="{{true}}" class="loginBtn" bind:click="changeMeter" wx:if="{{user.id}}">
+        <van-icon name="exchange" />
+        切换电表
+      </van-button>
    </view>
-    </van-grid-item>
-    <van-grid-item icon="photo-o" text="文字" use-slot>
-      <view>
-        <view class="gridTitle"> 剩余金额： </view>
-        <view class="gridContent"> {{ detail.money }} </view>
+    <view class="cardContent">
+      <view class="cardItem">
+        <view class="cardItemLabel"> 电表编号： </view>
+        <view class="cardItemValue" wx:if="{{user.id}}"> {{meter.code}} </view>
+        <view class="cardItemValue" wx:else> -- </view>
      </view>
-    </van-grid-item>
-    <van-grid-item icon="photo-o" text="文字" use-slot>
-      <view>
-        <view class="gridTitle"> 公司名称： </view>
-        <view class="gridContent"> {{ detail.tenement.name }} </view>
+      <view class="cardItem">
+        <view class="cardItemLabel"> 电表地址： </view>
+        <view class="cardItemValue" wx:if="{{user.id}}"> {{meter.address}} </view>
+        <view class="cardItemValue" wx:else> -- </view>
      </view>
-    </van-grid-item>
-  </van-grid> -->
-  <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 class="cardItem">
+        <view class="cardItemLabel"> 电表余额： </view>
+        <view class="cardItemValue" style="position: relative;">
+          <view class="text"  wx:if="{{user.id}}"> {{meter.money}} </view>
+          <view class="text"  wx:else> --- </view>
+          <van-button type="info" size="small" plain="{{true}}" custom-style="position: absolute; right: 0; bottom: 0;z-index: 99;" bind:click="refreshMeter"  wx:if="{{user.id}}">
+            <van-icon name="replay" />
+            刷新
+          </van-button>
        </view>
-  <view 
-    class="customInput border radius12" 
-    wx:if="{{customFlag}}"
-  > 
-    <input 
-      type="number" 
-      focus 
-      placeholder="请输入要充值的金额" 
-      bindinput="onChangeCustomMoney" 
+      </view>
+    </view>
+  </view>
+  <view class="recharge">
+    <view> 请输入金额： </view>
+    <view class="moneyBox">
+      <view class="money" bind:tap="changeMoney" data-money="30"> ￥30 </view>
+      <view class="money" bind:tap="changeMoney" data-money="50"> ￥50 </view>
+      <view class="money" bind:tap="changeMoney" data-money="100"> ￥100 </view>
+      <view class="money" style="margin-right: 0;" bind:tap="changeMoney" data-money="200"> ￥200 </view>
+    </view>
+    <view class="moneyInput">
+      <van-field
+        value="{{ money }}"
+        placeholder="请输入充值金额"
+        border="{{true}}"
+        bind:change="onChangeMoney"
+        size="large"
+        type="digit"
      />
    </view>
+  </view>
  <view class="operate">
-    <button type="primary" bind:tap="recharge" disabled="{{!money}}"> 充值 </button>
+    <van-button color="rgb(88, 165, 141)" block bind:click="recharge">去缴费</van-button>
+  </view>
+  <view class="others">
+    <van-grid direction="horizontal" column-num="2">
+      <van-grid-item icon="balance-list-o" text="电费账单" bind:click="jumpToOrder">
+      </van-grid-item>
+      <van-grid-item icon="after-sale" text="缴费记录" bind:click="jumpToRecord" />
+      <van-grid-item icon="bar-chart-o" text="用电查询" bind:click="jumpToElectric" />
+      <van-grid-item icon="bill-o" text="去开票" bind:click="jumpToInvoice" />
+    </van-grid>
  </view>
 </view>
+
+<van-action-sheet
+  show="{{ rechargeVisible }}"
+  actions="{{ actions }}"
+  bind:close="onCloseRechargeWay"
+  bind:select="onSelectRechargeWay"
+/>
+<picker show="{{show}}" valueKey="name" columns="{{columns}}" bind:ok="onOk" bind:cancel="onCancel" type="{{pickerType}}" />
--- a/pages/recharge/index.wxss
+++ b/pages/recharge/index.wxss
@@ -1,62 +1,99 @@
 /* pages/recharge/index.wxss */
-.moneyBoxs {
-  margin-top: 32rpx;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  flex-wrap: wrap;
+.rechargeWrapper {
+  background: linear-gradient(to bottom, var(--middle-green), #fff );
+  overflow: hidden;
+  padding-top: 30rpx;
 }

-.moneyBox {
-  width: 30%;
-  height: 140rpx;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  margin-bottom: 24rpx;
+.card {
+  margin-top: 0rpx;
+  margin-left: 46rpx;
+  margin-right: 46rpx;
+  border-radius: 30rpx;
+  padding: 22rpx 30rpx;
+  /* background-color: rgb(173, 217, 203); */
+  background: linear-gradient(to bottom right, rgb(212, 240, 231), rgb(145, 206, 185));
 }

-.chooseMeter {
+.cardTop {
  display: flex;
  align-items: center;
-  margin-top: 10rpx;
 }

-.selectMeter {
-  margin-left: 24rpx;
+.cardTopLeft {
+  display: flex;
+  align-items: center;
+  flex: 1;
+  font-size: 33rpx;
+}
+
+.cardContent {
+  margin: 30rpx 20rpx 0;
+}
+
+.cardItem {
+  display: flex;
+  align-items: center;
+  margin-bottom: 30rpx;
+  font-size: 32rpx;
+}
+
+.cardItem:last-child {
+  margin-bottom: 12rpx;
+}
+
+.cardItemValue {
+  display: flex;
+  flex: 1;
+  align-items: center;
+}
+
+.cardItemValue .text {
+  flex: 1;
+}
+
+.recharge {
+  background: #fff;
+  padding: 20rpx 30rpx;
+  margin-top: 24rpx;
+  margin-left: 46rpx;
+  margin-right: 46rpx;
+  margin-bottom: 30rpx;
+  border-radius: 30rpx;
 }

 .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-left: 46rpx;
+  margin-right: 46rpx;
  margin-bottom: 24rpx;
 }

-.colBottom {
-  margin-top: 40rpx;
+
+
+.moneyBox {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 30rpx;
 }

-.title {
-  font-weight: 600;
-  font-size: 40rpx;
+.money {
+  flex: 1;
+  padding: 16rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border: 1rpx solid #ccc;
+  margin-right: 30rpx;
+}
+
+.moneyInput {
+  margin-top: 20rpx;
  margin-bottom: 20rpx;
 }

-.content {
-  font-size: 32rpx;
+.others {
+  margin-left: 46rpx;
+  margin-right: 46rpx;
+  margin-top: 10rpx;
+  margin-bottom: 40rpx;
 }
--- a/pages/rechargeWay/index.js
+++ b/pages/rechargeWay/index.js
@@ -0,0 +1,140 @@
+// pages/rechargeWay/index.js
+import { requestRecharge } from "../../service/recharge";
+import { alertInfo } from "../../utils/index";
+import request from '../../utils/request';
+const { OK } = request;
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    money: 0,
+    address: "",
+    rechargeWay: 0,
+    id: "",
+    tenement: "",
+    park: "",
+    rechargeLoading: false,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    const { money, address, id, tenement, park } = options
+    this.setData({ money: Number(money), address, id, tenement, park })
+  },
+  onChangeRechargeWay(e) {
+    this.setData({ rechargeWay: e.detail })
+  },
+  onClickCell(e) {
+    const { name } = e.currentTarget.dataset;
+    this.setData({ rechargeWay: name })
+  },
+  async recharge() {
+    const { rechargeWay } = this.data;
+    await this.setLoading(true)
+    try {
+      switch(rechargeWay) {
+        case 1:
+          alertInfo("开发中")
+          break;
+        default:
+          await this.wxRecharge();
+          break;
+      }
+    } catch(err) {
+
+    } finally {
+      await this.setLoading(false)
+    }    
+  },
+  async wxRecharge() {
+    const { money, id, tenement, park } = this.data;
+    const { code, message, data } = await requestRecharge({ money: Number(money), id, tenement, park })
+    if (code !== OK) {
+      alertInfo(message)
+      return;
+    }
+    wx.requestPayment({
+      timeStamp: data?.time,
+      nonceStr: data?.nonceStr,
+      package: "prepay_id=" + data?.prepay_id,
+      paySign: data?.paySign,
+      signType: 'RSA',
+      success: (res) => {
+        alertSuccess("充值成功")
+        that.setData({
+          money: null
+        })
+      },
+      fail: (res) => {
+        console.log('fail', res)
+        alertInfo("请稍后重试")
+      },
+      complete: (res) => {
+        console.log('complete')
+        that.handleGetMeterDetail(meter.id)
+      }
+    })
+  },
+  async setLoading(flag) {
+    return new Promise((res) => {
+      this.setData({
+        rechargeLoading: flag,
+      }, () => {
+        res()
+      })
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
--- a/pages/rechargeWay/index.json
+++ b/pages/rechargeWay/index.json
@@ -0,0 +1,11 @@
+{
+  "usingComponents": {
+    "navigator": "/components/navigator/index",
+    "van-radio": "@vant/weapp/radio/index",
+    "van-radio-group": "@vant/weapp/radio-group/index",
+    "van-cell": "@vant/weapp/cell/index",
+    "van-cell-group": "@vant/weapp/cell-group/index",
+    "van-button": "@vant/weapp/button/index"
+  },
+  "navigationStyle": "custom"
+}
--- a/pages/rechargeWay/index.wxml
+++ b/pages/rechargeWay/index.wxml
@@ -0,0 +1,25 @@
+<!--pages/rechargeWay/index.wxml-->
+<navigator title="支付订单" canBack="{{true}}" bind:back="back" />
+
+<view class="rechargeInfoWrapper">
+  <view>
+    <text> ￥ </text>
+    <text class="money"> {{ money }} </text>
+  </view>
+  <view class="address"> 地址：{{address}} </view>
+</view>
+
+<van-radio-group value="{{ rechargeWay }}" bind:change="onChangeRechargeWay">
+  <van-cell-group>
+    <van-cell title="微信支付" clickable data-name="{{0}}" bind:click="onClickCell">
+      <van-radio slot="right-icon" name="{{0}}" />
+    </van-cell>
+    <van-cell title="对公转账" clickable data-name="{{1}}" bind:click="onClickCell">
+      <van-radio slot="right-icon" name="{{1}}" />
+    </van-cell>
+  </van-cell-group>
+</van-radio-group>
+
+<view class="rechargeBtn">
+  <van-button type="info" block bind:click="recharge" loading="{{rechargeLoading}}">支付</van-button>
+</view>
--- a/pages/rechargeWay/index.wxss
+++ b/pages/rechargeWay/index.wxss
@@ -0,0 +1,23 @@
+/* pages/rechargeWay/index.wxss */
+.rechargeInfoWrapper {
+  margin-top: 10vw;
+  margin-bottom: 10vw;
+  text-align: center;
+}
+
+.money {
+  font-weight: 700;
+  font-size: 60rpx;
+  margin-left: 10rpx;
+}
+
+.address {
+  font-size: 28rpx;
+  margin-top: 20rpx;
+}
+
+.rechargeBtn {
+  margin-top: 10vh;
+  margin-left: 32rpx;
+  margin-right: 32rpx;
+}
--- a/utils/request.js
+++ b/utils/request.js
@@ -78,12 +78,12 @@ const request = async function (options, config = {}) {

 // 处理返回结果，默认直接返回数据
 const parseResponse = function (response, url) {
-  console.log('url', url, 'response', response)
  if (!response) {
    alertError("服务异常")
    return
  }
  const { statusCode } = response;
+  console.log('url', url, 'response.status', statusCode, 'response.data', response.data)
  if (statusCode === 401) {
    wx.redirectTo({
      url: '/pages/login/index',
Author	SHA1	Message	Date
qiaomu	c266572022	修改商城和充费跳转	2024-08-14 09:07:37 +08:00
qiaomu	0b568a81e5	暂存商城修改	2024-07-17 17:05:58 +08:00
qiaomu	765b3ad111	缴费新增对公支付（但是功能不可操作）,开始调整首页	2024-07-16 08:52:36 +08:00
qiaomu	e4a22af891	完成充值改造	2024-07-15 14:16:06 +08:00
qiaomu	8e1ed62bd7	调整跳转h5链接	2024-07-10 08:28:53 +08:00
qiaomu	14dad0a506	修改发票详情样式错误	2024-06-26 17:15:37 +08:00
qiaomu	e6edf6e3d1	修改首页样式和手动绑定字段名	2024-06-25 11:16:38 +08:00