diff --git a/common/api/bill.js b/common/api/bill.js index 14301f2..21df12a 100644 --- a/common/api/bill.js +++ b/common/api/bill.js @@ -11,6 +11,14 @@ export const getInfoBySettleBillNo = (data = {})=> { return coreRequest(url.getInfoBySettleBillNo, data, {}, 'get') } +export const getSimpleInfoBySettleBillNo = (data = {})=> { + return coreRequest(url.getSimpleInfoBySettleBillNo, data, {}, 'get') +} + +export const getSubBillListBySettleBillNo = (data = {})=> { + return coreRequest(url.getSubBillListBySettleBillNo, data, {}, 'get') +} + // 获取微信支付二维码 export const getWxPayQrCode = (data = {})=> { return coreRequest(url.getWxPayQrCode, data, {}, 'get') diff --git a/common/api/url.js b/common/api/url.js index 5b7d9e1..432e3b5 100644 --- a/common/api/url.js +++ b/common/api/url.js @@ -65,6 +65,9 @@ export default { queryBSettleillList: `/emis/emisSettleBill/list`, // 账单列表 getInfoBySettleBillNo: `/emis/emisSettleBill/getInfoBySettleBillNo`, // 获取账单详情 + getSimpleInfoBySettleBillNo: `/emis/emisSettleBill/getSimpleInfoBySettleBillNo`, // 获取简化账单详情 + getSubBillListBySettleBillNo: `/emis/emisSettleSubBill/list`, // 获取账单子账单明细 + // getSubBillListBySettleBillNo: `/emis/emisSettleSubBill/listSimple`, // 获取账单子账单明细 getWxPayQrCode: `/emis/emisSettleBill/getWxPayQrCode`, // 获取微信支付二维码 sumbitWxPay: `/emis/emisSettleBill/sumbitWxPay`, // 账单-唤起微信立即支付 diff --git a/common/env.js b/common/env.js index f14ff80..2611ca7 100644 --- a/common/env.js +++ b/common/env.js @@ -1,9 +1,9 @@ let envMap = { development: { - apiHost: 'https://api-emis.tanex56.com/api/bizsvr', - socketHost: 'wss://api-emis.tanex56.com/api/bizsvr', - // apiHost: 'http://47.102.220.189:58089/api/bizsvr', - // socketHost: 'ws://47.102.220.189:58089/api/bizsvr', + // apiHost: 'https://api-emis.tanex56.com/api/bizsvr', + // socketHost: 'wss://api-emis.tanex56.com/api/bizsvr', + apiHost: 'http://47.102.220.189:58089/api/bizsvr', + socketHost: 'ws://47.102.220.189:58089/api/bizsvr', }, production: { apiHost: 'https://api-emis.tanex56.com/api/bizsvr', diff --git a/components/tpx-scroll-view/tpx-scroll-view.vue b/components/tpx-scroll-view/tpx-scroll-view.vue index 01f554c..714de70 100644 --- a/components/tpx-scroll-view/tpx-scroll-view.vue +++ b/components/tpx-scroll-view/tpx-scroll-view.vue @@ -80,6 +80,11 @@ return 'dfl' } }, + pageSize: { + default () { + return 20 + } + }, maxHeight: { default () { return '' @@ -91,7 +96,7 @@ reqLoading: false, page: { // 分页参数 pageNum: 1, - pageSize: 20, + pageSize: this.pageSize, }, showLoadMore: false, // 是否显示加载更多的loading loadedAll: false, // 是否加载了所有数据 diff --git a/pages/bill/detail.vue b/pages/bill/detail.vue index d344df0..d2899c1 100644 --- a/pages/bill/detail.vue +++ b/pages/bill/detail.vue @@ -1,11 +1,9 @@