Skip to content

S
SooonerHotel
Commit 02c6210a authored by wangjiangze's avatar wangjiangze
Browse files
Options

站点、合作方、云端片库功能更新

parent f15339b9
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 48 deletions
SooonerHotel/App/Lib/Action/Media/CloudAction.class.php
View file @ 02c6210a
...@@ -14,18 +14,15 @@ class CloudAction extends CommonAction{ ...@@ -14,18 +14,15 @@ class CloudAction extends CommonAction{
echo "{\"total\":\"".$total."\",\"rows\":".json_encode($list)."}"; echo "{\"total\":\"".$total."\",\"rows\":".json_encode($list)."}";
}else{ }else{
$spModel = D("Sp"); $spModel = D("Sp");
$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(); $sp_lists = $spModel->field("id,`name`")->where("`status`=0 and id in(".$userInfo['sp_ids'].")")->select();
}else{ }else{
$sp_lists = $spModel->field("id,`name`")->where("`status`=0")->select(); $site_lists = $siteModel->field("id,`name`")->where("`status`=0")->select();
} }
$this->sp_lists = $sp_lists; $this->site_lists = $site_lists;
$this->display(); $this->display();
} }
$spModel = D("Sp");
$sp_lists = $spModel->where("`status`=0")->select();
$this->sp_lists = $sp_lists;
} }
//添加 //添加
......
SooonerHotel/App/Lib/Action/Sp/SpAction.class.php
View file @ 02c6210a
...@@ -13,9 +13,9 @@ class SpAction extends CommonAction{ ...@@ -13,9 +13,9 @@ class SpAction extends CommonAction{
$total = $count[0]["count"]; $total = $count[0]["count"];
echo "{\"total\":\"".$total."\",\"rows\":".json_encode($list)."}"; echo "{\"total\":\"".$total."\",\"rows\":".json_encode($list)."}";
}else{ }else{
$spModel = D("Sp"); $siteModel = D("Site");
$sp_lists = $spModel->where("`status`=0")->select(); $site_lists = $siteModel->where("`status`=0")->select();
$this->sp_lists = $sp_lists; $this->site_lists = $site_lists;
$this->display(); $this->display();
} }
} }
...@@ -26,7 +26,7 @@ class SpAction extends CommonAction{ ...@@ -26,7 +26,7 @@ class SpAction extends CommonAction{
$id = I('id','',int)?I('id','',int):0; $id = I('id','',int)?I('id','',int):0;
$model = D("Sp"); $model = D("Sp");
$spModel = D("Sp"); $siteModel = D("Site");
$confTypeModel = D("ConfType"); $confTypeModel = D("ConfType");
$regionModel = D("Region"); $regionModel = D("Region");
...@@ -37,6 +37,8 @@ class SpAction extends CommonAction{ ...@@ -37,6 +37,8 @@ class SpAction extends CommonAction{
$conf_type_lists = $confTypeModel->join(" A left join sh_sp_config B on A.`code` = B.type_code and B.sp_id = $id ")->field("A.id,A.`name`,A.remark,A.`code`,A.`v` default_v,B.`v`")->where("A.`status`=0")->select(); $conf_type_lists = $confTypeModel->join(" A left join sh_sp_config B on A.`code` = B.type_code and B.sp_id = $id ")->field("A.id,A.`name`,A.remark,A.`code`,A.`v` default_v,B.`v`")->where("A.`status`=0")->select();
$region_lists = $regionModel->where("pid = 1 and `status`=0")->select(); $region_lists = $regionModel->where("pid = 1 and `status`=0")->select();
$region_city_lists = $regionModel->where("pid > 1 and `status`=0")->select(); $region_city_lists = $regionModel->where("pid > 1 and `status`=0")->select();
$site_lists = $siteModel->where("`status`=0")->select();
$this->site_lists = $site_lists;
$this->code = GetfourStr(8); $this->code = GetfourStr(8);
$this->conf_type_lists = $conf_type_lists; $this->conf_type_lists = $conf_type_lists;
$this->region_lists = $region_lists; $this->region_lists = $region_lists;
......
SooonerHotel/App/Lib/Model/MediaModel.class.php
View file @ 02c6210a
...@@ -12,12 +12,12 @@ class MediaModel extends RelationModel{ ...@@ -12,12 +12,12 @@ class MediaModel extends RelationModel{
//============= //=============
$searchField = $inputs["searchField"]?$inputs["searchField"]:'title'; $searchField = $inputs["searchField"]?$inputs["searchField"]:'title';
$searchValue = $inputs["searchValue"]?$inputs["searchValue"]:''; $searchValue = $inputs["searchValue"]?$inputs["searchValue"]:'';
$searchSp = $inputs["searchSp"]?$inputs["searchSp"]:0; $searchSite = $inputs["searchSite"]?$inputs["searchSite"]:0;
$searchClass = $inputs["searchClass"]?$inputs["searchClass"]:0; $searchClass = $inputs["searchClass"]?$inputs["searchClass"]:0;
$searchType = $inputs["searchType"]?$inputs["searchType"]:0; $searchType = $inputs["searchType"]?$inputs["searchType"]:0;
if ($searchSp){ if ($searchSite){
$where = " and mw.sp_id=$searchSp "; $where = " and mw.site_id=$searchSite ";
} }
if ($searchClass==2){ if ($searchClass==2){
$where .= " and mw.`type`='movie' "; $where .= " and mw.`type`='movie' ";
...@@ -42,11 +42,11 @@ class MediaModel extends RelationModel{ ...@@ -42,11 +42,11 @@ class MediaModel extends RelationModel{
//返回列表（limit分页） //返回列表（limit分页）
if($queryType=="list"){ if($queryType=="list"){
$where .= $sort." ".$limit; $where .= $sort." ".$limit;
$fields = " mw.sp_id,sp.name sp_name,mw.id,mw.url_pic,mw.title,mw.code,mw.type,mw.programType" $fields = " mw.site_id,site.name site_name,mw.id,mw.url_pic,mw.title,mw.code,mw.type,mw.programType"
.",mw.region,mw.year,mw.score,mw.addtime,mw.updatetime" .",mw.region,mw.year,mw.score,mw.addtime,mw.updatetime"
.",case mw.`status` when 1 then '<font color=green>上线</font>' when 2 then '<font color=red>下线</font>' when 0 then '<font>未知</font>' end as `status` "; .",case mw.`status` when 1 then '<font color=green>上线</font>' when 2 then '<font color=red>下线</font>' when 0 then '<font>未知</font>' end as `status` ";
} }
$sql = "select ".$fields." from sh_media_wasu mw,sh_sp sp where sp.id=mw.sp_id ".$where.";"; $sql = "select ".$fields." from sh_media_wasu mw,sh_site site where site.id=mw.site_id ".$where.";";
// echo $sql; // echo $sql;
return $model->query($sql); return $model->query($sql);
} }
......
SooonerHotel/App/Lib/Model/SpModel.class.php
View file @ 02c6210a
...@@ -10,27 +10,31 @@ class SpModel extends RelationModel{ ...@@ -10,27 +10,31 @@ class SpModel extends RelationModel{
if($inputs["sort"]) if($inputs["sort"])
$sort = "order by ".$inputs["sort"]." ".$inputs["order"]; $sort = "order by ".$inputs["sort"]." ".$inputs["order"];
//============= //=============
$searchField = $inputs["searchField"]?$inputs["searchField"]:'name'; $searchField = $inputs["searchField"]?$inputs["searchField"]:'A.name';
$searchValue = $inputs["searchValue"]?$inputs["searchValue"]:''; $searchValue = $inputs["searchValue"]?$inputs["searchValue"]:'';
$searchSite = $inputs["searchSite"]?$inputs["searchSite"]:'';
if($searchValue){ if($searchValue){
$where = " and (`name` like '%".$searchValue."%' or `code` like '%".$searchValue."%') "; $where = " and (A.`name` like '%".$searchValue."%' or A.`code` like '%".$searchValue."%') ";
}
if($searchSite){
$where .= " and A.site_id = $searchSite ";
} }
if($userInfo['sp_ids']&&$userInfo['grade']>=3){ if($userInfo['sp_ids']&&$userInfo['grade']>=3){
$where .= " and id in(".$userInfo['sp_ids'].") "; $where .= " and A.id in(".$userInfo['sp_ids'].") ";
} }
$model = new Model(); $model = new Model();
//====================== //======================
$fields = "count(id) count"; $fields = "count(A.id) count";
//返回列表（limit分页） //返回列表（limit分页）
if($queryType=="list"){ if($queryType=="list"){
$where .= $sort." ".$limit; $where .= $sort." ".$limit;
$fields = "*,case `status` when 1 then '<font color=red>禁用</font>' when 0 then '<font color=green>启用</font>' end as `status`"; $fields = "A.*,B.`name` site_name,case A.`status` when 1 then '<font color=red>禁用</font>' when 0 then '<font color=green>启用</font>' end as `status`";
} }
$sql = "select ".$fields." from sh_sp where 1=1 ".$where.";"; $sql = "select ".$fields." from sh_sp A left join sh_site B on A.site_id = B.id where 1=1 ".$where.";";
// echo $sql;
return $model->query($sql); return $model->query($sql);
} }
} }
\ No newline at end of file
SooonerHotel/App/Tpl/Media/zh-cn/Cloud/index.html
View file @ 02c6210a
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
<form name="searchform" method="post" action="" id ="searchform"> <form name="searchform" method="post" action="" id ="searchform">
<input type="hidden" name="op" value="getjson"> <input type="hidden" name="op" value="getjson">
<div class="inputBox"> <div class="inputBox">
<select class="select" name="searchSp"> <select class="select" name="searchSite">
<option value="0">请选择合作方</option> <option value="0">请选择站点</option>
<volist name="sp_lists" id="item"> <volist name="site_lists" id="item">
<option value="{$item.id}" <if condition="$key eq 0">selected="selected"</if> >{$item.name}</option> <option value="{$item.id}" <if condition="$key eq 0">selected="selected"</if> >{$item.name}</option>
</volist> </volist>
</select> </select>
...@@ -86,7 +86,7 @@ onRowContextMenu : onRowContextMenu ...@@ -86,7 +86,7 @@ onRowContextMenu : onRowContextMenu
<th data-options="field:'id',width:15" align="center">ID</th> <th data-options="field:'id',width:15" align="center">ID</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:'sp_name',width:20" sortable="true">所属合作方</th> <th data-options="field:'site_name',width:20" sortable="true">所属站点</th>
<th data-options="field:'code',width:15">媒资标识</th> <th data-options="field:'code',width:15">媒资标识</th>
<th data-options="field:'type',width:10">媒资分类</th> <th data-options="field:'type',width:10">媒资分类</th>
<th data-options="field:'programType',width:20">媒资类型</th> <th data-options="field:'programType',width:20">媒资类型</th>
......
SooonerHotel/App/Tpl/Sp/zh-cn/Sp/add.html
View file @ 02c6210a
...@@ -18,6 +18,17 @@ body{padding:20px} ...@@ -18,6 +18,17 @@ body{padding:20px}
<body> <body>
<form class="form-horizontal" role="form" id="ff" action="{:U('/Sp/Sp/addHandle')}" method="POST"> <form class="form-horizontal" role="form" id="ff" action="{:U('/Sp/Sp/addHandle')}" method="POST">
<input name="id" type="hidden" value="{$info.id}"/> <input name="id" type="hidden" value="{$info.id}"/>
<div class="form-group">
<label for="inputEmail3" class="col-sm-4 control-label"><font color="red">*</font> 站点</label>
<div class="col-sm-6">
<select class="form-control" name="site_id">
<option value="0">请选择站点</option>
<volist name="site_lists" id="item">
<option value="{$item.id}">{$item.name}</option>
</volist>
</select>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label for="inputEmail3" class="col-sm-4 control-label"><font color="red">*</font> 合作方名称</label> <label for="inputEmail3" class="col-sm-4 control-label"><font color="red">*</font> 合作方名称</label>
<div class="col-sm-6"> <div class="col-sm-6">
...@@ -86,17 +97,17 @@ body{padding:20px} ...@@ -86,17 +97,17 @@ body{padding:20px}
</form> </form>
<script type="text/javascript"> <script type="text/javascript">
function submitForm(){ function submitForm(){
var sp_id = $("select[name='sp_id'] option:selected").val(); var site_id = $("select[name='site_id'] option:selected").val();
var region_id = $("select[name='region_id'] option:selected").val(); // var region_id = $("select[name='region_id'] option:selected").val();
var name_v = $("input[name='name']").val(); var name_v = $("input[name='name']").val();
var code_v = $("input[name='code']").val(); var code_v = $("input[name='code']").val();
if(sp_id==0){ if(site_id==0){
alert("请选择合作方");return; alert("请选择站点");return;
}
if(region_id==0){
alert("请选择省份/城市");return;
} }
// if(region_id==0){
// alert("请选择省份/城市");return;
// }
if(!name_v){ if(!name_v){
alert("请输入合作方名称");return; alert("请输入合作方名称");return;
} }
...@@ -126,20 +137,8 @@ function submitForm(){ ...@@ -126,20 +137,8 @@ function submitForm(){
}); });
} }
$().ready(function(){ $().ready(function(){
$("select[id='province_select']").bind("change",function(){
var province_id = $(this).val();
$("select[name='region_id'] option").addClass("hidden");
$("select[name='region_id'] option[pid='0']").removeClass("hidden");
$("select[name='region_id'] option[value='0']").attr("selected",true);
$("select[name='region_id'] option[pid='"+province_id+"']").removeClass("hidden");
});
<if condition="$info"> <if condition="$info">
$("select[name='sp_id'] option[value='{$info.sp_id}']").attr("selected",true); $("select[name='site_id'] option[value='{$info.site_id}']").attr("selected",true);
var province_id = $("select[name='region_id'] option[value='{$info.region_id}']").attr("pid");
$("select[name='region_id'] option[pid='"+province_id+"']").removeClass("hidden");
$("select[id='province_select'] option[value='"+province_id+"']").attr("selected",true);
$("select[name='region_id'] option[value='{$info.region_id}']").attr("selected",true);
$("input[name='status'][value='{$info.status}']").attr("checked",true); $("input[name='status'][value='{$info.status}']").attr("checked",true);
$("input[name='push_type'][value='{$info.push_type}']").attr("checked",true); $("input[name='push_type'][value='{$info.push_type}']").attr("checked",true);
</if> </if>
......
SooonerHotel/App/Tpl/Sp/zh-cn/Sp/index.html
View file @ 02c6210a
...@@ -23,6 +23,12 @@ ...@@ -23,6 +23,12 @@
<form name="searchform" method="post" action="" id ="searchform"> <form name="searchform" method="post" action="" id ="searchform">
<input type="hidden" name="op" value="getjson"> <input type="hidden" name="op" value="getjson">
<div class="inputBox"> <div class="inputBox">
<select class="select" name="searchSite">
<option value="0">请选择站点</option>
<volist name="site_lists" id="item">
<option value="{$item.id}">{$item.name}</option>
</volist>
</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" />
...@@ -42,7 +48,7 @@ method: 'post', ...@@ -42,7 +48,7 @@ method: 'post',
pagination: true, pagination: true,
pageList:[15,30,45,60], pageList:[15,30,45,60],
rownumbers: true, rownumbers: true,
sortName:'id', sortName:'A.id',
sortOrder:'desc', sortOrder:'desc',
queryParams: form2Json('searchform'), queryParams: form2Json('searchform'),
fitColumns: true, fitColumns: true,
...@@ -52,7 +58,8 @@ onRowContextMenu : onRowContextMenu ...@@ -52,7 +58,8 @@ onRowContextMenu : onRowContextMenu
<thead> <thead>
<tr> <tr>
<th data-options="field:'id',width:15" sortable="true" align="center">标识</th> <th data-options="field:'id',width:15" sortable="true" align="center">标识</th>
<th data-options="field:'name',width:20" sortable="true">合作方名称</th> <th data-options="field:'site_name',width:20">站点名称</th>
<th data-options="field:'name',width:20">合作方名称</th>
<th data-options="field:'code',width:20">合作方代码</th> <th data-options="field:'code',width:20">合作方代码</th>
<th data-options="field:'email',width:40">邮箱</th> <th data-options="field:'email',width:40">邮箱</th>
<th data-options="field:'mobile',width:20">手机号</th> <th data-options="field:'mobile',width:20">手机号</th>
......
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