diff --git a/src/main/ui/managev2.html b/src/main/ui/managev2.html index e1f30a4f5..fae660339 100644 --- a/src/main/ui/managev2.html +++ b/src/main/ui/managev2.html @@ -200,6 +200,36 @@ margin-bottom: 10%;"/> +
  • + + + {{notifyCounts}} + + +
    • + +
  • diff --git a/src/main/ui/static/analysis/templates/settle_report.html b/src/main/ui/static/analysis/templates/settle_report.html index e6bbf9732..b335ae010 100644 --- a/src/main/ui/static/analysis/templates/settle_report.html +++ b/src/main/ui/static/analysis/templates/settle_report.html @@ -50,7 +50,7 @@ 清算日期 净交易额(扣除退款) - 腾讯清算总额 + 清算总额 清算给商户总额 RoyalPay手续费 diff --git a/src/main/ui/static/boot/managerMainApp.js b/src/main/ui/static/boot/managerMainApp.js index 067b1b66e..f8dfbf4f4 100644 --- a/src/main/ui/static/boot/managerMainApp.js +++ b/src/main/ui/static/boot/managerMainApp.js @@ -229,6 +229,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo case "compliance": rolenum = 2; break; + case "guest": + rolenum = 2048; + break; case "riskmanager": rolenum = 1024; break; diff --git a/src/main/ui/static/boot/managerMainAppv2.js b/src/main/ui/static/boot/managerMainAppv2.js index 8260078ee..26f205b3f 100644 --- a/src/main/ui/static/boot/managerMainAppv2.js +++ b/src/main/ui/static/boot/managerMainAppv2.js @@ -34,7 +34,7 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo roleMenu.push({'value':'riskmanager','module':"风控中心"}); } if ((role & 2048) >0){ - roleMenu.push({'value':'guest','module':"guest"}); + roleMenu.push({'value':'guest','module':"访客中心"}); } if ((role & 8192) >0){ roleMenu.push({'value':'salesmanager','module':"销管中心"}); @@ -130,6 +130,9 @@ define(['angular', 'angularSanitize', 'angularAnimate', 'angularMessages', 'uiRo case "riskmanager": roleNow = "风控中心"; break; + case "guest": + roleNow = "访客中心"; + break; default: break; } diff --git a/src/main/ui/static/config/sysconfigs/templates/permission_config.html b/src/main/ui/static/config/sysconfigs/templates/permission_config.html index b1a48b69f..45bd1090c 100644 --- a/src/main/ui/static/config/sysconfigs/templates/permission_config.html +++ b/src/main/ui/static/config/sysconfigs/templates/permission_config.html @@ -67,6 +67,10 @@ Developer + + + BD Leader + Risk Manager diff --git a/src/main/ui/static/dashboard/dashboard.js b/src/main/ui/static/dashboard/dashboard.js index e67fa4e6b..add62a4e6 100644 --- a/src/main/ui/static/dashboard/dashboard.js +++ b/src/main/ui/static/dashboard/dashboard.js @@ -78,8 +78,8 @@ define(['angular', 'uiRouter', 'jstz', 'uiBootstrap', 'angularEcharts'], functio var end = $filter('date')(date-oneDay, 'yyyyMMdd'); var date2 = new Date(); + date2.setDate(1); date2.setMonth(date2.getMonth() - 1); - date2 = date2.setDate(1); var begin = $filter('date')(date2, 'yyyyMMdd'); return { begin: begin, diff --git a/src/main/ui/static/menu/managerMenu.js b/src/main/ui/static/menu/managerMenu.js index 2088b8b93..9cf84e966 100644 --- a/src/main/ui/static/menu/managerMenu.js +++ b/src/main/ui/static/menu/managerMenu.js @@ -41,6 +41,9 @@ define(['angular', 'uiRouter', 'uiBootstrap'], function (angular) { case "compliance": rolenum = 2; break; + case "guest": + rolenum = 2048; + break; case "riskmanager": rolenum = 1024; break; diff --git a/src/main/ui/static/menu/templates/main_menu.html b/src/main/ui/static/menu/templates/main_menu.html index 01360cbd5..7c8eb2263 100644 --- a/src/main/ui/static/menu/templates/main_menu.html +++ b/src/main/ui/static/menu/templates/main_menu.html @@ -32,7 +32,7 @@ --> 返回 -
    +
    @@ -103,7 +103,7 @@
    -
    +