From e268b0419b1a269e7076fa5e43227ab863555836 Mon Sep 17 00:00:00 2001
From: dalong306 <304592994@qq.com>
Date: Wed, 8 Dec 2021 17:36:26 +0800
Subject: [PATCH] =?UTF-8?q?gateway=20=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/boot/indexMainApp.js              | 12 ++++++------
 .../payment/partner/templates/partner_pay_logs.html  | 10 +++++-----
 .../tradelog/templates/partner_trade_logs.html       | 12 +++++-------
 .../payment/tradelog/templates/trade_logs.html       | 12 +++++-------
 4 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/main/ui/static/boot/indexMainApp.js b/src/main/ui/static/boot/indexMainApp.js
index dc8cd2d3d..580cc7a7d 100644
--- a/src/main/ui/static/boot/indexMainApp.js
+++ b/src/main/ui/static/boot/indexMainApp.js
@@ -580,13 +580,13 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
         return function (gateway) {
             switch (gateway + '') {
                 case '0':
-                    return 'Retail In-Store';
+                    return 'POS';
                 case '1':
-                    return 'Retail In-Store';
+                    return 'POS';
                 case '2':
-                    return 'QR Code';
+                    return 'M QR';
                 case '3':
-                    return 'Online API';
+                    return 'WEB QR';
                 case '4':
                     return 'WeChat HTML5';
                 case '5':
@@ -598,7 +598,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 case '8':
                     return 'Mobile H5';
                 case '9':
-                    return 'Third-Party Gateway';
+                    return 'Cashier';
                 case '10':
                     return 'APP';
                 case '11':
@@ -606,7 +606,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
                 case '12':
                     return 'MICROAPP';
                 case '13':
-                    return 'Native QR Code';
+                    return 'Native QR';
                 case '14':
                     return 'Share Link'
                 case '16':
diff --git a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
index 38923d027..5010cc668 100644
--- a/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
+++ b/src/main/ui/static/payment/partner/templates/partner_pay_logs.html
@@ -84,19 +84,19 @@
                         <a role="button" ng-class="{'bg-primary':params.gateway==null}"
                             ng-click="params.gateway=null;loadTradeLogs(1)">All</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([0,1])}"
-                            ng-click="params.gateway=[0,1];initGatewayChild()">Retail In-Store</a> |
+                            ng-click="params.gateway=[0,1];initGatewayChild()">POS</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([5,6])}"
                             ng-click="params.gateway=[5,6];initGatewayChild()">Retail API</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([2,7])}"
-                            ng-click="params.gateway=[2,7];loadTradeLogs(1)">QR Code</a> |
+                            ng-click="params.gateway=[2,7];loadTradeLogs(1)">M QR</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([3])}"
-                            ng-click="params.gateway=[3];loadTradeLogs(1)">Online API</a> |
+                            ng-click="params.gateway=[3];loadTradeLogs(1)">WEB QR</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([4])}"
                             ng-click="params.gateway=[4];loadTradeLogs(1)">WeChat HTML5</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([8])}"
                             ng-click="params.gateway=[8];loadTradeLogs(1)">Mobile H5</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([9])}"
-                            ng-click="params.gateway=[9];loadTradeLogs(1)">Third Party Gateway</a> |
+                            ng-click="params.gateway=[9];loadTradeLogs(1)">Cashier</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([10])}"
                             ng-click="params.gateway=[10];loadTradeLogs(1)">APP</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([11])}"
@@ -104,7 +104,7 @@
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([12])}"
                             ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([13])}"
-                            ng-click="params.gateway=[13];loadTradeLogs(1)">Native QR Code</a> |
+                            ng-click="params.gateway=[13];loadTradeLogs(1)">Native QR</a> |
                         <a role="button" ng-class="{'bg-primary':gatewaySelected([14])}"
                             ng-click="params.gateway=[14];loadTradeLogs(1)">Share Link</a>
                     </p>
diff --git a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
index bc7ee3636..08464526f 100644
--- a/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
@@ -239,21 +239,19 @@
                                                 <a role="button" ng-class="{'bg-primary':params.gateway==null}"
                                                     ng-click="params.gateway=null;loadTradeLogs(1)">All</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([0,1])}"
-                                                    ng-click="params.gateway=[0,1];initGatewayChild()">Retail
-                                                    In-Store</a> |
+                                                    ng-click="params.gateway=[0,1];initGatewayChild()">POS</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([5,6])}"
                                                     ng-click="params.gateway=[5,6];initGatewayChild()">Retail API</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([2,7])}"
-                                                    ng-click="params.gateway=[2,7];loadTradeLogs(1)">QR Code</a> |
+                                                    ng-click="params.gateway=[2,7];loadTradeLogs(1)">M QR</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([3])}"
-                                                    ng-click="params.gateway=[3];loadTradeLogs(1)">Online API</a> |
+                                                    ng-click="params.gateway=[3];loadTradeLogs(1)">WEB QR</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([4])}"
                                                     ng-click="params.gateway=[4];loadTradeLogs(1)">WeChat HTML5</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([8])}"
                                                     ng-click="params.gateway=[8];loadTradeLogs(1)">Mobile H5</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([9])}"
-                                                    ng-click="params.gateway=[9];loadTradeLogs(1)">Third Party
-                                                    Gateway</a> |
+                                                    ng-click="params.gateway=[9];loadTradeLogs(1)">Cashier</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([10])}"
                                                     ng-click="params.gateway=[10];loadTradeLogs(1)">APP</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([11])}"
@@ -261,7 +259,7 @@
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([12])}"
                                                     ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([13])}"
-                                                    ng-click="params.gateway=[13];loadTradeLogs(1)">Native QR Code</a> |
+                                                    ng-click="params.gateway=[13];loadTradeLogs(1)">Native QR</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([14])}"
                                                     ng-click="params.gateway=[14];loadTradeLogs(1)">Share Link</a>
                                             </p>
diff --git a/src/main/ui/static/payment/tradelog/templates/trade_logs.html b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
index aa8eac824..3c43b0d81 100644
--- a/src/main/ui/static/payment/tradelog/templates/trade_logs.html
+++ b/src/main/ui/static/payment/tradelog/templates/trade_logs.html
@@ -214,23 +214,21 @@
                                                 <a role="button" ng-class="{'bg-primary':params.gateway==null}"
                                                     ng-click="params.gateway=null;loadTradeLogs(1)">All</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([0,1])}"
-                                                    ng-click="params.gateway=[0,1];initGatewayChild()">Retail
-                                                    In-Store</a>
+                                                    ng-click="params.gateway=[0,1];initGatewayChild()">POS</a>
                                                 |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([5,6])}"
                                                     ng-click="params.gateway=[5,6];loadTradeLogs(1);initGatewayChild()">Retail
                                                     API</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([2,7])}"
-                                                    ng-click="params.gateway=[2,7];loadTradeLogs(1)">QR Code</a> |
+                                                    ng-click="params.gateway=[2,7];loadTradeLogs(1)">M QR</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([3])}"
-                                                    ng-click="params.gateway=[3];loadTradeLogs(1)">Online API</a> |
+                                                    ng-click="params.gateway=[3];loadTradeLogs(1)">WEB QR</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([4])}"
                                                     ng-click="params.gateway=[4];loadTradeLogs(1)">WeChat HTML5</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([8])}"
                                                     ng-click="params.gateway=[8];loadTradeLogs(1)">Mobile H5</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([9])}"
-                                                    ng-click="params.gateway=[9];loadTradeLogs(1)">Third Party
-                                                    Gateway</a> |
+                                                    ng-click="params.gateway=[9];loadTradeLogs(1)">Cashier</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([10])}"
                                                     ng-click="params.gateway=[10];loadTradeLogs(1)">APP</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([11])}"
@@ -238,7 +236,7 @@
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([12])}"
                                                     ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([13])}"
-                                                    ng-click="params.gateway=[13];loadTradeLogs(1)">Native QR Code</a> |
+                                                    ng-click="params.gateway=[13];loadTradeLogs(1)">Native QR</a> |
                                                 <a role="button" ng-class="{'bg-primary':gatewaySelected([14])}"
                                                     ng-click="params.gateway=[14];loadTradeLogs(1)">Share Link</a>
                                             </p>