fix

src/main/websrc/styles/style.scss

@@ -896,14 +896,14 @@ textarea.iptform{
 }
 
 .btn.active,.btn.active:hover,.btnactive{
-	background-color:$activebgcolor;
-	border-color:$activebgcolor;
+	background-color:$logobg;
+	border-color:$logobg;
 	color:$activeftcolor;
 }
 .btn3{
 	height:$btnheight;
 	line-height:$btnheight;
-	border-color:$activebgcolor;
+	border-color:$logobg;
 	color:$activeftcolor;
 	padding:0px 10px;
 	float:left;
@@ -911,7 +911,7 @@ textarea.iptform{
 	-moz-box-sizing: border-box;
 	     -webkit-box-sizing: border-box;
 	        box-sizing: border-box;
-	background-color:$activebgcolor;
+	background-color:$logobg;
 	cursor:pointer;
 }
 .btn3.lh30{
@@ -950,11 +950,11 @@ textarea.iptform{
 	cursor: default;
 }
 .btn:hover,.btn2.active{
-	border-color:$activebgcolor;
-	color:$activebgcolor;
+	border-color:$logobg;
+	color:$logobg;
 }
 .btn4{
-	border:1px solid $activebgcolor;
+	border:1px solid $logobg;
 	color:$activeftcolor;
 	padding:6px 6px;
 	float:left;
@@ -962,7 +962,7 @@ textarea.iptform{
 	-moz-box-sizing: border-box;
 	     -webkit-box-sizing: border-box;
 	        box-sizing: border-box;
-	background-color:$activebgcolor;
+	background-color:$logobg;
 	cursor:pointer;
 	font-size:12px;
 	margin-right: 5px;
@@ -970,7 +970,7 @@ textarea.iptform{
 }
 
 .btn5{
-	border:1px solid $activebgcolor;
+	border:1px solid $logobg;
 	color:$activeftcolor;
 	height:$btnheight;
 	line-height:$btnheight;
@@ -979,7 +979,7 @@ textarea.iptform{
 	-moz-box-sizing: border-box;
 	     -webkit-box-sizing: border-box;
 	        box-sizing: border-box;
-	background-color:$btnformcolor;
+	background-color:$logobg;
 	cursor:pointer;
 	font-size:12px;
 }
@@ -1003,7 +1003,7 @@ textarea.iptform{
 	background-color:$btngraybg;
 }
 .btn7:hover{
-	background-color:$activebgcolor;
+	background-color:$logobg;
 }
 
 .btn8{
@@ -2137,6 +2137,10 @@ textarea.iptform{
 	color:$labeldisft;
 	cursor:not-allowed;
 }
+.formOper.leftAlg{
+	text-align:left;
+	padding-left:20px;
+}
 .formOper .btn2,.formOper .btn4{
 	display:inline-block;
 	float:none;

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

@@ -22,33 +22,38 @@
                     <th>姓名</th>
                     <th>角色</th>
                     <th>状态</th>
-                    <th>操作</th>
+                    <th colspan="2" ng-if="findName=='enable'">操作</th>
+                    <th ng-if="findName=='disable'">操作</th>
                     <th>操作记录</th>
                 </tr>
                 <tr ng-repeat="info in authList | filterList:searchTxt:'name,email' track by $index"  ng-if="$index>flipPage.start && $index < flipPage.end">
                     <td>{{$index+1}}</td>
                     <td>{{info.email}}</td>
                     <td>{{info.name}}</td>
-                    <td ng-if="accountFlag!='channel'">{{info.roleName}}</td>
+                    <td>{{info.roleName}}</td>
                     <td>
                         <span ng-if="info.status==-3">未激活</span>
                         <span ng-if="info.status!=-3 && info.valid">激活</span>
                         <span ng-if="info.status!=-3 && !info.valid">已过期</span>
                     </td>
-                    <td class="formOper">
+                    <td class="formOper leftAlg" ng-show="findName=='enable'">
                         <div ng-hide="(info.roleCategory == 1 && !isSuper) || info.email == 'demo@reyun.com' || (info.roleCategory==2 && isAppManage)">
-                            <div class="formBtn" ng-class="{'dis':!info.valid}" ng-click="gopage(info)" ng-show="info.status==1 && findName=='enable'"><span class="editIcon"></span>编辑</div>
-                            <div class="btn4" ng-if="info.status!=-3 && findName=='disable' && info.valid" ng-click="onUser(info.id)">启用</div>
-                            <div class="btn2" ng-if="info.status!=-3 && findName=='enable' && info.valid" ng-click="offUser(info.id)">停用</div>
+                            <div class="formBtn" ng-class="{'dis':!info.valid}" ng-click="gopage(info)" ng-show="info.status==1 && findName=='enable'">编辑</div>
                             <div class="formBtn" ng-if="info.status==-3 && !info.send" ng-click="sendEmailAgain(info)">重新发送激活邮件</div>
                             <div class="formBtn dis" ng-if="info.status==-3 && info.send == 1">发送成功</div>
-                            <div class="formBtn" ng-click="deleteAuth(info)" ng-if="info.status==-3"><span class="removeIcon"></span>删除</div>
-                        </div>
-                        <div class="nopower" ng-if="info.roleCategory==2 && isAppManage" title="您已无此授权权限，请联系管理员">
+                            <div class="formBtn" ng-click="deleteAuth(info)" ng-if="info.status==-3">删除</div>
                         </div>
                     </td>
                     <td>
-                        <div class="formBtn" ng-click="showDetails(info)" stop-event><span class="lookIcon"></span></div>
+                      <div ng-if="info.status!=-3 && findName=='enable' && info.valid">
+                        已启用<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>
+                    </td>
+                    <td>
+                        <div class="formBtn" ng-click="showDetails(info)" stop-event>查看</div>
                     </td>
                 </tr>
             </table>

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

@@ -82,7 +82,7 @@
 		<div class="formsaveBtnWrap clearfix">
 	        <div class="btn6" ng-click="cancel()">取消</div>
 	        <div class="btn5" ng-click="save()">
-	            <span ng-if="!id">完成</span>
+	            <span ng-if="!id">添加</span>
 	            <span ng-if="id">保存</span>
 	        </div>
 	    </div>