Merge branch 'featurer/ylw_4.0' into dev

Application/Admin/Controller/AjaxController.class.php

@@ -151,8 +151,9 @@ class AjaxController extends ThinkController{
         }
     }
 
-    public function getPromotersByLevel($level=1)
+    public function getPromotersByLevel()
     {
+        $level = I('level', 1);
         $this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>(new PromoteModel)->getPromotersByLevel($level)]);
     }
 

Application/Admin/View/Member/device_bans_list.html

@@ -100,7 +100,7 @@
                             <td>{:get_admin_nickname($data['operator_id'])}</td>
                             <td>{$data.create_time|date='Y-m-d H:i:s',###}</td>
                             <td>
-                                <a class="confirm ajax-post" href="{:U('Member/save_device_bans',array('id'=>$data['id']))}">解除</a>
+                                <a class="ajax-get" href="{:U('Member/save_device_bans',array('id'=>$data['id']))}">解除 </a>
                             </td>
                         </tr>
                     </volist>