diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js
index f0f1e5e3c..44b2bb179 100644
--- a/src/main/ui/static/boot/managerMainAppv2.js
+++ b/src/main/ui/static/boot/managerMainAppv2.js
@@ -5,9 +5,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo
'use strict';
var app = angular.module('managerMainAppv2', ['ngSanitize', 'ngAnimate', 'ngMessages', 'ui.router', 'ui.bootstrap', 'ngFileUpload']);
app.config(['$urlRouterProvider', '$httpProvider', function ($urlRouterProvider, $httpProvider) {
-/*
- $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/dashboard');
-*/
+
+ $urlRouterProvider.otherwise(((window.currentUser.role & parseInt('100000', 2)) > 0) ? '/managers' : '/home');
+
if (!$httpProvider.defaults.headers.get) {
$httpProvider.defaults.headers.get = {};
}
@@ -17,18 +17,21 @@ 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) {
- if (window.location.hash == "" || window.location.hash == "#/") {
+ if (window.location.hash == "" || window.location.hash == "#/home") {
$scope.headerDisplay = false;
$scope.copyright = false;
}else{
$scope.headerDisplay = true;
$scope.copyright = true;
}
-
-
- $scope.headerShow = function () {
+ $scope.headerCopyDisplay = function () {
+ $scope.headerDisplay = false;
+ $scope.copyright = false;
+ };
+ $scope.headerShow = function (role) {
$scope.headerDisplay = true;
$scope.copyright = true;
+ sessionStorage.setItem('role',role);
};
$http.get('/sysconfig/base').then(function (resp) {
$rootScope.sysParams = resp.data;
diff --git a/src/main/ui/static/images/main_menu/admin_shops.png b/src/main/ui/static/images/main_menu/admin_shops.png
new file mode 100644
index 000000000..8540a0ffa
Binary files /dev/null and b/src/main/ui/static/images/main_menu/admin_shops.png differ
diff --git a/src/main/ui/static/images/main_menu/dev_log.png b/src/main/ui/static/images/main_menu/dev_log.png
new file mode 100644
index 000000000..362dc26fb
Binary files /dev/null and b/src/main/ui/static/images/main_menu/dev_log.png differ
diff --git a/src/main/ui/static/images/main_menu/dev_tools.png b/src/main/ui/static/images/main_menu/dev_tools.png
new file mode 100644
index 000000000..b13eeb886
Binary files /dev/null and b/src/main/ui/static/images/main_menu/dev_tools.png differ
diff --git a/src/main/ui/static/images/main_menu/site_cms.png b/src/main/ui/static/images/main_menu/site_cms.png
new file mode 100644
index 000000000..6141f58be
Binary files /dev/null and b/src/main/ui/static/images/main_menu/site_cms.png differ
diff --git a/src/main/ui/static/images/main_menu/site_monelyact.png b/src/main/ui/static/images/main_menu/site_monelyact.png
new file mode 100644
index 000000000..71eaec542
Binary files /dev/null and b/src/main/ui/static/images/main_menu/site_monelyact.png differ
diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js
index 06e83dedd..81c08d874 100644
--- a/src/main/ui/static/menu/managerMenu.js
+++ b/src/main/ui/static/menu/managerMenu.js
@@ -5,62 +5,16 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
$stateProvider.state('listMenu', {
url: '/menu?role',
controller: 'listMenuCtrl',
- templateUrl: 'main_menu.html'
+ templateUrl: '/static/menu/templates/main_menu.html'
+ }).state('home', {
+ url: '/home',
+ templateUrl: '/static/menu/templates/home.html',
+ controller: 'homeCtrl'
});
}]);
app.controller('listMenuCtrl', ['$scope', '$http', '$filter','$uibModal','$location', '$anchorScroll','$stateParams', function ($scope, $http,$filter, $uibModal,$location, $anchorScroll,$stateParams) {
-
- $scope.role = $stateParams["role"];
- var gotohash = function (role) {
- switch (role) {
- case "Compliance" :
- $location.hash('partners');
- $anchorScroll();
- break;
- case "RiskManager" :
- $location.hash('risk');
- $anchorScroll();
- break;
- case "AccountManager" :
- $location.hash('org');
- $anchorScroll();
- break;
- case "Accountant" :
- $location.hash('clearing');
- $anchorScroll();
- break;
- case "BDUser" :
- $location.hash('bd');
- $anchorScroll();
- break;
- case "Service" :
- $location.hash('art');
- $anchorScroll();
- break;
- case "Administrator" :
- $location.hash('setting');
- $anchorScroll();
- break;
- case "SiteManager" :
- $location.hash('cms');
- $anchorScroll();
- break;
- case "Developer" :
- $location.hash('develop');
- $anchorScroll();
- break;
- case "Director" :
- $location.hash('staff');
- $anchorScroll();
- break;
- default:
- break;
- }
-
- };
-
- gotohash($stateParams["role"]);
+ $scope.role = sessionStorage.getItem('role');
$scope.editRateConfig = function () {
$uibModal.open({
@@ -146,5 +100,9 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) {
})
};
}]);
+ app.controller('homeCtrl', ['$scope', '$http', function ($scope, $http) {
+
+ }]);
+
return app;
});
diff --git a/src/main/ui/static/menu/templates/home.html b/src/main/ui/static/menu/templates/home.html
new file mode 100644
index 000000000..8b0598370
--- /dev/null
+++ b/src/main/ui/static/menu/templates/home.html
@@ -0,0 +1,169 @@
+
+
+
+
+
+ Easy Business，Easy Payment!
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/ui/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html
similarity index 98%
rename from src/main/ui/main_menu.html
rename to src/main/ui/static/menu/templates/main_menu.html
index d5c210a04..39d334eba 100644
--- a/src/main/ui/main_menu.html
+++ b/src/main/ui/static/menu/templates/main_menu.html
@@ -5,7 +5,7 @@
}
- 
- 
- 
- 
- 
- 
- 
- 
-