diff --git a/src/main/ui/static/analysis/partners-analysis.js b/src/main/ui/static/analysis/partners-analysis.js index fe4100c96..f2525a4d2 100644 --- a/src/main/ui/static/analysis/partners-analysis.js +++ b/src/main/ui/static/analysis/partners-analysis.js @@ -404,7 +404,23 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts','./transaction/an } ] }; - + $scope.analysisClients = function () { + $http.get('/sys/partners/analysis').then(function (resp) { + $scope.analysis = resp.data; + }) + }; + if ($scope.currentUser.org_id == 1 || $scope.currentUser.org_id == null) { + $scope.analysisClients(); + } + $scope.mapFrame = 'all_locations.html'; + $scope.loadLocations = function () { + var params = angular.copy($scope.params); + $http.get('/sys/partners/merchant/list_locations', {params: params}).then(function (resp) { + $scope.locations = resp.data; + window.merchant_maps.initMap($scope.locations); + }); + }; + $scope.loadLocations(); }]); diff --git a/src/main/ui/static/analysis/templates/partners_analysis.html b/src/main/ui/static/analysis/templates/partners_analysis.html index 5240b0ca6..f287b80ca 100644 --- a/src/main/ui/static/analysis/templates/partners_analysis.html +++ b/src/main/ui/static/analysis/templates/partners_analysis.html @@ -7,185 +7,228 @@ text-align: center; } - - - - - - - - - -
-
-
-
-
-
-
-
-
- - - - - - - +
+
+

Merchant statistics

+
    +
  1. + Payment +
    2. +
  2. Merchant statistics
    3. +
+
+
+
+
+
+ +
+ Waiting Compliance + {{analysis.wp}} + 其中自助开通:{{analysis.a_wp}} +
+
+
+
+
+ +
+ Pass + {{analysis.pass}} + 其中自助开通:{{analysis.z_pass+analysis.a_pass}} +
+
+
+
+
+ +
+ Temp SubMerchantID + +
+
+
+
+
+ +
+ 自助开通 + {{analysis.quick_pass}} + waiting compliance:{{analysis.a_wp}} +
+
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + - -
- -
-

- - - |  - All - -

+
+ +
+

+ + + |  + All + +

+
-
-
-
-
- - +
+
+
+ + +
-
-
-
-
-

各类型商家数量分布

-
+
+
+
+

各类型商家数量分布

+
+
+
+

{{partners_type.partner_type}} 行业列表

+ + + + + + + + + + + + + +
TypePartners
+
-
-

{{partners_type.partner_type}} 行业列表

- - - - - - - - - - - - - -
TypePartners
+
+
-
- -
-
-
-
-
-

商户清算周期分布

-
-
-
-
-

- - - -

-

-

清算周期列表

+
+
+
+

商户清算周期分布

+
+
+
+
+

+ + + +

+

+

清算周期列表

+
+ + + + + + + + + + + + + +
Clean DaysPartners
- - - - - - - - - - - - - -
Clean DaysPartners
-
-
-
-
-
-
-
- -
-
-
- -
- ~ -
- -
+
+
+
+
+
+
+ +
+
+
+ +
+ ~ +
+ +
- - - - - - - - -
- Last 7 Days -
-
- This Month + + + + + + + + +
+ Last 7 Days +
+
+ This Month +
+
+ Last Month +
+
+ This Year +
+
-
- Last Month -
-
- This Year -
-
@@ -193,20 +236,31 @@
-
-
-
新增商户数量变化
-
-
+
+
新增商户数量变化
+
+
+
-
-
-
交易商户数量变化
-
-
+
+
交易商户数量变化
+
+
+
+
+ +
+
商户分布 + 商户数量:{{locations.length}} +
+
+
+ +
+
diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index bb47df893..e680fe728 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -203,13 +203,13 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }); }; - $scope.loadLocations = function () { + /*$scope.loadLocations = function () { var params = angular.copy($scope.params); $http.get('/sys/partners/merchant/list_locations', {params: params}).then(function (resp) { $scope.locations = resp.data; window.merchant_maps.initMap($scope.locations); }); - }; + };*/ $scope.today = new Date(); $scope.listBDUsers = function () { @@ -268,14 +268,14 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }) }; - $scope.toogleMapSelect = function () { + /*$scope.toogleMapSelect = function () { $scope.mapFrame = 'all_locations.html'; $scope.loadLocations(); } $scope.toogleMerchantSelect = function () { $scope.mapFrame = null; } - $scope.toogleMerchantSelect(); + $scope.toogleMerchantSelect();*/ }]); app.controller('addPartnerCtrl', ['$rootScope', '$scope', '$http', '$state', 'Upload', 'commonDialog', 'timezone', function ($rootScope, $scope, $http, $state, Upload, commonDialog, timezone) { if ($scope.partner_application) { diff --git a/src/main/ui/static/payment/partner/templates/partners.html b/src/main/ui/static/payment/partner/templates/partners.html index 4121cdd6b..e7f5d7105 100644 --- a/src/main/ui/static/payment/partner/templates/partners.html +++ b/src/main/ui/static/payment/partner/templates/partners.html @@ -358,9 +358,10 @@
-
+ + + <!–
–> - -
+ <!–
–> +
-->
- -
@@ -434,7 +436,7 @@
-
    + -
    +
    禁用 @@ -541,7 +543,8 @@
    -
    + +