From 1795bc6145f00bd52a0d54f179155cf3e917eaf8 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Mon, 22 May 2023 16:22:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7=E8=BF=9B?=
=?UTF-8?q?=E4=BB=B6=E9=9D=9E=E6=B3=95=E4=BA=BA=E5=A7=94=E6=89=98=E4=B9=A6?=
=?UTF-8?q?=202.=E4=BC=98=E5=8C=96=E4=B8=8A=E4=BC=A0=E9=9D=9E=E6=B3=95?=
=?UTF-8?q?=E4=BA=BA=E5=8F=98=E6=B3=95=E4=BA=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 8 +-
Utils/Api.js | 7 +-
.../merchant-incoming-parts.vue | 138 ++++++++++++------
.../merchant-management.vue | 6 +-
pages/welcome/welcome.vue | 34 ++---
unpackage/dist/build/h5/index.html | 2 +-
6 files changed, 126 insertions(+), 69 deletions(-)
diff --git a/App.vue b/App.vue
index de77746..8941b45 100644
--- a/App.vue
+++ b/App.vue
@@ -4,11 +4,11 @@
// url: 'http://192.168.3.4:9301/crest',
// imgUrl: 'https://192.168.3.4:9301/filesystem/',
//正式
- // url: 'https://pay.dctpay.com/crest',
- // imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
+ url: 'https://pay.dctpay.com/crest',
+ imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
//测试
- url: 'https://gratia-pay.dctpay.com/crest',
- imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com',
+ // url: 'https://gratia-pay.dctpay.com/crest',
+ // imgUrl: 'https://gratia-pay-test.obs.cn-east-3.myhuaweicloud.com',
userInfo: "",
openId: '',
h5code: '',
diff --git a/Utils/Api.js b/Utils/Api.js
index 7f5db62..a0be93d 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -264,4 +264,9 @@ export const enrollActivity = params => {
// 配置费率
export const configRosterRate = params => {
return POST('POST', `${base}/bankActivity/configRosterRate`, params).then(res => res.data);
-}
\ No newline at end of file
+}
+
+//进件复议
+export const reconsider = params => {
+ return POST('POST', `${base}/mer/reconsider`, params).then(res => res.data);
+}
diff --git a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
index 163de2d..13b35b0 100644
--- a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
+++ b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
@@ -11,11 +11,14 @@
-
+
审核失败
+ 复议提交
{{merDetailInfo.merContractFailMsg.response_msg}}
+
@@ -400,11 +403,11 @@
有效期
-
- 选择时间
+
+ 选择时间
-
- 长期有效
+
+ 长期有效
@@ -413,11 +416,11 @@
{{cardstart_date}}
至
-
{{cardend_date}}
- 长期有效
+ 长期有效
@@ -764,7 +767,8 @@
configMerStore,
getDictionaryByCodeType,
getBankCardBin,
- recognizeBankAccount
+ recognizeBankAccount,
+ reconsider
} from '../../../Utils/Api.js';
const QQMapWX = require('../../../Utils/js/qqmap-wx-jssdk');
const qqmapsdk = new QQMapWX({
@@ -818,6 +822,7 @@
larIdCardAddress: '', //身份证地址
idcardtime: '1', // times:选择时间 longterm: 长期
uncorporsettelimg: '', //非法人结算授权书
+ uploaduncorporsettelimg: '', //上传非法人结算委托书
settleimg: '', //结算人银行卡照片
uploadsettleimg: '', //上传结算人银行卡照片
accopenperimg: '', //开户许可证图片
@@ -977,6 +982,45 @@
url: '../mcc-list/mcc-list'
})
},
+ //进件复议
+ reconsider() {
+ let that = this;
+ uni.showModal({
+ title: '复议提交',
+ content: '确认信息是否正确',
+ success: (res) => {
+ if (res.confirm) {
+ uni.showLoading({
+ title: '提交审核中...'
+ })
+ let datas = {
+ "merId": that.merId
+ }
+ reconsider(datas).then(res => {
+ uni.hideLoading();
+ if (res.return_code == '000000') {
+ uni.showToast({
+ title: '提交成功',
+ icon: "none",
+ duration: 2000,
+ success() {
+ setTimeout(() => {
+ uni.navigateBack()
+ }, 2000);
+ }
+ });
+ } else {
+ uni.showToast({
+ title: res.return_msg,
+ icon: "none",
+ duration: 2000
+ })
+ }
+ })
+ }
+ }
+ });
+ },
//选择商户
changeMerchant(item) {
if (item == 1) {
@@ -1230,9 +1274,10 @@
// if (item1 == 9) {
// that.electronicProtocolimg.push(res.return_data);
// }
- // if (item1 == 10) {
- // that.uncorporsettelimg = res.return_data;
- // }
+ if (item == 10) {
+ this.uploaduncorporsettelimg = item1;
+ this.uncorporsettelimg = res.return_data;
+ }
}
})
},
@@ -1466,7 +1511,8 @@
if (item == 1) {
this.merchart = res.return_data.completeStatus;
}
- if ((res.return_data.merStatus == 4 || res.return_data.merStatus == 2) && this.merchart !=
+ if ((res.return_data.merStatus == 4 || res.return_data.merStatus == 2) && this
+ .merchart !=
1) {
this.currentstatus = 0;
//第二步
@@ -1508,7 +1554,8 @@
}
if (res.return_data.merRegion) {
this.areaCode = res.return_data.merRegion.areaCode;
- this.regionName = res.return_data.merRegion.provinceName + '-' + res.return_data
+ this.regionName = res.return_data.merRegion.provinceName + '-' + res
+ .return_data
.merRegion.cityName + '-' + res.return_data.merRegion.areaName;
this.detailsaddress = res.return_data.merRegion.address;
}
@@ -1516,12 +1563,8 @@
this.idcardname = res.return_data.larName;
this.idcard = res.return_data.larIdCard;
this.larIdCardAddress = res.return_data.larIdCardAddress
- this.idcardposimg = res.return_data.larIdCardPortraitImg;
- this.uploadidcardposimg = res.return_data.larIdCardPortraitImg;
this.getImgSignedUrl(1, res.return_data.blisUrl, 2);
this.getImgSignedUrl(2, res.return_data.larIdCardPortraitImg, 2);
- this.idcardsideimg = res.return_data.larIdCardNationalEmblemImg;
- this.uploadidcardsideimg = res.return_data.larIdCardNationalEmblemImg;
this.getImgSignedUrl(3, res.return_data.larIdCardNationalEmblemImg, 2);
if (res.return_data.larIdCardPeriodStart) {
this.cardstart_date = res.return_data.larIdCardPeriodStart;
@@ -1537,14 +1580,16 @@
if (res.return_data.merSettleAcct && this.rateCodeList) {
this.rateCodeList = res.return_data.merSettleAcct.merRateList;
let rateDatas = [];
- for (var i = 0; i < res.return_data.merSettleAcct.merRateList.length; i++) {
+ 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
+ ext1: res.return_data.merSettleAcct.merRateList[i]
+ .ratePct
}
rateDatas.push(datas);
}
@@ -1557,15 +1602,15 @@
if (res.return_data.merSettleAcct && this.merchart == 3) {
- this.settleimg = res.return_data.merSettleAcct.bankCardImg;
this.getImgSignedUrl(4, res.return_data.merSettleAcct.bankCardImg, 2);
this.belongbranch = res.return_data.merSettleAcct.openningBankName;
this.openingbankNo = res.return_data.merSettleAcct.openningBankCode;
- this.accopenperimg = res.return_data.merSettleAcct.openningBankLicenseUrl;
- this.getImgSignedUrl(5, res.return_data.merSettleAcct.openningBankLicenseUrl, 2);
+ this.getImgSignedUrl(5, res.return_data.merSettleAcct
+ .openningBankLicenseUrl, 2);
if (res.return_data.merSettleAcct.electronicPact) {
- this.electronicProtocolimg = res.return_data.merSettleAcct.electronicPact
+ this.electronicProtocolimg = res.return_data.merSettleAcct
+ .electronicPact
.split(
';');
}
@@ -1581,28 +1626,33 @@
if (this.lementId == 3) {
this.lementType = '对私非法人结算';
}
- this.bankregionName = res.return_data.merSettleAcct.openningBankProvinceName +
+ this.bankregionName = res.return_data.merSettleAcct
+ .openningBankProvinceName +
'-' +
res.return_data
- .merSettleAcct.openningBankCityName + '-' + res.return_data.merSettleAcct
+ .merSettleAcct.openningBankCityName + '-' + res.return_data
+ .merSettleAcct
.openningBankAreaName;
this.bankNo = res.return_data.merSettleAcct.bankCardNo;
this.bankName = res.return_data.merSettleAcct.bankCardHolder;
this.belongbank = res.return_data.merSettleAcct.bankName;
this.idcardname = res.return_data.merSettleAcct.settleIdCardName;
this.idcard = res.return_data.merSettleAcct.settleIdCardNo;
+ this.larIdCardAddress = res.return_data.merSettleAcct
+ .settleIdCardAddress;
this.idcardtime = res.return_data.merSettleAcct.settleIdPeriodType;
this.bankareaCode = res.return_data.merSettleAcct.openningBankAreaCode;
- this.idcardposimg = res.return_data.merSettleAcct.settleIdCardPortraitImg;
- this.uploadidcardposimg = res.return_data.merSettleAcct.settleIdCardPortraitImg;
- this.idcardsideimg = res.return_data.merSettleAcct.settleIdCardNationalEmblemImg;
- this.uploadidcardsideimg = res.return_data.merSettleAcct
- .settleIdCardNationalEmblemImg;
- this.getImgSignedUrl(2, res.return_data.merSettleAcct.settleIdCardPortraitImg, 2);
+
+ this.getImgSignedUrl(2, res.return_data.merSettleAcct
+ .settleIdCardPortraitImg, 2);
this.getImgSignedUrl(3, res.return_data.merSettleAcct
.settleIdCardNationalEmblemImg, 2);
- this.cardstart_date = res.return_data.merSettleAcct.settleIdCardPeriodStart;
- this.cardend_date = res.return_data.merSettleAcct.settleIdCardPeriodEnd;
+ this.getImgSignedUrl(10, res.return_data.merSettleAcct
+ .commissionImg, 2);
+ this.cardstart_date = res.return_data.merSettleAcct
+ .settleIdCardPeriodStart;
+ this.cardend_date = res.return_data.merSettleAcct
+ .settleIdCardPeriodEnd;
}
//第四步
if (res.return_data.storeModel) {
@@ -1953,16 +2003,16 @@
return;
}
}
- // if (that.lementId == 3) {
- // if (!that.uncorporsettelimg) {
- // uni.showToast({
- // title: '请上授权书',
- // icon: "none",
- // duration: 2000
- // });
- // return;
- // }
- // }
+ if (that.lementId == 3) {
+ if (!that.uncorporsettelimg) {
+ uni.showToast({
+ title: '请上传结算委托书',
+ icon: "none",
+ duration: 2000
+ });
+ return;
+ }
+ }
if (that.lementId == 3) {
if (!that.idcardposimg) {
uni.showToast({
@@ -2117,7 +2167,7 @@
"settleIdCardName": that.idcardname, //身份证名字
"settleIdCardNo": that.idcard, //身份证号
"settleIdCardAddress": that.larIdCardAddress, // 身份证地址
- // "commissionImg": that.uncorporsettelimg, // 授权书
+ "commissionImg": that.uploaduncorporsettelimg, // 结算委托书
"settleIdPeriodType": that.idcardtime, //【对私非法人结算】结算人身份证有效期类型 1：有效期 2：长期,
"settleIdCardPortraitImg": that.uploadidcardposimg, //"【对私非法人结算】结算人身份证人像面图片",
"settleIdCardNationalEmblemImg": that.uploadidcardsideimg, //"【对私非法人结算】结算人身份证国徽面图片",
diff --git a/pages/index/merchant-management/merchant-management.vue b/pages/index/merchant-management/merchant-management.vue
index 55a874e..473f6a7 100644
--- a/pages/index/merchant-management/merchant-management.vue
+++ b/pages/index/merchant-management/merchant-management.vue
@@ -14,7 +14,7 @@
@click="jumpmerdes(item.id)">
-
+
{{item.merName}}
{{item.createTime | timeFormat('yyyy-mm-dd')}}
@@ -63,7 +63,9 @@
merstu: 2 //查询当前状态 2：编辑中 3：审核中 4：审核失败 5：违规 1：正常
}
},
- onLoad() {
+ onShow() {
+ this.merchantlist = [];
+ this.pageNum = 1;
this.getMerListBySalesman();
},
onReachBottom() { //上拉触底函数
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index 8565a0a..4d4e19d 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -21,24 +21,24 @@
url: '../tabBar/home/home'
})
// #ifdef H5
- // let arr1 = window.location.href;
- // let arr2 = arr1.split('=');
- // if (arr2[2]) {
- // var arr3 = arr2[2].split('&');
- // if (arr3[0] != undefined && arr3[0]) {
- // app.globalData.h5code = arr3[0];
- // uni.setStorage({
- // key: "h5code",
- // data: arr3[0]
- // })
- // }
- // } else {
+ let arr1 = window.location.href;
+ let arr2 = arr1.split('=');
+ if (arr2[2]) {
+ var arr3 = arr2[2].split('&');
+ if (arr3[0] != undefined && arr3[0]) {
+ app.globalData.h5code = arr3[0];
+ uni.setStorage({
+ key: "h5code",
+ data: arr3[0]
+ })
+ }
+ } else {
// 获取openid
- // that.jumpcdx();
- // }
- // if (app.globalData.h5code) {
- // that.getAccessToken();
- // }
+ that.jumpcdx();
+ }
+ if (app.globalData.h5code) {
+ that.getAccessToken();
+ }
// #endif
},
methods: {
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index 3d0445c..92f4050 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('')