diff --git a/Utils/Api.js b/Utils/Api.js index 0e52564..3dcd27f 100644 --- a/Utils/Api.js +++ b/Utils/Api.js @@ -320,6 +320,12 @@ export const unbindStore = params => { return POST('POST', `${base}/device/unbindStore`, params).then(res => res.data); } +//切换渠道 +export const switchPlatform = params => { + return POST('POST', `${base}/merPlatform/switchPlatform`, params).then(res => res.data); +} + + diff --git a/pages/index/merchant-details/merchant-details.vue b/pages/index/merchant-details/merchant-details.vue index 1e9d76f..0047a1b 100644 --- a/pages/index/merchant-details/merchant-details.vue +++ b/pages/index/merchant-details/merchant-details.vue @@ -101,14 +101,34 @@ - + - + 渠道名称: 拉卡拉 - 商户号: {{item.cupNo}} - 终端号: {{item.merPlatformTerm.termNo}} + 渠道名称: 随行付 + 商户号: {{item.cupNo}} + 审核驳回原因: + {{item.suggestionReject}} + + + + 不可用 + + + 可用 + + + 审核中 + + + 审核驳回 + 切换拉卡拉 + 切换随行付 @@ -123,7 +143,8 @@ import { getMerDetail, getStoreListByMer, - getMerPlatformList + getMerPlatformList, + switchPlatform } from '../../../Utils/Api.js'; export default { components: { @@ -144,6 +165,9 @@ this.merid = options.id; this.getMerDetail(this.merid); }, + onShow() { + this.getMerPlatformList(); + }, methods: { //筛选 change(index) { @@ -250,6 +274,39 @@ uni.navigateTo({ url: '../bindScan/bindScan?storeid=' + item + '&type=' + items }) + }, + //跳转进件 + jumpDetailsparts(item, item1) { + uni.navigateTo({ + url: '../merchant-incoming-parts/merchant-incoming-parts?id=' + item + '&merPlatformType=' + + item1 + }) + }, + //切换渠道 + switchPlatform(item, item1) { + uni.showModal({ + title: '切换渠道', + content: '是否确认切换当前渠道', + success: (res) => { + if (res.confirm) { + uni.showLoading({ + title: '处理中...' + }) + let data = { + "merId": item, + "platformType": item1 + } + switchPlatform(data).then(res => { + uni.hideLoading(); + if (res.return_code == '000000') { + this.getMerPlatformList(); + } + }) + } else if (res.cancel) { + console.log('用户点击取消'); + } + } + }); } } } @@ -263,7 +320,7 @@ .notes { width: calc(100% - 40rpx); display: flex; - align-items: center; + align-items: flex-start; padding: 30rpx 0 30rpx 20rpx; border-bottom: 1px solid #f6f6f6; } @@ -319,4 +376,14 @@ .lin10 { height: 10px; } + + .btnschange { + background-color: #0083f5; + font-size: 14px; + width: 90px; + text-align: center; + padding-top: 5px; + padding-bottom: 5px; + color: #FFFFFF; + } \ 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 6ba5730..9af9d20 100644 --- a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue +++ b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue @@ -11,11 +11,12 @@ - + 审核失败 复议提交 + style="width: 80px;" @click="reconsider" v-if="merPlatformType && merPlatformType == 1">复议提交 {{merDetailInfo.merContractFailMsg.response_msg}} @@ -179,11 +180,39 @@ - + mcc编号 - 营业信息 - - 机构类型 - {{merDetailInfo.orgName}} + 营业信息 + + 机构类型 + {{merDetailInfo.orgName}} 商户类型 @@ -837,6 +866,13 @@ larIdCardAddress: '', //身份证地址 idcardtime: '1', // times:选择时间 longterm: 长期 uncorporsettelimg: '', //非法人结算授权书 + merOperateList: '', //商户经营类型 + merOnlineList: '', //商户线上产品类型 + merOperateType: '', //"商户经营类型 1：线下 2：线上", + merOperateName: '', // 1：线下 2：线上", + merOnlineType: '', //"商户线上产品类型 1：APP 2：网站 3：公众号/小程序/服务窗 + merOnlinetypsName: '', //1：APP 2：网站 3：公众号/小程序/服务窗 + merOnlineName: '', //"商户线上产品名称" uploaduncorporsettelimg: '', //上传非法人结算委托书 settleimg: '', //结算人银行卡照片 uploadsettleimg: '', //上传结算人银行卡照片 @@ -885,6 +921,7 @@ merDetailInfo: '', //用户信息 rateCodeList: [], //费率字典 merRateList: [], //提交费率数组 + merPlatformType: '' //渠道ID } }, computed: { @@ -905,6 +942,7 @@ }, onLoad(options) { this.merId = options.id; + this.merPlatformType = options.merPlatformType; this.getMerDetail(1); }, onShow() { @@ -933,6 +971,8 @@ this.storelongitude = app.globalData.storeMessage.location.lng; this.storelatitude = app.globalData.storeMessage.location.lat; } + this.merOperateList = app.globalData.Dictionaries.MER_OPERATE_TYPE; + this.merOnlineList = app.globalData.Dictionaries.MER_ONLINE_TYPE; }, onUnload() { app.globalData.businessid = ''; @@ -945,6 +985,16 @@ app.globalData.depositaryBank = ''; }, methods: { + //商户经营类型 + bindUserCard(e) { + this.merOperateType = this.merOperateList[e.target.value].codeValue; + this.merOperateName = this.merOperateList[e.target.value].codeName; + }, + //商户线上产品类型 + bindUserCard1(e) { + this.merOnlineType = this.merOnlineList[e.target.value].codeValue; + this.merOnlinetypsName = this.merOnlineList[e.target.value].codeName; + }, //显示商户弹出 showPopup() { this.$refs.popup.show(); @@ -1000,6 +1050,10 @@ //进件复议 reconsider() { let that = this; + let platformType = ""; + if (that.merPlatformType && that.merPlatformType != undefined) { + platformType = that.merPlatformType; + } uni.showModal({ title: '复议提交', content: '确认信息是否正确', @@ -1009,7 +1063,8 @@ title: '提交审核中...' }) let datas = { - "merId": that.merId + "merId": that.merId, + "merPlatformType": platformType } reconsider(datas).then(res => { uni.hideLoading(); @@ -1517,8 +1572,13 @@ }, //查询商户信息 getMerDetail(item) { + let platformType = ""; + if (this.merPlatformType && this.merPlatformType != undefined) { + platformType = this.merPlatformType; + } let datas = { - merId: this.merId + merId: this.merId, + merPlatformType: platformType } getMerDetail(datas).then(res => { if (res.return_code == '000000' && res.return_data) { @@ -1545,8 +1605,8 @@ } else { this.merchantId = 1; } - this.companyname = res.return_data.merName - this.organizationName = res.return_data.orgName; + this.companyname = res.return_data.merName + this.organizationName = res.return_data.orgName; this.organizationId = res.return_data.orgNo; this.merabbreviation = res.return_data.merAbbreviate; this.mccno = res.return_data.merMccCode; @@ -1578,9 +1638,23 @@ } if (res.return_data && this.merchart == 2) { this.getDictionaryByCodeTypeOrg(); - + this.idcardname = res.return_data.larName; this.idcard = res.return_data.larIdCard; + this.merOperateType = res.return_data.merOperateType; + this.merOnlineType = res.return_data.merOnlineType; + for (var i = 0; i < this.merOperateList.length; i++) { + if (res.return_data.merOperateType == this.merOperateList[i].codeValue) { + this.merOperateName = this.merOperateList[i].codeName; + } + } + for (var j = 0; j < this.merOnlineList.length; j++) { + if (res.return_data.merOnlineType == this.merOnlineList[j].codeValue) { + this.merOnlinetypsName = this.merOnlineList[j].codeName; + } + } + //商户线上产品类型 + this.merOnlineName = res.return_data.merOnlineName; this.larIdCardAddress = res.return_data.larIdCardAddress this.getImgSignedUrl(1, res.return_data.blisUrl, 2); this.getImgSignedUrl(2, res.return_data.larIdCardPortraitImg, 2); @@ -1602,15 +1676,15 @@ for (var i = 0; i < res.return_data.merSettleAcct.merRateList .length; i++) { // if (res.return_data.merSettleAcct.merRateList[i].ratePct) { - let datas = { - codeName: res.return_data.merSettleAcct.merRateList[i] - .rateTypeName, - codeValue: res.return_data.merSettleAcct.merRateList[i] - .rateTypeCode, - ext1: res.return_data.merSettleAcct.merRateList[i] - .ratePct - } - rateDatas.push(datas); + let datas = { + codeName: res.return_data.merSettleAcct.merRateList[i] + .rateTypeName, + codeValue: res.return_data.merSettleAcct.merRateList[i] + .rateTypeCode, + ext1: res.return_data.merSettleAcct.merRateList[i] + .ratePct + } + rateDatas.push(datas); // } } this.rateCodeList = rateDatas; @@ -1926,6 +2000,33 @@ }); return; } + if (!that.merOperateType) { + uni.showToast({ + title: '请选择经营类型', + icon: "none", + duration: 2000 + }); + return; + } + + if (that.merOperateType && that.merOperateType == 2) { + if (!that.merOnlineType) { + uni.showToast({ + title: '请选择线上产品类型', + icon: "none", + duration: 2000 + }); + return; + } + if (!that.merOnlineName) { + uni.showToast({ + title: '请输入线上产品名称', + icon: "none", + duration: 2000 + }); + return; + } + } if (that.merchantId == 3) { this.start_date = ''; @@ -1957,6 +2058,9 @@ "blisPeriodEnd": that.end_date, "larName": that.idcardname, "larIdCard": that.idcard, + "merOperateType": that.merOperateType, + "merOnlineType": that.merOnlineType, + "merOnlineName": that.merOnlineName, "larIdCardAddress": that.larIdCardAddress, "larIdCardPortraitImg": that.uploadidcardposimg, "larIdCardNationalEmblemImg": that.uploadidcardsideimg, @@ -2308,6 +2412,10 @@ }); return; } + let platformType = ""; + if (that.merPlatformType && that.merPlatformType != undefined) { + platformType = that.merPlatformType; + } uni.showModal({ title: '提交审核', content: '确认信息是否正确。', @@ -2326,6 +2434,7 @@ "doorHeadImg": that.uploadstoreimg1, "cashRegisterImg": that.uploadstoreimg2, "internalImg": that.uploadstoreimg3, + "merPlatformType": platformType, "storeRegion": { "address": that.storeAddress, "areaCode": that.storeareaCode, @@ -2379,7 +2488,7 @@ } getDictionaryByCodeType(params).then(res => { if (res.return_code == '000000') { - this.organizationType = res.return_data; + this.organizationType = res.return_data; if (!this.merDetailInfo.orgName) { this.organizationId = res.return_data[0].codeValue; this.organizationName = res.return_data[0].codeName; diff --git a/pages/index/modifyRate/modifyRate.vue b/pages/index/modifyRate/modifyRate.vue index 4c4364e..33cb17a 100644 --- a/pages/index/modifyRate/modifyRate.vue +++ b/pages/index/modifyRate/modifyRate.vue @@ -26,7 +26,7 @@ - 提交审核 + 提交审核