景龙 / xingqiu · 提交

转到一个项目

作者 景龙
提交 bdfcf48a8830fa88343fa77d31934f71fae6ff23 1 个父辈 ddcaec5c
1 个管道 的构建 通过 耗费 4 秒

修改页面样式

内嵌 并排对比
正在显示 27 个修改的文件 包含 299 行增加 和 117 行删除
@@ -28,6 +28,7 @@ class IndexController extends HomeBaseController @@ -28,6 +28,7 @@ class IndexController extends HomeBaseController
28 $res['north'] = $this->getCity(CityCategoryModel::north); 28 $res['north'] = $this->getCity(CityCategoryModel::north);
29 $res['south'] = $this->getCity(CityCategoryModel::south); 29 $res['south'] = $this->getCity(CityCategoryModel::south);
30 $res['antarctica'] = $this->getCity(CityCategoryModel::antarctica); 30 $res['antarctica'] = $this->getCity(CityCategoryModel::antarctica);
  31 + $res['arctic'] = $this->getCity(CityCategoryModel::arctic);
31 $this->assign('res_city',$res); 32 $this->assign('res_city',$res);
32 33
33 //星享体验 34 //星享体验
@@ -25,7 +25,7 @@ class RegionController extends HomeBaseController @@ -25,7 +25,7 @@ class RegionController extends HomeBaseController
25 $res_xqyy = $this->getChildArticle($position,$field,1); 25 $res_xqyy = $this->getChildArticle($position,$field,1);
26 foreach($res_xqyy as &$value){ 26 foreach($res_xqyy as &$value){
27 $more = json_decode($value['more'],true); 27 $more = json_decode($value['more'],true);
28 - $value['video'] = $more['video']; 28 + $value['video'] = isset($more['video']) && !empty($more['video'])?$more['video']:'';
29 } 29 }
30 if($res_xqyy){ 30 if($res_xqyy){
31 $res_xqyy = $res_xqyy[0]; 31 $res_xqyy = $res_xqyy[0];
@@ -47,7 +47,7 @@ class RegionController extends HomeBaseController @@ -47,7 +47,7 @@ class RegionController extends HomeBaseController
47 $res_xqgs = $this->getChildArticle($position,$field,$this->index_limit); 47 $res_xqgs = $this->getChildArticle($position,$field,$this->index_limit);
48 foreach($res_xqgs as &$value){ 48 foreach($res_xqgs as &$value){
49 $more = json_decode($value['more'],true); 49 $more = json_decode($value['more'],true);
50 - $value['audio'] = $more['audio']; 50 + $value['audio'] = isset($more['audio']) && !empty($more['audio'])?$more['audio']:'';
51 } 51 }
52 $this->assign('res_xqgs',$res_xqgs); 52 $this->assign('res_xqgs',$res_xqgs);
53 53
@@ -138,18 +138,26 @@ class RegionController extends HomeBaseController @@ -138,18 +138,26 @@ class RegionController extends HomeBaseController
138 //星球影院更多(按照城市查询) 138 //星球影院更多(按照城市查询)
139 public function getMoreVideo(){ 139 public function getMoreVideo(){
140 $page = $this->request->param('page',1,'intval'); 140 $page = $this->request->param('page',1,'intval');
141 - $city_id = $this->request->param('city_id',1,'intval'); 141 + $city_id = $this->request->param('city_id',0,'intval');
142 $position['city_id'] = $city_id; 142 $position['city_id'] = $city_id;
143 $position['category_id'] = CityCategoryModel::xqyy; 143 $position['category_id'] = CityCategoryModel::xqyy;
144 - $field = 'id,post_title,framing,release_time,city_id,more'; 144 + $field = 'id,post_title,framing,release_time,city_id,more,thumbnail';
145 $star = new StarController(); 145 $star = new StarController();
146 - $res = $star->getChildArticlePage($position,$field,$page);  
147 - foreach($res as &$value){ 146 + $res = $star->getChildArticlePage($position,$field);
  147 + foreach($res['data']['data'] as &$value){
148 $more = json_decode($value['more'],true); 148 $more = json_decode($value['more'],true);
149 - $value['video'] = $more['video']; 149 + $value['video'] = isset($more['video']) && !empty($more['video'])?$more['video']:'';;
150 $value['city_name'] = $this->getCityCategory($value['city_id']); 150 $value['city_name'] = $this->getCityCategory($value['city_id']);
151 } 151 }
152 - $this->assign('res',$res); 152 + $this->assign('res',$res['data']);
  153 + $this->assign('page',$res['page']);
  154 +
  155 + //城市分类
  156 + $enjoyModel = new EnjoyController();
  157 + $city_name = $enjoyModel->getCityName();
  158 + $this->assign('city_name',$city_name);
  159 +
  160 + $this->assign('city_id',$city_id);
153 return $this->fetch(); 161 return $this->fetch();
154 } 162 }
155 163
@@ -178,9 +186,9 @@ class RegionController extends HomeBaseController @@ -178,9 +186,9 @@ class RegionController extends HomeBaseController
178 $position['category_id'] = CityCategoryModel::xqgs; 186 $position['category_id'] = CityCategoryModel::xqgs;
179 $field = 'id,thumbnail,post_excerpt,more,create_time'; 187 $field = 'id,thumbnail,post_excerpt,more,create_time';
180 $res = $this->getChildArticlePage($position,$field); 188 $res = $this->getChildArticlePage($position,$field);
181 - foreach($res as &$value){ 189 + foreach($res['data']['data'] as &$value){
182 $more = json_decode($value['more'],true); 190 $more = json_decode($value['more'],true);
183 - $value['audio'] = $more['audio']; 191 + $value['audio'] = isset($more['audio']) && !empty($more['audio'])?$more['audio']:'';
184 } 192 }
185 $this->assign('res',$res['data']); 193 $this->assign('res',$res['data']);
186 $this->assign('page',$res['page']); 194 $this->assign('page',$res['page']);
@@ -121,16 +121,21 @@ class StarController extends HomeBaseController @@ -121,16 +121,21 @@ class StarController extends HomeBaseController
121 ->toArray(); 121 ->toArray();
122 $post_id = array_column($post_id,'post_id'); 122 $post_id = array_column($post_id,'post_id');
123 //查询文章 123 //查询文章
  124 + if($position['city_id'] == 0){
  125 + //所有
  126 + $where = ['delete_time'=>0];
  127 + }else{
  128 + $where = ['city_id'=>$position['city_id'],'delete_time'=>0];
  129 + }
124 $res = Db::table($pre.'portal_post') 130 $res = Db::table($pre.'portal_post')
125 ->whereIn('id',$post_id) 131 ->whereIn('id',$post_id)
126 - ->where('city_id',$position['city_id'])  
127 - ->where('delete_time', 0) 132 + ->where($where)
128 ->field($field) 133 ->field($field)
129 ->order('weigh desc') 134 ->order('weigh desc')
130 ->paginate($limit,false,['query'=>request()->param()]); 135 ->paginate($limit,false,['query'=>request()->param()]);
131 - $res['data'] = $res->toArray();  
132 - $res['page'] = $res->render();  
133 - return $res; 136 + $arr['data'] = $res->toArray();
  137 + $arr['page'] = $res->render();
  138 + return $arr;
134 } 139 }
135 140
136 //网红美景更多 141 //网红美景更多
@@ -60,6 +60,7 @@ class CityCategoryModel extends Model @@ -60,6 +60,7 @@ class CityCategoryModel extends Model
60 const north = 5;//北美洲 60 const north = 5;//北美洲
61 const south = 6;//南美洲 61 const south = 6;//南美洲
62 const antarctica = 20;//南极洲 62 const antarctica = 20;//南极洲
  63 + const arctic = 43;//北极
63 64
64 //月份 65 //月份
65 const January = 1;//一月份 66 const January = 1;//一月份
@@ -83,6 +83,9 @@ @@ -83,6 +83,9 @@
83 </a> 83 </a>
84 <input type="button" class="btn btn-sm btn-cancel-thumbnail" value="取消图片"> 84 <input type="button" class="btn btn-sm btn-cancel-thumbnail" value="取消图片">
85 </div> 85 </div>
  86 + <div style="margin-top:30px;">
  87 + <span class="form-required">图片参考尺寸：1200*500</span>
  88 + </div>
86 </td> 89 </td>
87 </tr> 90 </tr>
88 <tr> 91 <tr>
@@ -121,6 +121,9 @@ @@ -121,6 +121,9 @@
121 </a> 121 </a>
122 <input type="button" class="btn btn-sm btn-cancel-thumbnail" value="取消图片"> 122 <input type="button" class="btn btn-sm btn-cancel-thumbnail" value="取消图片">
123 </div> 123 </div>
  124 + <div style="margin-top:30px;">
  125 + <span class="form-required">图片参考尺寸：400*400</span>
  126 + </div>
124 </td> 127 </td>
125 </tr> 128 </tr>
126 <tr> 129 <tr>
@@ -146,6 +146,9 @@ @@ -146,6 +146,9 @@
146 </a> 146 </a>
147 <input type="button" class="btn btn-sm btn-cancel-thumbnail" value="取消图片"> 147 <input type="button" class="btn btn-sm btn-cancel-thumbnail" value="取消图片">
148 </div> 148 </div>
  149 + <div style="margin-top:30px;">
  150 + <span class="form-required">图片参考尺寸：400*400</span>
  151 + </div>
149 </td> 152 </td>
150 </tr> 153 </tr>
151 <tr> 154 <tr>
@@ -14,17 +14,28 @@ @@ -14,17 +14,28 @@
14 <body> 14 <body>
15 <include file="public@header"/> 15 <include file="public@header"/>
16 <div class="banner"> 16 <div class="banner">
17 - <img src="__TMPL__/public/assets/starImg/bicon_31.png" alt=""> 17 + <img src="__TMPL__/public/assets/starImg/enjoy_banner.jpg" alt="">
18 </div> 18 </div>
19 <main> 19 <main>
20 <div class="container"> 20 <div class="container">
21 <div class="region"> 21 <div class="region">
22 - <select name="city_id">  
23 - <option value="0">所有</option>  
24 - <volist name="city_name" id="vo">  
25 - <option value="{$vo.id}" <eq name="$vo.id" value="$city_id">selected</eq>>{$vo.name}</option>  
26 - </volist>  
27 - </select> 22 + <!--<select name="city_id">-->
  23 + <!--<option value="0">所有</option>-->
  24 +
  25 + <!--<volist name="city_name" id="vo">-->
  26 + <!--<option value="{$vo.id}" <eq name="$vo.id" value="$city_id">selected</eq>>{$vo.name}</option>-->
  27 + <!--</volist>-->
  28 + <!--</select>-->
  29 + <div class="select">
  30 + <input type="text" value="中国" readonly="readonly">
  31 + <img src="__TMPL__/public/assets/starImg/down.png" alt="">
  32 + <ul>
  33 + <li>所有</li>
  34 + <volist name="city_name" id="vo">
  35 + <li value="{$vo.id}" <eq name="$vo.id" value="$city_id">selected</eq>>{$vo.name}</li>
  36 + </volist>
  37 + </ul>
  38 + </div>
28 </div> 39 </div>
29 <!--亲临现场--> 40 <!--亲临现场-->
30 <div class="Spot" id="own"> 41 <div class="Spot" id="own">
@@ -242,6 +253,32 @@ @@ -242,6 +253,32 @@
242 <script src="__TMPL__/public/assets/js/public.js"></script> 253 <script src="__TMPL__/public/assets/js/public.js"></script>
243 254
244 <script> 255 <script>
  256 + $('.select input').click(function() {
  257 + if ($(this).next('img').attr('src') == "__TMPL__/public/assets/starImg/down.png") {
  258 + $(this).next('img').attr('src', "__TMPL__/public/assets/starImg/up.png")
  259 + $('.select ul').toggle();
  260 + } else {
  261 + $(this).next('img').attr('src', "__TMPL__/public/assets/starImg/down.png")
  262 + $('.select ul').toggle();
  263 + }
  264 +
  265 + });
  266 +
  267 + $('.select ul li').click(function() {
  268 + $('.select input').val($(this).text());
  269 + $('.select ul').hide();
  270 + var index = $(this).index();
  271 + $('.curren').eq(index).addClass('video_active').siblings().removeClass('video_active');
  272 + });
  273 +
  274 + $(document).ready(function() {
  275 + var val = $('.select input').val();
  276 + var val2 = $('.select ul li:first-child').text();
  277 + val = val2;
  278 + $('.select input').val(val)
  279 + })
  280 +
  281 +
245 var swiper = new Swiper('.Spot_main .swiper-container', { 282 var swiper = new Swiper('.Spot_main .swiper-container', {
246 slidesPerView: 2, 283 slidesPerView: 2,
247 spaceBetween: 50, 284 spaceBetween: 50,
@@ -34,13 +34,13 @@ @@ -34,13 +34,13 @@
34 <div id="banner" class="swiper-container6"> 34 <div id="banner" class="swiper-container6">
35 <div class="swiper-wrapper"> 35 <div class="swiper-wrapper">
36 <div class="swiper-slide"> 36 <div class="swiper-slide">
37 - <img src="__TMPL__/public/assets/starImg/aicon_01.png" alt=""> 37 + <img src="__TMPL__/public/assets/starImg/banner/1.jpg" alt="">
38 </div> 38 </div>
39 <div class="swiper-slide"> 39 <div class="swiper-slide">
40 - <img src="__TMPL__/public/assets/starImg/aicon_01.png" alt=""> 40 + <img src="__TMPL__/public/assets/starImg/banner/2.jpg" alt="">
41 </div> 41 </div>
42 <div class="swiper-slide"> 42 <div class="swiper-slide">
43 - <img src="__TMPL__/public/assets/starImg/aicon_01.png" alt=""> 43 + <img src="__TMPL__/public/assets/starImg/banner/3.jpg" alt="">
44 </div> 44 </div>
45 </div> 45 </div>
46 <!--<div class="swiper-pagination">--> 46 <!--<div class="swiper-pagination">-->
@@ -67,9 +67,18 @@ @@ -67,9 +67,18 @@
67 </volist> 67 </volist>
68 </ul> 68 </ul>
69 </em> 69 </em>
  70 + <em class="beiji clearfix">
  71 + <img src="__TMPL__/public/assets/starImg/aicon_41.png" alt="">
  72 + <p>北极</p>
  73 + <ul class="star_happy_box">
  74 + <volist name="res_city.arctic" id="vo">
  75 + <li><a href="/portal/star/index?city_id={$vo.id}">{$vo.name}</a></li>
  76 + </volist>
  77 + </ul>
  78 + </em>
70 <em class="south clearfix"> 79 <em class="south clearfix">
71 <img src="__TMPL__/public/assets/starImg/aicon_41.png" alt=""> 80 <img src="__TMPL__/public/assets/starImg/aicon_41.png" alt="">
72 - <p>南美洲</p> 81 + <p>拉丁美洲</p>
73 <ul class="star_happy_box"> 82 <ul class="star_happy_box">
74 <volist name="res_city.south" id="vo"> 83 <volist name="res_city.south" id="vo">
75 <li><a href="/portal/star/index?city_id={$vo.id}">{$vo.name}</a></li> 84 <li><a href="/portal/star/index?city_id={$vo.id}">{$vo.name}</a></li>
@@ -246,7 +255,7 @@ @@ -246,7 +255,7 @@
246 </div> 255 </div>
247 <!-- 四月 --> 256 <!-- 四月 -->
248 <div class="star_month clearfix" style="margin:0 0 10px 0"> 257 <div class="star_month clearfix" style="margin:0 0 10px 0">
249 - <div class="star_february april hovers"> 258 + <div class="star_february aprils hovers">
250 <p>4</p> 259 <p>4</p>
251 <p>April</p> 260 <p>April</p>
252 </div> 261 </div>
@@ -317,7 +326,7 @@ @@ -317,7 +326,7 @@
317 </div> 326 </div>
318 <!-- 六月 --> 327 <!-- 六月 -->
319 <div class="star_month clearfix"> 328 <div class="star_month clearfix">
320 - <div class="star_february star_august star_august_bg hovers"> 329 + <div class="star_february star_augustss hovers">
321 <p>6</p> 330 <p>6</p>
322 <p>June</p> 331 <p>June</p>
323 </div> 332 </div>
  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/bootstrap4.0.css">
  10 + <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
  11 +</head>
  12 +
  13 +<body>
  14 + <include file="public@header"/>
  15 + <div class="show_story">
  16 + <!-- 顶部标题 -->
  17 + <div class="show_INMain_tit clearfix">
  18 + <div class="show_IN1 clearfix">
  19 + <img src="__TMPL__/public/assets/starImg/aicon_03.png" alt="">
  20 + <p>星球<span>故事</span></p>
  21 + <h2>Planet Story</h2>
  22 + </div>
  23 + </div>
  24 + <div>
  25 + <!-- 内容 -->
  26 + <div class="show_INMain_con2_2 ">
  27 + <volist name="res['data']" id="vo">
  28 + <div class="show_index_con2Txt clearfix">
  29 + <a href="/portal/star/getStoryDetail?id={$vo.id}">
  30 + <!-- 左侧图片 -->
  31 + <img class="show_indexImg1" src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
  32 + <!-- 文字 -->
  33 + <div class="show_index_con2Txt2">
  34 + {$vo.post_excerpt}
  35 + </div>
  36 + <!-- 进度条 -->
  37 + <div class="show_index_progress">
  38 + <img src="__TMPL__/public/assets/starImg/aicon_15.png" alt="">
  39 + </div>
  40 + </a>
  41 + </div>
  42 + </volist>
  43 +
  44 + </div>
  45 + <!--分页-->
  46 + <div class="pagination">
  47 + {$page|default=''}
  48 + </div>
  49 + </div>
  50 + </div>
  51 + <include file="public@footer"/>
  52 + <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
  53 + <script src="__TMPL__/public/assets/js/public.js"></script>
  54 +</body>
  55 +
  56 +</html>
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 </head> 10 </head>
11 11
12 <body> 12 <body>
  13 + <include file="public@header"/>
13 <!-- 弹出框 --> 14 <!-- 弹出框 -->
14 <div class="video_mask"> 15 <div class="video_mask">
15 您还不是VIP，可试看15秒 16 您还不是VIP，可试看15秒
@@ -30,52 +31,24 @@ @@ -30,52 +31,24 @@
30 <input type="text" value="中国" readonly="readonly"> 31 <input type="text" value="中国" readonly="readonly">
31 <img src="__TMPL__/public/assets/starImg/down.png" alt=""> 32 <img src="__TMPL__/public/assets/starImg/down.png" alt="">
32 <ul> 33 <ul>
33 - <li>中国</li>  
34 - <li>美国</li> 34 + <li>所有</li>
  35 + <volist name="city_name" id="vo">
  36 + <li value="{$vo.id}" <eq name="$vo.id" value="$city_id">selected</eq>>{$vo.name}</li>
  37 + </volist>
35 </ul> 38 </ul>
36 </div> 39 </div>
37 </div> 40 </div>
38 <!-- 视频 --> 41 <!-- 视频 -->
39 <div class="show_9_video_asideCon"> 42 <div class="show_9_video_asideCon">
40 - <ul class="curren video_active">  
41 - <li class="clearfix">  
42 - <img src="__TMPL__/public/assets/starImg/bicon_29.png" alt="">  
43 - <p>  
44 - 令人神往的 蒙大拿州  
45 - </p>  
46 - </li>  
47 - <li class="clearfix">  
48 - <img src="__TMPL__/public/assets/starImg/bicon_29.png" alt="">  
49 - <p>  
50 - 令人神往的 蒙大拿州  
51 - </p>  
52 - </li>  
53 - <li class="clearfix">  
54 - <img src="__TMPL__/public/assets/starImg/bicon_29.png" alt="">  
55 - <p>  
56 - 令人神往的 蒙大拿州  
57 - </p>  
58 - </li>  
59 - <li class="clearfix">  
60 - <img src="__TMPL__/public/assets/starImg/bicon_29.png" alt="">  
61 - <p>  
62 - 令人神往的 蒙大拿州  
63 - </p>  
64 - </li>  
65 - <li class="clearfix">  
66 - <img src="__TMPL__/public/assets/starImg/bicon_29.png" alt="">  
67 - <p>  
68 - 令人神往的 蒙大拿州  
69 - </p>  
70 - </li>  
71 - </ul>  
72 <ul class="curren"> 43 <ul class="curren">
73 - <li class="clearfix">  
74 - <img src="__TMPL__/public/assets/starImg/bicon_29.png" alt="">  
75 - <p>  
76 - 令人神往的 蒙大拿州  
77 - </p>  
78 - </li> 44 + <volist name="res['data']" id="vo">
  45 + <li class="clearfix">
  46 + <img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
  47 + <p>
  48 + {$vo.post_title}
  49 + </p>
  50 + </li>
  51 + </volist>
79 </ul> 52 </ul>
80 </div> 53 </div>
81 </div> 54 </div>
@@ -97,44 +70,48 @@ @@ -97,44 +70,48 @@
97 </div> 70 </div>
98 </div> 71 </div>
99 </div> 72 </div>
  73 + <include file="public@footer"/>
100 <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script> 74 <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
  75 + <script src="__TMPL__/public/assets/js/public.js"></script>
101 <script> 76 <script>
102 // 星域秀场视频 77 // 星域秀场视频
103 $(function() { 78 $(function() {
104 - $('.select input').click(function() {  
105 - if ($(this).next('img').attr('src') == "__TMPL__/public/assets/starImg/down.png") {  
106 - $(this).next('img').attr('src', "__TMPL__/public/assets/starImg/up.png")  
107 - $('.select ul').toggle();  
108 - } else {  
109 - $(this).next('img').attr('src', "__TMPL__/public/assets/starImg/down.png")  
110 - $('.select ul').toggle();  
111 - } 79 + $('.select input').click(function() {
  80 + if ($(this).next('img').attr('src') == "__TMPL__/public/assets/starImg/down.png") {
  81 + $(this).next('img').attr('src', "__TMPL__/public/assets/starImg/up.png")
  82 + $('.select ul').toggle();
  83 + } else {
  84 + $(this).next('img').attr('src', "__TMPL__/public/assets/starImg/down.png")
  85 + $('.select ul').toggle();
  86 + }
  87 +
  88 + });
112 89
113 - }) 90 + $('.select ul li').click(function() {
  91 + $('.select input').val($(this).text());
  92 + $('.select ul').hide();
  93 + var index = $(this).index();
  94 + $('.curren').eq(index).addClass('video_active').siblings().removeClass('video_active');
  95 + });
114 96
115 - $('.select ul li').click(function() {  
116 - $('.select input').val($(this).text());  
117 - $('.select ul').hide();  
118 - var index = $(this).index();  
119 - $('.curren').eq(index).addClass('video_active').siblings().removeClass('video_active');  
120 - }); 97 + $(document).ready(function() {
  98 + var val = $('.select input').val();
  99 + var val2 = $('.select ul li:first-child').text();
  100 + val = val2;
  101 + $('.select input').val(val);
  102 + });
121 103
122 - $(document).ready(function() {  
123 - var val = $('.select input').val();  
124 - var val2 = $('.select ul li:first-child').text();  
125 - val = val2;  
126 - $('.select input').val(val)  
127 - }) 104 + // 弹出框
  105 + setInterval(function() {
  106 + $('.video_mask').hide();
  107 + }, 4000);
128 108
129 - // 弹出框  
130 - setInterval(function() {  
131 - $('.video_mask').hide();  
132 - }, 4000)  
133 - }) 109 + $('.curren').eq(0).addClass('video_active');
  110 + });
134 // 点击播放 111 // 点击播放
135 function bofang() { 112 function bofang() {
136 video.play(); 113 video.play();
137 - $('#video').attr('controls', 'controls') 114 + $('#video').attr('controls', 'controls');
138 $('.show_9_video img').hide(); 115 $('.show_9_video img').hide();
139 } 116 }
140 </script> 117 </script>
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 </div> 71 </div>
72 <!-- 更多 --> 72 <!-- 更多 -->
73 <div class="show_IN2"> 73 <div class="show_IN2">
74 - <a href=""> MORE+ </a> 74 + <a href="/portal/region/getMoreStory"> MORE+ </a>
75 </div> 75 </div>
76 </div> 76 </div>
77 <!-- 内容 --> 77 <!-- 内容 -->
@@ -127,7 +127,9 @@ @@ -127,7 +127,9 @@
127 <ul class="swiper-wrapper"> 127 <ul class="swiper-wrapper">
128 <volist name="res_xyhl" id="vo"> 128 <volist name="res_xyhl" id="vo">
129 <li class="swiper-slide"> 129 <li class="swiper-slide">
  130 + <a href="/portal/region/getGalleryDetail?id={$vo.id}">
130 <img class="swiper-slide slide-image" src="{:cmf_get_image_url($vo.thumbnail)}" alt=""> 131 <img class="swiper-slide slide-image" src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
  132 + </a>
131 </li> 133 </li>
132 </volist> 134 </volist>
133 </ul> 135 </ul>
@@ -355,3 +355,58 @@ main { @@ -355,3 +355,58 @@ main {
355 .Sport .swiper-button-prev { 355 .Sport .swiper-button-prev {
356 right: 70px !important; 356 right: 70px !important;
357 } 357 }
  358 +
  359 +.select {
  360 + width: 316px;
  361 + position: relative;
  362 +}
  363 +
  364 +.select ul {
  365 + display: none;
  366 + position: absolute;
  367 + top: 60px;
  368 + left: 52px;
  369 + z-index: 100;
  370 +}
  371 +
  372 +.select ul li {
  373 + width: 218px;
  374 + height:40px;
  375 + line-height: 40px;
  376 + cursor: pointer;
  377 + border-bottom: 1px solid #EBEBEB;
  378 + padding-left: 16px;
  379 + background-color: white;
  380 +}
  381 +
  382 +.select ul li:last-child {
  383 + border-bottom: 0;
  384 +}
  385 +
  386 +.select ul li:hover {
  387 + background: #09FF8E;
  388 +}
  389 +
  390 + .select input {
  391 + cursor: pointer;
  392 + width:316px;
  393 + height:60px;
  394 + background:rgba(255,255,255,1);
  395 + box-shadow:-18px 18px 54px 0px rgba(0, 0, 0, 0.1);
  396 + border-radius:30px;
  397 + outline: none;
  398 + border: 0;
  399 + color: #1A1A1A;
  400 + padding-left: 20px;
  401 + box-sizing: border-box;
  402 + margin-left: 11px;
  403 + opacity: 0.9;
  404 +}
  405 +
  406 +.select img {
  407 + position: absolute;
  408 + top: 23px;
  409 + right: 24px;
  410 + width: 14px;
  411 + height: 14px;
  412 +}
@@ -173,7 +173,6 @@ p { @@ -173,7 +173,6 @@ p {
173 color: #fff; 173 color: #fff;
174 font-size: 14px; 174 font-size: 14px;
175 font-weight: bold; 175 font-weight: bold;
176 - width: 66px;  
177 height:32px; 176 height:32px;
178 cursor: pointer; 177 cursor: pointer;
179 display: inline-block; 178 display: inline-block;
@@ -207,7 +206,11 @@ p { @@ -207,7 +206,11 @@ p {
207 top: 546px; 206 top: 546px;
208 left: 320px 207 left: 320px
209 } 208 }
210 - 209 +/*北极*/
  210 +.beiji{
  211 + top: 327px;
  212 + left: 499px;
  213 +}
211 214
212 /* 南极洲 */ 215 /* 南极洲 */
213 216
@@ -373,19 +376,19 @@ p { @@ -373,19 +376,19 @@ p {
373 height: 290px; 376 height: 290px;
374 background-size: 290px 290px; 377 background-size: 290px 290px;
375 background-repeat: no-repeat; 378 background-repeat: no-repeat;
376 - background-image: url("../starImg/bicon_38.png") !important; 379 + background-image: url("../starImg/monthCover/3.jpg") !important;
377 } 380 }
378 381
379 .star_august_bg { 382 .star_august_bg {
380 - background-image: url("../starImg/bicon_42.png") !important; 383 +
381 } 384 }
382 385
383 .star_august_bg2 { 386 .star_august_bg2 {
384 - background-image: url("../starImg/bicon_20.png") !important; 387 + background-image: url("../starImg/monthCover/9.jpg") !important;
385 } 388 }
386 389
387 .star_august_bg3 { 390 .star_august_bg3 {
388 - background-image: url("../starImg/aicon_20.png") !important; 391 + background-image: url("../starImg/monthCover/11.jpg") !important;
389 } 392 }
390 393
391 #star_main .star_month .img_month p:first-child { 394 #star_main .star_month .img_month p:first-child {
@@ -508,14 +511,17 @@ p { @@ -508,14 +511,17 @@ p {
508 /* 四月 */ 511 /* 四月 */
509 512
510 #star_main .april { 513 #star_main .april {
511 - background: rgba(234, 161, 93, 1); 514 + background-image: url(../starImg/monthCover/1.jpg) !important;
  515 +}
  516 +.aprils{
  517 + background: rgba(77, 137, 200, 1);
512 } 518 }
513 519
514 520
515 /* 五月 */ 521 /* 五月 */
516 522
517 #star_main .may { 523 #star_main .may {
518 - background: rgba(191, 208, 166, 1); 524 + background-image: url(../starImg/monthCover/5.jpg) !important;
519 } 525 }
520 526
521 527
@@ -530,7 +536,7 @@ p { @@ -530,7 +536,7 @@ p {
530 /* 七月 */ 536 /* 七月 */
531 537
532 #star_main .july { 538 #star_main .july {
533 - background: rgba(13, 173, 103, 1); 539 + background-image: url(../starImg/monthCover/7.jpg) !important;
534 } 540 }
535 541
536 542
@@ -542,6 +548,10 @@ p { @@ -542,6 +548,10 @@ p {
542 548
543 #star_main .star_august { 549 #star_main .star_august {
544 color: rgba(91, 91, 107, 1); 550 color: rgba(91, 91, 107, 1);
  551 + background-color: #9df39f;
  552 +}
  553 +.star_augustss{
  554 + background-color:#0c6251;
545 } 555 }
546 556
547 557
@@ -555,7 +565,7 @@ p { @@ -555,7 +565,7 @@ p {
555 /* 十二月 */ 565 /* 十二月 */
556 566
557 #star_main .december { 567 #star_main .december {
558 - background: rgba(77, 137, 200, 1); 568 + background-color: #e3e658;
559 } 569 }
560 570
561 571
@@ -286,9 +286,14 @@ body { @@ -286,9 +286,14 @@ body {
286 overflow: hidden; 286 overflow: hidden;
287 } 287 }
288 288
289 -.show_index_con2Txt { 289 +.show_INMain_con2_2 {
290 width: 1200px; 290 width: 1200px;
  291 + margin-top: 78px;
  292 +}
  293 +
  294 +.show_index_con2Txt {
291 height: 400px; 295 height: 400px;
  296 + margin-bottom: 30px;
292 background-color: white; 297 background-color: white;
293 } 298 }
294 299
@@ -700,6 +705,7 @@ body { @@ -700,6 +705,7 @@ body {
700 color: rgba(26, 26, 26, 1); 705 color: rgba(26, 26, 26, 1);
701 line-height: 42px; 706 line-height: 42px;
702 text-align: center; 707 text-align: center;
  708 + outline: none;
703 } 709 }
704 710
705 .layui-laypage a, 711 .layui-laypage a,
@@ -723,7 +729,9 @@ body { @@ -723,7 +729,9 @@ body {
723 729
724 .show_comments_icon { 730 .show_comments_icon {
725 width: 44px; 731 width: 44px;
  732 + height: 44px;
726 float: left; 733 float: left;
  734 + border-radius: 50%;
727 } 735 }
728 736
729 .show_main2_show ul li { 737 .show_main2_show ul li {
@@ -746,7 +754,7 @@ body { @@ -746,7 +754,7 @@ body {
746 color: rgba(62, 228, 152, 1); 754 color: rgba(62, 228, 152, 1);
747 } 755 }
748 756
749 -.show_comments_con h2 { 757 +.show_comments_con dl{
750 font-size: 16px; 758 font-size: 16px;
751 font-weight: 400; 759 font-weight: 400;
752 line-height: 24px; 760 line-height: 24px;
@@ -765,6 +773,7 @@ body { @@ -765,6 +773,7 @@ body {
765 text-align: center; 773 text-align: center;
766 font-size: 18px; 774 font-size: 18px;
767 color: rgba(62, 228, 152, 1); 775 color: rgba(62, 228, 152, 1);
  776 + margin-top:30px;
768 } 777 }
769 778
770 779
@@ -952,7 +961,7 @@ body { @@ -952,7 +961,7 @@ body {
952 } 961 }
953 962
954 .show6_con2 img{ 963 .show6_con2 img{
955 - max-width:1100px 964 + max-width:1130px;
956 } 965 }
957 966
958 967
@@ -998,10 +1007,11 @@ body { @@ -998,10 +1007,11 @@ body {
998 -webkit-line-clamp: 10; 1007 -webkit-line-clamp: 10;
999 -webkit-box-orient: vertical; 1008 -webkit-box-orient: vertical;
1000 } 1009 }
1001 - 1010 +.show6_con2{
  1011 + overflow: hidden;
  1012 +}
1002 .show6_con2 img { 1013 .show6_con2 img {
1003 - width: 100%;  
1004 - margin: 38px 0 31px 0; 1014 +
1005 } 1015 }
1006 1016
1007 .show6_con2 p { 1017 .show6_con2 p {
@@ -1617,10 +1627,6 @@ body { @@ -1617,10 +1627,6 @@ body {
1617 margin-right: 80px; 1627 margin-right: 80px;
1618 } 1628 }
1619 1629
1620 -.show_9_video_asideTxt3 {  
1621 - float: left;  
1622 - margin-left: 334px;  
1623 -}  
1624 1630
1625 .show_9_video_asideTxt3 p { 1631 .show_9_video_asideTxt3 p {
1626 font-size: 16px; 1632 font-size: 16px;
@@ -1757,4 +1763,10 @@ body { @@ -1757,4 +1763,10 @@ body {
1757 z-index: 1; 1763 z-index: 1;
1758 font-size: 18px; 1764 font-size: 18px;
1759 color: rgba(255, 255, 255, 1); 1765 color: rgba(255, 255, 255, 1);
  1766 +}
  1767 +
  1768 +/*故事更多頁面*/
  1769 +.show_story{
  1770 + width: 1200px;
  1771 + margin:70px auto 150px;
1760 } 1772 }
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <img class="show_comments_icon" src="{:cmf_get_image_url($vo.avatar)}" alt=""> 16 <img class="show_comments_icon" src="{:cmf_get_image_url($vo.avatar)}" alt="">
17 <div class="show_comments_con"> 17 <div class="show_comments_con">
18 <h1>{$vo.nickname}</h1> 18 <h1>{$vo.nickname}</h1>
19 - <h2>{$vo.content}</h2> 19 + <dl>{$vo.content}</dl>
20 <p>{$vo.create_time|date="Y-m-d",###}</p> 20 <p>{$vo.create_time|date="Y-m-d",###}</p>
21 </div> 21 </div>
22 </li> 22 </li>