From 5c7b41448b2852a6cf48d12e2497be118205c9da Mon Sep 17 00:00:00 2001 From: Wik-T <812952667@qq.com> Date: Thu, 11 May 2023 14:07:39 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E7=BB=91=E5=AE=9A=E6=A1=8C?= =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD=202.=E6=96=B0=E5=A2=9E=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BB=93=E7=AE=97=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Utils/Api.js | 34 +- pages.json | 56 +- .../merchant-details/merchant-details.vue | 67 +- .../merchant-incoming-parts.vue | 2 +- .../merchant-management.vue | 2 +- .../review-Settlement/review-Settlement.vue | 153 +++ pages/index/salesOrderList/salesOrderList.vue | 6 +- .../settlement_details/settlement_details.vue | 266 +++++ pages/index/table_CodeList/table_CodeList.vue | 241 +++++ .../updateSettlement/updateSettlement.vue | 935 ++++++++++++++++++ pages/tabBar/home/home.vue | 14 + pages/welcome/welcome.vue | 2 +- unpackage/dist/build/h5/index.html | 2 +- 13 files changed, 1746 insertions(+), 34 deletions(-) create mode 100644 pages/index/review-Settlement/review-Settlement.vue create mode 100644 pages/index/settlement_details/settlement_details.vue create mode 100644 pages/index/table_CodeList/table_CodeList.vue create mode 100644 pages/index/updateSettlement/updateSettlement.vue diff --git a/Utils/Api.js b/Utils/Api.js index 12c1c3a..85731c1 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -103,6 +103,34 @@ export const getStoreDetailById = params => { export const configStore = params => { return POST('POST', `${base}/store/configStore`, params).then(res => res.data); } +//修改结算信息 +export const createApplyUpdateSettle = params => { + return POST('POST', `${base}/merSettleAcct/createApplyUpdateSettle`, params).then(res => res.data); +} +//查询商户最新申请修改 +export const getLastApplyByMer = params => { + return POST('GET', `${base}/merSettleAcct/getLastApplyByMer`, params).then(res => res.data); +} +//查询商户修改结算申请列表 +export const getAuditList = params => { + return POST('GET', `${base}/audit/getAuditList`, params).then(res => res.data); +} +//通过审核 +export const approve = params => { + return POST('POST', `${base}/audit/approve`, params).then(res => res.data); +} +//驳回审核 +export const reject = params => { + return POST('POST', `${base}/audit/reject`, params).then(res => res.data); +} +//审核详情 +export const getAuditDetail = params => { + return POST('GET', `${base}/audit/getAuditDetail`, params).then(res => res.data); +} + + + + // ---------- 设备 ---------- //查询设备列表 @@ -215,8 +243,8 @@ export const getLedgerReceiverList = params => { //分账解绑接收方申请 export const merLedgerReceiverDelApply = params => { return POST('POST', `${base}/merLedger/merLedgerReceiverDelApply`, params).then(res => res.data); -} -//查询接收方详情 +} +//查询接收方详情 export const getLedgerReceiverById = params => { return POST('GET', `${base}/merLedger/getLedgerReceiverById`, params).then(res => res.data); -} +} \ No newline at end of file diff --git a/pages.json b/pages.json index 6383271..706fd87 100644 --- a/pages.json +++ b/pages.json @@ -317,7 +317,7 @@ }, { "path": "pages/index/bindMerchants/bindMerchants", "style": { - "navigationBarTitleText": "绑定商户", + "navigationBarTitleText": "绑定接收方", "navigationBarTextStyle": "white", "enablePullDownRefresh": false, "app-plus": { @@ -329,7 +329,7 @@ }, { "path": "pages/index/bindDividedMerchant/bindDividedMerchant", "style": { - "navigationBarTitleText": "绑定分账商户", + "navigationBarTitleText": "绑定分账接收方", "navigationBarTextStyle": "white", "enablePullDownRefresh": false, "app-plus": { @@ -362,8 +362,58 @@ } } + }, { + "path": "pages/index/updateSettlement/updateSettlement", + "style": { + "navigationBarTitleText": "修改结算信息", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/review-Settlement/review-Settlement", + "style": { + "navigationBarTitleText": "结算信息", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + }, { + "path": "pages/index/settlement_details/settlement_details", + "style": { + "navigationBarTitleText": "结算详情", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + } - ], + ,{ + "path" : "pages/index/table_CodeList/table_CodeList", + "style" : + { + "navigationBarTitleText": "分配桌码", + "navigationBarTextStyle": "white", + "enablePullDownRefresh": false, + "app-plus": { + "titleNView": false, //禁用原生导航栏 + "softinputNavBar": "none" + } + } + + } + ], "subpackages": [{ "root": "subPages", diff --git a/pages/index/merchant-details/merchant-details.vue b/pages/index/merchant-details/merchant-details.vue index 160f777..79374bc 100644 --- a/pages/index/merchant-details/merchant-details.vue +++ b/pages/index/merchant-details/merchant-details.vue @@ -28,7 +28,7 @@ 联系人 - - + {{merDesInfo.account.userName}} 身份证号 @@ -36,12 +36,13 @@ 银行卡号 - - + {{merDesInfo.merSettleAcct.bankCardNo}} 所属银行 - - + {{merDesInfo.merSettleAcct.bankName}} + @@ -60,16 +61,16 @@ 编辑中 - - - 审核中 - - - 审核失败 - - - 停用 - + + + 审核中 + + + 审核失败 + + + 停用 + @@ -83,8 +84,8 @@ {{item.storeRegion.address}} - - + + @@ -92,6 +93,7 @@ + 修改结算 @@ -183,12 +185,18 @@ uni.navigateTo({ url: '../serviceBuild/serviceBuild?storeid=' + item + '&type=' + items }) - }, - //跳转绑定二维码 - jumpBindScan(item, items) { - uni.navigateTo({ - url: '../bindScan/bindScan?storeid=' + item + '&type=' + items - }) + }, + //更换结算信息 + updateFigMerBasis() { + uni.navigateTo({ + url: '/pages/index/updateSettlement/updateSettlement?id=' + this.merid + }) + }, + //跳转绑定二维码 + jumpBindScan(item, items) { + uni.navigateTo({ + url: '../bindScan/bindScan?storeid=' + item + '&type=' + items + }) } } } @@ -240,7 +248,22 @@ padding: 0px; } + .subbtn { + color: #FFFFFF; + background-color: #0083f5; + width: 90%; + margin-left: 5%; + margin-top: 80rpx; + margin-bottom: 50rpx; + height: 90rpx; + display: flex; + justify-content: center; + align-items: center; + border-radius: 10rpx; + font-size: 30rpx; + } + .lin10 { height: 10px; } - + \ No newline at end of file diff --git a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue index 83977f0..1fbcf1d 100644 --- a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue +++ b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue @@ -485,7 +485,7 @@ 所属支行 - diff --git a/pages/index/merchant-management/merchant-management.vue b/pages/index/merchant-management/merchant-management.vue index 6e9a309..9aa0ac2 100644 --- a/pages/index/merchant-management/merchant-management.vue +++ b/pages/index/merchant-management/merchant-management.vue @@ -34,7 +34,7 @@ - + diff --git a/pages/index/review-Settlement/review-Settlement.vue b/pages/index/review-Settlement/review-Settlement.vue new file mode 100644 index 0000000..29b7700 --- /dev/null +++ b/pages/index/review-Settlement/review-Settlement.vue @@ -0,0 +1,153 @@ + + + + + \ No newline at end of file diff --git a/pages/index/salesOrderList/salesOrderList.vue b/pages/index/salesOrderList/salesOrderList.vue index bfa2795..4a3d464 100644 --- a/pages/index/salesOrderList/salesOrderList.vue +++ b/pages/index/salesOrderList/salesOrderList.vue @@ -66,7 +66,8 @@ ], //状态 pageNum: 1, pagesize: 15, - goodtyid: 2, //当前状态 + goodtyid: 2, //当前状态 + isLoadMore: false, //是否加载中 serviceList: [] //设备列表˚ } }, @@ -97,7 +98,8 @@ methods: { //切换id switchid(item) { - this.goodtyid = item.id; + this.goodtyid = item.id; + this.pageNum = 1; this.serviceList = []; this.getOrderList(); }, diff --git a/pages/index/settlement_details/settlement_details.vue b/pages/index/settlement_details/settlement_details.vue new file mode 100644 index 0000000..24443a7 --- /dev/null +++ b/pages/index/settlement_details/settlement_details.vue @@ -0,0 +1,266 @@ + + + + + \ No newline at end of file diff --git a/pages/index/table_CodeList/table_CodeList.vue b/pages/index/table_CodeList/table_CodeList.vue new file mode 100644 index 0000000..8caaff4 --- /dev/null +++ b/pages/index/table_CodeList/table_CodeList.vue @@ -0,0 +1,241 @@ + + + + + diff --git a/pages/index/updateSettlement/updateSettlement.vue b/pages/index/updateSettlement/updateSettlement.vue new file mode 100644 index 0000000..2f99293 --- /dev/null +++ b/pages/index/updateSettlement/updateSettlement.vue @@ -0,0 +1,935 @@ + + + + + \ No newline at end of file diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue index 758cdd2..b94c698 100644 --- a/pages/tabBar/home/home.vue +++ b/pages/tabBar/home/home.vue @@ -9,6 +9,10 @@ {{userInfo.mer.merAbbreviate}} + + + {{userInfo.agent.name}} + {{userInfo.store.name}} @@ -143,6 +147,16 @@ } ] return; + } + //代理商 + if (this.userInfo.secUser.objectType == 2) { + this.funcList = [{ + title: '结算审核', + url: '../../index/review-Settlement/review-Settlement', + img: '../../../static/img/home1.png' + } + ] + return; } }, diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue index cf3893c..8565a0a 100644 --- a/pages/welcome/welcome.vue +++ b/pages/welcome/welcome.vue @@ -71,7 +71,7 @@ }, jumpcdx() { location.href = - 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://gratia-pay.dctpay.com/cweb&response_type=code&scope=snsapi_base#wechat_redirect'; + 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://pay.dctpay.com/cweb&response_type=code&scope=snsapi_base#wechat_redirect'; }, } } diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html index 5a88e71..a72f995 100644 --- a/unpackage/dist/build/h5/index.html +++ b/unpackage/dist/build/h5/index.html @@ -1,2 +1,2 @@ 惠支付
\ No newline at end of file + document.write('')
\ No newline at end of file