景龙 / xingqiu · 提交

转到一个项目

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

修改样式bug

内嵌 并排对比
正在显示 16 个修改的文件 包含 86 行增加 和 29 行删除
... ... @@ -161,7 +161,7 @@ class AdminStarSceneryController extends AdminBaseController
hook('portal_admin_after_save_article', $hookParam);
$this->success('添加成功!', url('AdminStarStory/edit', ['id' => $portalPostModel->id]));
$this->success('添加成功!', url('AdminStarScenery/edit', ['id' => $portalPostModel->id]));
}
}
... ...
... ... @@ -156,7 +156,7 @@ class RegionController extends HomeBaseController
$enjoyModel = new EnjoyController();
$city_name = $enjoyModel->getCityName();
$this->assign('city_name',$city_name);
$this->assign('city_id',$city_id);
return $this->fetch();
}
... ...
... ... @@ -66,13 +66,13 @@ class StarController extends HomeBaseController
//活力生态
$position['category_id'] = CityCategoryModel::hlst;
$field = 'id,thumbnail,post_title,post_excerpt';
$res_hlst = $this->getChildArticle($position,$field,$this->index_limit);
$res_hlst = $this->getChildArticle($position,$field,3);
$this->assign('res_hlst',$res_hlst);
//便利出行
$position['category_id'] = CityCategoryModel::blcx;
$field = 'id,thumbnail';
$res_blcx = $this->getChildArticle($position,$field,$this->index_limit);
$res_blcx = $this->getChildArticle($position,$field,3);
$this->assign('res_blcx',$res_blcx);
return $this->fetch();
}
... ...
... ... @@ -200,7 +200,7 @@ return array (
'PORTAL_ADMINREGIONFUTURE_DELETE' => '删除',
'PORTAL_ADMINREGIONFUTURE_EDIT' => '编辑显示',
'PORTAL_ADMINREGIONFUTURE_EDITPOST' => '编辑提交',
'PORTAL_ADMINREGIONFUTURE_INDEX' => '童趣未来',
'PORTAL_ADMINREGIONFUTURE_INDEX' => '公益未来',
'PORTAL_ADMINREGIONGALLERY_ADD' => '添加显示',
'PORTAL_ADMINREGIONGALLERY_ADDPOST' => '添加提交',
'PORTAL_ADMINREGIONGALLERY_DELETE' => '删除',
... ...
... ... @@ -66,7 +66,7 @@
<tr>
<th>电话<span class="form-required">*</span></th>
<td>
<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"/>
<input class="form-control" type="text" required name="post[tel]" placeholder="请输入电话" />
</td>
</tr>
<tr>
... ...
... ... @@ -70,7 +70,7 @@
<tr>
<th>电话<span class="form-required">*</span></th>
<td>
<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}"/>
<input class="form-control" type="text" required name="post[tel]" placeholder="请输入电话" value="{$post.tel}"/>
</td>
</tr>
<tr>
... ...
... ... @@ -9,6 +9,15 @@
<link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/enjoyment_index.css">
<link rel="stylesheet" href="__TMPL__/public/assets/js/swiper4/swiper.min.css">
<style>
/*.Spot_main .swiper-slide-next .Spot_top img {*/
/*width: 625px;*/
/*height: 648px;*/
/*}*/
.Spot_item, .swiper-slide-prev, .swiper-slide-prev .Spot_item img {
max-width: 1200px;
}
</style>
</head>
<body>
... ... @@ -173,6 +182,25 @@
</div>
</div>
</volist>
<volist name="res_stsy" id="vo">
<div class="swiper-slide">
<div class="Feast_item">
<a href="/portal/enjoy/getEnjoyDetail?id={$vo.id}">
<div class="Feast_item_img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="Feast_item_bottom">
<div class="Feast_item_bottom_title">
{$vo.post_title}
</div>
<div class="Feast_item_bottom_text">
{$vo.post_excerpt}
</div>
</div>
</a>
</div>
</div>
</volist>
</div>
<!-- Add Pagination -->
<div class="swiper-pagination"></div>
... ... @@ -276,7 +304,7 @@
var val2 = $('.select ul li:first-child').text();
val = val2;
$('.select input').val(val)
})
});
var swiper = new Swiper('.Spot_main .swiper-container', {
... ... @@ -289,7 +317,6 @@
});
var swipe = new Swiper('.Walker_main .swiper-container', {
navigation: {
nextEl: '.Walker .swiper-button-next',
prevEl: '.Walker .swiper-button-prev',
... ...
... ... @@ -218,7 +218,7 @@
</div>
<!-- 三月 -->
<div class="star_month clearfix">
<div class="star_february february february_bg hovers" style="color:rgba(91,91,107,1);">
<div class="star_february star_march february february_bg hovers" style="color:rgba(91,91,107,1);">
<p>3</p>
<p>March</p>
</div>
... ... @@ -437,7 +437,7 @@
</div>
<!-- 九月 -->
<div class="star_month clearfix">
<div class="star_february star_august star_august_bg2 hovers">
<div class="star_february star_september star_august_bg2 hovers">
<p>9</p>
<p>September</p>
</div>
... ... @@ -509,7 +509,7 @@
</div>
<!-- 十一月 -->
<div class="star_month clearfix">
<div class="star_february star_august star_august_bg3 hovers">
<div class="star_february star_November star_august_bg3 hovers">
<p>11</p>
<p>November</p>
</div>
... ... @@ -786,7 +786,7 @@
var swiper = new Swiper('.swiper-container6', {
spaceBetween: 20,
spaceBetween: 0,
centeredSlides: true,
autoplay: {
delay: 2500,
... ...
... ... @@ -18,7 +18,7 @@
<div class="show_9 clearfix">
<!-- 视频 -->
<div class="show_9_video">
<img class="video_poster" src="__TMPL__/public/assets/starImg/bicon_28.png" alt="">
<img class="video_poster iop" src="__TMPL__/public/assets/starImg/bicon_28.png" alt="">
<video id="video" width="100%" height="426" src="__TMPL__/public/assets/starImg/video.mp4"></video>
<img class="play_button" onclick="bofang()" src="__TMPL__/public/assets/starImg/aicon_30.png" alt="">
</div>
... ... @@ -47,6 +47,7 @@
<p>
{$vo.post_title}
</p>
<input type="text" value="{:cmf_get_file_download_url($vo.video)}" class="li_video">
</li>
</volist>
</ul>
... ... @@ -76,12 +77,30 @@
<script>
// 星域秀场视频
$(function() {
$('.curren li').each(function() {
$(this).click(function() {
// 封面图
var img = $(this).find('img').attr('src');
$('.video_poster').attr('src', img);
// 视频
$('.video_poster').css('z-index', '10');
$('.play_button').show();
$('.play_button').css('z-index', '11');
var videoSrc = $(this).children('.li_video').val();
$('#video').attr('src', videoSrc);
// 视频标题
var videoTitle = $(this).children('p').text();
$('.show_9_video_asideTxt h1').text(videoTitle);
});
});
$('.select input').click(function() {
if ($(this).next('img').attr('src') == "__TMPL__/public/assets/starImg/down.png") {
$(this).next('img').attr('src', "__TMPL__/public/assets/starImg/up.png")
$(this).next('img').attr('src', "__TMPL__/public/assets/starImg/up.png");
$('.select ul').toggle();
} else {
$(this).next('img').attr('src', "__TMPL__/public/assets/starImg/down.png")
$(this).next('img').attr('src', "__TMPL__/public/assets/starImg/down.png");
$('.select ul').toggle();
}
... ... @@ -111,8 +130,9 @@
// 点击播放
function bofang() {
video.play();
$('#video').attr('controls', 'controls');
$('.show_9_video img').hide();
$('#video').attr('controls', 'controls')
$('.play_button').hide();
$('.video_poster').css('z-index', '-1');
}
</script>
</body>
... ...
... ... @@ -15,7 +15,7 @@
<div class="happy_index">
<!-- banner轮播图 -->
<div class="happy_banner">
<img src="__TMPL__/public/assets/starImg/aicon_01.png" alt="" />
<img src="__TMPL__/public/assets/starImg/star_banner.jpg" alt="" />
<h3>Planet Discovery</h3>
</div>
<!-- main 背景 -->
... ...
... ... @@ -374,8 +374,8 @@ p {
.star_august_bg3 {
width: 290px;
height: 290px;
background-size: 290px 290px;
background-repeat: no-repeat;
background-size: cover !important;
background-image: url("../starImg/monthCover/3.jpg") !important;
}
... ... @@ -507,7 +507,9 @@ p {
font-size: 61px;
}
#star_main .star_march{
color: white !important;
}
/* 四月 */
#star_main .april {
... ... @@ -521,7 +523,7 @@ p {
/* 五月 */
#star_main .may {
background-image: url(../starImg/monthCover/5.jpg) !important;
background-color: #4e9f15;
}
... ... @@ -536,10 +538,9 @@ p {
/* 七月 */
#star_main .july {
background-image: url(../starImg/monthCover/7.jpg) !important;
background-color: #1bd3af;
}
/* 八月 */
#star_main .august {
... ... @@ -547,14 +548,21 @@ p {
}
#star_main .star_august {
color: rgba(91, 91, 107, 1);
background-color: #9df39f;
background: rgba(107, 190, 220, 1);
background-image: url(../starImg/monthCover/8.jpg) !important;
}
.star_November{
background-image: url(../starImg/monthCover/11.jpg) !important;
}
.star_augustss{
background-color:#0c6251;
background-image: url(../starImg/monthCover/6.jpg) !important;
}
/*九月*/
#star_main .star_september {
background: rgba(107, 190, 220, 1);
background-image: url(../starImg/monthCover/9.jpg) !important;
}
/* 十月 */
#star_main .october {
... ...
... ... @@ -1589,18 +1589,20 @@ body {
.show_9_video_asideCon ul li img {
float: left;
width: 128px;
height: 64px;
opacity: 0.3;
}
.show_9_video_asideCon ul li p {
width: 70px;
height: 64px;
overflow: hidden;
float: left;
margin-left: 10px;
font-size: 14px;
color: rgba(153, 153, 153, 1);
line-height: 22px;
}
.show_9_video_asideTxt {
padding: 24px 32px;
box-sizing: border-box;
... ...

143.2 KB | 宽: | 高:

33.7 KB | 宽: | 高:

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