景龙 / xingqiu · 提交

转到一个项目

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

增加星际活动页面

内嵌 并排对比
正在显示 9 个修改的文件 包含 230 行增加 和 11 行删除
@@ -41,13 +41,13 @@ class ActiveController extends HomeBaseController @@ -41,13 +41,13 @@ class ActiveController extends HomeBaseController
41 //查询文章 41 //查询文章
42 $res = Db::table($pre.'portal_post') 42 $res = Db::table($pre.'portal_post')
43 ->whereIn('id',$post_id) 43 ->whereIn('id',$post_id)
44 - ->where('delete_time', 0) 44 + ->where('delete_time',0)
45 ->field($field) 45 ->field($field)
46 ->order('weigh desc') 46 ->order('weigh desc')
47 ->paginate($limit); 47 ->paginate($limit);
48 $arr['data'] = $res->toArray(); 48 $arr['data'] = $res->toArray();
49 $arr['page'] = $res->render(); 49 $arr['page'] = $res->render();
50 - return $res; 50 + return $arr;
51 } 51 }
52 52
53 //星际活动详情 53 //星际活动详情
@@ -59,8 +59,9 @@ class ActiveController extends HomeBaseController @@ -59,8 +59,9 @@ class ActiveController extends HomeBaseController
59 $res = $starModel->getDetail($id,$field); 59 $res = $starModel->getDetail($id,$field);
60 if($res){ 60 if($res){
61 $more = json_decode($res['more'],true); 61 $more = json_decode($res['more'],true);
62 - $res['image_url'] = isset($more['photos']) && !empty($more['photos'])?$more['photos']:''; 62 + $res['image_url'] = isset($more['photos']) && !empty($more['photos'])?$more['photos'][0]['url']:'';
63 } 63 }
64 $this->assign('res',$res); 64 $this->assign('res',$res);
  65 + return $this->fetch();
65 } 66 }
66 } 67 }
  1 +<!DOCTYPE html>
  2 +<html lang="en">
  3 +
  4 +<head>
  5 + <meta charset="UTF-8">
  6 + <meta name="viewport" content="width=device-width, initial-scale=1.0">
  7 + <meta http-equiv="X-UA-Compatible" content="ie=edge">
  8 + <title>星际活动详情</title>
  9 + <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
  10 + <link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
  11 + <style>
  12 + .active_url{
  13 + height:50px;
  14 + background: #5454AF;
  15 + margin-bottom:80px;
  16 + }
  17 + .active_url p{
  18 + text-align: center;
  19 + line-height: 50px;
  20 + vertical-align: middle;
  21 + font-size: 17px;
  22 + color:#fff;
  23 + }
  24 + .active_url span{
  25 + color:#3AFFA5;
  26 + }
  27 + </style>
  28 +</head>
  29 +
  30 +<body>
  31 + <include file="public@header"/>
  32 + <div class="mask">
  33 + </div>
  34 + <!-- 侧边栏 -->
  35 + <include file="public@slide"/>
  36 + <!--主体内容-->
  37 + <div class="show_2">
  38 + <!--banner-->
  39 + <div class="show_banner">
  40 + <img src="{:cmf_get_image_url($res.image_url)}" alt="">
  41 + </div>
  42 + <!--main-->
  43 + <div class="show_main">
  44 + <!-- 头部 -->
  45 + <div class="show_main_Tit clearfix">
  46 + <h1>{$res.post_title}</h1>
  47 + <p>{$res.create_time|date="Y-m-d",###}</p>
  48 + </div>
  49 + <!-- 文字内容 -->
  50 + <div class="show_main_txt">
  51 + {$res.post_content}
  52 + </div>
  53 + </div>
  54 + <notempty name="user">
  55 + <div class="active_url">
  56 + <p>
  57 + 活动外链：<a href="{$res.active_url}"><span>{$res.active_url}</span></a>
  58 + </p>
  59 + </div>
  60 + <else/>
  61 + <div class="active_url">
  62 + <p>
  63 + 登录后可见活动外链
  64 + </p>
  65 + </div>
  66 + </notempty>
  67 + </div>
  68 +
  69 + <include file="public@footer"/>
  70 +</body>
  71 +<script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
  72 +<script src="__TMPL__/public/assets/js/public.js"></script>
  73 +
  74 +</html>
  1 +<!DOCTYPE html>
  2 +<html lang="en">
  3 +<head>
  4 + <meta charset="UTF-8">
  5 + <title>星际活动</title>
  6 + <link rel="stylesheet" href="__TMPL__/public/assets/css/bootstrap4.0.css">
  7 + <link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment.css">
  8 + <link rel="stylesheet" href="__TMPL__/public/assets/css/activity_index.css">
  9 + <link rel="stylesheet" href="__TMPL__/public/assets/css/Scout_index.css">
  10 + <style>
  11 + .Activity{
  12 + width: 1200px !important;
  13 + }
  14 + .container {
  15 + max-width: 1200px;
  16 + padding-right: 0;
  17 + padding-left: 0;
  18 + }
  19 + </style>
  20 +</head>
  21 +
  22 +<body>
  23 + <include file="public@header"/>
  24 + <div class="banner">
  25 + <img src="__TMPL__/public/assets/starImg/bicon_01.png" alt="">
  26 + </div>
  27 + <main>
  28 + <div class="container">
  29 + <div class="Activity">
  30 + <div class="Spot_title clearfix">
  31 + <div class="Spot_icon fl">
  32 + <img src="__TMPL__/public/assets/starImg/aicon_79.png" alt="">
  33 + </div>
  34 + <div class="Spot_name fl">
  35 + <div class="Spot_name_left fl">
  36 + 星际
  37 + </div>
  38 + <div class="Spot_name_right fl">
  39 + 活动
  40 + </div>
  41 + </div>
  42 + <div class="Spot_English_name fl">
  43 + <p>Innovation</p>
  44 + </div>
  45 + </div>
  46 + <div class="Activity_main clearfix">
  47 + <volist name="res['data']" id="vo" offset="0" length="1">
  48 + <div class="Activity_item_big">
  49 + <a href="/portal/active/getActiveDetail?id={$vo.id}">
  50 + <div class="Activity_item_img">
  51 + <img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
  52 + </div>
  53 + <div class="Activity_item_text">
  54 + {$vo.post_title}
  55 + </div>
  56 + </a>
  57 + </div>
  58 + </volist>
  59 + <volist name="res['data']" id="vo" offset="1" length="4">
  60 + <div class="Activity_item_small">
  61 + <a href="/portal/active/getActiveDetail?id={$vo.id}">
  62 + <div class="Activity_item_img">
  63 + <img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
  64 + </div>
  65 + <div class="Activity_item_text">
  66 + {$vo.post_title}
  67 + </div>
  68 + </a>
  69 + </div>
  70 + </volist>
  71 + </div>
  72 + <!--分页-->
  73 + <div class="pagination">
  74 + {$page|default=''}
  75 + </div>
  76 + </div>
  77 + </div>
  78 + </main>
  79 + <include file="public@footer"/>
  80 + <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
  81 + <script src="__TMPL__/public/assets/js/public.js"></script>
  82 +</body>
  83 +
  84 +</html>
@@ -5,15 +5,15 @@ @@ -5,15 +5,15 @@
5 <meta charset="UTF-8"> 5 <meta charset="UTF-8">
6 <meta name="viewport" content="width=device-width, initial-scale=1.0"> 6 <meta name="viewport" content="width=device-width, initial-scale=1.0">
7 <meta http-equiv="X-UA-Compatible" content="ie=edge"> 7 <meta http-equiv="X-UA-Compatible" content="ie=edge">
8 - <title>星域秀场--星球影院</title> 8 + <title>星球影院更多</title>
9 <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css"> 9 <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
  10 + <link rel="stylesheet" href="__TMPL__/public/assets/css/mask.css">
10 </head> 11 </head>
11 12
12 <body> 13 <body>
13 <include file="public@header"/> 14 <include file="public@header"/>
14 <!-- 弹出框 --> 15 <!-- 弹出框 -->
15 - <div class="video_mask">  
16 - 您还不是VIP，可试看15秒 16 + <div class="mask">
17 </div> 17 </div>
18 <div class="show_9 clearfix"> 18 <div class="show_9 clearfix">
19 <!-- 视频 --> 19 <!-- 视频 -->
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
21 <img class="video_poster iop" src="" alt=""> 21 <img class="video_poster iop" src="" alt="">
22 <video id="video" width="100%" height="426" src=""></video> 22 <video id="video" width="100%" height="426" src=""></video>
23 <img class="play_button" onclick="bofang()" src="__TMPL__/public/assets/starImg/aicon_30.png" alt=""> 23 <img class="play_button" onclick="bofang()" src="__TMPL__/public/assets/starImg/aicon_30.png" alt="">
  24 + <div class="video_box"></div>
24 </div> 25 </div>
25 <!-- 视频侧边选择 --> 26 <!-- 视频侧边选择 -->
26 <div class="show_9_video_aside"> 27 <div class="show_9_video_aside">
@@ -187,6 +188,7 @@ @@ -187,6 +188,7 @@
187 $('.play_button').hide(); 188 $('.play_button').hide();
188 $('.video_poster').css('z-index', '-1'); 189 $('.video_poster').css('z-index', '-1');
189 } 190 }
  191 +
190 </script> 192 </script>
191 </body> 193 </body>
192 194
@@ -169,9 +169,7 @@ @@ -169,9 +169,7 @@
169 <ul class="swiper-wrapper"> 169 <ul class="swiper-wrapper">
170 <volist name="res_xyhl" id="vo"> 170 <volist name="res_xyhl" id="vo">
171 <li class="swiper-slide"> 171 <li class="swiper-slide">
172 - <a href="/portal/region/getGalleryDetail?id={$vo.id}">  
173 <img class="swiper-slide slide-image" src="{:cmf_get_image_url($vo.thumbnail)}" alt=""> 172 <img class="swiper-slide slide-image" src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
174 - </a>  
175 </li> 173 </li>
176 </volist> 174 </volist>
177 </ul> 175 </ul>
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 5
6 main { 6 main {
7 padding-top: 142px; 7 padding-top: 142px;
8 - padding-bottom: 100px; 8 + padding-bottom: 150px;
9 box-sizing: border-box; 9 box-sizing: border-box;
10 } 10 }
11 11
  1 +.banner img {
  2 + height: 666px;
  3 + width: 100%;
  4 +}
  5 +
  6 +main {
  7 + padding-top: 142px;
  8 + padding-bottom: 100px;
  9 +}
  10 +
  11 +.Activity_item_big {
  12 + width: 100%;
  13 +}
  14 +
  15 +.Activity_item_big .Activity_item_img img {
  16 + height: 444px;
  17 + width: 100%;
  18 +}
  19 +
  20 +.Activity_item_big .Activity_item_text {
  21 + padding: 14px 38px;
  22 + box-sizing: border-box;
  23 + background: #fff;
  24 + width: 100%;
  25 + font-synthesis: 16px;
  26 + color: #1A1A1A;
  27 + overflow: hidden;
  28 + text-overflow: ellipsis;
  29 + white-space: nowrap;
  30 +}
  31 +.Activity_item_small{
  32 + width: 592px;
  33 + float: right;
  34 +}
  35 +.Activity_item_small:nth-child(2n){
  36 + float: left;
  37 +}
  38 +.Activity_item_small .Activity_item_img img{
  39 + width: 100%;
  40 + height: 300px;
  41 + margin-top: 40px;
  42 +}
  43 +.Activity_item_small .Activity_item_text {
  44 + padding: 14px 38px;
  45 + box-sizing: border-box;
  46 + background: #fff;
  47 + width: 100%;
  48 + font-synthesis: 16px;
  49 + color: #1A1A1A;
  50 + overflow: hidden;
  51 + text-overflow: ellipsis;
  52 + white-space: nowrap;
  53 +}
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 #header { 3 #header {
4 width: 100%; 4 width: 100%;
5 - height: 80px; 5 + height: 82px;
6 line-height: 80px; 6 line-height: 80px;
7 background-color: white; 7 background-color: white;
8 } 8 }
@@ -1772,6 +1772,7 @@ body { @@ -1772,6 +1772,7 @@ body {
1772 position: fixed; 1772 position: fixed;
1773 top: 44%; 1773 top: 44%;
1774 left: 50%; 1774 left: 50%;
  1775 + display: block;
1775 transform: translate(-50%, -50%); 1776 transform: translate(-50%, -50%);
1776 -webkit-transform: translate(-50%, -50%); 1777 -webkit-transform: translate(-50%, -50%);
1777 -moz-transform: translate(-50%, -50%); 1778 -moz-transform: translate(-50%, -50%);
@@ -1784,7 +1785,13 @@ body { @@ -1784,7 +1785,13 @@ body {
1784 font-size: 18px; 1785 font-size: 18px;
1785 color: rgba(255, 255, 255, 1); 1786 color: rgba(255, 255, 255, 1);
1786 } 1787 }
1787 - 1788 +.video_box{
  1789 + width: 100%;
  1790 + height: 30px;
  1791 + visibility: hidden;
  1792 + position: absolute;
  1793 + bottom: 0;
  1794 +}
1788 /*故事更多頁面*/ 1795 /*故事更多頁面*/
1789 .show_story{ 1796 .show_story{
1790 width: 1200px; 1797 width: 1200px;