Browse Source

修改bug

chenrui 5 months ago
parent
commit
f7e8ef2c74
2 changed files with 3 additions and 12 deletions
  1. 1 1
      public/version.json
  2. 2 11
      src/views/numsGoodsShelves/withdrawalManagementNew/list.vue

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1735978177382
+  "version": 1736211702938
 }

+ 2 - 11
src/views/numsGoodsShelves/withdrawalManagementNew/list.vue

@@ -20,7 +20,7 @@
       <div style="margin:10px 0">
         <div style="margin:10px 0">
           <p>可提现金额:<strong style="color:#ed1c24;">{{ pageInfo&&(pageInfo.activeAmount||pageInfo.activeAmount==0)?toThousands(pageInfo.activeAmount):'--' }}</strong></p>
-          <p>账户总金额:{{ (totalAmount||totalAmount==0)?toThousands(totalAmount):'--' }}(包含到账金额:<span>{{ (accountAmount||accountAmount==0)?toThousands(accountAmount):'--' }}</span>,在途金额:{{ pageInfo&&(pageInfo.floatAmount||pageInfo.floatAmount==0)?toThousands(pageInfo.floatAmount):'--' }})</p>
+          <p>账户总金额:{{ pageInfo&&(pageInfo.amount||pageInfo.amount==0)?toThousands(pageInfo.amount):'--' }}(包含到账金额:<span>{{ pageInfo&&(pageInfo.dzAmount||pageInfo.dzAmount==0)?toThousands(pageInfo.dzAmount):'--' }}</span>,在途金额:{{ pageInfo&&(pageInfo.floatAmount||pageInfo.floatAmount==0)?toThousands(pageInfo.floatAmount):'--' }})</p>
           <p v-if="pageInfo&&pageInfo.freezeRuleAmount">保证金:{{ toThousands(pageInfo.freezeRuleAmount) }}(已冻结金额:{{ pageInfo&&(pageInfo.freezeAmount||pageInfo.freezeAmount==0)?toThousands(pageInfo.freezeAmount):'--' }})</p>
           <p style="margin-top:10px;">(提示:①提现手续费为0.5元/笔;②资金到账周期:线上支付订单出库后自然日+10天;③订单被审核不通过或修理厂取消订单后,将在1-3个工作日原路返回对应金额)</p>
         </div>
@@ -59,6 +59,7 @@ import { STable } from '@/components'
 import applyWithdrawal from './applyWithdrawal.vue'
 import billFlowModal from './billFlowModal.vue'
 import rangeDate from '@/views/common/rangeDate.vue'
+import Decimal from 'decimal.js'
 // 接口
 import { queryMerchantCashOutPage, merchantCashOutDetail } from '@/api/merchantNew'
 export default {
@@ -116,16 +117,6 @@ export default {
       }
     }
   },
-  computed: {
-    totalAmount () {
-      const totalNum = this.pageInfo ? (this.pageInfo.activeAmount * 100 + this.pageInfo.freezeAmount * 100 + this.pageInfo.floatAmount * 100) / 100 : 0
-      return totalNum
-    },
-    accountAmount () {
-      const accountNum = this.pageInfo ? (this.pageInfo.activeAmount * 100 + this.pageInfo.freezeAmount * 100) / 100 : 0
-      return accountNum
-    }
-  },
   methods: {
     // 时间改变
     dateChange (date) {