diff --git a/common/api/bill.js b/common/api/bill.js
new file mode 100644
index 0000000..14301f2
--- /dev/null
+++ b/common/api/bill.js
@@ -0,0 +1,22 @@
+import { coreRequest } from '@/common/request'
+import url, { host } from "./url"
+
+// 账单列表
+export const queryBSettleillList = (data = {})=> {
+ return coreRequest(url.queryBSettleillList, data, {}, 'get')
+}
+
+// 获取账单详情
+export const getInfoBySettleBillNo = (data = {})=> {
+ return coreRequest(url.getInfoBySettleBillNo, data, {}, 'get')
+}
+
+// 获取微信支付二维码
+export const getWxPayQrCode = (data = {})=> {
+ return coreRequest(url.getWxPayQrCode, data, {}, 'get')
+}
+
+// 账单-唤起微信立即支付
+export const sumbitWxPay = (data = {})=> {
+ return coreRequest(url.sumbitWxPay, data, {})
+}
diff --git a/common/api/index.js b/common/api/index.js
index 4e70749..6ff4e50 100644
--- a/common/api/index.js
+++ b/common/api/index.js
@@ -2,6 +2,8 @@ import apiUrls, { host } from "./url"
export * from "./user"
export * from "./common"
export * from "./order"
+export * from "./bill"
+
export {
apiUrls,
diff --git a/common/api/url.js b/common/api/url.js
index 88afab8..5b7d9e1 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -63,6 +63,11 @@ export default {
getWareHouseInNo: `/emis/common/getWareHouseInNo`, // 获取新进仓单号
getValidExchangeRate: `/emis/emisExchangeRate/getValidExchangeRate`, // 获取汇率
+ queryBSettleillList: `/emis/emisSettleBill/list`, // 账单列表
+ getInfoBySettleBillNo: `/emis/emisSettleBill/getInfoBySettleBillNo`, // 获取账单详情
+ getWxPayQrCode: `/emis/emisSettleBill/getWxPayQrCode`, // 获取微信支付二维码
+ sumbitWxPay: `/emis/emisSettleBill/sumbitWxPay`, // 账单-唤起微信立即支付
+
getWarehouseInInfo: `/emis/emisWarehouseIn/getWarehouseInInfo`, // 获取进仓单详情
registerWarehouseInInfo: `/emis/emisWarehouseInBatch/registerWarehouseInInfo`, // 收货入仓登记
getWarehouseInList: `/emis/emisWarehouseIn/listSimple`, // 进仓单列表
diff --git a/common/enum.js b/common/enum.js
index d9f7686..c1572b3 100644
--- a/common/enum.js
+++ b/common/enum.js
@@ -91,6 +91,7 @@ const dealBtnMap = {
woDeRenWu: { title: '我的任务', subTitle: "", icon: getCdnUrl(`mine/kehu.png`), url: 'tabBar/order/order', code: authCodeEnum.woDeRenWu },
jiTiMingXi: { title: '计提明细', subTitle: "", icon: getCdnUrl(`mine/jitmx.png`), url: 'user/withdraw', code: authCodeEnum.jiTiMingXi },
yeWuTongJi: { title: '业务统计', subTitle: "", icon: getCdnUrl(`mine/shj.png`), url: 'user/bunsStatic', code: authCodeEnum.yeWuTongJi },
+ daiHuiKuan: { title: '待回款', subTitle: "", icon: getCdnUrl(`mine/jitmx.png`), url: 'bill/list', code: authCodeEnum.daiHuiKuan },
mianDanDayin: { title: '面单打印', subTitle: "", icon: getCdnUrl(`home/mdbuda.png`), url: 'print/courierNote', code: authCodeEnum.mianDanDaYin },
kuaiJianGenZong: { title: '快件跟踪', subTitle: "", icon: getCdnUrl(`home/kdchxun.png`), url: 'post/query', code: authCodeEnum.kuaiJianGenZong },
heBaoScan: { title: '合包扫描', subTitle: "", icon: getCdnUrl(`home/hebaosm.png`), url: 'tms/coPackingScanning', code: authCodeEnum.heBaoScan },
diff --git a/common/manageServer.js b/common/manageServer.js
index fde0996..86ee871 100644
--- a/common/manageServer.js
+++ b/common/manageServer.js
@@ -4,17 +4,11 @@ import { setSessionXToken, getSessionXToken } from "@/session"
import { textEncoder, textDecoder } from "./util"
import { getCurrentAppInfo } from "@/common/appUpdate"
-var _appVersion;
+
+let _appVersion="1.0.0"
// getCurrentAppInfo().then(res=> {
// _appVersion = res._appVersion
// })
-const init = async () => {
- const { getCurrentAppInfo } = await import("@/common/appUpdate");
- getCurrentAppInfo().then((res) => {
- _appVersion = res._appVersion;
- });
-};
-init();
const getCommonReqData = ()=> {
const xToken = getSessionXToken()
diff --git a/pages.json b/pages.json
index 5c5b7b7..4a3cca3 100644
--- a/pages.json
+++ b/pages.json
@@ -297,6 +297,18 @@
"style": {
"navigationBarTitleText": "进仓单列表"
}
+ },
+ {
+ "path": "pages/bill/list",
+ "style": {
+ "navigationBarTitleText": "账单列表"
+ }
+ },
+ {
+ "path": "pages/bill/detail",
+ "style": {
+ "navigationBarTitleText": "账单明细"
+ }
}
],
"subPackages": [{
diff --git a/pages/bill/detail.vue b/pages/bill/detail.vue
new file mode 100644
index 0000000..2949ca5
--- /dev/null
+++ b/pages/bill/detail.vue
@@ -0,0 +1,310 @@
+
+
+
+
+
+
+
+
+ 账单编号：
+ {{info.settleBillNo}}
+
+
+ 账单日期：
+ {{info.createTime}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 支付状态：
+
+ 未付款
+ 已付款
+ 部分付款
+
+
+
+
+
+
+
+ 待支付：
+
+
+
+
+
+
+
+ 备注：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/bill/list.vue b/pages/bill/list.vue
new file mode 100644
index 0000000..9313510
--- /dev/null
+++ b/pages/bill/list.vue
@@ -0,0 +1,294 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 账单号:{{item.settleBillNo}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 去付款
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 430822a..494d672 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -50,7 +50,7 @@
-
+
@@ -131,7 +131,7 @@
let { commStat } = this.staticInfo
let list = [
{ title: '计提预估', subTitle: commStat.estMoney, icon: this.getCdnUrl(`home/jityugu.png`), url: '', code: authCodeEnum.jiTiYuGu },
- { title: '待回款', subTitle: commStat.waitPay, icon: this.getCdnUrl(`home/daihuikuan.png`), url: '', code: authCodeEnum.daiHuiKuan }
+ { title: '待回款', subTitle: commStat.waitPay, icon: this.getCdnUrl(`home/daihuikuan.png`), url: 'bill/list', code: authCodeEnum.daiHuiKuan }
]
list = getAuthList({ list, _thisPage: this })
return list
diff --git a/pages/tabBar/mine/mine.vue b/pages/tabBar/mine/mine.vue
index f613e33..7ecf791 100644
--- a/pages/tabBar/mine/mine.vue
+++ b/pages/tabBar/mine/mine.vue
@@ -51,7 +51,7 @@
-
+
@@ -160,7 +160,7 @@
let list = [
{...dealBtnMap.woDeRenWu},
{...dealBtnMap.jiTiMingXi},
- {...dealBtnMap.woDeErWeiMa},
+ {...dealBtnMap.daiHuiKuan},
{...dealBtnMap.yeWuTongJi},
]
list = getAuthList({ list, _thisPage: this })