From 1ccb951d99acd0542d382a18bd818aa5fca9ee1e Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 22 Sep 2023 14:10:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98=20?=
=?UTF-8?q?=E6=89=93=E5=8C=85=E4=B8=8A=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 8 ++---
.../merchant-management.vue | 17 ++++++++++-
.../index/normal-Merchant/normal-Merchant.vue | 6 +++-
pages/tabBar/home/home.vue | 28 ++++++++++++++----
static/img/home6.png | Bin 0 -> 3684 bytes
unpackage/dist/build/h5/index.html | 2 +-
6 files changed, 48 insertions(+), 13 deletions(-)
create mode 100644 static/img/home6.png
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 0000000000000000000000000000000000000000..078771310f42a8b3347ca69f70b08a1e54529d6f
GIT binary patch
literal 3684
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
literal 0
HcmV?d00001
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('')