From 53bed178918468c515e495302e8bcde61c66928a Mon Sep 17 00:00:00 2001
From: gooking <javazj@qq.com>
Date: Wed, 27 Feb 2019 12:52:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=95=8C=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=B1=95=E7=A4=BA=20=E5=85=85=E5=80=BC=E6=BB=A1?=
 =?UTF-8?q?=E4=B8=80=E5=AE=9A=E9=87=91=E9=A2=9D=E8=B5=A0=E9=80=81=E4=B8=80?=
 =?UTF-8?q?=E5=AE=9A=E9=87=91=E9=A2=9D=20=E7=9A=84=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                 |  4 ++--
 pages/recharge/index.js   | 12 ++++++++++--
 pages/recharge/index.wxml | 10 ++++++++++
 pages/recharge/index.wxss |  3 +++
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/config.js b/config.js
index 35aa16ff..c937445d 100644
--- a/config.js
+++ b/config.js
@@ -1,6 +1,6 @@
 module.exports = {
-  version: "6.2.0",
-  note: '启动图后台可管理、充值增加单笔满多少金额赠送一定的金额',
+  version: "6.2.1",
+  note: '充值界面增加展示 充值满一定金额赠送一定金额 的规则',
   subDomain: "tz", // 如果你的域名是： https://api.it120.cc/abcd 那么这里只要填写 abcd
   appid: "wxa46b09d413fbcaff", // 您的小程序的appid，购物单功能需要使用
   shareProfile: '百款精品商品，总有一款适合您' // 首页转发的时候话术
diff --git a/pages/recharge/index.js b/pages/recharge/index.js
index 3e270090..992b4ca3 100644
--- a/pages/recharge/index.js
+++ b/pages/recharge/index.js
@@ -9,7 +9,8 @@ Page({
    */
   data: {
     uid: undefined,
-    showalipay: false
+    showalipay: false,
+    rechargeSendRules: undefined
   },
 
   /**
@@ -37,7 +38,14 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-  
+    const _this = this
+    WXAPI.rechargeSendRules().then(res => {
+      if (res.code === 0) {
+        _this.setData({
+          rechargeSendRules: res.data
+        });
+      }      
+    })
   },
 
   /**
diff --git a/pages/recharge/index.wxml b/pages/recharge/index.wxml
index ab10b044..00973933 100644
--- a/pages/recharge/index.wxml
+++ b/pages/recharge/index.wxml
@@ -25,4 +25,14 @@
     <view wx:if="{{showalipay}}" style='width:100%;font-size: 30rpx;margin-top:30rpx;color:red;text-align:center;margin-bottom:30rpx;'>保存以下二维码，使用支付宝扫码付款</view>
     <canvas wx:if="{{showalipay}}" style="width: 200px; height: 200px;text-align:center;" canvas-id="myQrcode"></canvas>
     <button wx:if="{{showalipay}}" type="primary" class="save-btn" bindtap="saveToMobile">保存相册</button>
+  <view wx:if="{{rechargeSendRules}}" class="weui-panel weui-panel_access">
+      <view class="weui-panel__hd">充值满送活动：</view>
+      <view class="weui-panel__bd">
+          <view wx:for="{{rechargeSendRules}}" wx:key="id" class="weui-media-box weui-media-box_text">
+              <view class="weui-media-box__title weui-media-box__title_in-text">单笔充值每满 {{ item.confine }} 元, 送 {{ item.send }} 元</view>
+              <view class="weui-media-box__desc">单笔充值每满 {{ item.confine }} 元，即可获得奖励。</view>
+              <view wx-if="{{item.loop}}" class="weui-media-box__desc">充的多送的多，上不封顶。</view>
+          </view>
+      </view>
+  </view>
 </view>
\ No newline at end of file
diff --git a/pages/recharge/index.wxss b/pages/recharge/index.wxss
index 17156776..da488618 100644
--- a/pages/recharge/index.wxss
+++ b/pages/recharge/index.wxss
@@ -84,4 +84,7 @@ picker {
 }
 .hui{
     color: #777;
+}
+.weui-panel {
+  width:740rpx;
 }
\ No newline at end of file