From 9c6881761223f4863f2470480d841ec83d3fd39e Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 29 Apr 2024 14:03:11 +0800
Subject: [PATCH] =?UTF-8?q?Fix(=E6=8F=90=E7=8E=B0):[#1202]=E6=8F=90?=
 =?UTF-8?q?=E7=8E=B0=E9=87=91=E9=A2=9D=E4=B8=8D=E5=BA=94=E8=AF=A5=E5=87=8F?=
 =?UTF-8?q?=E6=8E=89=E6=89=8B=E7=BB=AD=E8=B4=B9=EF=BC=8C=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E5=88=B0=E6=89=8B=E7=9A=84=E9=87=91=E9=A2=9D=E7=94=B1=E5=90=8E?=
 =?UTF-8?q?=E7=AB=AF=E8=AE=A1=E7=AE=97=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg_user/views/withdrawal.vue | 86 +++++++++++++++++------------------
 1 file changed, 41 insertions(+), 45 deletions(-)

diff --git a/pkg_user/views/withdrawal.vue b/pkg_user/views/withdrawal.vue
index d8cccb3..6b96855 100644
--- a/pkg_user/views/withdrawal.vue
+++ b/pkg_user/views/withdrawal.vue
@@ -21,15 +21,18 @@
       <view class="item acea-row row-middle">
         <view class="dollar bold">￥</view>
         <view class="input">
-          <input
-              :placeholder="'最低提现金额' + minPrice"
-              placeholder-style="font-size:28rpx"
-              v-model="amout"
-              :maxlength='maxlength'
-              @blur="balanceInputBlur"
-              @input="balanceInputChange"
-              type="digit"
-              autofocus
+          <u--input
+            v-model="amout"
+            :placeholder="'最低提现金额' + minPrice"
+            :maxlength="-1"
+            :customStyle="{
+              'border': 0
+            }"
+            placeholder-style="font-size:28rpx"
+            type="digit"
+            autofocus
+            @blur="balanceInputBlur"
+            @input="balanceInputChange"
           />
         </view>
         <view class="withdraw-all-btn" @click="withdrawalAll">全部提现</view>
@@ -52,7 +55,8 @@
     <uni-popup ref="popup" type="bottom">
       <blPaymentPasswordInput hideTopBorder ref="secrity" @input="onInput" @confirm="onConfirm">
         <block slot='header' style='width: 100%;'>
-          <view style="font-size: 36rpx;color: #8B8F99;margin-top: 10rpx;">请输入支付密码</view>
+          <view style="font-size: 36rpx;color: #8B8F99;line-height: 80rpx;">请输入支付密码</view>
+          <view style="font-size: 28rpx;color: #999;margin-top: 20rpx;">手续费：{{ totalFee }}</view>
         </block>
         <block slot='middle'>
           <view class="" style="background-color: #fff;"></view>
@@ -66,7 +70,7 @@
 
 <script>
 import {mapGetters} from "vuex";
-import {getUserInfo, getMenuUser, bindingPhone, getBank, bankCardList, postCashInfo} from "@/api/user";
+import { getBank, bankCardList, postCashInfo } from "@/api/user";
 import NP from "number-precision";
 import uniPopup from '@/components/uni-popup/uni-popup.vue';
 import blPaymentPasswordInput from '@/components/blPaymentPasswordInput.vue';
@@ -80,7 +84,6 @@ export default {
       amout: "",
       minPrice: 0,
       banks: [],
-      maxlength: -1,
       commissionCount: 0, //可提现金额
       fee: 0, //手续费
       gdAmount: 0, //固定手续费
@@ -102,7 +105,7 @@ export default {
           if( 提现金额 < gdLimit ) sxf = gdAmount
           if( 提现金额 >= gdLimit ) sxf = 提现金额*fl
           */
-      return this.calculateSxf(this.amout);
+      return this.calculateSxf(this.amout)
     }
   },
   onLoad: function (e) {
@@ -140,8 +143,9 @@ export default {
         console.log("variable");
       }
       console.log("sxf:" + sxf);
-
-      return this.$force2Decimal(sxf);
+      // fix bug#1202
+      // 四舍五入，再保留两位小数
+      return (Math.round(sxf * 100) / 100).toFixed(2);
     },
     goCashRecord() {
       this.$yrouter.push('/pkg_user/views/withdrawalLog');
@@ -193,19 +197,24 @@ export default {
 
       return value
     },
-    balanceInputChange: function (e) {
-      var value = e.target.value;
-      this.amout = value
-      var v = this.clearNoNum(value)
+    balanceInputChange(value) {
+      let v = this.clearNoNum(value)
+      if (v > this.commissionCount) {
+        v = this.commissionCount
+      }
       setTimeout(() => {
         this.amout = v
       }, 0)
     },
-    balanceInputBlur: function (e) {
-      var value = e.target.value;
-
+    balanceInputBlur(value) {
       if (String(value).length == 0) {
         this.amout = 0
+        return
+      }
+      if (value > this.commissionCount) {
+        this.amout = this.commissionCount
+      } else {
+        this.amout = value
       }
     },
     openPwdInput() {
@@ -287,7 +296,6 @@ export default {
           });
     },
     confrimBtnClick: function () {
-      let that = this;
       if (!this.selectedBank) {
         this.$dialog.error("请选择提现银行卡");
         return;
@@ -338,32 +346,20 @@ export default {
     },
     withdrawalAll: function () {
       if (this.commissionCount) {
-        this.amout = this.commissionCount + "";
+        this.amout = this.commissionCount + ''
       }
     },
     getBank: function () {
-      let that = this;
       getBank().then(
-          res => {
-            that.banks = res.data.extractBank;
-            that.minPrice = res.data.minPrice;
-            that.commissionCount = this.$force2Decimal(res.data.commissionCount);
-            that.gdAmount = parseFloat(res.data.gdAmount);
-            that.gdLimit = parseFloat(res.data.gdLimit);
-            that.feeRate = parseFloat(res.data.fl);
-
-            //可提现金额去除手续费
-            if (that.commissionCount > 0) {
-              var sxf = that.calculateSxf(that.commissionCount);
-              console.log('手续费:' + sxf);
-              that.commissionCount = this.$force2Decimal(Math.max(0, (that.commissionCount - sxf)));
-              ;
-            }
-          },
-          function (err) {
-
-          }
-      );
+        res => {
+          this.banks = res.data.extractBank
+          this.minPrice = res.data.minPrice
+          this.commissionCount = this.$force2Decimal(res.data.commissionCount)
+          this.gdAmount = parseFloat(res.data.gdAmount)
+          this.gdLimit = parseFloat(res.data.gdLimit)
+          this.feeRate = parseFloat(res.data.fl)
+        }
+      )
     }
 
   }