到账金额修改、到账比例添加

src/views/amount/index.vue

@@ -48,12 +48,12 @@
         </van-row>
         <van-row class="arrival" type="flex" justify="space-around">
           <van-col span="12" class="left">到账金额</van-col>
-          <van-col span="12" class="right">￥{{ Number(money -  proportion * money).toFixed(2) }}元</van-col>
+          <van-col span="12" class="right">￥{{ (Number((100 - (100 -  proportion * 100)) * money) / 100 ).toFixed(2) }}元</van-col>
+        </van-row>
+        <van-row class="tip">
+          服务费 ￥{{ (Number((100 - proportion * 100) * money) / 100 ).toFixed(2) || 0.00}}元 <br>
+          费率 {{ Number(100 - proportion * 100).toFixed(2)  || 0.00}}%
         </van-row>
-        <!-- <van-row class="tip">
-          服务费 ￥{{ Number(proportion * money).toFixed(2) || 0}}元 <br>
-          费率 {{ proportion*100|| 0}}%
-        </van-row> -->
         <van-button   type="danger" @click="recharge"
           >立即充值</van-button
         >
@@ -66,7 +66,6 @@
           <van-field
             readonly
             label=" "
-            
             placeholder="请输入充值金额（ 元 ）"
             label-width="10px"
             clickable
@@ -99,12 +98,12 @@
       </van-row>
       <van-row class="arrival" type="flex" justify="space-around">
         <van-col span="12" class="left">到账金额</van-col>
-        <van-col span="12" class="right">￥{{ Number(money -  proportion * money).toFixed(2) }}元</van-col>
+        <van-col span="12" class="right">￥{{ (Number((100 - (100 -  proportion * 100)) * money) / 100 ).toFixed(2) }}元</van-col>
+      </van-row>
+      <van-row class="tip">
+         服务费 ￥{{ (Number((100 - proportion * 100) * money) / 100 ).toFixed(2) || 0.00}}元 <br>
+          费率 {{ (100 - proportion * 100) .toFixed(2)  || 0.00}}%
       </van-row>
-      <!-- <van-row class="tip">
-        服务费 ￥{{ Number(proportion * money).toFixed(2) || 0}}元 <br>
-        费率 {{ proportion*100|| 0}}%
-      </van-row> -->
       <van-button   type="danger" @click="recharge"
         >立即充值</van-button
       >
@@ -232,7 +231,6 @@ export default {
     } else if(this.$route.query.backOrder) {
       this.title = "消费支付"
       this.order = false
-      console.log(this.$route.query.backOrder)
       const data = JSON.parse(this.$route.query.backOrder)
       var money = data.money
       if(money.toString().indexOf(".")<1){
@@ -272,10 +270,13 @@ export default {
         timeout: 10000,
       }).then(res =>{
         if(res.data?.data?.id){
-          console.log(res)
           //axios.get(`/dxtop/staff/one?id=0001T110000000002HBL`).then(res2 => { //测试
           axios.get(`/dxtop/staff/one?id=${res.data.data.id}`).then(res2 => { //验证充值信息是否同步
-            console.log(res2)
+            if(res2.data.data.proportion){
+              this.proportion = res2.data.data.proportion
+            }else{
+              this.proportion = 1
+            }
             if(res2.data.data){
               localStorage.setItem("user_wt", res.data.data.id)
               // localStorage.setItem("user_wt", "0001T110000000002HBL") //测试
@@ -800,7 +801,7 @@ export default {
   //交易记录
   .record{
     margin-top:10px;
-    padding: 20px 10px 20px 10px;
+    padding: 20px 10px 120px 10px;
     background-color: #fff;
     height:100%;
     .recordTitle{