待回款列表

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,

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`, // 进仓单列表

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 },

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()

pages.json

@@ -297,6 +297,18 @@
 			"style": {
 				"navigationBarTitleText": "进仓单列表"
 			}
+		},
+		{
+			"path": "pages/bill/list",
+			"style": {
+				"navigationBarTitleText": "账单列表"
+			}
+		},
+		{
+			"path": "pages/bill/detail",
+			"style": {
+				"navigationBarTitleText": "账单明细"
+			}
 		}
 	],
 	"subPackages": [{

pages/tabBar/home/home.vue

@@ -50,7 +50,7 @@
 							<u-col v-for="(mbItem, mIndex) in staticDataList" :span="6" 
 								:custom-style="'border-right: 2rpx solid rgba(255,255,255,0.5);' + (mIndex+1 == staticDataList.length ?'border-right:0;': '')"
 							>
-								<u-row align="center" justify="center">
+								<u-row align="center" justify="center" @click="goto(mbItem.url)">
 									<image mode="aspectFit" style="width: 92rpx;height: 76rpx;" :src="mbItem.icon"/>
 									<view class="neirong">
 										<u-text size="24rpx" color="#fff" :text="mbItem.title"></u-text>
@@ -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

pages/tabBar/mine/mine.vue

@@ -51,7 +51,7 @@
 							<u-col v-for="(item, index) in mainBtnlist" span="3" align="center" custom-style="padding: 30rpx 0;"
 								@click="goto(item.url)"
 							>
-								<u-image height="60" width="60" :src="item.icon" custom-style="margin-left: auto;margin-right: auto;"></u-image>
+								<u-image height="60" width="60" :src="item.icon"  custom-style="margin-left: auto;margin-right: auto;"></u-image>
 								<u-text :text="item.title" margin="20rpx 0 0 0" align="center" color="#666" size="26"></u-text>
 							</u-col>
 						</u-row>
@@ -160,7 +160,7 @@
 				let list =  [
 					{...dealBtnMap.woDeRenWu},
 					{...dealBtnMap.jiTiMingXi},
-					{...dealBtnMap.woDeErWeiMa},
+					{...dealBtnMap.daiHuiKuan},
 					{...dealBtnMap.yeWuTongJi},
 				]
 				list = getAuthList({ list, _thisPage: this })