Merge branch 'feature/group_type' into dev

Application/Admin/View/Member/user_info.html

@@ -328,7 +328,7 @@
                                 <if condition="get_info_status($data['lock_status'],4) eq 锁定">
                                     <a class="ajax-get" href="{:U('Member/lock_status',array('id'=>$data['id'],'lock_status'=>1))}">启用 </a>
                                     <else />
-                                    <a href="javascript:void();" id="lock" data-url="{:U('Member/lock_status',array('id'=>$data['id'],'lock_status'=>0))}">{:L('Lock')}</a>
+                                    <a href="javascript:;" id="lock" data-url="{:U('Member/lock_status',array('id'=>$data['id'],'lock_status'=>0))}">{:L('Lock')}</a>
                                 </if>
                             </td>
                         </tr>
@@ -590,7 +590,7 @@
     </script>
 
     <script>
-        $("#lock").bind("click",function () {
+        $(document).on('click', '#lock', function(){
             var url = $(this).attr("data-url");
             layer.prompt({
                 formType: 3,