mirror of
http://git.coreshop.cn/jianweie/coreshoppro.git
synced 2026-02-05 05:19:49 +08:00
【修复】修复提现二次扣除手续费的问题,同时优化相关提示。
This commit is contained in:
@@ -314,7 +314,8 @@ namespace CoreCms.Net.Services
|
|||||||
};
|
};
|
||||||
|
|
||||||
//按分计算
|
//按分计算
|
||||||
var amount = Convert.ToInt32((info.money - info.withdrawals) * 100);
|
//var amount = Convert.ToInt32((info.money - info.withdrawals) * 100);
|
||||||
|
var amount = Convert.ToInt32(info.money * 100);
|
||||||
//企业付款到零钱
|
//企业付款到零钱
|
||||||
var request = new WeChatPayPromotionTransfersRequest
|
var request = new WeChatPayPromotionTransfersRequest
|
||||||
{
|
{
|
||||||
@@ -393,7 +394,8 @@ namespace CoreCms.Net.Services
|
|||||||
};
|
};
|
||||||
|
|
||||||
//按分计算
|
//按分计算
|
||||||
var amount = Convert.ToInt32((info.money - info.withdrawals) * 100);
|
//var amount = Convert.ToInt32((info.money - info.withdrawals) * 100);
|
||||||
|
var amount = Convert.ToInt32(info.money * 100);
|
||||||
//企业付款到零钱
|
//企业付款到零钱
|
||||||
var request = new WeChatPayPayBankRequest
|
var request = new WeChatPayPayBankRequest
|
||||||
{
|
{
|
||||||
@@ -459,7 +461,8 @@ namespace CoreCms.Net.Services
|
|||||||
};
|
};
|
||||||
|
|
||||||
//按分计算
|
//按分计算
|
||||||
var amount = Convert.ToInt32((info.money - info.withdrawals) * 100);
|
//var amount = Convert.ToInt32((info.money - info.withdrawals) * 100);
|
||||||
|
var amount = Convert.ToInt32(info.money * 100);
|
||||||
|
|
||||||
var model = new WeChatPayTransferBatchesBodyModel
|
var model = new WeChatPayTransferBatchesBodyModel
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -44,9 +44,6 @@
|
|||||||
<p>
|
<p>
|
||||||
2、充值一经办理,概不退款;
|
2、充值一经办理,概不退款;
|
||||||
</p>
|
</p>
|
||||||
<p>
|
|
||||||
3、充值金额将无法用于提现;
|
|
||||||
</p>
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!--按钮-->
|
<!--按钮-->
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<view slot="right">
|
<view slot="right">
|
||||||
</view>
|
</view>
|
||||||
</u-navbar>
|
</u-navbar>
|
||||||
<view class="content" v-if="isAllowWithdrawCash">
|
<view class="content coreshop-bg-white" v-if="isAllowWithdrawCash">
|
||||||
<view class="coreshop-tabbar-height">
|
<view class="coreshop-tabbar-height">
|
||||||
<!-- 我的银行卡信息 -->
|
<!-- 我的银行卡信息 -->
|
||||||
<view class="coreshop-list menu sm-border margin-top" v-if="userbankCard" @click="toBankCardList">
|
<view class="coreshop-list menu sm-border margin-top" v-if="userbankCard" @click="toBankCardList">
|
||||||
@@ -43,11 +43,26 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class='coreshop-cell-item'>
|
<view class='coreshop-cell-item'>
|
||||||
<view class='coreshop-cell-item-bd'>
|
<view class='coreshop-cell-item-bd'>
|
||||||
<view class='coreshop-text-grey' v-show="!isError">可用余额 {{ user.balance}} 元</view>
|
<view class='coreshop-text-grey' v-show="!isError">可用余额 {{ user.balance}} 元,扣除手续费最高可提现{{maxMoney}}</view>
|
||||||
<view class='coreshop-text-red' v-show="isError">提现金额超过可用余额</view>
|
<view class='coreshop-text-red' v-show="isError">提现金额超过可用余额</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
<view class="coreshop-font-13 coreshop-line-height-22 coreshop-margin-top-40 coreshop-margin-10 coreshop-padding-10">
|
||||||
|
<p>
|
||||||
|
提现须知:
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
1、提现金额加提现服务费需超过或等于余额;
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
2、充值一经办理,概不退款;
|
||||||
|
</p>
|
||||||
|
</view>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
<view class="coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
|
<view class="coreshop-bg-white coreshop-footer-fixed coreshop-foot-padding-bottom">
|
||||||
<u-button size="normal" type="success" v-if="isSubmit" @click="toCash" :disabled='submitStatus' :loading='submitStatus'>确认提现</u-button>
|
<u-button size="normal" type="success" v-if="isSubmit" @click="toCash" :disabled='submitStatus' :loading='submitStatus'>确认提现</u-button>
|
||||||
@@ -75,7 +90,8 @@
|
|||||||
isError: false, // 当提现金额大于可用余额 显示错误提示
|
isError: false, // 当提现金额大于可用余额 显示错误提示
|
||||||
isSubmit: false, // 提现点击
|
isSubmit: false, // 提现点击
|
||||||
money: '', // 用户输入的提现金额
|
money: '', // 用户输入的提现金额
|
||||||
submitStatus: false
|
submitStatus: false,
|
||||||
|
maxMoney: 0,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
@@ -137,8 +153,11 @@
|
|||||||
// 获取我的余额信息
|
// 获取我的余额信息
|
||||||
// 获取用户的可用余额
|
// 获取用户的可用余额
|
||||||
this.$u.api.userInfo().then(res => {
|
this.$u.api.userInfo().then(res => {
|
||||||
this.user = res.data
|
this.user = res.data;
|
||||||
console.log(this.user);
|
|
||||||
|
//this.maxMoney = Math.floor(this.user.balance).toFixed(2) - Math.floor(this.user.balance * this.tocashMoneyRate / 100).toFixed(2) * 100 / 100;
|
||||||
|
this.maxMoney = (this.user.balance.toFixed(2) - (this.user.balance.toFixed(2) * (this.tocashMoneyRate / 100)).toFixed(2)).toFixed(2);
|
||||||
|
//console.log(this.user);
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
// 去提现
|
// 去提现
|
||||||
@@ -192,7 +211,11 @@
|
|||||||
} else if (Number(this.money) < Number(this.tocashMoneyLow)) {
|
} else if (Number(this.money) < Number(this.tocashMoneyLow)) {
|
||||||
this.isError = false
|
this.isError = false
|
||||||
this.isSubmit = false
|
this.isSubmit = false
|
||||||
} else {
|
} else if (Number(this.money) > Number(this.maxMoney)) {
|
||||||
|
this.isError = true
|
||||||
|
this.isSubmit = false
|
||||||
|
}
|
||||||
|
else {
|
||||||
this.isError = false
|
this.isError = false
|
||||||
this.isSubmit = true
|
this.isSubmit = true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -174,7 +174,7 @@
|
|||||||
{ field: 'createTime', title: '创建时间', width: 130, sort: false },
|
{ field: 'createTime', title: '创建时间', width: 130, sort: false },
|
||||||
{ field: 'updateTime', title: '更新时间', width: 130, sort: false },
|
{ field: 'updateTime', title: '更新时间', width: 130, sort: false },
|
||||||
{ width: 120, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsUserTocash-tableBox-bar' },
|
{ width: 120, align: 'center', title: '操作', fixed: 'right', toolbar: '#LAY-app-CoreCmsUserTocash-tableBox-bar' },
|
||||||
{ field: 'message', title: '反馈信息', width: 130, sort: false },
|
{ field: 'message', title: '反馈信息', sort: false },
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user