zhangdan 3 år sedan
förälder
incheckning
04238092cd

+ 2 - 3
src/api/merchant.js

@@ -31,10 +31,9 @@ export const queryTradeFlowPage = (params) => {
   })
 }
 
-export const merchantCashOutDetail = (params) => {
+export const merchantCashOutDetail = params => {
   return axios({
-    url: '/merchant/queryMerchantAccount',
-    data: {},
+    url: `/shelf/findShelfSettleRuleByShelfSn/${params.shelfSn}`,
     method: 'get'
   })
 }

+ 2 - 2
src/views/numsGoodsShelves/settlementManagement/unSettlementDetail.vue

@@ -32,7 +32,7 @@
                 <span>{{ total && toThousands(total.freezeAmount,2) }}</span>
               </a-descriptions-item>
               <a-descriptions-item label="可用额度">
-                <span>{{ total && toThousands(total.activeAmount,2) }}</span>
+                <span>{{ total && toThousands(total.usableAmount,2) }}</span>
               </a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
@@ -177,7 +177,7 @@ export default {
     getPageInfo () {
       this.spinning = true
       const info = JSON.parse(sessionStorage.getItem('settlementDetail'))
-      merchantCashOutDetail({}).then(res => {
+      merchantCashOutDetail({shelfSn:this.$route.params.shelfSn}).then(res => {
         console.log(res, info, '===========')
         if (res.status == 200) {
           this.total = res.data