caipin 5 năm trước cách đây
mục cha
commit
b2fe9b419e

+ 1 - 0
app/cloudAjaxRouter.js

@@ -18,6 +18,7 @@ router.get('/cloud/curing/ajax/refreshCuringPage', function(req, res, next) {
 router.get('/cloud/curing/ajax/getCuringPage/:currentPage', function(req, res, next) {
 	cloudAjaxController.refreshCuringPage(req, res);
 });
+
 /**
  * 用户检索
  */

+ 1 - 16
app/controller/cloudEditionAjaxController.js

@@ -48,22 +48,7 @@ var cloudEditionAjaxController={
         //获得本地绑定CLD客户用户
         var bcDetail= await cloudService.getBindCuringByMobile(req.params.mobile);
         var cDetail= await cloudService.getCuringByMobile(req.params.mobile);
-        //数据组合
-        /*var detail={};
-        if(hash.isExistence(bcDetail)){
-            detail=bcDetail;
-        }
-        if(hash.isExistence(cDetail)){
-            detail['mobile']=cDetail['userInfo']['mobile'];
-            detail['email']=cDetail['userInfo']['email'];
-            detail['username']=cDetail['userInfo']['username'];
-            detail['create_time']=cDetail['userInfo']['create_time'];
-            detail['company']=cDetail['userInfo']['company'];
-            detail['province']=cDetail['userInfo']['province'];
-            detail['upgrade_list']=cDetail['userInfo']['upgrade_list'];
-            detail['curing']=cDetail;
-        }*/
-        //console.log(detail);
+        
 
         if(!hash.isExistence(bcDetail)){//没有绑定CLD客户
             if(!hash.isExistence(cDetail)){

+ 7 - 1
app/service/cloudEditionService.js

@@ -37,6 +37,7 @@ var cloudService={
     	var latestCompilation='';
     	var sortField='create_time';
         var sort='-1';
+        var wd='';	//检索内容
     	
     	//编办参数-排序参数-当前页
         if(hash.isExistence(req.url)){
@@ -75,6 +76,10 @@ var cloudService={
     	    if(!hash.isNotANumber(page)){
     	    	page=1;
     	    }
+    	    //检索 内容
+    	    if(hash.isExistence(params.wd)){
+        		wd=params.wd;
+        	}
         }
         
         //分页参数
@@ -90,7 +95,8 @@ var cloudService={
         //var sort=curingInterfaceConfig.sort[1];
         
     	var url= curingUrl+'/getUserList'+
-    	'?page='+page+'&pageSize='+limit+'&latestUsed='+latestCompilation+'&upGrade='+compilation+'&sortField='+sortField+'&sort='+sort;
+    	'?page='+page+'&pageSize='+limit+'&latestUsed='+latestCompilation+'&upGrade='+compilation+'&sortField='+sortField+'&sort='+sort+
+    	'&keyword='+wd;
     	
     	/*	接口请求获得的信息
     	 *  userInfo	

+ 9 - 4
global/js/cloud/curingFN.js

@@ -2,11 +2,12 @@
  * 筛选-统一请求--刷新用户列表
  * @returns
  */
-function refreshCuringPage(compilation,latestCompilation,sortField,sort){
+function refreshCuringPage(compilation,latestCompilation,sortField,sort,wd){
 	$.ajax({
         cache :false,
         type: 'get',
-        url: '/cloud/curing/ajax/refreshCuringPage?sortField='+sortField+'&sort='+sort+'&compilation='+compilation+'&latestCompilation='+latestCompilation,
+        url: '/cloud/curing/ajax/refreshCuringPage?sortField='+sortField+'&sort='+sort+'&compilation='+compilation+'&latestCompilation='+latestCompilation+
+        	'&wd='+wd,
         dataType: 'json',
         success: function(data) {
             if (data.status == 1) {
@@ -28,7 +29,10 @@ function refreshCuringPage(compilation,latestCompilation,sortField,sort){
 function fnMobile2Info(){
     mobile2InfoTimeout = null;
     if((/^1[34578]\d{9}$/.test(mobile))) {
-        $.ajax({
+        
+    	refreshCuringPage('','','','',mobile);
+    	
+    	/*$.ajax({
             cache :false,
             type: 'GET',
             url: '/cloud/curing/ajax/curingInfo/' + mobile,
@@ -39,6 +43,7 @@ function fnMobile2Info(){
             success: function (data) {
                 if (data.status == 1) {
                     fnStructureCuringUser([data.detail]);
+                    fnPage(data.pageData);
                     $('div[pageDetail]').hide();
                 } 
 //                else if (data.status == 2) {
@@ -53,7 +58,7 @@ function fnMobile2Info(){
             error: function (xhr, type) {
                 console.log('Ajax error!')
             }
-        })
+        })*/
     }
 }