景龙 / xingqiu · 提交

转到一个项目

作者 zhangwei
提交 ae675b4201c3947e484208a499245594e648f93d 1 个父辈 3bca4cce
1 个管道 的构建 通过 耗费 1 秒

1

内嵌 并排对比
正在显示 11 个修改的文件 包含 171 行增加 和 78 行删除
... ... @@ -9,19 +9,23 @@
<link rel="stylesheet" href="__TMPL__/public/assets/css/index.css">
<link rel="stylesheet" href="__TMPL__/public/assets/js/swiper4/swiper.min.css">
<style>
.slide-image{
width:260px;
height:375px;
.slide-image {
width: 260px;
height: 375px;
}
.star_ming{
cursor:pointer;
.star_ming {
cursor: pointer;
}
.swiper-container6{
.swiper-container6 {
overflow: hidden;
}
.swiper-container6 .swiper-wrapper{
transition-duration:1.5s !important;
.swiper-container6 .swiper-wrapper {
transition-duration: 1.5s !important;
}
.mask {
width: 100%;
height: 100%;
... ... @@ -31,6 +35,7 @@
background-color: rgba(0, 0, 0, 0.5);
display: none;
}
.mask_video {
position: relative;
top: 50%;
... ... @@ -40,13 +45,15 @@
background-color: black;
transform: translate(-50%, -50%);
}
.mask_video video {
margin: auto;
display: block;
height: 100%;
width: 100%;
}
.mask_video img {
.mask_video .mak_videoCha {
width: 30px;
height: 30px;
cursor: pointer;
... ... @@ -54,6 +61,28 @@
right: -25px;
top: -27px;
}
.mask_videoFeng {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 10;
}
.mask_videoFeng img {
width: 100%;
height: 100%;
}
.show_in_banner3 {
position: absolute;
top: 35%;
left: 42%;
width: 120px;
z-index: 20;
}
</style>
</head>
... ... @@ -61,9 +90,13 @@
<!-- 弹框视频 -->
<notempty name="res_djxq.video">
<div class="mask" id="mask">
<div class="mask_video" >
<img onclick="nos()" src="__TMPL__/public/assets/starImg/nos.png" alt="">
<video autoplay="autoplay" controls loop="loop" id="video2" src="{:cmf_get_file_download_url($res_djxq.video)}" controlslist="nodownload"></video>
<div class="mask_video">
<img class="mak_videoCha" onclick="nos()" src="__TMPL__/public/assets/starImg/nos.png" alt="">
<div class="mask_videoFeng">
<img src="__TMPL__/public/assets/starImg/bicon_34.png" alt="">
</div>
<img onclick="bofang2()" class="show_in_banner3" src="__TMPL__/public/assets/starImg/aicon_30.png" alt="">
<video autoplay="autoplay" controls loop="loop" id="video2" src="{:cmf_get_file_download_url($res_djxq.video)}" controlslist="nodownload"></video>
</div>
</div>
</notempty>
... ... @@ -75,7 +108,7 @@
<img class="index_scrollTop" src="__TMPL__/public/assets/starImg/aicon_25.png" alt="">
</div>
<!-- 头部 -->
<include file="public@header"/>
<include file="public@header" />
<!-- banner -->
<div id="banner" class="swiper-container6">
<div class="swiper-wrapper">
... ... @@ -227,7 +260,7 @@
<!-- 图片 -->
<notempty name="res_month.1">
<div class="reverse_Imgs">
<img src="{:cmf_get_image_url($res_month.1.index_thumbnail)}"/>
<img src="{:cmf_get_image_url($res_month.1.index_thumbnail)}" />
</div>
<!-- 图片下方文字 -->
<a href="/portal/enjoy/getEnjoyDetail?id={$res_month.1.id}">
... ... @@ -238,7 +271,7 @@
</a>
<else/>
<div class="reverse_Imgs">
<img src="__TMPL__/public/assets/starImg/aicon_28.png"/>
<img src="__TMPL__/public/assets/starImg/aicon_28.png" />
</div>
<!-- 图片下方文字 -->
<div class="img_bottom">
... ... @@ -264,7 +297,7 @@
<!-- 图片 -->
<notempty name="res_month.2">
<div class="reverse_Imgs">
<img src="{:cmf_get_image_url($res_month.2.index_thumbnail)}"/>
<img src="{:cmf_get_image_url($res_month.2.index_thumbnail)}" />
</div>
<!-- 图片下方文字 -->
<a href="/portal/enjoy/getEnjoyDetail?id={$res_month.2.id}">
... ... @@ -275,7 +308,7 @@
</a>
<else/>
<div class="reverse_Imgs">
<img src="__TMPL__/public/assets/starImg/aicon_28.png"/>
<img src="__TMPL__/public/assets/starImg/aicon_28.png" />
</div>
<!-- 图片下方文字 -->
<div class="img_bottom">
... ... @@ -302,7 +335,7 @@
<!-- 图片 -->
<notempty name="res_month.3">
<div class="reverse_Imgs">
<img src="{:cmf_get_image_url($res_month.3.index_thumbnail)}"/>
<img src="{:cmf_get_image_url($res_month.3.index_thumbnail)}" />
</div>
<!-- 图片下方文字 -->
<a href="/portal/enjoy/getEnjoyDetail?id={$res_month.3.id}">
... ... @@ -313,7 +346,7 @@
</a>
<else/>
<div class="reverse_Imgs">
<img src="__TMPL__/public/assets/starImg/aicon_28.png"/>
<img src="__TMPL__/public/assets/starImg/aicon_28.png" />
</div>
<!-- 图片下方文字 -->
<div class="img_bottom">
... ... @@ -341,7 +374,7 @@
<!-- 图片 -->
<notempty name="res_month.4">
<div class="reverse_Imgs">
<img src="{:cmf_get_image_url($res_month.4.index_thumbnail)}"/>
<img src="{:cmf_get_image_url($res_month.4.index_thumbnail)}" />
</div>
<!-- 图片下方文字 -->
<a href="/portal/enjoy/getEnjoyDetail?id={$res_month.4.id}">
... ... @@ -352,7 +385,7 @@
</a>
<else/>
<div class="reverse_Imgs">
<img src="__TMPL__/public/assets/starImg/aicon_28.png"/>
<img src="__TMPL__/public/assets/starImg/aicon_28.png" />
</div>
<!-- 图片下方文字 -->
<div class="img_bottom">
... ... @@ -379,7 +412,7 @@
<!-- 图片 -->
<notempty name="res_month.5">
<div class="reverse_Imgs">
<img src="{:cmf_get_image_url($res_month.5.index_thumbnail)}"/>
<img src="{:cmf_get_image_url($res_month.5.index_thumbnail)}" />
</div>
<!-- 图片下方文字 -->
<a href="/portal/enjoy/getEnjoyDetail?id={$res_month.5.id}">
... ... @@ -390,7 +423,7 @@
</a>
<else/>
<div class="reverse_Imgs">
<img src="__TMPL__/public/assets/starImg/aicon_28.png"/>
<img src="__TMPL__/public/assets/starImg/aicon_28.png" />
</div>
<!-- 图片下方文字 -->
<div class="img_bottom">
... ... @@ -416,7 +449,7 @@
<!-- 图片 -->
<notempty name="res_month.6">
<div class="reverse_Imgs">
<img src="{:cmf_get_image_url($res_month.6.index_thumbnail)}"/>
<img src="{:cmf_get_image_url($res_month.6.index_thumbnail)}" />
</div>
<!-- 图片下方文字 -->
<a href="/portal/enjoy/getEnjoyDetail?id={$res_month.6.id}">
... ... @@ -427,7 +460,7 @@
</a>
<else/>
<div class="reverse_Imgs">
<img src="__TMPL__/public/assets/starImg/aicon_28.png"/>
<img src="__TMPL__/public/assets/starImg/aicon_28.png" />
</div>
<!-- 图片下方文字 -->
<div class="img_bottom">
... ... @@ -455,7 +488,7 @@
<!-- 图片 -->
<notempty name="res_month.7">
<div class="reverse_Imgs">
<img src="{:cmf_get_image_url($res_month.7.index_thumbnail)}"/>
<img src="{:cmf_get_image_url($res_month.7.index_thumbnail)}" />
</div>
<!-- 图片下方文字 -->
<a href="/portal/enjoy/getEnjoyDetail?id={$res_month.7.id}">
... ... @@ -466,7 +499,7 @@
</a>
<else/>
<div class="reverse_Imgs">
<img src="__TMPL__/public/assets/starImg/aicon_28.png"/>
<img src="__TMPL__/public/assets/starImg/aicon_28.png" />
</div>
<!-- 图片下方文字 -->
<div class="img_bottom">
... ... @@ -494,7 +527,7 @@
<!-- 图片 -->
<notempty name="res_month.8">
<div class="reverse_Imgs">
<img src="{:cmf_get_image_url($res_month.8.index_thumbnail)}"/>
<img src="{:cmf_get_image_url($res_month.8.index_thumbnail)}" />
</div>
<!-- 图片下方文字 -->
<a href="/portal/enjoy/getEnjoyDetail?id={$res_month.8.id}">
... ... @@ -505,7 +538,7 @@
</a>
<else/>
<div class="reverse_Imgs">
<img src="__TMPL__/public/assets/starImg/aicon_28.png"/>
<img src="__TMPL__/public/assets/starImg/aicon_28.png" />
</div>
<!-- 图片下方文字 -->
<div class="img_bottom">
... ... @@ -533,7 +566,7 @@
<!-- 图片 -->
<notempty name="res_month.9">
<div class="reverse_Imgs">
<img src="{:cmf_get_image_url($res_month.9.index_thumbnail)}"/>
<img src="{:cmf_get_image_url($res_month.9.index_thumbnail)}" />
</div>
<!-- 图片下方文字 -->
<a href="/portal/enjoy/getEnjoyDetail?id={$res_month.9.id}">
... ... @@ -544,7 +577,7 @@
</a>
<else/>
<div class="reverse_Imgs">
<img src="__TMPL__/public/assets/starImg/aicon_28.png"/>
<img src="__TMPL__/public/assets/starImg/aicon_28.png" />
</div>
<!-- 图片下方文字 -->
<div class="img_bottom">
... ... @@ -570,7 +603,7 @@
<!-- 图片 -->
<notempty name="res_month.10">
<div class="reverse_Imgs">
<img src="{:cmf_get_image_url($res_month.10.index_thumbnail)}"/>
<img src="{:cmf_get_image_url($res_month.10.index_thumbnail)}" />
</div>
<!-- 图片下方文字 -->
<a href="/portal/enjoy/getEnjoyDetail?id={$res_month.10.id}">
... ... @@ -581,7 +614,7 @@
</a>
<else/>
<div class="reverse_Imgs">
<img src="__TMPL__/public/assets/starImg/aicon_28.png"/>
<img src="__TMPL__/public/assets/starImg/aicon_28.png" />
</div>
<!-- 图片下方文字 -->
<div class="img_bottom">
... ... @@ -609,7 +642,7 @@
<!-- 图片 -->
<notempty name="res_month.11">
<div class="reverse_Imgs">
<img src="{:cmf_get_image_url($res_month.11.index_thumbnail)}"/>
<img src="{:cmf_get_image_url($res_month.11.index_thumbnail)}" />
</div>
<!-- 图片下方文字 -->
<a href="/portal/enjoy/getEnjoyDetail?id={$res_month.11.id}">
... ... @@ -620,7 +653,7 @@
</a>
<else/>
<div class="reverse_Imgs">
<img src="__TMPL__/public/assets/starImg/aicon_28.png"/>
<img src="__TMPL__/public/assets/starImg/aicon_28.png" />
</div>
<!-- 图片下方文字 -->
<div class="img_bottom">
... ... @@ -648,7 +681,7 @@
<!-- 图片 -->
<notempty name="res_month.12">
<div class="reverse_Imgs">
<img src="{:cmf_get_image_url($res_month.12.index_thumbnail)}"/>
<img src="{:cmf_get_image_url($res_month.12.index_thumbnail)}" />
</div>
<!-- 图片下方文字 -->
<a href="/portal/enjoy/getEnjoyDetail?id={$res_month.12.id}">
... ... @@ -659,7 +692,7 @@
</a>
<else/>
<div class="reverse_Imgs">
<img src="__TMPL__/public/assets/starImg/aicon_28.png"/>
<img src="__TMPL__/public/assets/starImg/aicon_28.png" />
</div>
<!-- 图片下方文字 -->
<div class="img_bottom">
... ... @@ -687,10 +720,10 @@
<!-- 视频 -->
<div class="star_video">
<notempty name="res_xqyy">
<video id="video" width="100%" height="675" src="{:cmf_get_file_download_url($res_xqyy.video)}" controlsList="nodownload"></video>
<video id="video" width="100%" height="675" src="{:cmf_get_file_download_url($res_xqyy.video)}" controlsList="nodownload"></video>
<img class="show_in_poster" src="{:cmf_get_image_url($res_xqyy.index_thumbnail)}" alt="">
<else/>
<video id="video" width="100%" height="675" src="__TMPL__//public/assets/starImg/video.mp4" controlsList="nodownload"></video>
<video id="video" width="100%" height="675" src="__TMPL__//public/assets/starImg/video.mp4" controlsList="nodownload"></video>
<img class="show_in_poster" src="__TMPL__/public/assets/starImg/bicon_34.png" alt="">
</notempty>
<img onclick="bofang()" class="show_in_banner2" src="__TMPL__/public/assets/starImg/aicon_30.png" alt="">
... ... @@ -835,7 +868,7 @@
<div class="star_activity">
<!-- 标题 -->
<div class="star_title clearfix">
<span>
<span>
<p>星际<i>活动</i></p>
<p>PLANET ACTIVITY</p>
</span>
... ... @@ -855,16 +888,17 @@
</notempty>
</div>
<include file="public@footer"/>
<include file="public@footer" />
<script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
<script src="__TMPL__/public/assets/js/swiper4/swiper.min.js"></script>
<script src="__TMPL__/public/assets/js/public.js"></script>
<script>
// 弹框视频
$('.mask').css('display','block');
$('.mask').css('display', 'block');
var video2 = document.getElementById("video2"); //获取ID 
var mask = document.getElementById("mask");
function nos() {
mask.style.display = "none";
video2.pause();
... ... @@ -897,16 +931,16 @@
$(this).children('.star_happy_box').hide();
}
});
// tab切换
// tab切换
$('.star_happy_box li').click(function() {
$(this).addClass('active').siblings().removeClass('active');
});
$('.star_ming').click(function() {
var id = $('#star_id').val();
window.location.href = '/portal/region/getStarDetail?id='+id;
window.location.href = '/portal/region/getStarDetail?id=' + id;
});
// swiper
// banner
// banner
var swiper = new Swiper('.swiper-container6', {
... ... @@ -951,6 +985,7 @@
});
// 星域秀场视频
var video = document.getElementById("video");
var video2 = document.getElementById("video2");
function bofang() {
video.play();
... ... @@ -959,6 +994,12 @@
$('.show_in_poster').hide();
}
function bofang2() {
video2.play();
$('#video2').attr('controls', 'controls');
$('.show_in_banner3').hide();
$('.mask_videoFeng').hide();
}
</script>
</body>
... ...
... ... @@ -11,10 +11,11 @@
margin: 0 auto;
}
#about_us{
#about_us {
cursor: pointer;
}
/* 上部 */
... ... @@ -84,9 +85,12 @@
color: rgba(255, 255, 255, 1);
opacity: 0.4;
}
.about_content p{
.about_content p {
height: 76px;
}
/* 关注我们 */
#footer .about_bot {
... ... @@ -112,9 +116,10 @@
#footer .qr_code dl dt {
text-align: center
}
#footer .qr_code dl dt img{
width:54px;
height:54px;
#footer .qr_code dl dt img {
width: 90px;
height: 90px;
}
#footer .qr_code dl dd {
... ... @@ -123,6 +128,7 @@
line-height: 22px;
opacity: 0.4;
text-align: left;
text-align: center;
}
... ...
... ... @@ -23,19 +23,19 @@
<div class="about_bot">
<!-- 标题 -->
<!--<span class="title">-->
<!--<p class="ch">关注我们</p>-->
<!--</span>-->
<!--<p class="ch">关注我们</p>-->
<!--</span>-->
<!-- 二维码 -->
<div class="qr_code">
<volist name="focus" id="vo">
<dl>
<dt>
<dl>
<dt>
<img src="{:cmf_get_image_url($vo.image)}" alt="">
</dt>
<dd>
<p>{$vo.name}</p>
</dd>
</dl>
<dd>
<p>{$vo.name}</p>
</dd>
</dl>
</volist>
</div>
</div>
... ... @@ -63,7 +63,9 @@
<div class="link_addr">
<ul>
<volist name="link" id="vo">
<a href="{$vo.url}"><li>{$vo.name}</li></a>
<a href="{$vo.url}">
<li>{$vo.name}</li>
</a>
</volist>
</ul>
</div>
... ...
... ... @@ -40,6 +40,30 @@
.indeX_Hl img {
height: 100%;
}
.vi_fengm {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
}
.vi_fengm img {
width: 100%;
height: 100%;
}
.video_start99 {
position: absolute;
top: 34%;
left: 43%;
}
.video_start99 img {
width: 1rem;
height: 1rem;
}
</style>
</head>
... ... @@ -47,7 +71,13 @@
<notempty name="res_djxq.video">
<div class="vi_maks" id="mask">
<div class="vi_video">
<video src="{:cmf_get_file_download_url($res_djxq.video)}" id="video2" style="height: 3.4rem;width: 100%;" autoplay="autoplay" controls controlslist="nodownload"></video>
<video src="{:cmf_get_file_download_url($res_djxq.video)}" id="video2" style="height: 3.4rem;width: 100%;" controls controlslist="nodownload"></video>
<div class="vi_fengm">
<img src="__TMPL__/public/assets/images/cicon_27@2x.png" alt="">
</div>
<div class="video_start99">
<img onclick="bofang2()" src="http://www.xingqiu.cn.com/themes/simpleboot3_mobile/public/assets/images/aicon_30.png" alt="">
</div>
<img class="vi_Img" src="__TMPL__/public/assets/images/nos.png" alt="" />
</div>
</div>
... ... @@ -626,11 +656,11 @@
<div class="useraccount tip left">
<div class="useraccount_top">
<div class="useraccount_name one-txt-cut">{$res_mxft.full_name}</div>
<div class="useraccount_career one-txt-cut">
<div class="useraccount_career">
{$res_mxft.position}<span>{$res_mxft.trade}</span>
</div>
</div>
<div class="useraccount_intro txt-cut" style="-webkit-line-clamp: 4;">
<div class="useraccount_intro txt-cut" style="-webkit-line-clamp: 3;">
{$res_mxft.post_excerpt}
</div>
</div>
... ... @@ -811,6 +841,7 @@
});
// 星域秀场视频
var video = document.getElementById("video");
var video2 = document.getElementById("video2");
function bofang() {
video.play();
... ... @@ -818,6 +849,13 @@
$("#video").attr("controls", "controls");
$(".video_start").hide();
}
function bofang2() {
video2.play();
$('.vi_fengm').hide();
$("#video").attr("controls", "controls");
$(".video_start99").hide();
}
// swiper
var swiper = new Swiper('.swiper-container4', {
pagination: '.swiper-pagination',
... ...
... ... @@ -40,11 +40,11 @@
<div class="useraccount tip left">
<div class="useraccount_top">
<div class="useraccount_name one-txt-cut">{$vo.full_name}</div>
<div class="useraccount_career one-txt-cut">
<div class="useraccount_career">
{$vo.position}<span>{$vo.trade}</span>
</div>
</div>
<div class="useraccount_intro txt-cut" style="-webkit-line-clamp: 4;">
<div class="useraccount_intro txt-cut" style="-webkit-line-clamp: 3;">
{$vo.post_excerpt}
</div>
</div>
... ...
... ... @@ -88,11 +88,11 @@
<a href="/portal/region/getStarDetail?id={$res_mxft.id}">
<div class="useraccount_top">
<div class="useraccount_name one-txt-cut">{$res_mxft.full_name}</div>
<div class="useraccount_career one-txt-cut">
<div class="useraccount_career">
{$res_mxft.position}<span>{$res_mxft.trade}</span>
</div>
</div>
<div class="useraccount_intro txt-cut" style="-webkit-line-clamp: 4;">
<div class="useraccount_intro txt-cut" style="-webkit-line-clamp: 3;">
{$res_mxft.post_excerpt}
</div>
</a>
... ...
... ... @@ -12,12 +12,12 @@
</head>
<body>
<include file="public@header"/>
<include file="public@header" />
<div class="index_fifteenth">
<div class="index_fifteenth_bg">
<div class="index_fifteenth_contant">
<div class="index_fifteenth_top">
<img src="__TMPL__/public/assets/images/cicon_58@2x.png" alt="" />
<img src="{:cmf_get_image_url($res.image_url)}" alt="" />
</div>
<div class="index_fifteenth_one">
{$res.post_title}
... ... @@ -41,7 +41,7 @@
</div>
</div>
</div>
<include file="public@footer"/>
<include file="public@footer" />
</body>
<script src="__TMPL__/public/assets/js/base.js"></script>
<script src="__TMPL__/public/assets/js/jquery-2.1.0.js"></script>
... ...
... ... @@ -12,12 +12,14 @@
</head>
<body>
<include file="public@header"/>
<include file="public@header" />
<div class="index_fifteenth">
<div class="index_fifteenth_bg">
<div class="index_fifteenth_contant">
<div class="index_fifteenth_top">
<img src="__TMPL__/public/assets/images/cicon_58@2x.png" alt="" />
<volist name="res.image_url" id="vo" offset="0" length="1">
<img src="{:cmf_get_image_url($vo.url)}" alt="">
</volist>
</div>
<div class="index_fifteenth_one">
{$res.post_title}
... ... @@ -65,7 +67,7 @@
</div>
</div>
</div>
<include file="public@footer"/>
<include file="public@footer" />
</body>
<script src="__TMPL__/public/assets/js/base.js"></script>
<script src="__TMPL__/public/assets/js/jquery-2.1.0.js"></script>
... ...
... ... @@ -654,10 +654,10 @@ body::-webkit-scrollbar {
}
.useraccount_top {
display: flex;
/* display: flex;
display: -webkit-flex;
justify-content: flex-start;
align-items: baseline;
align-items: baseline; */
}
.useraccount_name {
... ... @@ -671,8 +671,7 @@ body::-webkit-scrollbar {
}
.useraccount_career {
width: 1.8rem;
margin-left: 0.32rem;
width: 4.2rem;
font-size: 0.24rem;
font-family: PingFang-SC-Medium;
font-weight: 500;
... ... @@ -685,7 +684,7 @@ body::-webkit-scrollbar {
}
.useraccount_intro {
margin-top: 0.27rem;
margin-top: 0.12rem;
/* width: 4.14rem; */
/* height: 1.48rem; */
font-size: 0.26rem;
... ...
... ... @@ -87,9 +87,14 @@ $(function() {
// 点击出现搜索栏
$('.navImg3').click(function() {
$('.navImg2').hide();
$(this).addClass('searchs');
setInterval(function() {
$('.nav_search').show();
}, 200);
//搜索
$(".searchs").click(function() {
$("#searchForm").submit(); //处理事件
});
});
//登录
... ...
... ... @@ -9,7 +9,7 @@
</div>
<!-- input框 -->
<div class="nav_search">
<form action="/portal/login/searchList" method="GET">
<form action="/portal/login/searchList" method="GET" id="searchForm">
<i></i>
<input type="text" placeholder="请输入搜索内容" name="keyword" value="{$keyword}" id="keywords">
</form>
... ...