From 0592081f272845172fa33f4e6241c3f10ce26639 Mon Sep 17 00:00:00 2001 From: "xiao.tang" Date: Wed, 31 Mar 2021 10:15:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8feat(AlphaPay):=20=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0AlipayPlus?= =?UTF-8?q?=E8=B4=B9=E7=8E=87=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organizations/templates/org_detail.html | 1610 +++++++++-------- .../templates/partner_bankaccounts.html | 4 + 2 files changed, 878 insertions(+), 736 deletions(-) diff --git a/src/main/ui/static/config/organizations/templates/org_detail.html b/src/main/ui/static/config/organizations/templates/org_detail.html index 7f95fc1b4..f5be4b635 100644 --- a/src/main/ui/static/config/organizations/templates/org_detail.html +++ b/src/main/ui/static/config/organizations/templates/org_detail.html @@ -1,149 +1,206 @@
-

-
    -
  1. Framework
    2. -
  2. - Organizations -
    3. -
  3. -
+

+
    +
  1. Framework
    2. +
  2. + Organizations +
    3. +
  3. +
-
-
- - -
-
-
- -
- -
-
-
- -
-

- - - -

-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
- - % -
-
-
-
-
-
- -
- - % -
-
-
-
-
- -
- - % -
-
+
+
+ + + +
+
+ +
+ +
+
+
+ +
+

+ + + +

+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+ + % +
+
+
+
+
+
+ +
+ + % +
+
+
+
+
+ +
+ + % +
+
-
- -
- - % -
-
+
+ +
+ + % +
+
-
- -
- - % -
-
-
- -
- - % -
-
- - -
- -
- - % -
-
+ +
+ +
+ + % +
+
- -
- -
- - % -
-
+ +
+ +
+ + % +
+
-
- -
- - % -
-
-
+
+ +
+ + % +
+
+
+
+
+ +
+ + % +
+
+
+ +
+ + % +
+
-
-
- -
- - % -
-
-
- -
- - % -
-
+
+ +
+ + % +
+
-
- -
- - % -
-
-
- -
- - % -
-
- - -
- -
- - % -
-
- - -
- -
- - % -
-
- -
- -
- - % -
-
-
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - Back -
- - -
-
-
- + +
+ +
+ + % +
+
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
UsernameDisplay NameWechatCreate TimeEmailRolesOperation
{{manager.nickname}} - - - - - - - - - - - - Modify - | - Disable -
-
-
- -
-
Total Records:{{paginationa.totalCount}};Total Pages:{{paginationa.totalPages}}
-
-
-
-
-
+
+ +
+ + %
- - -
-
- -
-

- {{org.gateway_short_id||'初始化'}} - -

-
-
-
- -
- - View - -
-
-
- -
- - Upload - -
-
-
- - -
-
- -
- -
-
-
- - -
-
-
- 禁用 -   超期提醒   -   等待合规   -   绿色通道   -   通过   -
- - - - - - - - - - - - - - - - - - - - - - - - - -
Partner CodePartner NameSub Mch IDRegister TimeCompliance StatusOrganizationBDOperation
- - - - (已禁用) - - - - - 通过({{partner.approve_time}}) - 资料完善中 - (自助开通)资料完善中 - 自助开通试用中({{partner.approve_time}}~{{partner.expiry_time}}) - 不通过({{partner.approve_time}}) - 申请打回({{partner.refuse_remark|limitTo:15}}) - 等待合规 - 自助开通（等待合规） - 合同制作完成 - 等待BD上传材料审核 - 绿色通道申请中 - 等待合规 - - - Detail - -
+
+
+
-
-
- -
-
Total Records:{{pagination.totalCount}};Total - Pages:{{pagination.totalPages}} -
-
-
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + Back +
+ + +
+
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + +
UsernameDisplay NameWechatCreate TimeEmailRolesOperation
+ {{manager.nickname}} + + + + + + + + + + + + + Modify + | + Disable +
+
+
+
-
-
-
-
-
- -
-
-
- -
- ~ -
- -
- -
- Today -
-
- Yesterday -
-
- Last 7 Days -
-
- This - Month -
-
- Last - Month -
-
- This - Year -
- -
-
-
-
-
-
-
+
Total Records:{{paginationa.totalCount}};Total Pages:{{paginationa.totalPages}}
-
-
-
- -
交易分布
-
-
-
-

组织总交易额

-
- - - - - - - - - - - - - -
OrganizationAmount ($)
- -
-
-
-

{{chooseOrg}} 合伙人商户交易量排名

-
- - - - - - - - - - - - - - - - - - - - - -
RankingPartnerAUD AmountRankingPartnerAmount
- - {{sale[0].client_moniker}} - - - - {{sale[1].client_moniker}} - -
- -
- -
-
-
-
- -
+
+
+
+
+
+ + +
+
+ +
+

+ {{org.gateway_short_id||'初始化'}} + +

+
+
+
+ +
+ View +
+
+
+ +
+ Upload +
+
+
+ + +
+
+ +
+ +
+
+
+ + +
+
+
+ 禁用 +   超期提醒   +   等待合规   +   绿色通道   +   通过   +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Partner CodePartner NameSub Mch IDRegister TimeCompliance StatusOrganizationBDOperation
+ + + + (已禁用) + + + + + 通过({{partner.approve_time}}) + 资料完善中 + (自助开通)资料完善中 + 自助开通试用中({{partner.approve_time}}~{{partner.expiry_time}}) + 不通过({{partner.approve_time}}) + 申请打回({{partner.refuse_remark|limitTo:15}}) + 等待合规 + 自助开通（等待合规） + 合同制作完成 + 等待BD上传材料审核 + 绿色通道申请中 + 等待合规 + + + Detail + +
+
+
+ +
+
Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}
+
+
+
+ + +
+
+
+
商户新增趋势
+
+
+
+
+
+
+
+
+
+
交易额趋势
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+ ~ +
+ +
-
+
+ Today +
+
+ Yesterday +
+
+ Last 7 Days +
+
+ This Month +
+
+ Last Month +
+
+ This Year +
+
+
- - -
-
合伙人提成
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
名称时间交易金额商户总手续费Royalpay手续费合伙人提成提成分润支付渠道
- {{clientExtracts.year|limitTo:10}} - - - {{clientExtracts.month|limitTo:10}} - - - - - {{clientExtracts.channel}} -
-
-
- -
-
Total Records:{{paginationc.totalCount}};Total Pages:{{paginationc.totalPages}}
-
-
+
+
+
+
+
+
+
+
+ +
交易分布
+
+
+
+

组织总交易额

+
+ + + + + + + + + + + + + +
OrganizationAmount ($)
+ +
- - - -
-
- -
- -

-
-
-
- - - - -
+
+

{{chooseOrg}} 合伙人商户交易量排名

+
+ + + + + + + + + + + + + + + + + + + + + +
RankingPartnerAUD AmountRankingPartnerAmount
+ + {{sale[0].client_moniker}} + + + + {{sale[1].client_moniker}} + +
+ +
+
+
+
+
+
+
+
+ + +
+
合伙人提成
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
名称时间交易金额商户总手续费Royalpay手续费合伙人提成提成分润支付渠道
{{clientExtracts.year|limitTo:10}} - {{clientExtracts.month|limitTo:10}} + + + + {{clientExtracts.channel}} +
+
+
+ +
+
Total Records:{{paginationc.totalCount}};Total Pages:{{paginationc.totalPages}}
+
+
+
+ + +
+
+ +
+ +

+
+
+
+ + + +
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html index f15c83f7c..ab0ad5e8a 100644 --- a/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html +++ b/src/main/ui/static/payment/partner/templates/partner_bankaccounts.html @@ -397,6 +397,10 @@ +
+ check +
From b859d6010ca09a72fdb8cf38d7df2f3d486359ac Mon Sep 17 00:00:00 2001 From: Todking Date: Wed, 31 Mar 2021 14:34:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20V5=E9=9D=99=E6=80=81=E7=A0=81?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=8C=89=E9=92=AE=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/templates/alipay/v5/payment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/ui/static/templates/alipay/v5/payment.js b/src/main/ui/static/templates/alipay/v5/payment.js index c43709374..5c1498ad3 100644 --- a/src/main/ui/static/templates/alipay/v5/payment.js +++ b/src/main/ui/static/templates/alipay/v5/payment.js @@ -234,7 +234,7 @@ $(function () { $('.pay_button').css({"background-color":"#eee",}).attr('disabled',true); $('.bank_button').css({"background-color":"#eee",}).attr('disabled',true); }else{ - $('.pay_button').css({"background-color":"#19AD18",}).attr('disabled',false); + $('.pay_button').css({"background-color":"#108ee9",}).attr('disabled',false); $('.bank_button').css({"background-color":"#FF6600",}).attr('disabled',false); } }); From dc099e0e960a24e4bfbd18482534196a2a9958ad Mon Sep 17 00:00:00 2001 From: AlanFenng Date: Wed, 31 Mar 2021 14:39:48 +0800 Subject: [PATCH 3/3] add develop version 2.3.80-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e9d665d68..5ae7b28e2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 manage - 2.3.79 + 2.3.80-SNAPSHOT UTF-8 2.4.0