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/pages/index/merchant-management/merchant-management.vue b/pages/index/merchant-management/merchant-management.vue
index c009fdd..01349ec 100644
--- a/pages/index/merchant-management/merchant-management.vue
+++ b/pages/index/merchant-management/merchant-management.vue
@@ -26,8 +26,12 @@
审核中
审核失败
违规
+
+
+ 商户号
+ {{item.merNo}}
-
+
联系人
{{item.regName}}
-
@@ -63,6 +67,17 @@
merstu: 2 //查询当前状态 2：编辑中 3：审核中 4：审核失败 5：违规 1：正常
}
},
+ onLoad(options) {
+ if (options.id == 1) {
+ this.merstu = 2;
+ this.current = 0;
+ }
+
+ if (options.id == 2) {
+ this.merstu = 3;
+ this.current = 1;
+ }
+ },
onShow() {
this.merchantlist = [];
this.pageNum = 1;
diff --git a/pages/index/normal-Merchant/normal-Merchant.vue b/pages/index/normal-Merchant/normal-Merchant.vue
index dff8c99..7247b21 100644
--- a/pages/index/normal-Merchant/normal-Merchant.vue
+++ b/pages/index/normal-Merchant/normal-Merchant.vue
@@ -16,8 +16,12 @@
+
+
+ 商户号
+ {{item.merNo}}
-
+
联系人
{{item.regName}}
-
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 2c51860..4cc97cd 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -25,12 +25,12 @@
¥{{auditnum.tradePrice}}
-
-
+
+
进件成功数量
{{auditnum.contractSuccess}}
-
+
待审核数量
{{auditnum.contractAudit}}
@@ -94,7 +94,7 @@
},
{
title: '进件管理',
- url: '../../index/merchant-management/merchant-management',
+ url: '../../index/merchant-management/merchant-management?id=1',
img: '../../../static/img/home4.png'
}, {
title: '商户管理',
@@ -108,6 +108,10 @@
title: '申请订单',
url: '../../index/salesOrderList/salesOrderList',
img: '../../../static/img/apply.png'
+ }, {
+ title: '收款记录',
+ url: '../../index/collectNotes/collectNotes',
+ img: '../../../static/img/home6.png'
}
]
return;
@@ -117,7 +121,7 @@
this.funcList = [{
title: '收款记录',
url: '../../index/collectNotes/collectNotes',
- img: '../../../static/img/home1.png'
+ img: '../../../static/img/home6.png'
},
{
title: '门店管理',
@@ -132,7 +136,7 @@
this.funcList = [{
title: '收款记录',
url: '../../index/collectNotes/collectNotes',
- img: '../../../static/img/home1.png'
+ img: '../../../static/img/home6.png'
}, {
title: '二维码列表',
url: '../../index/scanList/scanList',
@@ -243,6 +247,18 @@
url: item
})
},
+ //跳转审核商户
+ jumpsuccmerchant() {
+ uni.navigateTo({
+ url: '../../index/normal-Merchant/normal-Merchant'
+ })
+ },
+ //待审核的商户
+ jumpwaitmerchant() {
+ uni.navigateTo({
+ url: '../../index/merchant-management/merchant-management?id=2'
+ })
+ },
//跳转记录
jumpaudt() {
uni.navigateTo({
diff --git a/static/img/home6.png b/static/img/home6.png
new file mode 100644
index 0000000..0787713
Binary files /dev/null and b/static/img/home6.png differ
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index 930eb2f..bbcd4ef 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('')