景龙 / xingqiu · 提交

转到一个项目

作者 景龙
提交 c717043103c22958fd3c0054833353e7165a646c 1 个父辈 c8e0b6a5
1 个管道 的构建 通过 耗费 2 秒

增加星际活动页面

内嵌 并排对比
正在显示 9 个修改的文件 包含 230 行增加 和 11 行删除
... ... @@ -41,13 +41,13 @@ class ActiveController extends HomeBaseController
//查询文章
$res = Db::table($pre.'portal_post')
->whereIn('id',$post_id)
->where('delete_time', 0)
->where('delete_time',0)
->field($field)
->order('weigh desc')
->paginate($limit);
$arr['data'] = $res->toArray();
$arr['page'] = $res->render();
return $res;
return $arr;
}
//星际活动详情
... ... @@ -59,8 +59,9 @@ class ActiveController extends HomeBaseController
$res = $starModel->getDetail($id,$field);
if($res){
$more = json_decode($res['more'],true);
$res['image_url'] = isset($more['photos']) && !empty($more['photos'])?$more['photos']:'';
$res['image_url'] = isset($more['photos']) && !empty($more['photos'])?$more['photos'][0]['url']:'';
}
$this->assign('res',$res);
return $this->fetch();
}
}
... ...
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>星际活动详情</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
<style>
.active_url{
height:50px;
background: #5454AF;
margin-bottom:80px;
}
.active_url p{
text-align: center;
line-height: 50px;
vertical-align: middle;
font-size: 17px;
color:#fff;
}
.active_url span{
color:#3AFFA5;
}
</style>
</head>
<body>
<include file="public@header"/>
<div class="mask">
</div>
<!-- 侧边栏 -->
<include file="public@slide"/>
<!--主体内容-->
<div class="show_2">
<!--banner-->
<div class="show_banner">
<img src="{:cmf_get_image_url($res.image_url)}" alt="">
</div>
<!--main-->
<div class="show_main">
<!-- 头部 -->
<div class="show_main_Tit clearfix">
<h1>{$res.post_title}</h1>
<p>{$res.create_time|date="Y-m-d",###}</p>
</div>
<!-- 文字内容 -->
<div class="show_main_txt">
{$res.post_content}
</div>
</div>
<notempty name="user">
<div class="active_url">
<p>
活动外链：<a href="{$res.active_url}"><span>{$res.active_url}</span></a>
</p>
</div>
<else/>
<div class="active_url">
<p>
登录后可见活动外链
</p>
</div>
</notempty>
</div>
<include file="public@footer"/>
</body>
<script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
<script src="__TMPL__/public/assets/js/public.js"></script>
</html>
\ No newline at end of file
... ...
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>星际活动</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/bootstrap4.0.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/activity_index.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/Scout_index.css">
<style>
.Activity{
width: 1200px !important;
}
.container {
max-width: 1200px;
padding-right: 0;
padding-left: 0;
}
</style>
</head>
<body>
<include file="public@header"/>
<div class="banner">
<img src="__TMPL__/public/assets/starImg/bicon_01.png" alt="">
</div>
<main>
<div class="container">
<div class="Activity">
<div class="Spot_title clearfix">
<div class="Spot_icon fl">
<img src="__TMPL__/public/assets/starImg/aicon_79.png" alt="">
</div>
<div class="Spot_name fl">
<div class="Spot_name_left fl">
星际
</div>
<div class="Spot_name_right fl">
活动
</div>
</div>
<div class="Spot_English_name fl">
<p>Innovation</p>
</div>
</div>
<div class="Activity_main clearfix">
<volist name="res['data']" id="vo" offset="0" length="1">
<div class="Activity_item_big">
<a href="/portal/active/getActiveDetail?id={$vo.id}">
<div class="Activity_item_img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="Activity_item_text">
{$vo.post_title}
</div>
</a>
</div>
</volist>
<volist name="res['data']" id="vo" offset="1" length="4">
<div class="Activity_item_small">
<a href="/portal/active/getActiveDetail?id={$vo.id}">
<div class="Activity_item_img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="Activity_item_text">
{$vo.post_title}
</div>
</a>
</div>
</volist>
</div>
<!--分页-->
<div class="pagination">
{$page|default=''}
</div>
</div>
</div>
</main>
<include file="public@footer"/>
<script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
<script src="__TMPL__/public/assets/js/public.js"></script>
</body>
</html>
... ...
... ... @@ -5,15 +5,15 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>星域秀场--星球影院</title>
<title>星球影院更多</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
</head>
<body>
<include file="public@header"/>
<!-- 弹出框 -->
<div class="video_mask">
您还不是VIP，可试看15秒
<div class="mask">
</div>
<div class="show_9 clearfix">
<!-- 视频 -->
... ... @@ -21,6 +21,7 @@
<img class="video_poster iop" src="" alt="">
<video id="video" width="100%" height="426" src=""></video>
<img class="play_button" onclick="bofang()" src="__TMPL__/public/assets/starImg/aicon_30.png" alt="">
<div class="video_box"></div>
</div>
<!-- 视频侧边选择 -->
<div class="show_9_video_aside">
... ... @@ -187,6 +188,7 @@
$('.play_button').hide();
$('.video_poster').css('z-index', '-1');
}
</script>
</body>
... ...
... ... @@ -169,9 +169,7 @@
<ul class="swiper-wrapper">
<volist name="res_xyhl" id="vo">
<li class="swiper-slide">
<a href="/portal/region/getGalleryDetail?id={$vo.id}">
<img class="swiper-slide slide-image" src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</a>
</li>
</volist>
</ul>
... ...
... ... @@ -5,7 +5,7 @@
main {
padding-top: 142px;
padding-bottom: 100px;
padding-bottom: 150px;
box-sizing: border-box;
}
... ...
.banner img {
height: 666px;
width: 100%;
}
main {
padding-top: 142px;
padding-bottom: 100px;
}
.Activity_item_big {
width: 100%;
}
.Activity_item_big .Activity_item_img img {
height: 444px;
width: 100%;
}
.Activity_item_big .Activity_item_text {
padding: 14px 38px;
box-sizing: border-box;
background: #fff;
width: 100%;
font-synthesis: 16px;
color: #1A1A1A;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.Activity_item_small{
width: 592px;
float: right;
}
.Activity_item_small:nth-child(2n){
float: left;
}
.Activity_item_small .Activity_item_img img{
width: 100%;
height: 300px;
margin-top: 40px;
}
.Activity_item_small .Activity_item_text {
padding: 14px 38px;
box-sizing: border-box;
background: #fff;
width: 100%;
font-synthesis: 16px;
color: #1A1A1A;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
\ No newline at end of file
... ...
... ... @@ -2,7 +2,7 @@
#header {
width: 100%;
height: 80px;
height: 82px;
line-height: 80px;
background-color: white;
}
... ...
... ... @@ -1772,6 +1772,7 @@ body {
position: fixed;
top: 44%;
left: 50%;
display: block;
transform: translate(-50%, -50%);
-webkit-transform: translate(-50%, -50%);
-moz-transform: translate(-50%, -50%);
... ... @@ -1784,7 +1785,13 @@ body {
font-size: 18px;
color: rgba(255, 255, 255, 1);
}
.video_box{
width: 100%;
height: 30px;
visibility: hidden;
position: absolute;
bottom: 0;
}
/*故事更多頁面*/
.show_story{
width: 1200px;
... ...