Merge branch 'master' of git.minrow.com:reyun/saasio

src/main/websrc/js/manage/auth.js

@@ -45,8 +45,21 @@
     	$scope.$on('flipinfo',function(e,msg){
             $scope.flipPage = msg;
       });
-
+       $scope.wantOn = false;
+       $scope.doOpen = function(info){
+         $scope.curOnId = info.id;
+         if(info.isSpecialAccount=="1"){
+           $scope.wantOn = true;
+           ToolService.showAlp();
+         }
+         else{
+           $scope.onUser($scope.curOnId);
+         }
+       }
        $scope.onUser = function(id){
+          if($scope.wantOn){
+            $scope.closeOn();
+          }
           ToolService.showLoading();
       	  var userPM = HttpService.putInfo("mng/auth"+$scope.getSuburl()+"/"+id+"/enable");
     	    userPM.then(function(data){
@@ -56,6 +69,10 @@
             $scope.query();
     	    });
         }
+        $scope.closeOn = function(){
+          $scope.wantOn = false;
+          ToolService.hideAlp();
+        }
         $scope.offUser = function(id){
         	var userPM = HttpService.putInfo("mng/auth"+$scope.getSuburl()+"/"+id+"/disable");
           ToolService.showLoading();

src/main/websrc/template/manage/auth.html

@@ -49,7 +49,7 @@
                         已启用<div class="onOffBtn on" ng-click="offUser(info.id)"></div>
                       </div>
                       <div ng-if="info.status!=-3 && findName=='disable' && info.valid">
-                        已停用<div class="onOffBtn" ng-click="onUser(info.id)"></div>
+                        已停用<div class="onOffBtn" ng-click="doOpen(info)"></div>
                       </div>
                     </td>
                     <td>
@@ -72,6 +72,16 @@
         <div class="btn8" ng-click="doDelete()">确定</div>
     </div>
 </div>
+<div class="openTipWin" ng-show="wantOn">
+    <div class="closeGray" ng-click="closeOn()"></div>
+    <div class="tipCont">
+        由于系统权限升级，不支持自定义账号权限，该账号启用后将会拥有对应产品的子应用管理员权限，请谨慎操作。是否确定启用？
+    </div>
+    <div class="openBtnGroup clearfix">
+        <div class="btn8 mr20" ng-click="closeOn()">取消</div>
+        <div class="btn8" ng-click="onUser(curOnId)">确定</div>
+    </div>
+</div>
 <div class="leftTipsSlider" ng-class="{'sliderSw':isdetail}" stop-event>
     <div class="slideHeader">
         操作记录