diff --git a/images/ic_take_cash_record.png b/images/ic_take_cash_record.png
new file mode 100644
index 0000000..b047677
Binary files /dev/null and b/images/ic_take_cash_record.png differ
diff --git a/images/ic_wechat_icon.png b/images/ic_wechat_icon.png
new file mode 100644
index 0000000..2f7cdea
Binary files /dev/null and b/images/ic_wechat_icon.png differ
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 @@
立即提现
-
+
+
+ 可提现金额(元)
+
+ ¥
+ {{accountInfo.accountMoney/100}}
+
+
+
+ 最低提现金额(元)
+ ¥1.00
+
+
+ 查看提现记录
+
+
+
+
+
+
+
+ 提现金额
+
+
+ ¥
+
+ 全部提现
+
+
+ 提现至微信零钱
+
+
+
+
+
+
+
+
+
+
\ 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) {