From 1b020d8f043636c776b60ab20152a9267d53a628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=81=A5?= <itgaojian@163.com>
Date: Wed, 22 Sep 2021 09:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images/ic_take_cash_record.png  | Bin 0 -> 951 bytes
 images/ic_wechat_icon.png       | Bin 0 -> 713 bytes
 packagecard/purse/takecash.wxml |  44 ++++++++++++++++++++++++--
 packagecard/purse/takecash.wxss |  54 +++++++++++++++++++++-----------
 pages/index/index.js            |   1 +
 pages/mine/index/index.js       |  36 +++++++++++++++++++--
 6 files changed, 113 insertions(+), 22 deletions(-)
 create mode 100644 images/ic_take_cash_record.png
 create mode 100644 images/ic_wechat_icon.png

diff --git a/images/ic_take_cash_record.png b/images/ic_take_cash_record.png
new file mode 100644
index 0000000000000000000000000000000000000000..b047677a640f0a75b3d4afa54c7fc30c0493d431
GIT binary patch
literal 951
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s>jHd2T!Hlep#yZgzGwkmY*`ZI
z7tHYc_Sc6eSw6nLyvkfg;`#M+hqrbcsPS?2r}{f+vu$XK+P!q%<l3w-7vbrZao!%b
zCQ7Bn`3fDm7yRb%&17I;s`qqp4DmSrcIwMriwt<$yh8;dr!;dYz5BiI^~t~YZ>Z#6
zWVGem|J?HZ{A(tepH+1?{TEKR|NAI!YW3tF5eM!{g+Fx6-0`-qEdQIsqRgzIo3)?z
zPiZ;->Qbg!`%Zh2z`)n)-^Fs*`+lpJeK9?w`E~XG58UGIVS2}<q|QFbWzh94`MUVG
zz-{;9zp-KIF*8nGc~rPGF8_)dpYpXG2324A0~Y9~G4pl3+BtQe;AR_*1B+{9LjEne
z6moLfXHVG;-b>0~GJf$(y|{HndmpD%zn+7&xB=UWrKi|+4sax&-d5t)5hmZze)D%Q
zQ*L8256AY%fVEL)3>hsi3$i&F3tu>Rc;kd!>@J5BuQghVuDo-sbk4aMO1gKa_e>V_
zUiOWB=3f2l^B3%y{D#%B%1Ky6Tgx<W5@!ZOPGLmntDZj@XQu^<tc_uKx$}5lI#a>!
zzBPf*-e@YMuIX=e{>QTGyYj-KyYtRQ-q?5Fzcg@*Ue{@Mo~7IDI5NI!9Q$&_(Qc_n
z*6kJ7mzmzU>LGtuN<8nzL7xLLQaR1*Duh_fF84c5;PAZ?z<+jTgG=+J&}-7~{6DuC
zUHW)vchKX>>o^M*D;Kyvp7VW1Zc*GaCHV_?j$J&-67WrL=CfHsxy>nFw`-YuKFc?3
z+LX()@V0#8g7t9|rqy0s<xo89jcvsN_LQ4bUl=~S*nVTv+!?%2zMohTGwqRD_(o2}
z>W8luosSXK&D*Z8T%vBX^3PPhd27Dz_PN;dOR4s)@waKLFaP$HehoeLLHg|5mk*Bn
z7cvWM&cCS}E8c(7`-b}=k8KAFd@oPkocnM;d+YIkt+lHPc}13NXGq-C@p$En3dR3h
p);P54o|9{c3YY0Ve?xzg{UhU=)q7vPj{>G=22WQ%mvv4FO#t-M9WDR>

literal 0
HcmV?d00001

diff --git a/images/ic_wechat_icon.png b/images/ic_wechat_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f7cdea1b0d95be46f41bdece66507d2cdf4305a
GIT binary patch
literal 713
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s^8<WBT!A#_ZgvRb*u};HW^?R@
zG4=o%Z0sN|8^>N&pfa!&m<tpKsb}Tb!v+!uvB3ze1t<s<VF$|Y2FY^nVF!soq=4c(
z5aK{t_Fb%;AVa|BfDHkv2MO+G4?EXB6X-;fk|4ieh9B>DbH2K`R_V#*`Q08u5AIx_
zUYe#Y|M}FUqySTWDbaKJS<zvRmi%l7m)fc@ZCqG;q(-B3HfJUS1LIOp7sn8f<8LQl
zpVs8S<KX<hW5J4sr1!bypa0+A<{==Ert|*Za+w_lnauHasW!L$d5^yE`d0Mm)--YJ
zH34pq#rG|Kq}=q>?)Tr&17go6z1}TkB+1CmX?f;mUH?74ki}~vMPFW=^;CVz{wkL1
zO85Q!cg=L4J7s>rgjQ~@|C<V27T*2#+an|Lk9XqwU%fZ--tlnjeGJt}OE?~uSH0?{
z+=8|otAiFkb5iG+Tu(W1r8nd8k5>xz>EbT}4yXJKs#?MCzQsJ?)8P-z8)jx~pSAG(
z2lH2xZ6lK=FTC?<<;|AW3Czc}eyNCwmaMqRDG+#gzsTaACj~Ri*XW;L$v4x^!gN|`
z?q&Yi2AfSr?VBPP3Tt-Qo>~(9WY5**M>!d7EvNssUD3ZFe%q(G=JpoOaz3_cKeV4*
zY!tHkbCq4Ln02e&Cj)K!Gphp5Ei2Hr`a0q8zB)}7@Ak>>TsF_MapG&gbf0hQE!W86
znzcc9M6cX<cSE)PK=R>TA&&%q_}qG}b>u@&!L2znna@vD?hH1NKmLkqd(57_YZuHo
tB%Sj$W$U%4Yt-h4{bqh-SyMT?-qvnQV@T0dJz#`0c)I$ztaD0e0svulD~$jE

literal 0
HcmV?d00001

diff --git a/packagecard/purse/takecash.wxml b/packagecard/purse/takecash.wxml
index a1f540e..f4fa579 100644
--- a/packagecard/purse/takecash.wxml
+++ b/packagecard/purse/takecash.wxml
@@ -1,7 +1,47 @@
 <cu-custom isBack="{{true}}">
     <view slot="content">立即提现</view>
 </cu-custom>
-<view class="page-box" style="padding: 0rpx;">
+<view class="page-box">
+    <view class="content-box">
+        <view style="font-size: 32rpx;padding: 20rpx;">可提现金额(元)</view>
+        <view style="margin-left: 23rpx;">
+            <text style="font-size: 40rpx;line-height: 80rpx;">¥</text>
+            <text
+                style="font-size: 80rpx;line-height: 80rpx;margin-left: 15rpx;">{{accountInfo.accountMoney/100}}</text>
+        </view>
+        <view class="content-bottom-box">
+            <view>
+                <view>最低提现金额(元)</view>
+                <view style="height: 40rpx;text-align: left;line-height: 40rpx;">¥1.00</view>
+            </view>
+            <view bindtap="toRecord">
+                <view>查看提现记录</view>
+                <image src="/images/ic_take_cash_record.png" style="width: 40rpx;height: 40rpx;" mode="scaleToFill">
+                </image>
+            </view>
+        </view>
+    </view>
+    <view class="cash-box">
+        <view class="title-box">
+            <view class="title">提现金额</view>
+        </view>
+        <view class="input-box">
+            <text style="text-align: left;font-size: 40rpx;line-height: 40rpx;">¥</text>
+            <input type="digit" value="{{takeValue}}" bindinput="inputWatch" />
+            <view catchtap="takeAll" style="font-size: 28rpx;color: #E6B980;">全部提现</view>
+        </view>
+        <view class="cash-bottom-box">
+            <view>提现至微信零钱</view>
+            <image src="/images/ic_wechat_icon.png" style="width: 40rpx;height: 40rpx;" mode="scaleToFill"></image>
+        </view>
+    </view>
+
+    <view style="width: 100%;margin-top: 70rpx;">
+        <button class="cu-btn bg-blue" style="width:100%" bindtap="doCash">申请提现</button>
+    </view>
+</view>
+
+<!-- <view class="page-box" style="padding: 0rpx;">
     <view class="content-box">
         <view>
             <view class="money">
@@ -27,4 +67,4 @@
 </view>
 <view class="foot" style="padding: 15rpx;">
     <button class="cu-btn bg-blue" style="width:100%" bindtap="doCash">申请提现</button>
-</view>
\ No newline at end of file
+</view> -->
\ No newline at end of file
diff --git a/packagecard/purse/takecash.wxss b/packagecard/purse/takecash.wxss
index cd283ac..677de42 100644
--- a/packagecard/purse/takecash.wxss
+++ b/packagecard/purse/takecash.wxss
@@ -3,21 +3,25 @@
     display: flex;
     flex-direction: column;
     justify-content: center;
-    align-items: center;
+    align-items: flex-start;
     width: 100%;
     background-color: #E6B980;
-    text-align: center;
-    min-height: 400rpx;
+    border-radius: 10rpx;
+    color: #ffffff;
 }
 
-.content-box .money {
-    color: #fff;
-}
-
-.content-box .hint {
+.content-bottom-box {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+    background-color: #D6A970;
+    border-bottom-left-radius: 10rpx;
+    border-bottom-right-radius: 10rpx;
+    padding: 25rpx;
     font-size: 28rpx;
-    margin-top: 15rpx;
-    color: #fff;
+    margin-top: 25rpx;
 }
 
 .cash-box {
@@ -26,32 +30,45 @@
     flex-direction: column;
     justify-content: space-around;
     align-items: flex-start;
-    width: 90%;
+    width: 100%;
     background-color: #fff;
-    border-radius: 15rpx;
-    position: absolute;
-    top: 450rpx;
+    border-radius: 5rpx;
     box-shadow: 0 4rpx 8rpx 0 #DFDBDB, 0 6rpx 20rpx 0 #DFDBDB;
+    margin-top: 15rpx;
 }
 
 .cash-box .title {
     font-size: 32rpx;
 }
 
+.cash-bottom-box {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%;
+    border-top: 1rpx solid #f3f3f3;
+    padding: 20rpx 20rpx 0rpx 20rpx;
+}
+
 .input-box {
     width: 100%;
     display: flex;
     flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
+    align-items: flex-end;
+    justify-content: flex-start;
     font-size: 80rpx;
+    padding: 20rpx;
+    line-height: 80rpx;
 }
 
 .input-box input {
-    width: 100%;
-    text-align: center;
+    width: 80%;
+    text-align: left;
     line-height: 80rpx;
     height: 80rpx;
+    font-size: 80rpx;
+    padding-left: 15rpx;
 }
 
 .title-box {
@@ -61,4 +78,5 @@
     align-items: center;
     width: 100%;
     font-size: 32rpx;
+    padding: 0rpx 20rpx 20rpx 20rpx;
 }
\ No newline at end of file
diff --git a/pages/index/index.js b/pages/index/index.js
index d1a6129..362f90f 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -651,6 +651,7 @@ Page({
       })
       .then(res => {
         wx.setStorageSync('usercode', res.data.userCode)
+        wx.setStorageSync('userId', res.data.userId)
       })
       .catch(err => {
         console.log(err)
diff --git a/pages/mine/index/index.js b/pages/mine/index/index.js
index 05ea209..6c9bc87 100644
--- a/pages/mine/index/index.js
+++ b/pages/mine/index/index.js
@@ -18,7 +18,8 @@ Page({
     code: '',
     isOpen: true,
     payState: {},
-    accountInfo: undefined
+    accountInfo: undefined,
+    userId: ''
   },
   /**
    * 生命周期函数--监听页面加载
@@ -32,9 +33,11 @@ Page({
     try {
       var isBind = wx.getStorageSync('bindPhone')
       var code = wx.getStorageSync('usercode')
+      var userId = wx.getStorageSync('userId')
       if (code && code.length > 0) {
         _self.setData({
-          code: code
+          code: code,
+          userId: userId
         })
       }
       _self.setData({
@@ -257,6 +260,35 @@ Page({
     this.getItemList()
     this.getPayState()
     this.getAccountInfo()
+    this.getBaseInfo()
+  },
+  getBaseInfo() {
+    var _self = this
+    app.http.get(app.urls.getMainMoment.format({
+        configColumnId: 'de7b5e22-64f9-4c60-a1f9-6ac004dfb9a8'
+      }), {
+        header: {
+          token: app.globalData.token
+        },
+        data: {
+          userId: _self.data.userId
+        }
+      })
+      .then(res => {
+        if (res.data.length > 0) {
+          res.data[0].list.forEach(it => {
+            switch (it.name) {
+              case 'cardtitle':
+                wx.setStorageSync('cardtitle', it.value)
+                break
+              case 'postertitle':
+                wx.setStorageSync('postertitle', it.value)
+                break
+            }
+          })
+        } else {}
+      })
+      .catch(err => {})
   },
   //跳转到二级栏目页面
   goColumnList(e) {