Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release_zyx

Application/Admin/View/AuthManager/managergroup.html

@@ -64,7 +64,7 @@
 
 			        <input type="hidden" name="id" value="{$this_group.id}" />
                     <button type="submit" class="submit_btn ajax-post" target-form="auth-form">确 定</button>
-                    <button class="back_btn" onclick="javascript:history.back(-1);return false;">返 回</button>
+                    <a class="back_btn" href="{:U('index')}" style="display: inline-block">返 回</a>
 			    </form>
 			</div>
 

Application/Admin/View/AuthManager/user.html

@@ -58,7 +58,7 @@
 
 
     </div>
-	<div class="main-title" style="border-bottom: 0px solid #C1C1C1 !important;">
+	<div class="main-title" style="border-bottom: 0px solid #C1C1C1 !important;margin-bottom: 0;padding-bottom: 0">
 		<div class="page_nav fl">
 			{$_page}
 		</div>
@@ -67,9 +67,17 @@
 				<input class="" type="text" name="uid" style="width:240px;" placeholder="请输入uid,多个用英文逗号分隔">
 				<input type="hidden" name="group_id" value="{:I('group_id')}">
                 <a type="submit" class="ajax-post" target-form="add-user" style="float:right;margin-left:15px;"><span class="button_icon button_icon1"></span>新增</a>
+
 			</form>
 		</div>
 	</div>
+	<div class="tabcon1711">
+		<a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('index')}" style="margin-top: 0;float: right;    color: #000000;
+    background: #ffffff;
+    border: solid 1px #000;">
+			返回
+		</a></div>
+
 
 </div>