Merge branch 'ymf' of https://e.coding.net/g-cphe0354/duanju/video_app into test
This commit is contained in:
commit
a147eaab4f
|
|
@ -20,6 +20,10 @@
|
|||
{
|
||||
"playground" : "custom",
|
||||
"type" : "uni-app:app-android"
|
||||
},
|
||||
{
|
||||
"playground" : "custom",
|
||||
"type" : "uni-app:app-ios"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@
|
|||
"cache" : {
|
||||
"use" : true,
|
||||
"maxAge" : "86400000",
|
||||
"version" : "1.0.4"
|
||||
"version" : "1.0.7"
|
||||
}
|
||||
},
|
||||
"template" : "template.html"
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@
|
|||
style="display: flex;flex-direction: row;padding: 20upx;justify-content: space-between;align-items: center;">
|
||||
<view style="display: flex;align-items: center;">
|
||||
<view style="font-size: 40upx;color: #333333;">¥</view>
|
||||
<input type="number" v-model="money" placeholder="请输入金额"
|
||||
<input type="number" v-model="money" placeholder="请输入金额" @input="moneyInput" @blur="moneyBlur"
|
||||
style="font-size: 40upx;color: #333333;text-align: left;margin-left: 10upx;width: 80%;" />
|
||||
</view>
|
||||
<view @click="money = mayMoney"
|
||||
<view @click="setAllMoney"
|
||||
style="font-size: 30rpx;color: #333333;background: #ff7581;color: white;border-radius: 10rpx;padding: 7rpx 15rpx;flex-shrink: 0;">
|
||||
全部</view>
|
||||
|
||||
|
|
@ -46,9 +46,11 @@
|
|||
</view>
|
||||
|
||||
<view style="display: flex;width: 100%;justify-content: center;">
|
||||
<view class="u-flex-1" style="color: grey;padding-bottom: 30px;padding-top: 20upx;" @click="goZhifuBao">提现账号
|
||||
<view class="u-flex-1" style="color: grey;padding-bottom: 30px;padding-top: 20upx;" @click="goZhifuBao">
|
||||
提现账号
|
||||
</view>
|
||||
<view class="u-flex-1" style="color: grey;padding-bottom: 30px;padding-top: 20upx;" @click="goqianbao">红包明细
|
||||
<view class="u-flex-1" style="color: grey;padding-bottom: 30px;padding-top: 20upx;" @click="goqianbao">
|
||||
红包明细
|
||||
</view>
|
||||
<!-- <view style="color: grey;padding-bottom: 30px;padding-top: 20upx;width: 33%;" @click="gojilu">提现记录
|
||||
</view> -->
|
||||
|
|
@ -60,7 +62,8 @@
|
|||
<view style="margin-bottom: 8upx;text-align: right;">
|
||||
<text style="margin-bottom: 8upx;color: green" v-if="item.state==1"> 提现成功</text>
|
||||
<text style="margin-bottom: 8upx;color: green" v-if="item.state==0"> 提现中</text>
|
||||
<text style="margin-bottom: 8upx;color: #FD6416" v-if="item.state==-1||item.state==2"> 提现失败</text>
|
||||
<text style="margin-bottom: 8upx;color: #FD6416" v-if="item.state==-1||item.state==2">
|
||||
提现失败</text>
|
||||
</view>
|
||||
|
||||
<view style="color: #999999;font-size: 28upx;">
|
||||
|
|
@ -68,7 +71,8 @@
|
|||
<view style="margin-bottom: 8upx"> 收款人姓名:{{item.zhifubaoName}}</view>
|
||||
<view style="margin-bottom: 8upx"> 发起时间:{{item.createAt}}</view>
|
||||
<view style="margin-bottom: 8upx" v-if="item.state==1">成功时间 {{item.outAt}}</view>
|
||||
<view style="margin-bottom: 8upx;color: #FD6416" v-if="item.state==-1||item.state==2">失败原因:{{item.refund}}
|
||||
<view style="margin-bottom: 8upx;color: #FD6416" v-if="item.state==-1||item.state==2">
|
||||
失败原因:{{item.refund}}
|
||||
</view>
|
||||
|
||||
<view style="margin-bottom: 8upx;text-align: right;">
|
||||
|
|
@ -159,10 +163,26 @@
|
|||
// this.list();
|
||||
},
|
||||
methods: {
|
||||
moneyInput(e) {
|
||||
let num = e.detail.value.match(/^\d*(\.?\d{0,2})/g)[0] || null;
|
||||
this.$nextTick(() => {
|
||||
this.money = num;
|
||||
});
|
||||
|
||||
},
|
||||
moneyBlur(e) {
|
||||
let num = e.detail.value.match(/^\d*(\.?\d{0,2})/g)[0] || null;
|
||||
this.$nextTick(() => {
|
||||
this.money = num;
|
||||
});
|
||||
},
|
||||
setAllMoney() {
|
||||
this.money = Math.floor(this.mayMoney * 100) / 100
|
||||
},
|
||||
getMoneyDetail() {
|
||||
let that = this;
|
||||
let token = uni.getStorageSync('token')
|
||||
console.log(1);
|
||||
console.log(1);
|
||||
if (token) {
|
||||
//可以提现金额查询预估收入查询
|
||||
let data = {
|
||||
|
|
@ -460,7 +480,8 @@
|
|||
margin-bottom: 10px;
|
||||
}
|
||||
}
|
||||
.money-list{
|
||||
|
||||
.money-list {
|
||||
.item {
|
||||
background: white;
|
||||
padding: 32rpx;
|
||||
|
|
@ -469,18 +490,19 @@
|
|||
box-shadow: 7px 9px 34px rgba(0, 0, 0, 0.1);
|
||||
border-radius: 16upx;
|
||||
}
|
||||
.item:first-child{
|
||||
|
||||
.item:first-child {
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
.centre {
|
||||
text-align: center;
|
||||
padding: 200rpx 0;
|
||||
font-size: 32rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
|
||||
image {
|
||||
width: 360rpx;
|
||||
height: 360rpx;
|
||||
|
|
@ -488,13 +510,13 @@
|
|||
margin: 0 auto 20rpx;
|
||||
// border: 1px dotted #000000;
|
||||
}
|
||||
|
||||
|
||||
.tips {
|
||||
font-size: 34rpx;
|
||||
color: #999999;
|
||||
margin-top: 20rpx;
|
||||
}
|
||||
|
||||
|
||||
.btn {
|
||||
margin: 80rpx auto;
|
||||
width: 600rpx;
|
||||
|
|
|
|||
Loading…
Reference in New Issue