Skip to content

S
SooonerHotel
Commit 4f30f0be authored by wangjiangze's avatar wangjiangze
Browse files
Options

功能优化、BUG修复

parent b1008c5f
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 6 deletions
SooonerHotel/App/Lib/Action/Inject/InjectAction.class.php
View file @ 4f30f0be
...@@ -63,7 +63,7 @@ class InjectAction extends CommonAction{ ...@@ -63,7 +63,7 @@ class InjectAction extends CommonAction{
} }
$media_lists = $mediaModel->join(" A join sh_sp B on A.site_id = B.site_id ")->field("concat(A.id,'_',A.code) id,A.title,group_concat(B.id) sp_ids")->group(" A.id ")->select(); $media_lists = $mediaModel->join(" A join sh_sp B on A.site_id = B.site_id ")->field("concat(A.id,'_',A.code) id,A.title,group_concat(B.id) sp_ids")->group(" A.id ")->select();
if($userInfo['sp_ids']&&$userInfo['grade']>=3){ if($userInfo['sp_ids']&&$userInfo['grade']>=3){
$sp_lists = $spModel->field("A.id,`name`")->where("`status`=0 and id in(".$userInfo['sp_ids'].")")->select(); $sp_lists = $spModel->field("id,`name`")->where("`status`=0 and id in(".$userInfo['sp_ids'].")")->select();
$hotel_lists = $hotelModel->field("id,`name`,sp_id")->where("`status`=0 and sp_id in(".$userInfo['sp_ids'].")")->select(); $hotel_lists = $hotelModel->field("id,`name`,sp_id")->where("`status`=0 and sp_id in(".$userInfo['sp_ids'].")")->select();
$play_lists = $spPlaylistModel->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")->field("A.id,A.`name`,A.sp_id,group_concat(B.media_id) media_ids")->where("A.sp_id in(".$userInfo['sp_ids'].") and A.`status` = 0")->group("A.id")->select(); $play_lists = $spPlaylistModel->join(" A join sh_sp_playlist_media_map B on A.id = B.playlist_id ")->field("A.id,A.`name`,A.sp_id,group_concat(B.media_id) media_ids")->where("A.sp_id in(".$userInfo['sp_ids'].") and A.`status` = 0")->group("A.id")->select();
}else{ }else{
......
SooonerHotel/App/Lib/Action/Media/CloudAction.class.php
View file @ 4f30f0be
...@@ -16,7 +16,7 @@ class CloudAction extends CommonAction{ ...@@ -16,7 +16,7 @@ class CloudAction extends CommonAction{
$spModel = D("Sp"); $spModel = D("Sp");
$siteModel = D("Site"); $siteModel = D("Site");
if($userInfo['sp_ids']&&$userInfo['grade']>=3){ if($userInfo['sp_ids']&&$userInfo['grade']>=3){
$sp_lists = $spModel->field("id,`name`")->where("`status`=0 and id in(".$userInfo['sp_ids'].")")->select(); $site_lists = $spModel->field("B.id,B.`name`")->join(" A join sh_site B on A.site_id = B.id")->where("A.`status`=0 and A.id in(".$userInfo['sp_ids'].")")->select();
}else{ }else{
$site_lists = $siteModel->field("id,`name`")->where("`status`=0")->select(); $site_lists = $siteModel->field("id,`name`")->where("`status`=0")->select();
} }
......
SooonerHotel/App/Lib/Model/HotelMediaMapModel.class.php
View file @ 4f30f0be
...@@ -16,6 +16,8 @@ class HotelMediaMapModel extends RelationModel{ ...@@ -16,6 +16,8 @@ class HotelMediaMapModel extends RelationModel{
$searchHotel = $inputs["searchHotel"]?$inputs["searchHotel"]:0; $searchHotel = $inputs["searchHotel"]?$inputs["searchHotel"]:0;
$searchStatus = $inputs["searchStatus"]?$inputs["searchStatus"]:0; $searchStatus = $inputs["searchStatus"]?$inputs["searchStatus"]:0;
$searchStatusInject = $inputs["searchStatusInject"]!=-1?$inputs["searchStatusInject"]:-1; $searchStatusInject = $inputs["searchStatusInject"]!=-1?$inputs["searchStatusInject"]:-1;
$searchClass = $inputs["searchClass"]?$inputs["searchClass"]:0;
$searchType = $inputs["searchType"]?$inputs["searchType"]:0;
if($searchValue){ if($searchValue){
$where = " and (B.`title` like '%".$searchValue."%' or B.`code` like '%".$searchValue."%') "; $where = " and (B.`title` like '%".$searchValue."%' or B.`code` like '%".$searchValue."%') ";
...@@ -32,6 +34,15 @@ class HotelMediaMapModel extends RelationModel{ ...@@ -32,6 +34,15 @@ class HotelMediaMapModel extends RelationModel{
if($searchStatusInject!=-1){ if($searchStatusInject!=-1){
$where .= " and A.status_inject = $searchStatusInject "; $where .= " and A.status_inject = $searchStatusInject ";
} }
if ($searchClass==2){
$where .= " and B.`type`='movie' ";
}else if($searchClass==1){
$where .= " and (B.`type`='news' or B.`type`='column') ";
}
if($searchType){
$where .= " and B.programType='$searchType' ";
}
if($userInfo['sp_ids']&&$userInfo['grade']>=3){ if($userInfo['sp_ids']&&$userInfo['grade']>=3){
$where .= " and C.sp_id in(".$userInfo['sp_ids'].") "; $where .= " and C.sp_id in(".$userInfo['sp_ids'].") ";
} }
...@@ -43,7 +54,7 @@ class HotelMediaMapModel extends RelationModel{ ...@@ -43,7 +54,7 @@ class HotelMediaMapModel extends RelationModel{
//返回列表（limit分页） //返回列表（limit分页）
if($queryType=="list"){ if($queryType=="list"){
$where .= $sort." ".$limit; $where .= $sort." ".$limit;
$fields = " A.*,B.id mid,B.code mcode,B.url_pic,B.title,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` "; $fields = " A.*,B.id mid,B.code mcode,B.programType,B.url_pic,B.title,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.";"; $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; // echo $sql;
......
SooonerHotel/App/Tpl/Media/zh-cn/Cloud/index.html
View file @ 4f30f0be
...@@ -77,7 +77,7 @@ singleSelect: true, ...@@ -77,7 +77,7 @@ singleSelect: true,
url: '/Media/Cloud/index/', url: '/Media/Cloud/index/',
method: 'post', method: 'post',
pagination: true, pagination: true,
pageList:[10,20,30,100], pageList:[10,20,30,50],
rownumbers: true, rownumbers: true,
sortName:'updatetime', sortName:'updatetime',
sortOrder:'desc', sortOrder:'desc',
......
SooonerHotel/App/Tpl/Media/zh-cn/Hotel/index.html
View file @ 4f30f0be
...@@ -46,6 +46,33 @@ ...@@ -46,6 +46,33 @@
<option value="1">已注入</option> <option value="1">已注入</option>
<option value="2">注入失败</option> <option value="2">注入失败</option>
</select> </select>
<select class="select" name="searchClass">
<option value="0">请选择分类</option>
<option value="1">电竞</option>
<option value="2">电影</option>
</select>
<select class="select" name="searchType">
<option value="0">请选择类型</option>
<option value="绝地求生" pid="1" style="display: none">绝地求生</option>
<option value="我的世界" pid="1" style="display: none">我的世界</option>
<option value="英雄联盟" pid="1" style="display: none">英雄联盟</option>
<option value="王者荣耀" pid="1" style="display: none">王者荣耀</option>
<option value="火爆节目" pid="1" style="display: none">火爆节目</option>
<option value="游戏专区" pid="1" style="display: none">游戏专区</option>
<option value="明星主播" pid="1" style="display: none">明星主播</option>
<option value="电竞赛事" pid="1" style="display: none">电竞赛事</option>
<option value="游戏改编" pid="1" style="display: none">游戏改编</option>
<option value="网络电影" pid="2" style="display: none">网络电影</option>
<option value="免费大片" pid="2" style="display: none">免费大片</option>
<option value="亲子之旅" pid="2" style="display: none">亲子之旅</option>
<option value="文艺情感" pid="2" style="display: none">文艺情感</option>
<option value="警匪动作" pid="2" style="display: none">警匪动作</option>
<option value="恐怖悬疑" pid="2" style="display: none">恐怖悬疑</option>
<option value="新片预告" pid="2" style="display: none">新片预告</option>
<option value="科幻灾难" pid="2" style="display: none">科幻灾难</option>
<option value="战争史诗" pid="2" style="display: none">战争史诗</option>
</select>
<input class="input" type="text" placeholder="媒资名称/媒资唯一标识" name="searchValue"> <input class="input" type="text" placeholder="媒资名称/媒资唯一标识" name="searchValue">
</div> </div>
<input id="submit_search" name="" type="button" value="查询" class="btn_go_s btn_orange" /> <input id="submit_search" name="" type="button" value="查询" class="btn_go_s btn_orange" />
...@@ -70,7 +97,7 @@ singleSelect: true, ...@@ -70,7 +97,7 @@ singleSelect: true,
url: '/Media/Hotel/index/', url: '/Media/Hotel/index/',
method: 'post', method: 'post',
pagination: true, pagination: true,
pageList:[15,30,45,60], pageList:[10,20,30,50],
rownumbers: true, rownumbers: true,
sortName:'id', sortName:'id',
sortOrder:'asc', sortOrder:'asc',
...@@ -85,6 +112,7 @@ onRowContextMenu : onRowContextMenu ...@@ -85,6 +112,7 @@ onRowContextMenu : onRowContextMenu
<th data-options="field:'mcode',width:20" align="center">媒资标识</th> <th data-options="field:'mcode',width:20" align="center">媒资标识</th>
<th field="url_pic" align="center" formatter="imageFormat">媒资海报</th> <th field="url_pic" align="center" formatter="imageFormat">媒资海报</th>
<th data-options="field:'title',width:60" sortable="true">媒资标题</th> <th data-options="field:'title',width:60" sortable="true">媒资标题</th>
<th data-options="field:'programType',width:60" sortable="true">媒资类型</th>
<th data-options="field:'hotel_name',width:30">酒店名称</th> <th data-options="field:'hotel_name',width:30">酒店名称</th>
<th data-options="field:'addtime',width:30" sortable="true">创建时间</th> <th data-options="field:'addtime',width:30" sortable="true">创建时间</th>
<th data-options="field:'updatetime',width:30" sortable="true">更新时间</th> <th data-options="field:'updatetime',width:30" sortable="true">更新时间</th>
...@@ -263,7 +291,13 @@ function del(){ ...@@ -263,7 +291,13 @@ function del(){
$.messager.alert('提示', '请选择要操作的记录！','info'); $.messager.alert('提示', '请选择要操作的记录！','info');
} }
} }
$("select[name='searchClass']").bind("change",function(){
var class_val = $(this).val();
$("select[name='searchType']").val('');
$("select[name='searchType'] option").hide();
$("select[name='searchType'] option:eq(0)").show();
$("select[name='searchType'] option[pid='"+class_val+"']").show();
});
$("#submit_search").click(function () { $("#submit_search").click(function () {
$('#dg').datagrid({ queryParams: form2Json("searchform") }); //点击搜索 $('#dg').datagrid({ queryParams: form2Json("searchform") }); //点击搜索
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment