From 4f5a95b13faa29097757c10f865ae75c8c46bec1 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Sun, 8 Oct 2023 10:08:41 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E6=B8=A0=E9=81=93=202.?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=BF=E4=B8=8A=E9=97=AE=E9=A2=98=203.?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E8=B4=A6=E6=8E=A5=E6=94=B6=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../bindDividedMerchant.vue | 16 +++--
pages/index/bindMerchants/bindMerchants.vue | 35 +++++-----
.../ledgerReceiverList/ledgerReceiverList.vue | 9 +--
.../merchant-management.vue | 33 ++-------
.../index/normal-Merchant/normal-Merchant.vue | 30 ++------
.../open-Divide_accounts.vue | 70 ++++++++++++++++---
pages/welcome/welcome.vue | 44 ++++++------
unpackage/dist/build/h5/index.html | 2 +-
8 files changed, 124 insertions(+), 115 deletions(-)
diff --git a/pages/index/bindDividedMerchant/bindDividedMerchant.vue b/pages/index/bindDividedMerchant/bindDividedMerchant.vue
index 00303ad..d21e16f 100644
--- a/pages/index/bindDividedMerchant/bindDividedMerchant.vue
+++ b/pages/index/bindDividedMerchant/bindDividedMerchant.vue
@@ -16,7 +16,8 @@
- {{ledgerReceiverApply.rejectReason}}
+ {{ledgerReceiverApply.rejectReason}}
+
@@ -32,7 +33,7 @@
placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
-
+
合作协议
@@ -46,7 +47,7 @@
-->
-
+
@@ -84,13 +85,14 @@
merLedgerId: '', //商户id
typeId: '', //进入id 1 新建 2 查看
ledgerReceiverId: '', //接收方id
- ledgerReceiverApply: '', //详情数据
+ ledgerReceiverApply: '', //详情数据
+ platformType: '' //渠道ID
}
},
onLoad(options) {
this.merLedgerId = options.id;
this.typeId = options.typeid;
-
+ this.platformType = options.platformType;
if (this.typeId == 2 || this.typeId == 3) {
this.ledgerReceiverId = options.ledgerReceiverId;
this.getLedgerReceiverById();
@@ -115,7 +117,7 @@
jumpMerchantlist() {
if (this.typeId == 1) {
uni.navigateTo({
- url: '/pages/index/ledgerReceiverList/ledgerReceiverList'
+ url: '/pages/index/ledgerReceiverList/ledgerReceiverList?platformType='+this.platformType
})
}
},
@@ -252,7 +254,7 @@
});
return;
}
- if (!this.entrustFilePath) {
+ if (!this.entrustFilePath && this.platformType == 1) {
uni.showToast({
title: '请上传合作协议',
icon: "none",
diff --git a/pages/index/bindMerchants/bindMerchants.vue b/pages/index/bindMerchants/bindMerchants.vue
index a93c91c..b6d43c6 100644
--- a/pages/index/bindMerchants/bindMerchants.vue
+++ b/pages/index/bindMerchants/bindMerchants.vue
@@ -17,8 +17,8 @@
{{item.createTime | timeFormat('yyyy-mm-dd')}}
{{item.createTime | timeFormat('hh:mm')}}
-
-
+
+
@@ -35,12 +35,14 @@
return {
merchantList: [], //商户列表
merLedgerId: '', //开通分账ID
- merId: '' //商户id
+ merId: '', //商户id
+ platformType: '' //渠道ID
}
},
onLoad(options) {
this.merId = options.merId;
this.merLedgerId = options.id;
+ this.platformType = options.platformType;
},
onShow() {
this.getLedgerReceiverListByMer();
@@ -50,7 +52,7 @@
getLedgerReceiverListByMer() {
let datas = {
merId: this.merId,
- platformType: 1
+ platformType: this.platformType
}
getLedgerReceiverListByMer(datas).then(res => {
if (res.return_code == '000000' && res.return_data != null) {
@@ -62,7 +64,7 @@
jumpBindMerchants(item, item1) {
uni.navigateTo({
url: '/pages/index/bindDividedMerchant/bindDividedMerchant?id=' + this.merLedgerId +
- '&typeid=' + item + '&ledgerReceiverId=' + item1
+ '&typeid=' + item + '&ledgerReceiverId=' + item1 + '&platformType=' + this.platformType
})
}
}
@@ -103,16 +105,17 @@
color: #db8c73;
text-align: center;
padding: 2px 5px;
- }
- .btns {
- width: 21%;
- float: left;
- height: 35px;
- line-height: 35px;
- background-color: #0083f5;
- color: #FFFFFF;
- font-weight: bold;
- font-size: 12px;
- padding: 0px;
+ }
+
+ .btns {
+ width: 21%;
+ float: left;
+ height: 35px;
+ line-height: 35px;
+ background-color: #0083f5;
+ color: #FFFFFF;
+ font-weight: bold;
+ font-size: 12px;
+ padding: 0px;
}
\ No newline at end of file
diff --git a/pages/index/ledgerReceiverList/ledgerReceiverList.vue b/pages/index/ledgerReceiverList/ledgerReceiverList.vue
index d3c38ea..2541c51 100644
--- a/pages/index/ledgerReceiverList/ledgerReceiverList.vue
+++ b/pages/index/ledgerReceiverList/ledgerReceiverList.vue
@@ -29,10 +29,12 @@
pageNum: 1,
pagesize: 15,
isLoadMore: false, //是否加载中
- merName: '' //商户名称
+ merName: '' ,//商户名称
+ platformType: '' //渠道ID
}
},
- onLoad(options) {
+ onLoad(options) {
+ this.platformType = options.platformType;
this.getLedgerReceiverList();
},
onReachBottom() { //上拉触底函数
@@ -44,7 +46,6 @@
},
methods: {
toSearch() {
- console.log('====='+this.merName);
this.pageNum = 1;
this.pageSize = 10;
this.isLoadMore = false;
@@ -57,7 +58,7 @@
title: '加载中...'
})
let datas = {
- platformType: 1,
+ platformType: this.platformType,
pageNum: this.pageNum,
merNme: this.merName,
pageSize: this.pagesize
diff --git a/pages/index/merchant-management/merchant-management.vue b/pages/index/merchant-management/merchant-management.vue
index 01349ec..6a14514 100644
--- a/pages/index/merchant-management/merchant-management.vue
+++ b/pages/index/merchant-management/merchant-management.vue
@@ -26,10 +26,10 @@
审核中
审核失败
违规
-
-
- 商户号
- {{item.merNo}}
+
+
+ 商户号
+ {{item.merNo}}
联系人
@@ -38,7 +38,7 @@
-
+
@@ -50,7 +50,6 @@
import QSTabs from '../../../components/QS-tabs/QS-tabs.vue';
import {
getMerListBySalesman,
- getMerLedgerApply
} from '../../../Utils/Api.js';
export default {
components: {
@@ -164,28 +163,6 @@
url: '/pages/index/open-Divide_accounts/open-Divide_accounts?id=' + item
})
},
- //绑定商户
- bindMerchants(item) {
- //查询商户分账详情
- let datas = {
- merId: item,
- platformType: 1
- }
- getMerLedgerApply(datas).then(res => {
- if (res.return_code == '000000') {
- uni.navigateTo({
- url: '/pages/index/bindMerchants/bindMerchants?id=' + res.return_data.id +
- '&merId=' + item
- })
- } else {
- uni.showToast({
- title: res.return_msg,
- duration: 2000,
- icon: 'none'
- })
- }
- })
- },
//跳转权益活动
jumpEquityActivity(item) {
uni.navigateTo({
diff --git a/pages/index/normal-Merchant/normal-Merchant.vue b/pages/index/normal-Merchant/normal-Merchant.vue
index 9e18ef4..e927d93 100644
--- a/pages/index/normal-Merchant/normal-Merchant.vue
+++ b/pages/index/normal-Merchant/normal-Merchant.vue
@@ -33,7 +33,7 @@
-
+
@@ -44,7 +44,6 @@
@@ -245,6 +289,10 @@
}
}
+ .borbtom {
+ border-bottom: 3px solid #089bf5;
+ }
+
.btn {
color: #FFFFFF;
background-color: #0083f5;
@@ -256,7 +304,7 @@
justify-content: center;
align-items: center;
border-radius: 10rpx;
- font-size: 40rpx;
+ font-size: 36rpx;
}
.notes {
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index 7cd585b..9c93c9d 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -17,28 +17,28 @@
},
onLoad(options) {
let that = this;
- uni.reLaunch({
- url: '../tabBar/home/home'
- })
+ // uni.reLaunch({
+ // 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 {
- // // 获取openid
- // that.jumpcdx();
- // }
- // if (app.globalData.h5code) {
- // that.getAccessToken();
- // }
+ 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();
+ }
// #endif
},
methods: {
@@ -71,7 +71,7 @@
},
jumpcdx() {
location.href =
- 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://gratia-pay.dctpay.com/cweb&response_type=code&scope=snsapi_base#wechat_redirect';
+ 'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://pay.dctpay.com/cweb&response_type=code&scope=snsapi_base#wechat_redirect';
},
}
}
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index bbcd4ef..3dc33ad 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('')