From d4c2f5e164ced3a2630624c91943eda6011ea243 Mon Sep 17 00:00:00 2001
From: "junwen.deng" <junwen.deng@yeepay.com>
Date: Wed, 27 Feb 2019 17:45:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E5=80=BC=E9=80=81?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改充值送样式
---
 pages/recharge/index.js   |  3 +++
 pages/recharge/index.wxml | 15 ++++++++++----
 pages/recharge/index.wxss | 41 +++++++++++++++++++++++++++------------
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/pages/recharge/index.js b/pages/recharge/index.js
index c8ad260b..851710a3 100644
--- a/pages/recharge/index.js
+++ b/pages/recharge/index.js
@@ -33,6 +33,9 @@ Page({
   rechargeAmount: function (e) {
     var confine = e.currentTarget.dataset.confine;
     var amount = confine;
+    this.setData({
+      amount: amount
+    });
     wxpay.wxpay(app, amount, 0, "/pages/cashier/cashier");
   },
 
diff --git a/pages/recharge/index.wxml b/pages/recharge/index.wxml
index d2621782..881bce88 100644
--- a/pages/recharge/index.wxml
+++ b/pages/recharge/index.wxml
@@ -4,7 +4,7 @@
         <view class="row-wrap">
             <view class="label">充值金额</view>
             <view class="label-right">
-                <input name="amount" class="input" type="text" placeholder="至少充值 {{recharge_amount_min}} 元"/>
+                <input name="amount" class="input" type="text" value="{{amount}}" placeholder="至少充值 {{recharge_amount_min}} 元"/>
             </view>
         </view>
     </view>
@@ -20,14 +20,21 @@
         </radio-group>
       </view>
     </view>
+    
 
    <block wx:if='{{rechargeSendRules}}'>
       <view class="charge-rule-wrap">
             <block  wx:for='{{rechargeSendRules}}' wx:for-item="item">
-              <button  class='font charge-detail' bindtap="rechargeAmount" data-confine="{{item.confine}}" data-send="{{item.send}}">
-                <text>充{{item.confine}}送{{item.send}}</text>
-              </button>
+            
+                <!-- <button  class='font charge-detail' bindtap="rechargeAmount" data-confine="{{item.confine}}" data-send="{{item.send}}">
+                  <text>充{{item.confine}}送{{item.send}}</text>
+                </button> -->
+                  <view class="btn charge-detail" bindtap="rechargeAmount" data-confine="{{item.confine}}" data-send="{{item.send}}">
+                      <text>充{{item.confine}}</text>
+                      <text>送{{item.send}}</text>
+                  </view>
             </block>
+             
       </view>
     </block>
 
diff --git a/pages/recharge/index.wxss b/pages/recharge/index.wxss
index bbe31527..309d8569 100644
--- a/pages/recharge/index.wxss
+++ b/pages/recharge/index.wxss
@@ -90,25 +90,42 @@ picker {
   width:740rpx;
 }
 
+
 .charge-rule-wrap{
   background: white;
-  margin-top:10rpx;
-  padding:10rpx
+  margin-top:20rpx;
+  padding:10rpx;
+  padding-left:20rpx;
+  display: flex;
+  flex-direction:row;
+  flex-wrap:wrap;
+}
+.btn{
+    box-sizing: border-box;
+    text-align: center;
+    border-radius: 6rpx;
+    margin-left: 20rpx;
 }
 .charge-detail{
-  width: 160rpx;
-  height: 80rpx;
-  color: rgba(46, 189, 2, 0.925);
-  /* padding-left: 6rpx; */
+  width:220rpx;
+  height:100rpx;
+  color:rgba(99, 190, 133, 1);
   background-color:white;
-  border:2rpx solid rgba(46, 189, 2, 0.925);
-
-   display: table-cell;
-    line-height: 30rpx;
+  border:3rpx solid rgba(99, 190, 133, 1);
+  display:table-cell;
+  line-height:30rpx;
+  font-weight:300;
+  font-size:30rpx;
+  margin:10rpx;
+  align-items:flex-start;
 }
 .charge-detail text{
-   vertical-align:middle;
-   font-size: 28rpx;
+  vertical-align:middle;
+  font-size: 28rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top:12rpx;
 }
 .button-hover{
   background-color:grey;