Merge branch 'develop' of ssh://code.dev.soooner.com:50022/wuxiande/SooonerHotel into develop

SooonerHotel/App/Lib/Action/Inject/InjectAction.class.php

@@ -126,7 +126,6 @@ class InjectAction extends CommonAction{
             $task_id = $model->add($taskData);
             
             if($task_id){
-                
                 foreach($hotel_lists as $key => $value){
                     list($hotel_id,$sp_id) = explode("-",$value);
                     $logDataLists = array();
@@ -160,13 +159,14 @@ class InjectAction extends CommonAction{
                         $log_r = $injectLogModel->addAll($logDataLists);
                     }
                 }
-                
+                if($log_r){
+                    echo "true";
+//                    $this->ajaxReturn(array("status"=>1000,"msg"=>"操作成功！"));
+                }else{
+                    echo "false";
                 }
-			
-			if($task_id){
-                echo 'true';
             }else{
-				echo 'false';
+				echo "false";
 			}
 		}
 	}

SooonerHotel/App/Lib/Model/InjectModel.class.php

@@ -24,7 +24,7 @@ class InjectModel extends RelationModel{
         $model = new Model();
 
 		//======================
-		$fields = "count(id) count";
+		$fields = "count(1) count";
 		//返回列表（limit分页）
 		if($queryType=="list"){
 			$where .= $sort." ".$limit;

SooonerHotel/App/Tpl/Inject/zh-cn/Inject/add.html

@@ -199,17 +199,12 @@ function submitForm(){
 	        return isValid;
 	    },
 	    success:function(data){
-	    	if(data=='true'){
-//	    		$.messager.confirm('友情提示', '操作成功！ 是否关闭窗口？', function(r){
-//					 if (r){
-//						 parentDialog.CancelEvent();
-//					 }
-//				 });
+	    	if(data=="true"){
                 parentDialog.CancelEvent();
-//                $.messager.alert('友情提示','操作成功！','info');
-	    	}else
+	    	}else{
                 $.messager.alert('友情提示','操作失败！','info');
             }
+	    }
 	});
 }
 $().ready(function(){

SooonerHotel/App/Tpl/Inject/zh-cn/Inject/index.html

@@ -49,7 +49,7 @@ pagination: true,
 pageList:[15,30,45,60],
 rownumbers: true,
 sortName:'id',
-sortOrder:'asc',
+sortOrder:'desc',
 queryParams: form2Json('searchform'),
 fitColumns: true,
 height:'auto',