diff --git a/common/api/bill.js b/common/api/bill.js index 14301f2..21d85cb 100644 --- a/common/api/bill.js +++ b/common/api/bill.js @@ -11,6 +11,16 @@ 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 1cb8c88..591b49b 100644 --- a/common/api/url.js +++ b/common/api/url.js @@ -56,6 +56,10 @@ export default { scanCheckBillCode: `/oms2c/emisWaybill/scanCheckBillCode`, // 扫码下单寄件-checke queryBSettleillList: `/oms2c/emisSettleBill/listSimple`, // 账单列表 getInfoBySettleBillNo: `/oms2c/emisSettleBill/getInfoBySettleBillNo`, // 获取账单详情 + + getSimpleInfoBySettleBillNo: `/oms2c/emisSettleBill/getSimpleInfoBySettleBillNo`, // 获取简化账单详情 + getSubBillListBySettleBillNo: `/oms2c/emisSettleBill/listSubBill`, // 获取账单子账单明细 + getWxPayQrCode: `/oms2c/emisSettleBill/getWxPayQrCode`, // 获取微信支付二维码 sumbitWxPay: `/oms2c/emisSettleBill/sumbitWxPay`, // 账单-唤起微信立即支付 diff --git a/components/tpx-scroll-view/tpx-scroll-view.vue b/components/tpx-scroll-view/tpx-scroll-view.vue index 01f554c..ed573a6 100644 --- a/components/tpx-scroll-view/tpx-scroll-view.vue +++ b/components/tpx-scroll-view/tpx-scroll-view.vue @@ -80,6 +80,12 @@ return 'dfl' } }, + pageSize: { + default () { + return 20 + } + }, + maxHeight: { default () { return '' @@ -91,7 +97,7 @@ reqLoading: false, page: { // 分页参数 pageNum: 1, - pageSize: 20, + pageSize: this.pageSize, }, showLoadMore: false, // 是否显示加载更多的loading loadedAll: false, // 是否加载了所有数据 diff --git a/manifest.json b/manifest.json index 94217f6..9bc4277 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "探路速运", - "appid" : "__UNI__21F858F", + "appid" : "__UNI__BAEB38C", "description" : "探路速运", "versionName" : "1.0.0", "versionCode" : "100", @@ -98,6 +98,18 @@ "appkey_ios" : "aatodo", "appkey_android" : "b7feefb9882f1d0953fbeffb1cef8aec" } + }, + "share" : { + "weixin" : { + "appid" : "wx79c800bfadd5b081", + "UniversalLinks" : "" + } + }, + "oauth" : { + "weixin" : { + "appid" : "wx79c800bfadd5b081", + "UniversalLinks" : "" + } } }, "orientation" : [ "portrait-primary" ], diff --git a/pages/bill/detail.vue b/pages/bill/detail.vue index 1e8603e..04d322f 100644 --- a/pages/bill/detail.vue +++ b/pages/bill/detail.vue @@ -1,11 +1,9 @@