From 7123295bac789011a9dad11938997721149a35ce Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 30 五月 2024 15:36:59 +0800
Subject: [PATCH] 开泵相关界面优化和充值界面

---
 pages/home/home.js                    |   16 +-
 app.wxss                              |    1 
 pages/rechargeMoney/rechargMoney.js   |   12 +
 pages/rechargeCard/rechargeCard.wxml  |   52 +++--
 /dev/null                             |  117 --------------
 pages/rechargeCard/rechargeCard.wxss  |   31 +++
 app.js                                |    2 
 pages/openCard/openCard.js            |   64 +++----
 api/request.js                        |    4 
 pages/openCard/openCard.wxss          |   18 +-
 pages/rechargeMoney/rechargMoney.json |    4 
 pages/openCard/openCard.wxml          |    8 
 pages/rechargeMoney/rechargMoney.wxml |  112 +++++++------
 pages/home/home.wxml                  |    6 
 pages/home/home.wxss                  |    4 
 pages/rechargeMoney/rechargMoney.wxss |    4 
 16 files changed, 190 insertions(+), 265 deletions(-)

diff --git a/api/request.js b/api/request.js
index 62f4b83..2b8e5f2 100644
--- a/api/request.js
+++ b/api/request.js
@@ -80,7 +80,7 @@
         if (code === statusCode.SUCCESS) {
           if (res.data.code !== "0001") {
             // 缁熶竴澶勭悊璇锋眰閿欒
-            showToast(res.data.errorMsg)
+            // showToast(res.data.errorMsg)
             reject(res.data)
             return
           }
@@ -102,7 +102,7 @@
           wx.hideLoading(); // 闅愯棌鍔犺浇鍔ㄧ敾
         }
 
-        showToast(err.errMsg)
+        // showToast(err.errMsg)
         reject(err)
       }
     })
diff --git a/app.js b/app.js
index 910fd81..2b9b904 100644
--- a/app.js
+++ b/app.js
@@ -14,7 +14,7 @@
     })
   },
   globalData: {
-    sessionId:'2023111514251400001',
+    sessionId:'2024042414041300006',
     userInfo: null,
     userId:"",
     userCode:"",
diff --git a/app.wxss b/app.wxss
index f076322..ca25be8 100644
--- a/app.wxss
+++ b/app.wxss
@@ -8,6 +8,7 @@
   box-sizing: border-box;
 } 
 .noMore-View {
+  flex: 1;
   display: flex;
   justify-content: center;
   align-items: center;
diff --git a/pages/home/home.js b/pages/home/home.js
index 4bc1a09..e0509ad 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -74,6 +74,11 @@
     //褰撳紑闃�鎴愬姛鍚庤皟鐢ㄥ埛鏂�
     console.log("onLoad锛�" + options.param);
     if(options.param){
+      wx.showToast({
+        title: '寮�娉垫垚鍔�',
+        icon: 'success',
+        duration: 2000
+      })
       getOpenList() ;
     }
   },
@@ -131,13 +136,7 @@
     });
     console.log(this.data.isRefreshing);
     // 鏁版嵁璇锋眰瀹屾垚鍚庯紝鍋滄涓嬫媺鍒锋柊鐨勫姩鐢�
-    var self = this;
-    setTimeout(function () {
-      self.setData({
-        isWXRefreshing: false, // 灏唗riggered灞炴�ц缃负false锛岃〃绀轰笅鎷夊埛鏂板凡瀹屾垚
-      })
-      console.log('涓嬫媺鍒锋柊宸插畬鎴�');
-    }, 3000);
+    this.getOpenList();
   },
 
   /**
@@ -233,10 +232,11 @@
       this.setData({
         listData: data.content,
         isRefreshing: false, // 灏唗riggered灞炴�ц缃负false锛岃〃绀轰笅鎷夊埛鏂板凡瀹屾垚
+        isWXRefreshing: false, // 灏唗riggered灞炴�ц缃负false锛岃〃绀轰笅鎷夊埛鏂板凡瀹屾垚
       })
     }).catch(err => {
       // 閿欒鍥炶皟
-      console.error('Error:', err);
+      
       this.setData({
         isRefreshing: false, // 灏唗riggered灞炴�ц缃负false锛岃〃绀轰笅鎷夊埛鏂板凡瀹屾垚
       })
diff --git a/pages/home/home.wxml b/pages/home/home.wxml
index b0596cb..2e74315 100644
--- a/pages/home/home.wxml
+++ b/pages/home/home.wxml
@@ -46,7 +46,7 @@
       <view class="dot"></view>
     </view>
     <view class="scroll-bg">
-      <view class="list-item" wx:for="{{listData}}" wx:for-item="item" wx:for-index="index">
+      <view  wx:if="{{listData.length > 0}}" class="list-item" wx:for="{{listData}}" wx:for-item="item" wx:for-index="index">
         <view class="item-left">
           <!-- <image class="item-img" src="/images/pipeline.svg" /> -->
           <text>{{item.intakeNum}}</text>
@@ -57,6 +57,10 @@
         </view>
       </view>
     </view>
+    <view wx:if="{{listData.length === 0}}" class="noMore-View">
+      <image class="noMore-img" src="/images/no_more.svg" />
+      <text class="noMore-text">娌℃湁鏁版嵁</text>
+    </view>
   </scroll-view>
   <t-dialog class="t-dialog" visible="{{showConfirm}}" content="纭鍏抽棴{{waterIntakeName}}鍚楋紵" confirm-btn="{{ { content: '纭', variant: 'base', theme: 'danger' } }}" close-on-overlay-click="false" cancel-btn="鍙栨秷"  bind:confirm="confirmDialog" bind:cancel="closeDialog" />
 
diff --git a/pages/home/home.wxss b/pages/home/home.wxss
index 336ac99..49a8d8d 100644
--- a/pages/home/home.wxss
+++ b/pages/home/home.wxss
@@ -215,8 +215,8 @@
   /* 鎸夐挳鍦嗚 */
   padding-left: 20rpx;
   padding-right: 20rpx;
-  padding-top: 5rpx;
-  padding-bottom: 5rpx;
+  padding-top: 10rpx;
+  padding-bottom: 10rpx;
 }
 
 .refresh-view {
diff --git a/pages/openCard/openCard.js b/pages/openCard/openCard.js
index 2a1fdcb..0942e8c 100644
--- a/pages/openCard/openCard.js
+++ b/pages/openCard/openCard.js
@@ -11,57 +11,27 @@
   data: {
     intakeId: 0,
 
-    allCardPoints: [{
-        id: 511111111,
-        balance: '30',
-        state: 1
-      },
-      {
-        id: 411111111,
-        balance: '30',
-        state: 0
-      },
-      {
-        id: 31111111111,
-        balance: '30',
-        state: 1
-      },
-      {
-        id: 2,
-        balance: '30',
-        state: 1
-      },
-      {
-        id: 1,
-        balance: '30',
-        state: 1
-      },
-      {
-        id: 0,
-        balance: '30',
-        state: 1
-      },
-    ] // 甯哥敤鍙栨按鍙f暟鎹�
+    allCardPoints: [] // 鎵�鏈夎櫄鎷熷崱
   },
   openValva(event) {
     const {
       item
     } = event.currentTarget.dataset; // 鑾峰彇褰撳墠鐐瑰嚮鐨� item
-    if (item.state === 1) {
+    if (item.inUse === 0) {
       // 鍦ㄩ〉闈㈠姞杞芥椂鏄剧ず鍔犺浇鍔ㄧ敾
       wx.showLoading({
         title: '姝e湪寮�娉佃绋嶅悗...', // 鍔犺浇鎻愮ず鏂囧瓧
         mask: true // 鏄惁鏄剧ず閫忔槑钂欏眰锛岄槻姝㈣Е鎽哥┛閫忥紝榛樿涓� false
       });
-      this.postOpenValva();
+      this.postOpenValva(item.vcId);
     }
   },
   //寮�娉甸�氫俊
-  postOpenValva() {
+  postOpenValva(vcId) {
     const app = getApp();
     const data = {
       intakeId: this.data.intakeId, //鍙栨按鍙D
-      vcId: '2023122618460900006', //铏氭嫙鍗D
+      vcId: vcId, //铏氭嫙鍗D
       userType: 2, //鐢ㄦ埛绫诲瀷1-骞冲彴锛�2-App
       operator: app.globalData.sessionId //鎿嶄綔鍛�
     };
@@ -69,7 +39,7 @@
       url: "comRes/receive",
       data: data
     }).then(response => {
-   
+    
       // 澶勭悊鎴愬姛鍝嶅簲
       console.log('璇锋眰鎴愬姛:', response);
       // 鍔犺浇瀹屾垚鍚庨殣钘忓姞杞藉姩鐢�
@@ -97,6 +67,7 @@
       intakeId
     })
     console.log('intakeId:' + this.data.intakeId);
+    this. getCardList();
   },
 
   /**
@@ -146,5 +117,26 @@
    */
   onShareAppMessage() {
 
+  },
+  //鑾峰彇铏氭嫙鍗″垪琛�
+  getCardList(){
+    get({url:'https://d4x9787456.vicp.fun/sell/virtual_card/get', data: {
+      operator: getApp().globalData.sessionId
+    }})
+    .then((data) => {
+      if(data.success&&data.code==="0001"){
+        this.setData({
+          allCardPoints:  data.content
+        });
+      }else{
+        wx.showToast({
+          title: data.msg,
+        })
+      }
+      console.log('Failed to add item:');
+    })
+    .catch((error) => {
+      console.error('Failed to add item:', error);
+    });
   }
 })
\ No newline at end of file
diff --git a/pages/openCard/openCard.wxml b/pages/openCard/openCard.wxml
index 478e9d8..f688677 100644
--- a/pages/openCard/openCard.wxml
+++ b/pages/openCard/openCard.wxml
@@ -3,18 +3,18 @@
 
   <scroll-view class="list-container" scroll-y="true" scroll-x="false">
     <block wx:for="{{allCardPoints}}" wx:key="index">
-      <view class="{{item.state===1?'item':'item-gray'}}">
+      <view class="{{item.inUse===0?'item':'item-gray'}}">
         <view class="item-card">
           <text>鍗$紪鍙凤細</text>
-          <text>{{item.id}}</text>
+          <text>{{item.vcNum}}</text>
         </view>
         <view class="item-bottom">
           <image class="item-balance-img" src="/images/balance.svg" />
           <view class="item-balance">
-            <text class="item-balance-text">{{item.balance}}</text>
+            <text class="item-balance-text">{{item.money}}</text>
             <text class="item-balance-text-yuan">鍏�</text>
           </view>
-          <text class="{{item.state===1?'item-button':'item-button-gray'}}" bind:tap="openValva" data-item="{{item}}">{{item.state === 1 ? '閫夋嫨' : '浣跨敤涓�'}}</text>
+          <text class="{{item.inUse===0?'item-button':'item-button-gray'}}" bind:tap="openValva" data-item="{{item}}">{{item.inUse===0 ? '閫夋嫨' : '浣跨敤涓�'}}</text>
         </view>
       </view>
     </block>
diff --git a/pages/openCard/openCard.wxss b/pages/openCard/openCard.wxss
index 764d9f5..f88c7f2 100644
--- a/pages/openCard/openCard.wxss
+++ b/pages/openCard/openCard.wxss
@@ -19,8 +19,8 @@
 }
 
 .item-balance-img {
-  width: 60rpx;
-  height: 50rpx;
+  width: 50rpx;
+  height: 40rpx;
 }
 
 .item-bottom {
@@ -42,7 +42,7 @@
 .item-balance-text {
   color: #fff;
   font-size: 50rpx;
-  margin-left: 10rpx;
+  margin-left: 5rpx;
 }
 
 .item-button {
@@ -56,10 +56,10 @@
   color: white;
   padding-left: 40rpx;
   padding-right: 40rpx;
-  padding-bottom: 8rpx;
-  padding-top: 8rpx;
+  padding-bottom: 10rpx;
+  padding-top: 10rpx;
   border-radius: 30rpx;
-  font-size: 40rpx;
+  font-size: 35rpx;
   border: none;
 }
 
@@ -74,10 +74,10 @@
   color: #FF6A6A;
   padding-left: 40rpx;
   padding-right: 40rpx;
-  padding-bottom: 8rpx;
-  padding-top: 8rpx;
+  padding-bottom: 10rpx;
+  padding-top: 10rpx;
   border-radius: 30rpx;
-  font-size: 40rpx;
+  font-size: 35rpx;
   border: none;
 }
 
diff --git a/pages/rechargeCard/rechargeCard.js b/pages/rechargeCard/rechargeCard.js
deleted file mode 100644
index d0f862a..0000000
--- a/pages/rechargeCard/rechargeCard.js
+++ /dev/null
@@ -1,117 +0,0 @@
-// pages/rechargeCard/rechargeCard.js
-Page({
-
-  /**
-   * 椤甸潰鐨勫垵濮嬫暟鎹�
-   */
-  data: {
-    currentTab: 0, // 褰撳墠鏄剧ず鐨勮〃鏍硷紝榛樿涓虹涓�涓〃鏍�
-    allCardPoints: [{
-      id: 511111111,
-      balance: '30000',
-      state: 1
-    },{
-      id: 411111111,
-      balance: '30',
-      state: 0
-    },{
-      id: 411111111,
-      balance: '30',
-      state: 0
-    },{
-      id: 411111111,
-      balance: '30',
-      state: 0
-    },
-    {
-      id: 411111111,
-      balance: '30',
-      state: 0
-    },
-    {
-      id: 31111111111,
-      balance: '30',
-      state: 1
-    },
-    {
-      id: 2,
-      balance: '30',
-      state: 1
-    },
-    {
-      id: 1,
-      balance: '30',
-      state: 1
-    },
-    {
-      id: 0,
-      balance: '30',
-      state: 1
-    },
-  ]
-  },
- // 鍒囨崲 Tabs
- switchTab: function (e) {
-  const tab = parseInt(e.currentTarget.dataset.tab);
-  this.setData({
-    currentTab: tab
-  });
-},
-  /**
-   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鏄剧ず
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰闅愯棌
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍗歌浇
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 椤甸潰鐩稿叧浜嬩欢澶勭悊鍑芥暟--鐩戝惉鐢ㄦ埛涓嬫媺鍔ㄤ綔
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
-   */
-  onShareAppMessage() {
-
-  }
-
-
-})
\ No newline at end of file
diff --git a/pages/rechargeCard/rechargeCard.wxml b/pages/rechargeCard/rechargeCard.wxml
index d3d1db7..3fda0dc 100644
--- a/pages/rechargeCard/rechargeCard.wxml
+++ b/pages/rechargeCard/rechargeCard.wxml
@@ -13,44 +13,50 @@
   </view>
 
   <!-- 铏氭嫙鍗� -->
-  <scroll-view class="list-container" wx:if="{{currentTab === 0}}" scroll-y="true" scroll-x="false" style="width: 713rpx; height: 465rpx; display: block; box-sizing: border-box">
-    <block wx:for="{{allCardPoints}}" wx:key="index">
-      <view class="{{item.state===1?'item':'item-gray'}}">
+  <scroll-view class="list-container" wx:if="{{currentTab === 0}}" scroll-y="true" scroll-x="false">
+    <block wx:if="{{allCardPoints.length > 0}}" wx:for="{{allCardPoints}}" wx:key="index">
+      <view class="{{item.inUse===0?'item':'item-gray'}}">
         <view class="item-card">
-          <text>鍗$紪鍙凤細</text>
-          <text>{{item.id}}</text>
-          <text wx:if="{{item.state==0}}" class="item-card-state">浣跨敤涓�</text>
+          <text class="item-card-text">鍗$紪鍙凤細</text>
+          <text class="item-card-text">{{item.vcNum}}</text>
+          <text wx:if="{{item.inUse==1}}" class="item-card-state">浣跨敤涓�</text>
         </view>
         <view class="item-bottom">
           <image class="item-balance-img" src="/images/balance.svg" />
           <view class="item-balance">
-            <text class="item-balance-text">{{item.balance}}</text>
+            <text class="item-balance-text">{{item.money}}</text>
             <text class="item-balance-text-yuan">鍏�</text>
           </view>
           <view class="button-view">
-            <text wx:if="{{item.state==1}}" class="ruinCard" >閿�鍗�</text>
-            <text wx:if="{{item.state==1}}" class="recharge">鍏呭��</text>
+            <text wx:if="{{item.inUse==0}}" class="ruinCard">閿�鍗�</text>
+            <text wx:if="{{item.inUse==0}}" class="recharge" bind:tap="rechargeCard">鍏呭��</text>
           </view>
         </view>
       </view>
     </block>
+    <view wx:if="{{allCardPoints.length === 0}}" class="noMore-View">
+      <image class="noMore-img" src="/images/no_more.svg" />
+      <text class="noMore-text">娌℃湁鏁版嵁</text>
+    </view>
   </scroll-view>
 
   <!-- 姘村崱 -->
   <view class="all-waterIntake" wx:else>
-    <view>
-      <scroll-view class="list-container" scroll-y="true" scroll-x="false">
-        <block wx:for="{{allWaterPoints}}" wx:key="index">
-          <view class="item">
-            <view class="item-left">
-              <image class="item-img" src="/images/pipeline.svg" /> -->
-               <text>{{item}}</text>
-              <image class="item-img" src="/images/wifi_no.svg" />
-            </view>
-            <text class="item-button" bind:tap="choseCard" data-item="{{item}}">閫夋嫨</text>
+    <scroll-view class="list-container" scroll-y="true" scroll-x="false">
+      <block wx:if="{{allWaterPoints.length > 0}}" wx:for="{{allWaterPoints}}" wx:key="index">
+        <view class="item">
+          <view class="item-card">
+            <text class="item-card-text">鍗$紪鍙凤細</text>
+            <text class="item-card-text">{{item.vcNum}}</text>
+            <text class="waterIntake-recharge">鍏呭��</text>
           </view>
-        </block>
-      </scroll-view>
-    </view>
-  </view> 
+        </view>
+      </block>
+      <view wx:if="{{allWaterPoints.length === 0}}" class="noMore-View">
+        <image class="noMore-img" src="/images/no_more.svg" />
+        <text class="noMore-text">娌℃湁鏁版嵁</text>
+      </view>
+    </scroll-view>
+
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/rechargeCard/rechargeCard.wxss b/pages/rechargeCard/rechargeCard.wxss
index 19f7b8c..0eded79 100644
--- a/pages/rechargeCard/rechargeCard.wxss
+++ b/pages/rechargeCard/rechargeCard.wxss
@@ -23,9 +23,11 @@
 .item-card {
   display: flex;
   margin-left: 10rpx;
+  align-items: center;
+  /* 鍨傜洿灞呬腑瀵归綈 */
 }
 
-.item-card text {
+.item-card-text {
   font-size: 35rpx;
   color: #fff;
 }
@@ -66,7 +68,7 @@
   display: flex;
   margin-top: 20rpx;
   align-items: center;
-  
+
   /* 鍨傜洿灞呬腑 */
 }
 
@@ -106,6 +108,9 @@
   margin-left: auto;
   /* 灏嗘寜閽浐瀹氬湪鍙宠竟 */
   display: flex;
+  color: rgb(238, 153, 153);
+  margin-bottom: 2rpx;
+  font-size: 35rpx;
 }
 
 .list-container {
@@ -117,7 +122,8 @@
 .button-view {
   display: flex;
   width: 50%;
-  margin-left: auto; /* 灏嗘寜閽粍鎺ㄥ埌鍙宠竟 */
+  margin-left: auto;
+  /* 灏嗘寜閽粍鎺ㄥ埌鍙宠竟 */
   justify-content: space-around;
   align-items: flex-end;
   /* 璁╂寜閽湪瀹瑰櫒涓按骞冲钩鍒嗙┖闂� */
@@ -152,4 +158,23 @@
   font-size: 30rpx;
   border: none;
 
+}
+
+.all-waterIntake {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  /* 纭繚鍐呭灞呬笂 */
+  height: 100%;
+  width: 100%;
+}
+
+.waterIntake-recharge {
+  margin-left: auto; /* 灏嗘寜閽帹鍒板鍣ㄦ渶鍙充晶 */
+  cursor: pointer;
+  background-color: #32CD32;
+  color: white;
+  padding: 15rpx 30rpx;
+  border-radius: 30rpx;
+  font-size: 30rpx;
 }
\ No newline at end of file
diff --git a/pages/rechargeMoney/rechargMoney.js b/pages/rechargeMoney/rechargMoney.js
index 9e2514a..03bfb1b 100644
--- a/pages/rechargeMoney/rechargMoney.js
+++ b/pages/rechargeMoney/rechargMoney.js
@@ -66,5 +66,15 @@
    */
   onShareAppMessage() {
 
-  }
+  },
+  handleMoneyWrapperTap: function (e) { 
+    const index = e.currentTarget.dataset.index; 
+    console.log(index) 
+    if (index !== undefined) { 
+      this.setData({ 
+        activeIndex: parseInt(index), 
+      }); 
+    } 
+ 
+  }, 
 })
\ No newline at end of file
diff --git a/pages/rechargeMoney/rechargMoney.json b/pages/rechargeMoney/rechargMoney.json
index 8835af0..7d8067e 100644
--- a/pages/rechargeMoney/rechargMoney.json
+++ b/pages/rechargeMoney/rechargMoney.json
@@ -1,3 +1,5 @@
 {
-  "usingComponents": {}
+  "component": true,
+  "navigationBarTitleText": "鍏呭�艰櫄鎷熷崱",
+  "navigationBarTextStyle": "white"
 }
\ No newline at end of file
diff --git a/pages/rechargeMoney/rechargMoney.wxml b/pages/rechargeMoney/rechargMoney.wxml
index 72a4990..18c0177 100644
--- a/pages/rechargeMoney/rechargMoney.wxml
+++ b/pages/rechargeMoney/rechargMoney.wxml
@@ -1,6 +1,7 @@
-<!--pages/recharge/recharge.wxml--> 
-<view class="base-wrapper"> 
-  <!-- <view class="user-wrapper"> 
+<!-- pages/recharge/recharge.wxml -->
+<view class="base-wrapper">
+  <!-- 
+  <view class="user-wrapper"> 
     <view> 
       <text>铏氭嫙鍗$紪鍙凤細</text> 
       <text>{{userCode}}</text> 
@@ -9,58 +10,59 @@
       <text>浣欓锛�</text> 
       <text>{{balance}}</text> 
     </view> 
-  </view>  -->
- 
-  <view class="money-base-wrapper"> 
-    <view class="row"> 
-      <view class="item{{activeIndex === 0 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="0"> 
-      <view class="money-wrapper"> 
-        <text class="money-number">100</text> 
-        <text class="money-label">鍏�</text> 
-      </view> 
-      </view> 
-      <view class="item{{activeIndex === 1 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="1"> 
-        <view class="money-wrapper"> 
-        <text class="money-number">200</text> 
-        <text class="money-label">鍏�</text> 
-      </view> 
-      </view> 
-      <view class="item{{activeIndex === 2 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="2"> 
-        <view class="money-wrapper"> 
-        <text class="money-number">300</text> 
-        <text class="money-label">鍏�</text> 
-        </view> 
-      </view> 
-    </view> 
-    <view class="row"> 
-      <view class="item{{activeIndex === 3 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="3"> 
-        <view class="money-wrapper"> 
-        <text class="money-number">400</text> 
-        <text class="money-label">鍏�</text> 
-        </view> 
-      </view> 
-      <view class="item{{activeIndex === 4 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="4"> 
-        <view class="money-wrapper"> 
-        <text class="money-number">500</text> 
-        <text class="money-label">鍏�</text> 
-        </view> 
-      </view> 
-      <view class="item{{activeIndex === 5 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="5"> 
-        <view class="money-wrapper"> 
-        <text class="money-number">600</text> 
-        <text class="money-label">鍏�</text> 
-        </view> 
-      </view> 
-    </view> 
   </view> 
- 
-<view class="rechage-view"> 
-  <view class="rechage{{activeIndex === -1 ? 'active' : ''}}"> 
-  <text >鍏呭��</text> 
-  </view> 
+  -->
 
-</view> 
-<view class="rechageList-view"> 
+  <view class="money-base-wrapper">
+    <view class="row">
+      <view class="item {{activeIndex === 0 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="0">
+        <view class="money-wrapper">
+          <text class="money-number">100</text>
+          <text class="money-label">鍏�</text>
+        </view>
+      </view>
+      <view class="item {{activeIndex === 1 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="1">
+        <view class="money-wrapper">
+          <text class="money-number">200</text>
+          <text class="money-label">鍏�</text>
+        </view>
+      </view>
+      <view class="item {{activeIndex === 2 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="2">
+        <view class="money-wrapper">
+          <text class="money-number">300</text>
+          <text class="money-label">鍏�</text>
+        </view>
+      </view>
+    </view>
+    <view class="row">
+      <view class="item {{activeIndex === 3 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="3">
+        <view class="money-wrapper">
+          <text class="money-number">400</text>
+          <text class="money-label">鍏�</text>
+        </view>
+      </view>
+      <view class="item {{activeIndex === 4 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="4">
+        <view class="money-wrapper">
+          <text class="money-number">500</text>
+          <text class="money-label">鍏�</text>
+        </view>
+      </view>
+      <view class="item {{activeIndex === 5 ? 'active' : ''}}" bindtap="handleMoneyWrapperTap" data-index="5">
+        <view class="money-wrapper">
+          <text class="money-number">600</text>
+          <text class="money-label">鍏�</text>
+        </view>
+      </view>
+    </view>
+  </view>
+
+  <view class="rechage-view">
+    <view class="rechage {{activeIndex === -1 ? 'active' : ''}}">
+      <text>鍏呭��</text>
+    </view>
+  </view>
+  <!-- 
+  <view class="rechageList-view">
   </view> 
- 
-</view>
\ No newline at end of file
+  -->
+</view>
diff --git a/pages/rechargeMoney/rechargMoney.wxss b/pages/rechargeMoney/rechargMoney.wxss
index a5ccb6d..ca20ff7 100644
--- a/pages/rechargeMoney/rechargMoney.wxss
+++ b/pages/rechargeMoney/rechargMoney.wxss
@@ -122,7 +122,7 @@
  
 .rechage { 
   display: flex; 
-  width: 50%; 
+  width: 80%; 
   background-color: #2D8BF7; 
   align-items: center; 
   justify-content: center; 
@@ -137,7 +137,7 @@
   margin-top: 45rpx; 
   align-items: center; 
   justify-content: center; 
-  width: 50%; 
+  width: 80%; 
   background-color: #bababa; 
   padding-top: 15rpx; 
   padding-bottom: 15rpx; 

--
Gitblit v1.8.0