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

fix ui

Browse Source
master
luoyang 5 years ago
parent dd4635e55d
commit 642adc007f
15 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File

22
src/main/resources/application-dev.properties
Unescape View File

@ -1,6 +1,16 @@
spring.datasource.driver-class-name=com.mysql.jdbc.Driver #多数据源配置
spring.datasource.schema-name=royalpay_local spring.datasource.type = com.zaxxer.hikari.HikariDataSource
spring.datasource.host=192.168.0.50:3306 #数据源master
spring.datasource.url=jdbc:mysql://${spring.datasource.host}/${spring.datasource.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
spring.datasource.username=root spring.datasource.master.schema-name=royalpay_production
spring.datasource.password=root spring.datasource.master.host=192.168.1.52:3306
spring.datasource.master.jdbc-url=jdbc:mysql://${spring.datasource.master.host}/${spring.datasource.master.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
spring.datasource.master.username=taylor
spring.datasource.master.password=taylor
#数据源salve
spring.datasource.slave.schema-name=royalpay_production
spring.datasource.slave.host=192.168.1.52:3306
spring.datasource.slave.jdbc-url=jdbc:mysql://${spring.datasource.slave.host}/${spring.datasource.slave.schema-name}?useUnicode=true&characterEncoding=utf8&useSSL=false
spring.datasource.slave.username=taylor
spring.datasource.slave.password=taylor

2
src/main/ui/static/cashback/templates/partner_cashback_records.html
Unescape View File

@ -84,7 +84,7 @@
<img src="/static/images/royalpay_sign_s.png" <img src="/static/images/royalpay_sign_s.png"
uib-tooltip="RoyalPay" ng-if="record.source=='system'"/> uib-tooltip="RoyalPay" ng-if="record.source=='system'"/>
<img src="/static/images/yangmaimai_sign.png" <img src="/static/images/yangmaimai_sign.png"
uib-tooltip="YangMaiMai" ng-if="record.source=='yangmaimai'"/> uib-tooltip="R跨境商城" ng-if="record.source=='R跨境商城'"/>
{{record.order_id}} {{record.order_id}}
</td> </td>
<td ng-bind="record.cashback_amount|currency:'AUD '"></td> <td ng-bind="record.cashback_amount|currency:'AUD '"></td>

BIN
src/main/ui/static/images/R跨境商城.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
src/main/ui/static/images/r_cross_mall.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
src/main/ui/static/images/yangmaimai_sign.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 432 B

After

Width:  |  Height:  |  Size: 547 B

6
src/main/ui/static/incrementalService/templates/partner_incremental_service_info.html
Unescape View File

@ -139,8 +139,8 @@
ng-click="params.source='ALL';loadTradeLogs(1)">All</a> | ng-click="params.source='ALL';loadTradeLogs(1)">All</a> |
<a role="button" ng-class="{'bg-primary':params.source=='system'}" <a role="button" ng-class="{'bg-primary':params.source=='system'}"
ng-click="params.source='system';loadTradeLogs(1)">System</a> | ng-click="params.source='system';loadTradeLogs(1)">System</a> |
<a role="button" ng-class="{'bg-primary':params.source=='yangmaimai'}" <a role="button" ng-class="{'bg-primary':params.source=='R跨境商城'}"
ng-click="params.source='yangmaimai';loadTradeLogs(1)">Yangmaimai2</a> ng-click="params.source='R跨境商城';loadTradeLogs(1)">R跨境商城</a>
</p> </p>
</div> </div>
</div>--> </div>-->
@ -368,7 +368,7 @@
<img src="/static/images/clearing-icon.png" uib-tooltip="clearing" ng-if="trade.clearing_status=='1'"/> <img src="/static/images/clearing-icon.png" uib-tooltip="clearing" ng-if="trade.clearing_status=='1'"/>
<i class="fa fa-check-circle-o text-danger" uib-tooltip="Refund Audition Required" ng-if="trade.audition"></i> <i class="fa fa-check-circle-o text-danger" uib-tooltip="Refund Audition Required" ng-if="trade.audition"></i>
<img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/> <img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmaimai_sign.png" uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/> <img src="/static/images/yangmaimai_sign.png" uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
<img src="/static/images/wechatpay_sign.png" uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/>
<img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Pay" ng-if="trade.channel=='Wechat'"/> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Pay" ng-if="trade.channel=='Wechat'"/>
<img src="/static/images/bestpay_sign.png" uib-tooltip="BestPay" alt="BestPay" ng-if="trade.channel=='Bestpay'"/> <img src="/static/images/bestpay_sign.png" uib-tooltip="BestPay" alt="BestPay" ng-if="trade.channel=='Bestpay'"/>

2
src/main/ui/static/invoice/templates/invoice_assistant.html
Unescape View File

@ -197,7 +197,7 @@
<img src="/static/images/royalpay_sign_s.png" <img src="/static/images/royalpay_sign_s.png"
uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/> uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmaimai_sign.png" <img src="/static/images/yangmaimai_sign.png"
uib-tooltip="yangmaimai" ng-if="trade.source=='yangmaimai'"/> uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
<img src="/static/images/wechatpay_sign.png" <img src="/static/images/wechatpay_sign.png"
uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/> uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/>
<img src="/static/images/wechatpay_sign.png" <img src="/static/images/wechatpay_sign.png"

2
src/main/ui/static/payment/tradelog/templates/balance_report.html
Unescape View File

@ -314,7 +314,7 @@
<img src="/static/images/royalpay_sign_s.png" <img src="/static/images/royalpay_sign_s.png"
uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/> uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmaimai_sign.png" <img src="/static/images/yangmaimai_sign.png"
uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/> uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
<img src="/static/images/wechatpay_sign.png" <img src="/static/images/wechatpay_sign.png"
uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/> uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/>
<img src="/static/images/wechatpay_sign.png" <img src="/static/images/wechatpay_sign.png"

6
src/main/ui/static/payment/tradelog/templates/incremental_trade_logs.html
Unescape View File

@ -348,8 +348,8 @@
<th>Input Amount</th> <th>Input Amount</th>
<th>System Rate</th> <th>System Rate</th>
<th>System Profit</th> <th>System Profit</th>
<th>YangMaiMai Rate</th> <th>R跨境商城 Rate</th>
<th>YangMaiMai Profit</th> <th>R跨境商城 Profit</th>
<th>Status</th> <th>Status</th>
<th>Create Time</th> <th>Create Time</th>
<th>Operation</th> <th>Operation</th>
@ -366,7 +366,7 @@
<img src="/static/images/royalpay_sign_s.png" <img src="/static/images/royalpay_sign_s.png"
uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/> uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmaimai_sign.png" <img src="/static/images/yangmaimai_sign.png"
uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/> uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
<img src="/static/images/wechatpay_sign.png" <img src="/static/images/wechatpay_sign.png"
uib-tooltip="WechatPay" ng-if="trade.channel=='Wechat'"/> uib-tooltip="WechatPay" ng-if="trade.channel=='Wechat'"/>
<img src="/static/images/wechatpay_sign.png" <img src="/static/images/wechatpay_sign.png"

6
src/main/ui/static/payment/tradelog/templates/partner_incremental_trade_logs.html
Unescape View File

@ -101,8 +101,8 @@
ng-click="params.source='ALL';loadTradeLogs(1)">All</a> | ng-click="params.source='ALL';loadTradeLogs(1)">All</a> |
<a role="button" ng-class="{'bg-primary':params.source=='system'}" <a role="button" ng-class="{'bg-primary':params.source=='system'}"
ng-click="params.source='system';loadTradeLogs(1)">System</a> | ng-click="params.source='system';loadTradeLogs(1)">System</a> |
<a role="button" ng-class="{'bg-primary':params.source=='yangmaimai'}" <a role="button" ng-class="{'bg-primary':params.source=='R跨境商城'}"
ng-click="params.source='yangmaimai';loadTradeLogs(1)">Yangmaimai2</a> ng-click="params.source='R跨境商城';loadTradeLogs(1)">R跨境商城</a>
</p> </p>
</div> </div>
</div>--> </div>-->
@ -330,7 +330,7 @@
<img src="/static/images/clearing-icon.png" uib-tooltip="clearing" ng-if="trade.clearing_status=='1'"/> <img src="/static/images/clearing-icon.png" uib-tooltip="clearing" ng-if="trade.clearing_status=='1'"/>
<i class="fa fa-check-circle-o text-danger" uib-tooltip="Refund Audition Required" ng-if="trade.audition"></i> <i class="fa fa-check-circle-o text-danger" uib-tooltip="Refund Audition Required" ng-if="trade.audition"></i>
<img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/> <img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmaimai_sign.png" uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/> <img src="/static/images/yangmaimai_sign.png" uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
<img src="/static/images/wechatpay_sign.png" uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/>
<img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Pay" ng-if="trade.channel=='Wechat'"/> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Pay" ng-if="trade.channel=='Wechat'"/>
<img src="/static/images/bestpay_sign.png" uib-tooltip="BestPay" alt="BestPay" ng-if="trade.channel=='Bestpay'"/> <img src="/static/images/bestpay_sign.png" uib-tooltip="BestPay" alt="BestPay" ng-if="trade.channel=='Bestpay'"/>

2
src/main/ui/static/payment/tradelog/templates/partner_settlement_dialog.html
Unescape View File

@ -220,7 +220,7 @@
<tr ng-repeat="tr in report.report|propsFilter:{transaction_type:'Credit',channel:ctrl.channel,transaction_time:ctrl.day}:true"> <tr ng-repeat="tr in report.report|propsFilter:{transaction_type:'Credit',channel:ctrl.channel,transaction_time:ctrl.day}:true">
<td> <td>
<img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="tr.source=='system'"/> <img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="tr.source=='system'"/>
<img src="/static/images/yangmaimai_sign.png" uib-tooltip="YangMaiMai" ng-if="tr.source=='yangmaimai'"/> <img src="/static/images/yangmaimai_sign.png" uib-tooltip="R跨境商城" ng-if="tr.source=='R跨境商城'"/>
<img class="channel-icon" ng-src="{{tr.channel|channel_image}}">{{tr.order_id}} <img class="channel-icon" ng-src="{{tr.channel|channel_image}}">{{tr.order_id}}
</td> </td>
<td ng-bind="tr.transaction_time"></td> <td ng-bind="tr.transaction_time"></td>

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

@ -117,8 +117,8 @@
ng-click="params.source='ALL';loadTradeLogs(1)">All</a> | ng-click="params.source='ALL';loadTradeLogs(1)">All</a> |
<a role="button" ng-class="{'bg-primary':params.source=='system'}" <a role="button" ng-class="{'bg-primary':params.source=='system'}"
ng-click="params.source='system';loadTradeLogs(1)">System</a> | ng-click="params.source='system';loadTradeLogs(1)">System</a> |
<a role="button" ng-class="{'bg-primary':params.source=='yangmaimai'}" <a role="button" ng-class="{'bg-primary':params.source=='R跨境商城'}"
ng-click="params.source='yangmaimai';loadTradeLogs(1)">YangMaiMai</a> ng-click="params.source='R跨境商城';loadTradeLogs(1)">R跨境商城</a>
</p> </p>
</div> </div>
</div> </div>
@ -420,7 +420,7 @@
<img src="/static/images/clearing-icon.png" uib-tooltip="clearing" ng-if="trade.clearing_status=='1'"/> <img src="/static/images/clearing-icon.png" uib-tooltip="clearing" ng-if="trade.clearing_status=='1'"/>
<i class="fa fa-check-circle-o text-danger" uib-tooltip="Refund Audition Required" ng-if="trade.audition"></i> <i class="fa fa-check-circle-o text-danger" uib-tooltip="Refund Audition Required" ng-if="trade.audition"></i>
<img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/> <img src="/static/images/royalpay_sign_s.png" uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmaimai_sign.png" uib-tooltip="Yangmaimai" ng-if="trade.source=='yangmaimai'"/> <img src="/static/images/yangmaimai_sign.png" uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
<img src="/static/images/wechatpay_sign.png" uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Znyoo" ng-if="trade.channel=='Znyoo'"/>
<img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Pay" ng-if="trade.channel=='Wechat'"/> <img src="/static/images/wechatpay_sign.png" uib-tooltip="Wechat Pay" ng-if="trade.channel=='Wechat'"/>
<img src="/static/images/bestpay_sign.png" uib-tooltip="BestPay" alt="BestPay" ng-if="trade.channel=='Bestpay'"/> <img src="/static/images/bestpay_sign.png" uib-tooltip="BestPay" alt="BestPay" ng-if="trade.channel=='Bestpay'"/>

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

@ -150,8 +150,8 @@
ng-click="params.source='ALL';loadTradeLogs(1)">All</a> | ng-click="params.source='ALL';loadTradeLogs(1)">All</a> |
<a role="button" ng-class="{'bg-primary':params.source=='system'}" <a role="button" ng-class="{'bg-primary':params.source=='system'}"
ng-click="params.source='system';loadTradeLogs(1)">System</a> | ng-click="params.source='system';loadTradeLogs(1)">System</a> |
<a role="button" ng-class="{'bg-primary':params.source=='yangmaimai'}" <a role="button" ng-class="{'bg-primary':params.source=='R跨境商城'}"
ng-click="params.source='yangmaimai';loadTradeLogs(1)">YangMaiMai</a> ng-click="params.source='R跨境商城';loadTradeLogs(1)">R跨境商城</a>
</p> </p>
</div> </div>
</div> </div>
@ -465,7 +465,7 @@
<img src="/static/images/royalpay_sign_s.png" <img src="/static/images/royalpay_sign_s.png"
uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/> uib-tooltip="RoyalPay" ng-if="trade.source=='system'"/>
<img src="/static/images/yangmaimai_sign.png" <img src="/static/images/yangmaimai_sign.png"
uib-tooltip="YangMaiMai" ng-if="trade.source=='yangmaimai'"/> uib-tooltip="R跨境商城" ng-if="trade.source=='R跨境商城'"/>
<img src="/static/images/wechatpay_sign.png" <img src="/static/images/wechatpay_sign.png"
uib-tooltip="WechatPay" ng-if="trade.channel=='Wechat'"/> uib-tooltip="WechatPay" ng-if="trade.channel=='Wechat'"/>
<img src="/static/images/wechatpay_sign.png" <img src="/static/images/wechatpay_sign.png"

2
src/main/ui/static/payment/tradelog/tradelog-manage.js
Unescape View File

@ -326,7 +326,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
}]); }]);
app.controller('globalIncrementalTradeLogCtrl', ['$scope', '$http', '$filter', 'commonDialog', 'refunder', 'orderService','$sce', app.controller('globalIncrementalTradeLogCtrl', ['$scope', '$http', '$filter', 'commonDialog', 'refunder', 'orderService','$sce',
function ($scope, $http, $filter, commonDialog, refunder, orderService,$sce) { function ($scope, $http, $filter, commonDialog, refunder, orderService,$sce) {
$scope.params = {source: 'yangmaimai',status: 'PAID',channel:'ALL', textType: 'all', datefrom: new Date(), dateto: new Date(),org_name:'ALL'}; $scope.params = {source: 'R跨境商城',status: 'PAID',channel:'ALL', textType: 'all', datefrom: new Date(), dateto: new Date(),org_name:'ALL'};
$scope.pagination = {}; $scope.pagination = {};
$scope.today = new Date(); $scope.today = new Date();

4
src/main/ui/static/payment/tradelog/tradelog.js
Unescape View File

@ -112,7 +112,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.tradeLogs[i].htmlTooltip = $sce.trustAsHtml('<div style="width: 180px">' + $scope.tradeLogs[i].htmlTooltip = $sce.trustAsHtml('<div style="width: 180px">' +
'<h5>手续费组成</h5>'+'<div style="background-color: #EFEFF5;height: 1px;margin-bottom: 10px;"></div>'+ '<h5>手续费组成</h5>'+'<div style="background-color: #EFEFF5;height: 1px;margin-bottom: 10px;"></div>'+
'<p>system:'+ system_surcharge +'</p>' + '<p>system:'+ system_surcharge +'</p>' +
'<p>yangmaimai:'+ incremental_surcharge +'</p>' + '<p>R跨境商城:'+ incremental_surcharge +'</p>' +
'<p>tax amount:'+ tax_amount +'</p>' + '<p>tax amount:'+ tax_amount +'</p>' +
'</div>'); '</div>');
} }
@ -297,7 +297,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
app.controller('IncrementalTradeLogCtrl', ['$scope', '$http', '$filter', '$timeout', 'partnerRefunder', 'orderService', 'commonDialog', app.controller('IncrementalTradeLogCtrl', ['$scope', '$http', '$filter', '$timeout', 'partnerRefunder', 'orderService', 'commonDialog',
function ($scope, $http, $filter, $timeout, partnerRefunder, orderService, commonDialog) { function ($scope, $http, $filter, $timeout, partnerRefunder, orderService, commonDialog) {
$scope.params = {source: 'yangmaimai',status: 'PAID', channel :'ALL' ,textType: 'all', datefrom: new Date(), dateto: new Date()}; $scope.params = {source: 'R跨境商城',status: 'PAID', channel :'ALL' ,textType: 'all', datefrom: new Date(), dateto: new Date()};
$scope.pagination = {}; $scope.pagination = {};
$scope.today = new Date(); $scope.today = new Date();
$scope.isAll = true; $scope.isAll = true;

Write Preview
Loading…
Cancel
Save