Merge remote-tracking branch 'origin/release-1.0.0' into release-1.0.0

Application/Admin/View/AuthManager/category.html

@@ -40,7 +40,7 @@
 
             <div class="tb-unit-bar box_mt">
                 <button class="category_btn ajax-post" type="submit" target-form="save-category">确 定</button>
-                <button class="category_return" onclick="javascript:history.back(-1);return false;">返 回</button>
+                <a  class="category_return" style="display: inline-block;text-align: center;top: -10px" href="{:U('index')}" ><span style="    line-height: 36px;">返 回</span></a>
             </div>
         </form>
     </div>

Application/Admin/View/AuthManager/dataempower.html

@@ -73,7 +73,7 @@
             <button class="submit_btn ajax-post mlspacing" id="submit" type="submit" target-form="form-horizontal" >
               确认
             </button>
-            <a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back(-1);"  style="color:#000000;background:#ffffff;border: solid 1px #000">
+            <a class="submit_btn " alt="返回上一页" title="返回上一页" href="{:U('index')}"  style="color:#000000;background:#ffffff;border: solid 1px #000">
               返回
             </a>
           </div>