From 4620304d80bbc888bd5aa9b3a9350c7a0a053200 Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 26 Jun 2025 08:26:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=9B=9E=E6=AC=BE=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/api/index.js | 2 ++ common/api/url.js | 5 +++++ common/enum.js | 1 + common/manageServer.js | 8 ++++---- pages.json | 12 ++++++++++++ pages/tabBar/home/home.vue | 4 ++-- pages/tabBar/mine/mine.vue | 4 ++-- 7 files changed, 28 insertions(+), 8 deletions(-) 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 13bc841..dc9ca33 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 a00b163..d3ff03a 100644 --- a/common/manageServer.js +++ b/common/manageServer.js @@ -4,10 +4,10 @@ import { setSessionXToken, getSessionXToken } from "@/session" import { textEncoder, textDecoder } from "./util" import { getCurrentAppInfo } from "@/common/appUpdate" -let _appVersion -getCurrentAppInfo().then(res=> { - _appVersion = res._appVersion -}) +let _appVersion="1.0.0" +// getCurrentAppInfo().then(res=> { +// _appVersion = res._appVersion +// }) 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/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 })