From 765b3ad11184b35a614439f8ff0480b6aa0d509c Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Tue, 16 Jul 2024 08:52:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=B4=E8=B4=B9=E6=96=B0=E5=A2=9E=E5=AF=B9?=
 =?UTF-8?q?=E5=85=AC=E6=94=AF=E4=BB=98=EF=BC=88=E4=BD=86=E6=98=AF=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=B8=8D=E5=8F=AF=E6=93=8D=E4=BD=9C=EF=BC=89,?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/avatar/index.wxss |  5 ++--
 pages/home/index.js          | 57 ++++++++++++++++++++++++++++++++----
 pages/home/index.json        |  3 +-
 pages/home/index.wxml        |  7 +++++
 4 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/components/avatar/index.wxss b/components/avatar/index.wxss
index 1147be5..f37dea3 100644
--- 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;
 }
diff --git a/pages/home/index.js b/pages/home/index.js
index 9681a60..e15ccea 100644
--- a/pages/home/index.js
+++ b/pages/home/index.js
@@ -4,7 +4,7 @@ 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 +22,11 @@ Page({
     pickerType: "",
     meterList: [],
     meterIndex: 0,
+    rechargeVisible: false,
+    actions: [
+      { name: '微信支付', },
+      { name: '对公支付', disabled: true },
+    ],
   },
   
   /**
@@ -148,10 +153,10 @@ Page({
       alertInfo("最少为1分")
       return
     }
-    wx.navigateTo({
-      url: `/pages/rechargeWay/index?money=${money}&address=${meter.address}&id=${meter?.id}&tenement=${tenement?.id}&park=${park.id}`,
-    })
-    
+    // wx.navigateTo({
+    //   url: `/pages/rechargeWay/index?money=${money}&address=${meter.address}&id=${meter?.id}&tenement=${tenement?.id}&park=${park.id}`,
+    // })
+    this.setData({ rechargeVisible: true })
   },
   jumpToInvoice() {
     wx.navigateTo({
@@ -311,6 +316,48 @@ Page({
       url: '/pages/billList/index',
     })
   },
+  onCloseRechargeWay() {
+    this.setData({ rechargeVisible: false })
+  },
+  onSelectRechargeWay(e) {
+    switch(e.detail.name) {
+      case "对公支付":
+        alertInfo("开发中")
+        break;
+      default:
+        this.wxRecharge();
+        break;
+    }
+  },
+  async wxRecharge() {
+    const { money, meter, tenement, park } = this.data;
+    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)
+      }
+    })
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */
diff --git a/pages/home/index.json b/pages/home/index.json
index f87c4e7..205dfa6 100644
--- 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"
 }
\ No newline at end of file
diff --git a/pages/home/index.wxml b/pages/home/index.wxml
index fc2aa43..93a727e 100644
--- a/pages/home/index.wxml
+++ b/pages/home/index.wxml
@@ -106,3 +106,10 @@
 </view>
 </view>
 <picker show="{{show}}" valueKey="name" columns="{{columns}}" bind:ok="onOk" bind:cancel="onCancel" type="{{pickerType}}" />
+
+<van-action-sheet
+  show="{{ rechargeVisible }}"
+  actions="{{ actions }}"
+  bind:close="onCloseRechargeWay"
+  bind:select="onSelectRechargeWay"
+/>