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

SooonerHotel/App/Lib/Action/Hotel/FrontAction.class.php

@@ -99,7 +99,11 @@ class FrontAction extends CommonAction{
     
     //删除处理
 	public function deleteHandle(){
-		if(D("Front")->where("id=".I("id","",int))->delete()){
+        $model = D("Front");
+        $data['id'] = I("id","",int);
+        $data['status'] = 2;
+        $data['updatetime'] = date('Y-m-d H:i:s');
+		if($model->save($data)){
 			echo 'true';
 		}else{
 			echo 'false';

SooonerHotel/App/Lib/Action/Media/HotelAction.class.php

@@ -79,7 +79,11 @@ class HotelAction extends CommonAction{
     
     //删除处理
 	public function deleteHandle(){
-		if(D("HotelMediaMap")->where("id=".I("id","",int))->delete()){
+		$model = D("HotelMediaMap");
+        $data['id'] = I("id","",int);
+        $data['status'] = 0;
+        $data['updatetime'] = date('Y-m-d H:i:s');
+        if($model->save($data)){
             echo 'true';
         }else{
             echo 'false';
@@ -90,8 +94,10 @@ class HotelAction extends CommonAction{
 	public function updateStatusAjaxHandle(){
         $model = D("HotelMediaMap");
         $data = $_POST;
+        $searchSp = $data['searchSp'];
+        unset($data['searchSp']);
         $data['updatetime'] = date('Y-m-d H:i:s');
-        if($model->save($data)){
+        if($model->table("sh_hotel_media_map_$searchSp")->save($data)){
             echo 'true';
         }else{
             echo 'false';

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

@@ -29,7 +29,7 @@ class FrontModel extends RelationModel{
 		//返回列表（limit分页）
 		if($queryType=="list"){
 			$where .= $sort." ".$limit;
-			$fields = " A.*,B.`name` hotel_name,case A.`status` when 1 then '<font color=red>禁用</font>' when 0 then '<font color=green>启用</font>' end as `status` ";
+			$fields = " A.*,B.`name` hotel_name,case A.`status` when 2 then '<font color=red>删除</font>' when 1 then '<font color=red>禁用</font>' when 0 then '<font color=green>启用</font>' end as `status` ";
 		}
 		$sql = "select ".$fields." from sh_hotel_device A join sh_hotel B on A.hotel_id = B.id where 1=1 ".$where.";";
 		return $model->query($sql);

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

@@ -32,7 +32,7 @@ class HotelMediaMapModel extends RelationModel{
 		//返回列表（limit分页）
 		if($queryType=="list"){
 			$where .= $sort." ".$limit;
-			$fields = " A.*,B.title media_name,C.`name` hotel_name,case A.`status` when 1 then '<font color=green>上线</font>' when 2 then '<font color=red>下线</font>' when 0 then '<font>删除</font>' end as `status` ";
+			$fields = " A.*,B.title media_name,C.`name` hotel_name,case A.`status` when 1 then '<font color=green>上线</font>' when 2 then '<font color=red>下线</font>' when 0 then '<font color=red>删除</font>' end as `status` ";
 		}
 		$sql = "select ".$fields." from ".$this->tableName." A join sh_media_wasu B on A.media_id = B.id join sh_hotel C on A.hotel_id = C.id and C.sp_id = $searchSp where 1=1 ".$where.";";
 //        echo $sql;

SooonerHotel/App/Tpl/Media/zh-cn/Hotel/index.html

@@ -84,17 +84,17 @@ onRowContextMenu : onRowContextMenu
 
 <div id="mm1" class="easyui-menu" style="width:120px;display: none">  
 <!--    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Media','Hotel','add')}>编辑</div>-->
-    <div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('Media','Hotel','deletehandle')}>删除</div>
-<!--    <div class="menu-sep"></div>
-    <div iconCls="icon-stop" id="menuStop" onclick="enable(1)" {:buttonAuth('Media','Hotel','updateStatusAjaxHandle')}>禁用</div>
-    <div iconCls="icon-start" id="menuStart" onclick="enable(0)" {:buttonAuth('Media','Hotel','updateStatusAjaxHandle')}>启用</div>-->
+    <div iconCls="icon-cancel" id="menuDel" onclick="enable(0)" {:buttonAuth('Media','Hotel','deletehandle')}>删除</div>
+    <div class="menu-sep"></div>
+    <div iconCls="icon-start" id="menuStop" onclick="enable(1)" {:buttonAuth('Media','Hotel','updateStatusAjaxHandle')}>上线</div>
+    <div iconCls="icon-stop" id="menuStart" onclick="enable(2)" {:buttonAuth('Media','Hotel','updateStatusAjaxHandle')}>下线</div>
 </div>
 <div id="mm2" class="easyui-menu" style="width:120px;display: none">  
 <!--    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Media','Hotel','add')}>编辑</div>-->
-    <div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('Media','Hotel','deletehandle')}>删除</div>
-<!--    <div class="menu-sep"></div>
-    <div iconCls="icon-stop" id="menuStop" onclick="enable(1)" {:buttonAuth('Media','Hotel','updateStatusAjaxHandle')}>禁用</div>
-    <div iconCls="icon-start" id="menuStart" onclick="enable(0)" {:buttonAuth('Media','Hotel','updateStatusAjaxHandle')}>启用</div>-->
+    <div iconCls="icon-cancel" id="menuDel" onclick="enable(0)" {:buttonAuth('Media','Hotel','deletehandle')}>删除</div>
+    <div class="menu-sep"></div>
+    <div iconCls="icon-start" id="menuStop" onclick="enable(1)" {:buttonAuth('Media','Hotel','updateStatusAjaxHandle')}>上线</div>
+    <div iconCls="icon-stop" id="menuStart" onclick="enable(2)" {:buttonAuth('Media','Hotel','updateStatusAjaxHandle')}>下线</div>
 </div>
 <script>
     $().ready(function(){
@@ -157,13 +157,16 @@ $(function(){
 //禁用启用
 function enable(status){
 	var row = $('#dg').datagrid('getSelected');
+    var searchSp = $("select[name='searchSp']").val();
 	 if (row){
-		 var msg='启用';
+		 var msg='上线';
 		 if(status==1)
-			 msg='禁用'
+			 msg='下线'
+         else if(status==0)
+             msg='删除'
 		 $.messager.confirm('操作确认', '确认['+msg+']该记录?', function(r){
 			 if (r){
-				 $.post("/Media/Hotel/updateStatusAjaxHandle/", {id:row.id,status:status},
+				 $.post("/Media/Hotel/updateStatusAjaxHandle/", {id:row.id,status:status,searchSp:searchSp},
 				   function(data){
 						$('#dg').datagrid('reload');
 				   });

SooonerHotel/App/Tpl/Media/zh-cn/Playlist/index.html

@@ -81,8 +81,8 @@ onRowContextMenu : onRowContextMenu
     <div class="menu-sep"></div>
     <div iconCls="icon-stop" id="menuStop" onclick="enable(1)" {:buttonAuth('Media','Playlist','updateStatusAjaxHandle')}>禁用</div>
     <div iconCls="icon-start" id="menuStart" onclick="enable(0)" {:buttonAuth('Media','Playlist','updateStatusAjaxHandle')}>启用</div>
-    <div class="menu-sep"></div>
-    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Media','Playlist','add')}>列表</div>
+<!--    <div class="menu-sep"></div>
+    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Media','Playlist','add')}>列表</div>-->
 </div>
 <div id="mm2" class="easyui-menu" style="width:120px;display: none">  
     <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Media','Playlist','add')}>编辑</div>
@@ -90,8 +90,8 @@ onRowContextMenu : onRowContextMenu
     <div class="menu-sep"></div>
     <div iconCls="icon-stop" id="menuStop" onclick="enable(1)" {:buttonAuth('Media','Playlist','updateStatusAjaxHandle')}>禁用</div>
     <div iconCls="icon-start" id="menuStart" onclick="enable(0)" {:buttonAuth('Media','Playlist','updateStatusAjaxHandle')}>启用</div>
-    <div class="menu-sep"></div>
-    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Media','Playlist','add')}>列表</div>
+<!--    <div class="menu-sep"></div>
+    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('Media','Playlist','add')}>列表</div>-->
 </div>
 
 <script type="text/javascript">

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

@@ -71,20 +71,20 @@ onRowContextMenu : onRowContextMenu
 <div id="mm1" class="easyui-menu" style="width:120px;display: none">  
     <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>编辑</div>
     <div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('PlayCtrl','PlayCtrl','deletehandle')}>删除</div>
-    <div class="menu-sep"></div>
-    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>列表</div>
 <!--    <div class="menu-sep"></div>
-    <div iconCls="icon-stop" id="menuStop" onclick="enable(1)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>禁用</div>
-    <div iconCls="icon-start" id="menuStart" onclick="enable(0)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>启用</div>-->
+    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>列表</div>-->
+    <div class="menu-sep"></div>
+    <div iconCls="icon-start" id="menuStop" onclick="enable(1)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>上线</div>
+    <div iconCls="icon-stop" id="menuStart" onclick="enable(2)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>下线</div>
 </div>
 <div id="mm2" class="easyui-menu" style="width:120px;display: none">  
     <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>编辑</div>
     <div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('PlayCtrl','PlayCtrl','deletehandle')}>删除</div>
-    <div class="menu-sep"></div>
-    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>列表</div>
 <!--    <div class="menu-sep"></div>
-    <div iconCls="icon-stop" id="menuStop" onclick="enable(1)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>禁用</div>
-    <div iconCls="icon-start" id="menuStart" onclick="enable(0)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>启用</div>-->
+    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>列表</div>-->
+    <div class="menu-sep"></div>
+    <div iconCls="icon-start" id="menuStop" onclick="enable(1)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>上线</div>
+    <div iconCls="icon-stop" id="menuStart" onclick="enable(2)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>下线</div>
 </div>
 
 <script type="text/javascript">
@@ -125,9 +125,9 @@ $(function(){
 function enable(status){
 	var row = $('#dg').datagrid('getSelected');
 	 if (row){
-		 var msg='启用';
-		 if(status==1)
-			 msg='禁用'
+		 var msg='上线';
+		 if(status==2)
+			 msg='下线'
 		 $.messager.confirm('操作确认', '确认['+msg+']该记录?', function(r){
 			 if (r){
 				 $.post("/PlayCtrl/PlayCtrl/updateStatusAjaxHandle/", {id:row.id,status:status},

SooonerHotel/App/Tpl/Playctrl/zh-cn/PlayCtrl/index.html

@@ -71,20 +71,20 @@ onRowContextMenu : onRowContextMenu
 <div id="mm1" class="easyui-menu" style="width:120px;display: none">  
     <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>编辑</div>
     <div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('PlayCtrl','PlayCtrl','deletehandle')}>删除</div>
-    <div class="menu-sep"></div>
-    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>列表</div>
 <!--    <div class="menu-sep"></div>
-    <div iconCls="icon-stop" id="menuStop" onclick="enable(1)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>禁用</div>
-    <div iconCls="icon-start" id="menuStart" onclick="enable(0)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>启用</div>-->
+    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>列表</div>-->
+    <div class="menu-sep"></div>
+    <div iconCls="icon-start" id="menuStop" onclick="enable(1)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>上线</div>
+    <div iconCls="icon-stop" id="menuStart" onclick="enable(2)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>下线</div>
 </div>
 <div id="mm2" class="easyui-menu" style="width:120px;display: none">  
     <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>编辑</div>
     <div iconCls="icon-cancel" id="menuDel" onclick="del()" {:buttonAuth('PlayCtrl','PlayCtrl','deletehandle')}>删除</div>
-    <div class="menu-sep"></div>
-    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>列表</div>
 <!--    <div class="menu-sep"></div>
-    <div iconCls="icon-stop" id="menuStop" onclick="enable(1)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>禁用</div>
-    <div iconCls="icon-start" id="menuStart" onclick="enable(0)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>启用</div>-->
+    <div iconCls="icon-edit" id="menuEdit" onclick="edit()" {:buttonAuth('PlayCtrl','PlayCtrl','add')}>列表</div>-->
+    <div class="menu-sep"></div>
+    <div iconCls="icon-start" id="menuStop" onclick="enable(1)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>上线</div>
+    <div iconCls="icon-stop" id="menuStart" onclick="enable(2)" {:buttonAuth('PlayCtrl','PlayCtrl','updateStatusAjaxHandle')}>下线</div>
 </div>
 
 <script type="text/javascript">
@@ -125,9 +125,9 @@ $(function(){
 function enable(status){
 	var row = $('#dg').datagrid('getSelected');
 	 if (row){
-		 var msg='启用';
-		 if(status==1)
-			 msg='禁用'
+		 var msg='上线';
+		 if(status==2)
+			 msg='下线'
 		 $.messager.confirm('操作确认', '确认['+msg+']该记录?', function(r){
 			 if (r){
 				 $.post("/PlayCtrl/PlayCtrl/updateStatusAjaxHandle/", {id:row.id,status:status},