diff --git a/Utils/Api.js b/Utils/Api.js
index a0be93d..1648707 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -270,3 +270,8 @@ export const configRosterRate = params => {
export const reconsider = params => {
return POST('POST', `${base}/mer/reconsider`, params).then(res => res.data);
}
+
+//根据商户查询结算
+export const getSettleAcctByMer = params => {
+ return POST('GET', `${base}/merSettleAcct/getSettleAcctByMer`, params).then(res => res.data);
+}
diff --git a/pages/index/depositaryBank/depositaryBank.vue b/pages/index/depositaryBank/depositaryBank.vue
index e8506e4..75e7df1 100644
--- a/pages/index/depositaryBank/depositaryBank.vue
+++ b/pages/index/depositaryBank/depositaryBank.vue
@@ -4,7 +4,7 @@
-
+
@@ -53,7 +53,7 @@
}
getBankList(datas).then(res => {
uni.hideLoading();
- if (res.return_code == '000000' && res.return_data) {
+ if (res.return_code == '000000') {
this.taryBankList = res.return_data;
} else {
uni.showToast({
diff --git a/pages/index/equity-activities-details/equity-activities-details.vue b/pages/index/equity-activities-details/equity-activities-details.vue
index f3127aa..2ef26b2 100644
--- a/pages/index/equity-activities-details/equity-activities-details.vue
+++ b/pages/index/equity-activities-details/equity-activities-details.vue
@@ -19,10 +19,51 @@
+
+ 商户信息
+
+
+
+ 商户名称
+ {{merDetailInfo.mer.merName}}
+
+
+ 支行名称
+ {{merDetailInfo.mer.merSettleAcct.openningBankName}}
+
+
+ 支行行号
+ {{merDetailInfo.mer.merSettleAcct.openningBankCode}}
+
+
+
+
+
+
+
选择周期费率
- (已生效)
- (未配置)
+ (已生效)
+ (未配置)
@@ -46,24 +87,78 @@
import {
queryActivityDetail,
enrollActivity,
- configRosterRate
+ configRosterRate,
+ getSettleAcctByMer
} from '../../../Utils/Api.js';
+ import pickRegions from '../../../components/pick-regions/pick-regions.vue';
+ let app = getApp();
export default {
+ components: {
+ pickRegions
+ },
data() {
return {
activitydetails: '', //活动数据
detailsid: '', // 详情id
merId: '', //商户id
activityList: [], // 所有费率
- changeValue: '' //选择的值
+ changeValue: '', //选择的值
+ region: [], //选择区域
+ defaultRegion: ['北京市', '市辖区', '东城区'], //默认地区
+ defaultRegionCodes: '110101', //区级编号
+ bankareaCode: '', //开户行市区编号
+ bankregionName: '', //开户行名字
+ belongbranch: '', //所属支行
+ branchBankNo: '', //所属支行编号
+ merDetailInfo: '' //商户信息
}
},
onLoad(options) {
this.detailsid = options.id;
this.merId = options.merid;
- this.queryActivityDetail();
+ this.queryActivityDetail();
+ this.getSettleAcctByMer();
+ },
+ onShow() {
+ if (app.globalData.depositaryBank) {
+ this.belongbranch = app.globalData.depositaryBank;
+ }
+ if (app.globalData.branchBankNo) {
+ this.branchBankNo = app.globalData.branchBankNo;
+ }
+ },
+ onUnload() {
+ app.globalData.depositaryBank = '';
+ app.globalData.bankareaCode = '';
+ app.globalData.branchBankNo = '';
+ app.globalData.clearNo = '';
},
methods: {
+ //查询商户信息
+ getSettleAcctByMer() {
+ let datas = {
+ merId: this.merId
+ }
+ getSettleAcctByMer(datas).then(res => {
+ if (res.return_code == '000000') {
+ this.merDetailInfo = res.return_data;
+ this.branchBankNo = res.return_data.mer.merSettleAcct.openningBankCode;
+ } else {
+ uni.showToast({
+ title: res.return_msg,
+ duration: 2000,
+ icon: 'none'
+ })
+ }
+ })
+ },
+ //选择开户行
+ handleBankCityCode(region) {
+ this.region = region;
+ this.bankareaCode = this.region.map(item => item.code)[2];
+ this.bankregionName = this.region.map(item => item.name).join('-');
+ app.globalData.bankareaCode = this.bankareaCode;
+ },
//选择卡号
changefeil(e) {
let query = e.target.value;
@@ -75,6 +170,20 @@
}
}
},
+ //选择支行
+ showdepositaryBank() {
+ if (!this.bankareaCode) {
+ uni.showToast({
+ title: '请选择地区',
+ duration: 2000,
+ icon: 'none'
+ })
+ return;
+ }
+ uni.navigateTo({
+ url: '/pages/index/depositaryBank/depositaryBank'
+ })
+ },
changefeilvalue(item) {
this.changeValue = item;
},
@@ -91,8 +200,11 @@
uni.hideLoading();
if (res.return_code == '000000') {
this.activitydetails = res.return_data;
- this.activityList = res.return_data.bankActivityRoster
- .bankActivityRosterRateList
+ if (res.return_data.bankActivityRoster) {
+ this.activityList = res.return_data.bankActivityRoster
+ .bankActivityRosterRateList
+ }
+
} else {
uni.showToast({
title: res.return_msg,
@@ -115,6 +227,7 @@
})
let datas = {
bankActivityId: that.detailsid,
+ branchBankNo: that.branchBankNo,
merId: that.merId
}
enrollActivity(datas).then(res => {
@@ -129,7 +242,7 @@
} else {
uni.showToast({
title: res.return_msg,
- duration: 2000,
+ duration: 3000,
icon: 'none'
})
}
@@ -228,7 +341,7 @@
.namecont {
color: #666666;
- width: 80%;
+ width: 60%;
}
}
\ No newline at end of file
diff --git a/pages/index/equity-activities/equity-activities.vue b/pages/index/equity-activities/equity-activities.vue
index 7886d67..6183f4a 100644
--- a/pages/index/equity-activities/equity-activities.vue
+++ b/pages/index/equity-activities/equity-activities.vue
@@ -68,6 +68,10 @@
},
onLoad(options) {
this.merId = options.id;
+ },
+ onShow() {
+ this.pageNum = 1;
+ this.activityList = [];
this.queryActivityList();
},
methods: {
diff --git a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
index 13b35b0..e8b2508 100644
--- a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
+++ b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
@@ -79,6 +79,14 @@
营业信息
+
+ 机构类型
+
+ {{organizationName}}
+
+
+
商户类型
- 营业信息
+ 营业信息
+
+ 机构类型
+ {{merDetailInfo.orgName}}
+
商户类型
个体商户
@@ -800,6 +812,9 @@
getCodeisWaiting: false, //是否点击
ischecked: false, //是否同意条约
currentstatus: 0, //当前步骤状态 1: 已录入 其他:未录入
+ organizationType: [], //机构类型
+ organizationId: '', //机构id
+ organizationName: '', //机构名称
merchantType: '个体商户', //商户类型
merchantId: '1', //商户id
lementType: '对公结算', //结算账户类型
@@ -1530,7 +1545,9 @@
} else {
this.merchantId = 1;
}
- this.companyname = res.return_data.merName
+ 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;
this.mccname = res.return_data.merMccName;
@@ -1560,6 +1577,8 @@
this.detailsaddress = res.return_data.merRegion.address;
}
if (res.return_data && this.merchart == 2) {
+ this.getDictionaryByCodeTypeOrg();
+
this.idcardname = res.return_data.larName;
this.idcard = res.return_data.larIdCard;
this.larIdCardAddress = res.return_data.larIdCardAddress
@@ -1673,6 +1692,7 @@
}
} else {
this.getDictionaryByCodeType();
+ this.getDictionaryByCodeTypeOrg();
}
})
},
@@ -1923,6 +1943,7 @@
})
let datas = {
"id": that.merId,
+ "orgNo": that.organizationId,
"merType": that.merchantId,
"merName": that.companyname,
"merAbbreviate": that.merabbreviation,
@@ -2350,6 +2371,26 @@
this.rateCodeList = res.return_data;
}
})
+ },
+ //查询机构数据字典
+ getDictionaryByCodeTypeOrg() {
+ let params = {
+ codeType: 'ORG_NO'
+ }
+ getDictionaryByCodeType(params).then(res => {
+ if (res.return_code == '000000') {
+ this.organizationType = res.return_data;
+ if (!this.merDetailInfo.orgName) {
+ this.organizationId = res.return_data[0].codeValue;
+ this.organizationName = res.return_data[0].codeName;
+ }
+ }
+ })
+ },
+ //选择机构类型
+ changefeilvalue(e) {
+ this.organizationId = this.organizationType[e.target.value].codeValue;
+ this.organizationName = this.organizationType[e.target.value].codeName;
}
}
}
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index 0dd89c3..930eb2f 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('')