diff --git a/pages/index/bindDividedMerchant/bindDividedMerchant.vue b/pages/index/bindDividedMerchant/bindDividedMerchant.vue index 00303ad..d21e16f 100644 --- a/pages/index/bindDividedMerchant/bindDividedMerchant.vue +++ b/pages/index/bindDividedMerchant/bindDividedMerchant.vue @@ -16,7 +16,8 @@ - {{ledgerReceiverApply.rejectReason}} + {{ledgerReceiverApply.rejectReason}} + @@ -32,7 +33,7 @@ placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" /> - + 合作协议 @@ -46,7 +47,7 @@ --> - + @@ -84,13 +85,14 @@ merLedgerId: '', //商户id typeId: '', //进入id 1 新建 2 查看 ledgerReceiverId: '', //接收方id - ledgerReceiverApply: '', //详情数据 + ledgerReceiverApply: '', //详情数据 + platformType: '' //渠道ID } }, onLoad(options) { this.merLedgerId = options.id; this.typeId = options.typeid; - + this.platformType = options.platformType; if (this.typeId == 2 || this.typeId == 3) { this.ledgerReceiverId = options.ledgerReceiverId; this.getLedgerReceiverById(); @@ -115,7 +117,7 @@ jumpMerchantlist() { if (this.typeId == 1) { uni.navigateTo({ - url: '/pages/index/ledgerReceiverList/ledgerReceiverList' + url: '/pages/index/ledgerReceiverList/ledgerReceiverList?platformType='+this.platformType }) } }, @@ -252,7 +254,7 @@ }); return; } - if (!this.entrustFilePath) { + if (!this.entrustFilePath && this.platformType == 1) { uni.showToast({ title: '请上传合作协议', icon: "none", diff --git a/pages/index/bindMerchants/bindMerchants.vue b/pages/index/bindMerchants/bindMerchants.vue index a93c91c..b6d43c6 100644 --- a/pages/index/bindMerchants/bindMerchants.vue +++ b/pages/index/bindMerchants/bindMerchants.vue @@ -17,8 +17,8 @@ {{item.createTime | timeFormat('yyyy-mm-dd')}} {{item.createTime | timeFormat('hh:mm')}} - - + + @@ -35,12 +35,14 @@ return { merchantList: [], //商户列表 merLedgerId: '', //开通分账ID - merId: '' //商户id + merId: '', //商户id + platformType: '' //渠道ID } }, onLoad(options) { this.merId = options.merId; this.merLedgerId = options.id; + this.platformType = options.platformType; }, onShow() { this.getLedgerReceiverListByMer(); @@ -50,7 +52,7 @@ getLedgerReceiverListByMer() { let datas = { merId: this.merId, - platformType: 1 + platformType: this.platformType } getLedgerReceiverListByMer(datas).then(res => { if (res.return_code == '000000' && res.return_data != null) { @@ -62,7 +64,7 @@ jumpBindMerchants(item, item1) { uni.navigateTo({ url: '/pages/index/bindDividedMerchant/bindDividedMerchant?id=' + this.merLedgerId + - '&typeid=' + item + '&ledgerReceiverId=' + item1 + '&typeid=' + item + '&ledgerReceiverId=' + item1 + '&platformType=' + this.platformType }) } } @@ -103,16 +105,17 @@ color: #db8c73; text-align: center; padding: 2px 5px; - } - .btns { - width: 21%; - float: left; - height: 35px; - line-height: 35px; - background-color: #0083f5; - color: #FFFFFF; - font-weight: bold; - font-size: 12px; - padding: 0px; + } + + .btns { + width: 21%; + float: left; + height: 35px; + line-height: 35px; + background-color: #0083f5; + color: #FFFFFF; + font-weight: bold; + font-size: 12px; + padding: 0px; } \ No newline at end of file diff --git a/pages/index/ledgerReceiverList/ledgerReceiverList.vue b/pages/index/ledgerReceiverList/ledgerReceiverList.vue index d3c38ea..2541c51 100644 --- a/pages/index/ledgerReceiverList/ledgerReceiverList.vue +++ b/pages/index/ledgerReceiverList/ledgerReceiverList.vue @@ -29,10 +29,12 @@ pageNum: 1, pagesize: 15, isLoadMore: false, //是否加载中 - merName: '' //商户名称 + merName: '' ,//商户名称 + platformType: '' //渠道ID } }, - onLoad(options) { + onLoad(options) { + this.platformType = options.platformType; this.getLedgerReceiverList(); }, onReachBottom() { //上拉触底函数 @@ -44,7 +46,6 @@ }, methods: { toSearch() { - console.log('====='+this.merName); this.pageNum = 1; this.pageSize = 10; this.isLoadMore = false; @@ -57,7 +58,7 @@ title: '加载中...' }) let datas = { - platformType: 1, + platformType: this.platformType, pageNum: this.pageNum, merNme: this.merName, pageSize: this.pagesize diff --git a/pages/index/merchant-management/merchant-management.vue b/pages/index/merchant-management/merchant-management.vue index 01349ec..6a14514 100644 --- a/pages/index/merchant-management/merchant-management.vue +++ b/pages/index/merchant-management/merchant-management.vue @@ -26,10 +26,10 @@ 审核中 审核失败 违规 - - - 商户号 - {{item.merNo}} + + + 商户号 + {{item.merNo}} 联系人 @@ -38,7 +38,7 @@ - + @@ -50,7 +50,6 @@ import QSTabs from '../../../components/QS-tabs/QS-tabs.vue'; import { getMerListBySalesman, - getMerLedgerApply } from '../../../Utils/Api.js'; export default { components: { @@ -164,28 +163,6 @@ url: '/pages/index/open-Divide_accounts/open-Divide_accounts?id=' + item }) }, - //绑定商户 - bindMerchants(item) { - //查询商户分账详情 - let datas = { - merId: item, - platformType: 1 - } - getMerLedgerApply(datas).then(res => { - if (res.return_code == '000000') { - uni.navigateTo({ - url: '/pages/index/bindMerchants/bindMerchants?id=' + res.return_data.id + - '&merId=' + item - }) - } else { - uni.showToast({ - title: res.return_msg, - duration: 2000, - icon: 'none' - }) - } - }) - }, //跳转权益活动 jumpEquityActivity(item) { uni.navigateTo({ diff --git a/pages/index/normal-Merchant/normal-Merchant.vue b/pages/index/normal-Merchant/normal-Merchant.vue index 7247b21..e927d93 100644 --- a/pages/index/normal-Merchant/normal-Merchant.vue +++ b/pages/index/normal-Merchant/normal-Merchant.vue @@ -1,5 +1,10 @@