msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/alipayplus_aps' into alipayplus_aps

Browse Source
master
Todking 3 years ago
parent b60707d7ac e893ed3111
commit 500066f8aa
4 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File

12
src/main/ui/static/boot/indexMainApp.js
Unescape View File

@ -580,13 +580,13 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
return function (gateway) { return function (gateway) {
switch (gateway + '') { switch (gateway + '') {
case '0': case '0':
return 'Retail In-Store'; return 'POS';
case '1': case '1':
return 'Retail In-Store'; return 'POS';
case '2': case '2':
return 'QR Code'; return 'M QR';
case '3': case '3':
return 'Online API'; return 'WEB QR';
case '4': case '4':
return 'WeChat HTML5'; return 'WeChat HTML5';
case '5': case '5':
@ -598,7 +598,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
case '8': case '8':
return 'Mobile H5'; return 'Mobile H5';
case '9': case '9':
return 'Third-Party Gateway'; return 'Cashier';
case '10': case '10':
return 'APP'; return 'APP';
case '11': case '11':
@ -606,7 +606,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
case '12': case '12':
return 'MICROAPP'; return 'MICROAPP';
case '13': case '13':
return 'Native QR Code'; return 'Native QR';
case '14': case '14':
return 'Share Link' return 'Share Link'
case '16': case '16':

10
src/main/ui/static/payment/partner/templates/partner_pay_logs.html
Unescape View File

@ -84,19 +84,19 @@
<a role="button" ng-class="{'bg-primary':params.gateway==null}" <a role="button" ng-class="{'bg-primary':params.gateway==null}"
ng-click="params.gateway=null;loadTradeLogs(1)">All</a> | ng-click="params.gateway=null;loadTradeLogs(1)">All</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([0,1])}" <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])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([5,6])}"
ng-click="params.gateway=[5,6];initGatewayChild()">Retail API</a> | ng-click="params.gateway=[5,6];initGatewayChild()">Retail API</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([2,7])}" <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])}" <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])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([4])}"
ng-click="params.gateway=[4];loadTradeLogs(1)">WeChat HTML5</a> | ng-click="params.gateway=[4];loadTradeLogs(1)">WeChat HTML5</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([8])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([8])}"
ng-click="params.gateway=[8];loadTradeLogs(1)">Mobile H5</a> | ng-click="params.gateway=[8];loadTradeLogs(1)">Mobile H5</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([9])}" <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])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([10])}"
ng-click="params.gateway=[10];loadTradeLogs(1)">APP</a> | ng-click="params.gateway=[10];loadTradeLogs(1)">APP</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([11])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([11])}"
@ -104,7 +104,7 @@
<a role="button" ng-class="{'bg-primary':gatewaySelected([12])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([12])}"
ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram</a> | ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([13])}" <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])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([14])}"
ng-click="params.gateway=[14];loadTradeLogs(1)">Share Link</a> ng-click="params.gateway=[14];loadTradeLogs(1)">Share Link</a>
</p> </p>

12
src/main/ui/static/payment/tradelog/templates/partner_trade_logs.html
Unescape View File

@ -239,21 +239,19 @@
<a role="button" ng-class="{'bg-primary':params.gateway==null}" <a role="button" ng-class="{'bg-primary':params.gateway==null}"
ng-click="params.gateway=null;loadTradeLogs(1)">All</a> | ng-click="params.gateway=null;loadTradeLogs(1)">All</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([0,1])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([0,1])}"
ng-click="params.gateway=[0,1];initGatewayChild()">Retail ng-click="params.gateway=[0,1];initGatewayChild()">POS</a> |
In-Store</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([5,6])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([5,6])}"
ng-click="params.gateway=[5,6];initGatewayChild()">Retail API</a> | ng-click="params.gateway=[5,6];initGatewayChild()">Retail API</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([2,7])}" <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])}" <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])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([4])}"
ng-click="params.gateway=[4];loadTradeLogs(1)">WeChat HTML5</a> | ng-click="params.gateway=[4];loadTradeLogs(1)">WeChat HTML5</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([8])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([8])}"
ng-click="params.gateway=[8];loadTradeLogs(1)">Mobile H5</a> | ng-click="params.gateway=[8];loadTradeLogs(1)">Mobile H5</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([9])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([9])}"
ng-click="params.gateway=[9];loadTradeLogs(1)">Third Party ng-click="params.gateway=[9];loadTradeLogs(1)">Cashier</a> |
Gateway</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([10])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([10])}"
ng-click="params.gateway=[10];loadTradeLogs(1)">APP</a> | ng-click="params.gateway=[10];loadTradeLogs(1)">APP</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([11])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([11])}"
@ -261,7 +259,7 @@
<a role="button" ng-class="{'bg-primary':gatewaySelected([12])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([12])}"
ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram</a> | ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([13])}" <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])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([14])}"
ng-click="params.gateway=[14];loadTradeLogs(1)">Share Link</a> ng-click="params.gateway=[14];loadTradeLogs(1)">Share Link</a>
</p> </p>

12
src/main/ui/static/payment/tradelog/templates/trade_logs.html
Unescape View File

@ -214,23 +214,21 @@
<a role="button" ng-class="{'bg-primary':params.gateway==null}" <a role="button" ng-class="{'bg-primary':params.gateway==null}"
ng-click="params.gateway=null;loadTradeLogs(1)">All</a> | ng-click="params.gateway=null;loadTradeLogs(1)">All</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([0,1])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([0,1])}"
ng-click="params.gateway=[0,1];initGatewayChild()">Retail ng-click="params.gateway=[0,1];initGatewayChild()">POS</a>
In-Store</a>
| |
<a role="button" ng-class="{'bg-primary':gatewaySelected([5,6])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([5,6])}"
ng-click="params.gateway=[5,6];loadTradeLogs(1);initGatewayChild()">Retail ng-click="params.gateway=[5,6];loadTradeLogs(1);initGatewayChild()">Retail
API</a> | API</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([2,7])}" <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])}" <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])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([4])}"
ng-click="params.gateway=[4];loadTradeLogs(1)">WeChat HTML5</a> | ng-click="params.gateway=[4];loadTradeLogs(1)">WeChat HTML5</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([8])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([8])}"
ng-click="params.gateway=[8];loadTradeLogs(1)">Mobile H5</a> | ng-click="params.gateway=[8];loadTradeLogs(1)">Mobile H5</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([9])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([9])}"
ng-click="params.gateway=[9];loadTradeLogs(1)">Third Party ng-click="params.gateway=[9];loadTradeLogs(1)">Cashier</a> |
Gateway</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([10])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([10])}"
ng-click="params.gateway=[10];loadTradeLogs(1)">APP</a> | ng-click="params.gateway=[10];loadTradeLogs(1)">APP</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([11])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([11])}"
@ -238,7 +236,7 @@
<a role="button" ng-class="{'bg-primary':gatewaySelected([12])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([12])}"
ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram</a> | ng-click="params.gateway=[12];loadTradeLogs(1)">MiniProgram</a> |
<a role="button" ng-class="{'bg-primary':gatewaySelected([13])}" <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])}" <a role="button" ng-class="{'bg-primary':gatewaySelected([14])}"
ng-click="params.gateway=[14];loadTradeLogs(1)">Share Link</a> ng-click="params.gateway=[14];loadTradeLogs(1)">Share Link</a>
</p> </p>

Write Preview
Loading…
Cancel
Save