diff --git a/plugins/pureftp/index.py b/plugins/pureftp/index.py
index 4c946d34d..24a7fedd1 100755
--- a/plugins/pureftp/index.py
+++ b/plugins/pureftp/index.py
@@ -217,20 +217,29 @@ def getFtpPort():
 def getFtpList():
     args = getArgs()
     page = 1
-    page_size = 3
+    page_size = 10
+    search = ''
     if 'page' in args:
         page = int(args['page'])
 
     if 'page_size' in args:
         page_size = int(args['page_size'])
-    page_size = 2
+
+    if 'search' in args:
+        search = args['search']
 
     data = {}
     conn = pftpDB()
-    clist = conn.where('', ()).field('id,pid,name,password,path,status,ps,addtime').limit(
-        '0,1').order('id desc').select()
-
-    count = conn.count()
+    limit = str((page - 1) * page_size) + ',' + str(page_size)
+    # print limit, search
+    condition = ''
+    if not search == '':
+        condition = "name like '%" + search + "%'"
+    field = 'id,pid,name,password,path,status,ps,addtime'
+    clist = conn.where(condition, ()).field(
+        field).limit(limit).order('id desc').select()
+
+    count = conn.where(condition, ()).count()
     _page = {}
     _page['count'] = count
     _page['p'] = page
@@ -278,6 +287,23 @@ def addFtp():
         return 'ok'
     return data[0]
 
+
+def delFtp():
+    args = getArgs()
+    if not 'id' in args:
+        return 'ftp_username missing'
+
+    if not 'username' in args:
+        return 'username missing'
+
+    public.execShell(getServerDir() +
+                     '/bin/pure-pw userdel ' + args['username'])
+    pftpReload()
+    conn = pftpDB()
+    conn.where("id=?", (args['id'],)).delete()
+    public.writeLog('TYPE_FTP', 'FTP_DEL_SUCCESS', (args['username'],))
+    return 'ok'
+
 if __name__ == "__main__":
     func = sys.argv[1]
     if func == 'status':
@@ -304,5 +330,7 @@ if __name__ == "__main__":
         print getFtpList()
     elif func == 'add_ftp':
         print addFtp()
+    elif func == 'del_ftp':
+        print delFtp()
     else:
         print 'error'
diff --git a/plugins/pureftp/js/ftp.js b/plugins/pureftp/js/ftp.js
index de5dd6dc9..13a5d7901 100755
--- a/plugins/pureftp/js/ftp.js
+++ b/plugins/pureftp/js/ftp.js
@@ -38,6 +38,15 @@ function ftpAsyncPost(method,args){
 	);
 }
 
+function ftpListFind(){
+    var search = $('#ftp_find_user').val();
+    if (search==''){
+        layer.msg('搜索字符不能为空!',{icon:0,time:2000,shade: [0.3, '#000']});
+        return;
+    }
+    ftpList(1, search);
+}
+
 function ftpList(page, search){
 	var _data = {};
     if (typeof(page) =='undefined'){
@@ -55,8 +64,8 @@ function ftpList(page, search){
         var rdata = $.parseJSON(data.data);
         console.log(rdata);
         content = '<div class="info-title-tips"><p><span class="glyphicon glyphicon-alert" style="color: #f39c12; margin-right: 10px;"></span>当前FTP地址为：ftp://'+rdata['info']['ip']+':'+rdata['info']['port']+'</p></div>';
-        content += '<div class="finduser"><input class="bt-input-text mr5 outline_no" type="text" placeholder="查找用户名" id="csvn_find_user" style="height: 28px; border-radius: 3px;width: 435px;">';
-        content += '<button class="btn btn-success btn-sm" onclick="csvnUserFind();">查找</button></div>';
+        content += '<div class="finduser"><input class="bt-input-text mr5 outline_no" type="text" placeholder="查找用户名" id="ftp_find_user" style="height: 28px; border-radius: 3px;width: 605px;">';
+        content += '<button class="btn btn-success btn-sm" onclick="ftpListFind();">查找</button></div>';
 
         content += '<div class="divtable" style="margin-top:5px;"><table class="table table-hover" width="100%" cellspacing="0" cellpadding="0" border="0">';
         content += '<thead><tr>';
@@ -78,8 +87,8 @@ function ftpList(page, search){
         		'<td><a href="javascript:;" onclick="ftp.start_user(2,\'kkk\')" <span="" style="color:red">已停用<span style="color:red" class="glyphicon glyphicon-pause"></span></a></td>' +
         		'<td>'+ulist[i]['path']+'</td>' +
         		'<td>'+ulist[i]['ps']+'</td>' +
-            	'<td><a class="btlink" onclick="csvnModPwdUser(\''+ulist[i]+'\')">改密</a> | ' +
-            	'<a class="btlink" onclick="delFtp(\''+ulist[i]['id']+'\',\''+ulist[i]['name']+'\')">删除</a></td></tr>';
+            	'<td><a class="btlink" onclick="ftpMod(\''+ulist[i]['id']+'\',\''+ulist[i]['name']+'\'))">改密</a> | ' +
+            	'<a class="btlink" onclick="ftpDelete(\''+ulist[i]['id']+'\',\''+ulist[i]['name']+'\')">删除</a></td></tr>';
         }
 
         content += '</tbody>';
@@ -171,18 +180,6 @@ function addFtp(type) {
 			ftpList();
 			layer.close(loadT);
 		});
-
-		// $.post('/ftp?action=AddUser', data, function(rdata) {
-		// 	if (rdata.status) {
-		// 		ftpList();
-		// 		layer.closeAll();
-		// 		layer.msg(rdata.msg, {icon: 1});
-		// 	} else {
-		// 		ftpList();
-		// 		layer.closeAll();
-		// 		layer.msg(rdata.msg, {icon: 5});
-		// 	}
-		// });
 		return true;
 	}
 
@@ -235,21 +232,17 @@ function addFtp(type) {
  * @param {String} ftp_username  欲被删除的用户名
  * @return {bool}
  */
-// function ftpDelete(id,ftp_username){
-// 	safeMessage(lan.public.del+"["+ftp_username+"]",lan.get('confirm_del',[ftp_username]),function(){
-// 		layer.msg(lan.public.the_del,{icon:16,time:0,shade: [0.3, '#000']});
-// 		var data='&id='+id+'&username='+ftp_username;
-// 		$.post('/ftp?action=DeleteUser',data,function(rdata){
-// 			layer.closeAll();
-// 			if(rdata['status'] == true){
-// 				getFtp(1);
-// 				layer.msg(rdata.msg,{icon:1});
-// 			}else{
-// 				layer.msg(rdata.msg,{icon:2});
-// 			}
-// 		});
-// 	});
-// }
+function ftpDelete(id,ftp_username){
+	safeMessage(lan.public.del+"["+ftp_username+"]",lan.get('confirm_del',[ftp_username]),function(){
+		layer.msg(lan.public.the_del,{icon:16,time:0,shade: [0.3, '#000']});
+		var data='&id='+id+'&username='+ftp_username;
+
+		ftpPost('del_ftp', data, function(data){
+			layer.msg('删除成功!', {icon: 1});
+			ftpList();
+		})
+	});
+}
 
 
 //批量删除