add guest login

src/main/ui/managev2.html

@@ -200,6 +200,36 @@ margin-bottom: 10%;"/>
                         </a>
                     </li>
 
+                    <li ng-if="('110'|withRole)" ng-class="{'dropdown notifications-menu open':openNotice,'dropdown notifications-menu':!openNotice}">
+                        <a title="New Notice" ng-click="toggleOpenNotice()"  class="dropdown-toggle" data-toggle="dropdown" aria-expanded="true">
+                            <i class="fa fa-bell-o"></i>
+                            <span class="label label-warning" ng-if="notifyCounts">{{notifyCounts}}</span>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <!--
+                                                       <li class="header">System notifications,please resolve it!</li>
+                            -->
+                            <li>
+                                <!--inner menu: contains the actual data-->
+                                <div class="slimScrollDiv" style="position: relative; overflow: hidden; width: auto; max-height: 200px;"><ul class="menu" style="overflow: hidden; width: 100%;">
+                                    <li>
+                                        <a ng-if="partner_application_new" ui-sref="partner_apply">
+                                            <i class="fa fa-commenting"></i>
+                                            新的自主申请商户<span style="font-size:smaller;float:right;right: 0"></span>
+                                        </a>
+                                    </li>
+                                    <li>
+                                        <a ng-if="refundReviews && ('10000000000'|withRole)" ui-sref="refundReview">
+                                            <i class="fa fa-commenting"></i>
+                                            新的退款申请<span style="font-size:smaller;float:right;right: 0"></span>
+                                        </a>
+                                    </li>
+                                </ul><div class="slimScrollBar" style="background: rgb(0, 0, 0); width: 3px; position: absolute; top: 0px; opacity: 0.4; display: none; border-radius: 7px; z-index: 99; right: 1px; height: 195.122px;"></div><div class="slimScrollRail" style="width: 3px; height: 100%; position: absolute; top: 0px; display: none; border-radius: 7px; background: rgb(51, 51, 51); opacity: 0.2; z-index: 90; right: 1px;"></div></div>
+                            </li>
+                        </ul>
+                    </li>
+
+
                     <!-- User Account: style can be found in dropdown.less -->
                     <li class="dropdown user user-menu" uib-dropdown>
                         <a href class="dropdown-toggle" uib-dropdown-toggle>

src/main/ui/static/analysis/templates/settle_report.html

@@ -50,7 +50,7 @@
                 <tr>
                     <th>清算日期</th>
                     <th>净交易额(扣除退款)</th>
-                    <th>腾讯清算总额</th>
+                    <th>清算总额</th>
                     <th>清算给商户总额</th>
                     <th>RoyalPay手续费</th>
                 </tr>

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;

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;
                 }

src/main/ui/static/config/sysconfigs/templates/permission_config.html

@@ -67,6 +67,10 @@
                         <i class="fa fa-code"></i>
                         Developer
                     </a>
+                    <a class="btn btn-app" ng-class="{'isSelect':role=='1000000000'}" role="button" ng-click="authorizeRole('1000000000')">
+                        <i class="fa fa-male"></i>
+                        BD Leader
+                    </a>
                     <a class="btn btn-app" ng-class="{'isSelect':role=='10000000000'}" role="button" ng-click="authorizeRole('10000000000')">
                         <i class="fa fa-user"></i>
                         Risk Manager

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,

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;

src/main/ui/static/menu/templates/main_menu.html

@@ -32,7 +32,7 @@
             </div>
         </div>
 -->     <a role="button" style="float: right;line-height: 46px" ui-sref="home" ng-click="headerCopyDisplay()"><i class="fa fa-reply"></i> 返回</a>
-        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager'">
+        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager' &&  'partners'|withModule">
             <div class="row">
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="partners">
                     <div class="description-block">
@@ -103,7 +103,7 @@
                 </div>
             </div>
         </div>
-        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager'">
+        <div class="list-group" ng-if="role!=null && role!='administrator' && role!='developer' && role!='sitemanager' && 'tradelog'|withModule">
             <div class="row" >
                 <div class="col-sm-2 col-lg-2 col-xs-6" id="transaction">
                     <div class="description-block">