zhangdan 3 年 前
コミット
8e5c056a86

+ 9 - 2
src/api/merchant.js

@@ -31,12 +31,19 @@ export const queryTradeFlowPage = (params) => {
   })
 }
 
-export const merchantCashOutDetail = params => {
+export const merchantCashOut = params => {
   return axios({
     url: `/shelf/findShelfSettleRuleByShelfSn/${params.shelfSn}`,
     method: 'get'
   })
 }
+export const merchantCashOutDetail = (params) => {
+  return axios({
+    url: '/merchant/queryMerchantAccount',
+    data: {},
+    method: 'get'
+  })
+}
 
 // 结算管理列表
 export const queryShelfSettleRulePage = (params) => {
@@ -89,4 +96,4 @@ export const queryOrderBillDetailCount = (params) => {
     data: params,
     method: 'post'
   })
-}
+}

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

@@ -91,7 +91,7 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { toThousands } from '@/libs/tools.js'
 import moment from 'moment'
-import { queryOrderBillDetailPage, queryOrderBillDetailCount, merchantCashOutDetail } from '@/api/merchant'
+import { queryOrderBillDetailPage, queryOrderBillDetailCount, merchantCashOut } from '@/api/merchant'
 export default {
   mixins: [commonMixin],
   components: { STable, VSelect, commonMixin },
@@ -177,7 +177,7 @@ export default {
     getPageInfo () {
       this.spinning = true
       const info = JSON.parse(sessionStorage.getItem('settlementDetail'))
-      merchantCashOutDetail({shelfSn:this.$route.params.shelfSn}).then(res => {
+      merchantCashOut({shelfSn:this.$route.params.shelfSn}).then(res => {
         console.log(res, info, '===========')
         if (res.status == 200) {
           this.total = res.data