From 419758b21fbb655653b1f3d56df8681ee195c674 Mon Sep 17 00:00:00 2001 From: luoyang Date: Wed, 10 Oct 2018 15:22:01 +0800 Subject: [PATCH] fix ui-view --- src/main/ui/main_menu.html | 116 +--------------------- src/main/ui/manage.html | 115 ++++++++++++++++++++- src/main/ui/static/boot/managerMainApp.js | 7 ++ src/main/ui/static/menu/managerMenu.js | 6 +- 4 files changed, 123 insertions(+), 121 deletions(-) diff --git a/src/main/ui/main_menu.html b/src/main/ui/main_menu.html index 655f1c824..60e98f5ff 100644 --- a/src/main/ui/main_menu.html +++ b/src/main/ui/main_menu.html @@ -26,113 +26,9 @@ } } - -
- -
- -
+
@@ -144,7 +40,7 @@
- +
@@ -772,11 +668,3 @@
- - diff --git a/src/main/ui/manage.html b/src/main/ui/manage.html index 1ad134ae4..abec3c402 100644 --- a/src/main/ui/manage.html +++ b/src/main/ui/manage.html @@ -136,8 +136,112 @@ margin-bottom: 10%;"/>

To Be The Best QRCode Payment Service Provider!

+
+ + +
+ ng-class="currentUser.org?(currentUser.org.banner_class||'fxplus'):'royalpay'" ui-view>
diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js index cd2609478..5c25c5a3f 100644 --- a/src/main/ui/static/boot/managerMainApp.js +++ b/src/main/ui/static/boot/managerMainApp.js @@ -17,6 +17,13 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo }]); app.controller('managerIndexCtrl', ['$scope', '$rootScope', '$http', '$log', '$timeout', '$interval', '$uibModal', '$filter', 'myLoginLogView', 'commonDialog', function ($scope, $rootScope, $http, $log, $timeout, $interval, $uibModal, $filter, myLoginLogView, commonDialog) { + $scope.headerDisplay = false; + $scope.copyright = false; + + $scope.headerShow = function () { + $scope.headerDisplay = true; + $scope.copyright = true; + }; $http.get('/sysconfig/base').then(function (resp) { $rootScope.sysParams = resp.data; }); diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js index 0301b2a69..51d0c8f5d 100644 --- a/src/main/ui/static/menu/managerMenu.js +++ b/src/main/ui/static/menu/managerMenu.js @@ -5,11 +5,7 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { $stateProvider.state('listMenu', { url: '/menu?role', controller: 'listMenuCtrl', - views: { - "menu": { - templateUrl: 'main_menu.html' - } - } + templateUrl: 'main_menu.html' }); }]); app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal', 'commonDialog','$stateParams', function ($scope, $http,$filter, $uibModal, commonDialog,$stateParams) {