景龙 / xingqiu · 提交

转到一个项目

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

修改样式bug

内嵌 并排对比
正在显示 16 个修改的文件 包含 85 行增加 和 28 行删除
@@ -161,7 +161,7 @@ class AdminStarSceneryController extends AdminBaseController @@ -161,7 +161,7 @@ class AdminStarSceneryController extends AdminBaseController
161 hook('portal_admin_after_save_article', $hookParam); 161 hook('portal_admin_after_save_article', $hookParam);
162 162
163 163
164 - $this->success('添加成功!', url('AdminStarStory/edit', ['id' => $portalPostModel->id])); 164 + $this->success('添加成功!', url('AdminStarScenery/edit', ['id' => $portalPostModel->id]));
165 } 165 }
166 166
167 } 167 }
@@ -66,13 +66,13 @@ class StarController extends HomeBaseController @@ -66,13 +66,13 @@ class StarController extends HomeBaseController
66 //活力生态 66 //活力生态
67 $position['category_id'] = CityCategoryModel::hlst; 67 $position['category_id'] = CityCategoryModel::hlst;
68 $field = 'id,thumbnail,post_title,post_excerpt'; 68 $field = 'id,thumbnail,post_title,post_excerpt';
69 - $res_hlst = $this->getChildArticle($position,$field,$this->index_limit); 69 + $res_hlst = $this->getChildArticle($position,$field,3);
70 $this->assign('res_hlst',$res_hlst); 70 $this->assign('res_hlst',$res_hlst);
71 71
72 //便利出行 72 //便利出行
73 $position['category_id'] = CityCategoryModel::blcx; 73 $position['category_id'] = CityCategoryModel::blcx;
74 $field = 'id,thumbnail'; 74 $field = 'id,thumbnail';
75 - $res_blcx = $this->getChildArticle($position,$field,$this->index_limit); 75 + $res_blcx = $this->getChildArticle($position,$field,3);
76 $this->assign('res_blcx',$res_blcx); 76 $this->assign('res_blcx',$res_blcx);
77 return $this->fetch(); 77 return $this->fetch();
78 } 78 }
@@ -200,7 +200,7 @@ return array ( @@ -200,7 +200,7 @@ return array (
200 'PORTAL_ADMINREGIONFUTURE_DELETE' => '删除', 200 'PORTAL_ADMINREGIONFUTURE_DELETE' => '删除',
201 'PORTAL_ADMINREGIONFUTURE_EDIT' => '编辑显示', 201 'PORTAL_ADMINREGIONFUTURE_EDIT' => '编辑显示',
202 'PORTAL_ADMINREGIONFUTURE_EDITPOST' => '编辑提交', 202 'PORTAL_ADMINREGIONFUTURE_EDITPOST' => '编辑提交',
203 - 'PORTAL_ADMINREGIONFUTURE_INDEX' => '童趣未来', 203 + 'PORTAL_ADMINREGIONFUTURE_INDEX' => '公益未来',
204 'PORTAL_ADMINREGIONGALLERY_ADD' => '添加显示', 204 'PORTAL_ADMINREGIONGALLERY_ADD' => '添加显示',
205 'PORTAL_ADMINREGIONGALLERY_ADDPOST' => '添加提交', 205 'PORTAL_ADMINREGIONGALLERY_ADDPOST' => '添加提交',
206 'PORTAL_ADMINREGIONGALLERY_DELETE' => '删除', 206 'PORTAL_ADMINREGIONGALLERY_DELETE' => '删除',
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 <tr> 66 <tr>
67 <th>电话<span class="form-required">*</span></th> 67 <th>电话<span class="form-required">*</span></th>
68 <td> 68 <td>
69 - <input class="form-control" type="number" required name="post[tel]" placeholder="请输入电话" pattern="^(13[0-9]|14[5|7]|15[0|1|2|3|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$" minlength="11" maxlength="11"/> 69 + <input class="form-control" type="text" required name="post[tel]" placeholder="请输入电话" />
70 </td> 70 </td>
71 </tr> 71 </tr>
72 <tr> 72 <tr>
@@ -70,7 +70,7 @@ @@ -70,7 +70,7 @@
70 <tr> 70 <tr>
71 <th>电话<span class="form-required">*</span></th> 71 <th>电话<span class="form-required">*</span></th>
72 <td> 72 <td>
73 - <input class="form-control" type="number" required name="post[tel]" placeholder="请输入电话" pattern="^(13[0-9]|14[5|7]|15[0|1|2|3|5|6|7|8|9]|18[0|1|2|3|5|6|7|8|9])\d{8}$" minlength="11" maxlength="11" value="{$post.tel}"/> 73 + <input class="form-control" type="text" required name="post[tel]" placeholder="请输入电话" value="{$post.tel}"/>
74 </td> 74 </td>
75 </tr> 75 </tr>
76 <tr> 76 <tr>
@@ -9,6 +9,15 @@ @@ -9,6 +9,15 @@
9 <link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment.css"> 9 <link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment.css">
10 <link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment_index.css"> 10 <link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment_index.css">
11 <link rel="stylesheet" href="__TMPL__/public/assets/js/swiper4/swiper.min.css"> 11 <link rel="stylesheet" href="__TMPL__/public/assets/js/swiper4/swiper.min.css">
  12 + <style>
  13 + /*.Spot_main .swiper-slide-next .Spot_top img {*/
  14 + /*width: 625px;*/
  15 + /*height: 648px;*/
  16 + /*}*/
  17 + .Spot_item, .swiper-slide-prev, .swiper-slide-prev .Spot_item img {
  18 + max-width: 1200px;
  19 + }
  20 + </style>
12 </head> 21 </head>
13 22
14 <body> 23 <body>
@@ -173,6 +182,25 @@ @@ -173,6 +182,25 @@
173 </div> 182 </div>
174 </div> 183 </div>
175 </volist> 184 </volist>
  185 + <volist name="res_stsy" id="vo">
  186 + <div class="swiper-slide">
  187 + <div class="Feast_item">
  188 + <a href="/portal/enjoy/getEnjoyDetail?id={$vo.id}">
  189 + <div class="Feast_item_img">
  190 + <img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
  191 + </div>
  192 + <div class="Feast_item_bottom">
  193 + <div class="Feast_item_bottom_title">
  194 + {$vo.post_title}
  195 + </div>
  196 + <div class="Feast_item_bottom_text">
  197 + {$vo.post_excerpt}
  198 + </div>
  199 + </div>
  200 + </a>
  201 + </div>
  202 + </div>
  203 + </volist>
176 </div> 204 </div>
177 <!-- Add Pagination --> 205 <!-- Add Pagination -->
178 <div class="swiper-pagination"></div> 206 <div class="swiper-pagination"></div>
@@ -276,7 +304,7 @@ @@ -276,7 +304,7 @@
276 var val2 = $('.select ul li:first-child').text(); 304 var val2 = $('.select ul li:first-child').text();
277 val = val2; 305 val = val2;
278 $('.select input').val(val) 306 $('.select input').val(val)
279 - }) 307 + });
280 308
281 309
282 var swiper = new Swiper('.Spot_main .swiper-container', { 310 var swiper = new Swiper('.Spot_main .swiper-container', {
@@ -289,7 +317,6 @@ @@ -289,7 +317,6 @@
289 317
290 }); 318 });
291 var swipe = new Swiper('.Walker_main .swiper-container', { 319 var swipe = new Swiper('.Walker_main .swiper-container', {
292 -  
293 navigation: { 320 navigation: {
294 nextEl: '.Walker .swiper-button-next', 321 nextEl: '.Walker .swiper-button-next',
295 prevEl: '.Walker .swiper-button-prev', 322 prevEl: '.Walker .swiper-button-prev',
@@ -218,7 +218,7 @@ @@ -218,7 +218,7 @@
218 </div> 218 </div>
219 <!-- 三月 --> 219 <!-- 三月 -->
220 <div class="star_month clearfix"> 220 <div class="star_month clearfix">
221 - <div class="star_february february february_bg hovers" style="color:rgba(91,91,107,1);"> 221 + <div class="star_february star_march february february_bg hovers" style="color:rgba(91,91,107,1);">
222 <p>3</p> 222 <p>3</p>
223 <p>March</p> 223 <p>March</p>
224 </div> 224 </div>
@@ -437,7 +437,7 @@ @@ -437,7 +437,7 @@
437 </div> 437 </div>
438 <!-- 九月 --> 438 <!-- 九月 -->
439 <div class="star_month clearfix"> 439 <div class="star_month clearfix">
440 - <div class="star_february star_august star_august_bg2 hovers"> 440 + <div class="star_february star_september star_august_bg2 hovers">
441 <p>9</p> 441 <p>9</p>
442 <p>September</p> 442 <p>September</p>
443 </div> 443 </div>
@@ -509,7 +509,7 @@ @@ -509,7 +509,7 @@
509 </div> 509 </div>
510 <!-- 十一月 --> 510 <!-- 十一月 -->
511 <div class="star_month clearfix"> 511 <div class="star_month clearfix">
512 - <div class="star_february star_august star_august_bg3 hovers"> 512 + <div class="star_february star_November star_august_bg3 hovers">
513 <p>11</p> 513 <p>11</p>
514 <p>November</p> 514 <p>November</p>
515 </div> 515 </div>
@@ -786,7 +786,7 @@ @@ -786,7 +786,7 @@
786 786
787 787
788 var swiper = new Swiper('.swiper-container6', { 788 var swiper = new Swiper('.swiper-container6', {
789 - spaceBetween: 20, 789 + spaceBetween: 0,
790 centeredSlides: true, 790 centeredSlides: true,
791 autoplay: { 791 autoplay: {
792 delay: 2500, 792 delay: 2500,
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <div class="show_9 clearfix"> 18 <div class="show_9 clearfix">
19 <!-- 视频 --> 19 <!-- 视频 -->
20 <div class="show_9_video"> 20 <div class="show_9_video">
21 - <img class="video_poster" src="__TMPL__/public/assets/starImg/bicon_28.png" alt=""> 21 + <img class="video_poster iop" src="__TMPL__/public/assets/starImg/bicon_28.png" alt="">
22 <video id="video" width="100%" height="426" src="__TMPL__/public/assets/starImg/video.mp4"></video> 22 <video id="video" width="100%" height="426" src="__TMPL__/public/assets/starImg/video.mp4"></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> 24 </div>
@@ -47,6 +47,7 @@ @@ -47,6 +47,7 @@
47 <p> 47 <p>
48 {$vo.post_title} 48 {$vo.post_title}
49 </p> 49 </p>
  50 + <input type="text" value="{:cmf_get_file_download_url($vo.video)}" class="li_video">
50 </li> 51 </li>
51 </volist> 52 </volist>
52 </ul> 53 </ul>
@@ -76,12 +77,30 @@ @@ -76,12 +77,30 @@
76 <script> 77 <script>
77 // 星域秀场视频 78 // 星域秀场视频
78 $(function() { 79 $(function() {
  80 + $('.curren li').each(function() {
  81 + $(this).click(function() {
  82 + // 封面图
  83 + var img = $(this).find('img').attr('src');
  84 + $('.video_poster').attr('src', img);
  85 + // 视频
  86 + $('.video_poster').css('z-index', '10');
  87 + $('.play_button').show();
  88 + $('.play_button').css('z-index', '11');
  89 + var videoSrc = $(this).children('.li_video').val();
  90 + $('#video').attr('src', videoSrc);
  91 +
  92 + // 视频标题
  93 + var videoTitle = $(this).children('p').text();
  94 + $('.show_9_video_asideTxt h1').text(videoTitle);
  95 + });
  96 + });
  97 +
79 $('.select input').click(function() { 98 $('.select input').click(function() {
80 if ($(this).next('img').attr('src') == "__TMPL__/public/assets/starImg/down.png") { 99 if ($(this).next('img').attr('src') == "__TMPL__/public/assets/starImg/down.png") {
81 - $(this).next('img').attr('src', "__TMPL__/public/assets/starImg/up.png") 100 + $(this).next('img').attr('src', "__TMPL__/public/assets/starImg/up.png");
82 $('.select ul').toggle(); 101 $('.select ul').toggle();
83 } else { 102 } else {
84 - $(this).next('img').attr('src', "__TMPL__/public/assets/starImg/down.png") 103 + $(this).next('img').attr('src', "__TMPL__/public/assets/starImg/down.png");
85 $('.select ul').toggle(); 104 $('.select ul').toggle();
86 } 105 }
87 106
@@ -111,8 +130,9 @@ @@ -111,8 +130,9 @@
111 // 点击播放 130 // 点击播放
112 function bofang() { 131 function bofang() {
113 video.play(); 132 video.play();
114 - $('#video').attr('controls', 'controls');  
115 - $('.show_9_video img').hide(); 133 + $('#video').attr('controls', 'controls')
  134 + $('.play_button').hide();
  135 + $('.video_poster').css('z-index', '-1');
116 } 136 }
117 </script> 137 </script>
118 </body> 138 </body>
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <div class="happy_index"> 15 <div class="happy_index">
16 <!-- banner轮播图 --> 16 <!-- banner轮播图 -->
17 <div class="happy_banner"> 17 <div class="happy_banner">
18 - <img src="__TMPL__/public/assets/starImg/aicon_01.png" alt="" /> 18 + <img src="__TMPL__/public/assets/starImg/star_banner.jpg" alt="" />
19 <h3>Planet Discovery</h3> 19 <h3>Planet Discovery</h3>
20 </div> 20 </div>
21 <!-- main 背景 --> 21 <!-- main 背景 -->
@@ -374,8 +374,8 @@ p { @@ -374,8 +374,8 @@ p {
374 .star_august_bg3 { 374 .star_august_bg3 {
375 width: 290px; 375 width: 290px;
376 height: 290px; 376 height: 290px;
377 - background-size: 290px 290px;  
378 background-repeat: no-repeat; 377 background-repeat: no-repeat;
  378 + background-size: cover !important;
379 background-image: url("../starImg/monthCover/3.jpg") !important; 379 background-image: url("../starImg/monthCover/3.jpg") !important;
380 } 380 }
381 381
@@ -507,7 +507,9 @@ p { @@ -507,7 +507,9 @@ p {
507 font-size: 61px; 507 font-size: 61px;
508 } 508 }
509 509
510 - 510 +#star_main .star_march{
  511 + color: white !important;
  512 +}
511 /* 四月 */ 513 /* 四月 */
512 514
513 #star_main .april { 515 #star_main .april {
@@ -521,7 +523,7 @@ p { @@ -521,7 +523,7 @@ p {
521 /* 五月 */ 523 /* 五月 */
522 524
523 #star_main .may { 525 #star_main .may {
524 - background-image: url(../starImg/monthCover/5.jpg) !important; 526 + background-color: #4e9f15;
525 } 527 }
526 528
527 529
@@ -536,10 +538,9 @@ p { @@ -536,10 +538,9 @@ p {
536 /* 七月 */ 538 /* 七月 */
537 539
538 #star_main .july { 540 #star_main .july {
539 - background-image: url(../starImg/monthCover/7.jpg) !important; 541 + background-color: #1bd3af;
540 } 542 }
541 543
542 -  
543 /* 八月 */ 544 /* 八月 */
544 545
545 #star_main .august { 546 #star_main .august {
@@ -547,14 +548,21 @@ p { @@ -547,14 +548,21 @@ p {
547 } 548 }
548 549
549 #star_main .star_august { 550 #star_main .star_august {
550 - color: rgba(91, 91, 107, 1);  
551 - background-color: #9df39f; 551 + background: rgba(107, 190, 220, 1);
  552 + background-image: url(../starImg/monthCover/8.jpg) !important;
  553 +}
  554 +.star_November{
  555 + background-image: url(../starImg/monthCover/11.jpg) !important;
552 } 556 }
553 .star_augustss{ 557 .star_augustss{
554 - background-color:#0c6251; 558 + background-image: url(../starImg/monthCover/6.jpg) !important;
555 } 559 }
556 560
557 - 561 +/*九月*/
  562 +#star_main .star_september {
  563 + background: rgba(107, 190, 220, 1);
  564 + background-image: url(../starImg/monthCover/9.jpg) !important;
  565 +}
558 /* 十月 */ 566 /* 十月 */
559 567
560 #star_main .october { 568 #star_main .october {
@@ -1589,18 +1589,20 @@ body { @@ -1589,18 +1589,20 @@ body {
1589 .show_9_video_asideCon ul li img { 1589 .show_9_video_asideCon ul li img {
1590 float: left; 1590 float: left;
1591 width: 128px; 1591 width: 128px;
  1592 + height: 64px;
1592 opacity: 0.3; 1593 opacity: 0.3;
1593 } 1594 }
1594 1595
1595 .show_9_video_asideCon ul li p { 1596 .show_9_video_asideCon ul li p {
1596 width: 70px; 1597 width: 70px;
  1598 + height: 64px;
  1599 + overflow: hidden;
1597 float: left; 1600 float: left;
1598 margin-left: 10px; 1601 margin-left: 10px;
1599 font-size: 14px; 1602 font-size: 14px;
1600 color: rgba(153, 153, 153, 1); 1603 color: rgba(153, 153, 153, 1);
1601 line-height: 22px; 1604 line-height: 22px;
1602 } 1605 }
1603 -  
1604 .show_9_video_asideTxt { 1606 .show_9_video_asideTxt {
1605 padding: 24px 32px; 1607 padding: 24px 32px;
1606 box-sizing: border-box; 1608 box-sizing: border-box;

143.2 KB | 宽: | 高:

33.7 KB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖