景龙 / xingqiu · 提交

转到一个项目

作者 景龙
提交 0393256d24e8d023ad1150bbd8ae6e4698391295 1 个父辈 60b1ddfa
1 个管道 的构建 通过 耗费 4 秒

增加独角日志，公益未来更多页

内嵌 并排对比
正在显示 8 个修改的文件 包含 534 行增加 和 7 行删除
... ... @@ -68,12 +68,8 @@ class RegionController extends HomeBaseController
//独角日志
$position['category_id'] = CityCategoryModel::djrz;
$field = 'id,thumbnail avatar,post_title,post_excerpt,more';
$field = 'id,thumbnail avatar,index_thumbnail,post_title,post_excerpt,more';
$res_djrz = $this->getChildArticle($position,$field,3);
foreach($res_djrz as &$value){
$more = json_decode($value['more'],true);
$value['thumbnail'] = isset($more['photos']) && !empty($more['photos'])?$more['photos'][0]['url']:'';
}
$this->assign('res_djrz',$res_djrz);
//童趣未来
... ... @@ -265,6 +261,16 @@ class RegionController extends HomeBaseController
return $this->fetch();
}
//独角日志更多
public function getMoreNote(){
$position['category_id'] = CityCategoryModel::djrz;
$field = 'id,thumbnail avatar,index_thumbnail,post_title,post_excerpt,create_time';
$res = $this->getChildArticlePage($position,$field,6);
$this->assign('res',$res['data']);
$this->assign('page',$res['page']);
return $this->fetch();
}
//独角日志详情
public function getNoteDetail(){
$id = $this->request->param('id',0,'intval');
... ... @@ -275,6 +281,16 @@ class RegionController extends HomeBaseController
return $this->fetch();
}
//童趣未来更多
public function getMoreFuture(){
$position['category_id'] = CityCategoryModel::tqwl;
$field = 'id,thumbnail,post_title,post_excerpt,create_time';
$res = $this->getChildArticlePage($position,$field,5);
$this->assign('res',$res['data']);
$this->assign('page',$res['page']);
return $this->fetch();
}
//童趣未来详情
public function getFutureDetail(){
$id = $this->request->param('id',0,'intval');
... ...
... ... @@ -91,6 +91,25 @@
<div class="col-md-3">
<table class="table table-bordered">
<tr>
<th><b>缩略图</b><span class="form-required">*</span></th>
</tr>
<tr>
<td>
<div style="text-align: center;">
<input type="hidden" name="post[index_thumbnail]" id="index_thumbnail" value="">
<a href="javascript:uploadOneImage('图片上传','#index_thumbnail');">
<img src="__TMPL__/public/assets/images/default-thumbnail.png"
id="index_thumbnail-preview"
width="135" style="cursor: pointer"/>
</a>
<input type="button" class="btn btn-sm btn-cancel-index_thumbnail" value="取消图片">
</div>
<div style="margin-top:30px;">
<span class="form-required">图片参考尺寸：387*218</span>
</div>
</td>
</tr>
<tr>
<th><b>头像</b><span class="form-required">*</span></th>
</tr>
<tr>
... ... @@ -104,6 +123,9 @@
</a>
<input type="button" class="btn btn-sm btn-cancel-thumbnail" value="取消图片">
</div>
<div style="margin-top:30px;">
<span class="form-required">图片参考尺寸：44*44</span>
</div>
</td>
</tr>
<tr>
... ... @@ -139,6 +161,12 @@
} catch (err) {
}
//缩略图
$('.btn-cancel-index_thumbnail').click(function () {
$('#index_thumbnail-preview').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
$('#index_thumbnail').val('');
});
//头像
$('.btn-cancel-thumbnail').click(function () {
$('#thumbnail-preview').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
$('#thumbnail').val('');
... ...
... ... @@ -109,6 +109,30 @@
<div class="col-md-3">
<table class="table table-bordered">
<tr>
<td>
<div style="text-align: center;">
<input type="hidden" name="post[index_thumbnail]" id="index_thumbnail"
value="{$post.index_thumbnail|default=''}">
<a href="javascript:uploadOneImage('图片上传','#index_thumbnail');">
<if condition="empty($post.index_thumbnail)">
<img src="__TMPL__/public/assets/images/default-thumbnail.png"
id="index_thumbnail-preview"
width="135" style="cursor: pointer"/>
<else/>
<img src="{:cmf_get_image_preview_url($post.index_thumbnail)}"
id="index_thumbnail-preview"
width="135" style="cursor: pointer"/>
</if>
</a>
<input type="button" class="btn btn-sm btn-cancel-index_thumbnail" value="取消图片">
</div>
<div style="margin-top:30px;">
<span class="form-required">图片参考尺寸：387*218</span>
</div>
</td>
</tr>
<tr>
<th>头像<span class="form-required">*</span></th>
</tr>
<tr>
... ... @@ -129,6 +153,9 @@
</a>
<input type="button" class="btn btn-sm btn-cancel-thumbnail" value="取消图片">
</div>
<div style="margin-top:30px;">
<span class="form-required">图片参考尺寸：44*44</span>
</div>
</td>
</tr>
<tr>
... ... @@ -169,7 +196,12 @@
editorcontent.sync();
} catch (err) {
}
//缩略图
$('.btn-cancel-index_thumbnail').click(function () {
$('#index_thumbnail-preview').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
$('#index_thumbnail').val('');
});
//头像
$('.btn-cancel-thumbnail').click(function () {
$('#thumbnail-preview').attr('src', '__TMPL__/public/assets/images/default-thumbnail.png');
$('#thumbnail').val('');
... ...
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>公益未来更多</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/bootstrap4.0.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
<style>
a:hover{
text-decoration:none;
}
</style>
</head>
<body>
<include file="public@header"/>
<div class="show_futureBox">
<!-- 顶部标题 -->
<div class="show_INMain_tit clearfix">
<div class="show_IN1 clearfix">
<img src="__TMPL__/public/assets/starImg/aicon_53.png" alt="" style="margin-top:8px;width: 32px;">
<p>公益<span>未来</span></p>
<h2>Commonweal & Future</h2>
</div>
</div>
<!-- 内容 -->
<div class="show_fuCon">
<!-- 第一部分 -->
<div class="show_fuCon1">
<volist name="res['data']" id="vo" offset="0" length="2">
<a href="/portal/region/getFutureDetail?id={$vo.id}">
<div class="show_fuCon1Box">
<div class="show_fuCon1Img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="show_fuCon1Txt">
<h1 class="show_fuCon1Txt1">{$vo.post_title}</h1>
<p class="show_fuCon1Txt2">{$vo.post_excerpt}</p>
</div>
</div>
</a>
</volist>
</div>
<!-- 第二部分 -->
<volist name="res['data']" id="vo" offset="2" length="1">
<a href="/portal/region/getFutureDetail?id={$vo.id}">
<div class="show_fuCon2">
<div class="show_fuCon2Img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="show_fuCon2Txt">
<h1 class="show_fuCon1Txt1">{$vo.post_title}</h1>
<p class="show_fuCon2Txt2">{$vo.post_excerpt}</p>
</div>
</div>
</a>
</volist>
<!-- 第三部分 -->
<div class="show_fuCon1">
<volist name="res['data']" id="vo" offset="3" length="2">
<a href="/portal/region/getFutureDetail?id={$vo.id}">
<div class="show_fuCon1Box">
<div class="show_fuCon1Img">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
</div>
<div class="show_fuCon1Txt">
<h1 class="show_fuCon1Txt1">{$vo.post_title}</h1>
<p class="show_fuCon1Txt2">{$vo.post_excerpt}</p>
</div>
</div>
</a>
</volist>
</div>
</div>
<!-- 分页 -->
<div class="pagination">
{$page|default=''}
</div>
</div>
<include file="public@footer"/>
<script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
<script src="__TMPL__/public/assets/js/public.js"></script>
</body>
</html>
\ No newline at end of file
... ...
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>独角日志更多</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/bootstrap4.0.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/show.css">
<style>
a:hover{
text-decoration:none;
}
.show_logCon1Img2 img,.show_logCon2Img2 img{
border-radius:50%;
}
</style>
</head>
<body>
<include file="public@header"/>
<div class="show_logBox">
<!-- 顶部标题 -->
<div class="show_INMain_tit clearfix">
<div class="show_IN1 clearfix">
<img src="__TMPL__/public/assets/starImg/aicon_52.png" alt="" style="width: 28px;">
<p>独角<span>日志</span></p>
<h2>Planet Express</h2>
</div>
</div>
<!-- 内容 -->
<div class="show_logCon">
<!-- 第一部分 -->
<volist name="res['data']" id="vo" offset="0" length="1">
<a href="/portal/region/getNoteDetail?id={$vo.id}">
<div class="show_logCon1">
<div class="show_logCon1Img1">
<img src="{:cmf_get_image_url($vo.index_thumbnail)}" alt="">
</div>
<div class="show_logCon1Txt">
<h1 class="show_logCon1Txt1">{$vo.post_title}</h1>
<p class="show_logCon1Txt2">
{$vo.post_excerpt}
</p>
<div class="show_logCon1Img2">
<img src="{:cmf_get_image_url($vo.avatar)}" alt="">
</div>
</div>
</div>
</a>
</volist>
<!-- 第二部分 -->
<div class="show_logCon2">
<volist name="res['data']" id="vo" offset="1" length="2">
<a href="/portal/region/getNoteDetail?id={$vo.id}">
<div class="show_logCon2Box">
<div class="show_logCon2Img">
<img src="{:cmf_get_image_url($vo.index_thumbnail)}" alt="">
</div>
<div class="show_logCon2Txt">
<h1 class="show_logCon2Txt1">{$vo.post_title}</h1>
<p class="show_logCon2Tx2">
{$vo.post_excerpt}
</p>
<div class="show_logCon2Img2">
<img src="{:cmf_get_image_url($vo.avatar)}" alt="">
</div>
</div>
</div>
</a>
</volist>
</div>
<!-- 第三部分 -->
<div class="show_logCon3">
<ul>
<volist name="res['data']" id="vo" offset="3" length="3">
<a href="/portal/region/getNoteDetail?id={$vo.id}">
<li>
<div class="show_logCon3Img">
<img src="{:cmf_get_image_url($vo.index_thumbnail)}" alt="">
</div>
<div class="show_logCon2Txt">
<h1 class="show_logCon2Txt1">{$vo.post_title}</h1>
<p class="show_logCon2Tx2">
{$vo.post_excerpt}
</p>
<div class="show_logCon2Img2">
<img src="{:cmf_get_image_url($vo.avatar)}" alt="">
</div>
</div>
</li>
</a>
</volist>
</ul>
</div>
</div>
<!-- 分页 -->
<div class="pagination">
{$page|default=''}
</div>
</div>
<include file="public@footer"/>
<script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script>
<script src="__TMPL__/public/assets/js/public.js"></script>
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -228,6 +228,10 @@
<p>独角<span>日志</span></p>
<h2>Neo Blog</h2>
</div>
<!-- 更多 -->
<div class="show_IN2">
<a href="/portal/region/getMoreNote"> MORE+ </a>
</div>
</div>
<!-- 内容 -->
<div class="show_INMain_con5">
... ... @@ -236,7 +240,7 @@
<li>
<a href="/portal/region/getNoteDetail?id={$vo.id}">
<div class="show_INMain_con5_1">
<img src="{:cmf_get_image_url($vo.thumbnail)}" alt="">
<img src="{:cmf_get_image_url($vo.index_thumbnail)}" alt="">
</div>
<div class="show_INMain_con5_2">
<h1>{$vo.post_title}</h1>
... ... @@ -260,6 +264,10 @@
<p>公益<span>未来</span></p>
<h2>Commonweal & Future</h2>
</div>
<!-- 更多 -->
<div class="show_IN2">
<a href="/portal/region/getMoreFuture"> MORE+ </a>
</div>
</div>
<!-- 内容 -->
<div class="show_INMain_con6">
... ...
... ... @@ -8,6 +8,11 @@
<title>网红美景更多</title>
<link rel="stylesheet" href="__TMPL__/public/assets/css/bootstrap4.0.css">
<link rel="stylesheet" href="__TMPL__/public/assets/css/happy.css">
<style>
.happy_beauty_con_1topimg1 {
height: 675px;
}
</style>
</head>
<body>
... ...
... ... @@ -1805,3 +1805,245 @@ body {
width: 1200px;
margin:70px auto 150px;
}
/* 独角日志页面 */
.show_logBox,
.show_futureBox {
width: 1200px;
margin: 138px auto 150px;
}
.show_logCon {
margin-top: 40px;
}
.show_logCon1 {
width: 100%;
height: 504px;
display: flex;
}
.show_logCon1Img1 {
width: 900px;
height: 504px;
}
.show_logCon1Img1 img {
width: 100%;
height: 100%;
}
.show_logCon1Txt {
width: 300px;
height: 504px;
padding: 118px 58px 0 58px;
text-align: center;
box-sizing: border-box;
background-color: white;
}
.show_logCon1Txt1 {
font-size: 18px;
line-height: 32px;
cursor: pointer;
color: rgba(26, 26, 26, 1);
}
.show_logCon1Txt2 {
font-size: 14px;
margin-top: 38px;
color: rgba(153, 153, 153, 1);
line-height: 22px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
.show_logCon1Img2 {
width: 44px;
height: 44px;
cursor: pointer;
border-radius: 50%;
margin: 48px auto 0;
}
.show_logCon1Img2 img {
width: 100%;
height: 100%;
}
.show_logCon2 {
display: flex;
display: -webkit-flex;
margin: 17px 0;
justify-content: space-between;
}
.show_logCon2Box {
width: 590px;
}
.show_logCon2Img {
width: 590px;
height: 332px;
}
.show_logCon2Img img {
width: 100%;
height: 100%;
}
.show_logCon2Txt {
width: 100%;
height: 164px;
padding: 16px 0;
line-height: 1;
box-sizing: border-box;
background-color: white;
}
.show_logCon2Txt1 {
text-align: center;
font-size: 18px;
color: rgba(26, 26, 26, 1);
}
.show_logCon2Tx2 {
width: 304px;
margin: 14px auto;
font-size: 14px;
color: #999999;
overflow: hidden;
line-height: 22px;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.show_logCon2Img2 {
width: 44px;
height: 44px;
margin: auto;
}
.show_logCon2Img2 img {
width: 100%;
height: 100%;
}
.show_logCon3Img {
width: 388px;
height: 218px;
}
.show_logCon3Img img {
width: 100%;
height: 100%;
}
.show_logCon3 ul {
width: calc(100% + 18px);
display: flex;
display: -webkit-flex;
}
.show_logCon3 ul li {
width: 388px;
margin-right: 18px;
}
/* 公益未来页面 */
.show_fuCon {
margin-top: 42px;
}
.show_fuCon1Box {
width: 580px;
}
.show_fuCon1 {
display: flex;
display: -webkit-flex;
justify-content: space-between;
}
.show_fuCon1Img {
width: 100%;
height: 340px;
}
.show_fuCon1Img img {
width: 100%;
height: 100%;
}
.show_fuCon1Txt {
width: 100%;
height: 104px;
padding: 0 38px;
line-height: 1;
box-sizing: border-box;
background-color: white;
}
.show_fuCon1Txt1 {
cursor: pointer;
text-align: center;
font-size: 18px;
padding: 18px 0 13px 0;
color: rgba(0, 0, 0, 1);
}
.show_fuCon1Txt2 {
overflow: hidden;
line-height: 22px;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
font-size: 14px;
color: rgba(153, 153, 153, 1);
line-height: 22px;
}
.show_fuCon2 {
width: 100%;
display: flex;
display: -webkit-flex;
margin: 40px 0;
}
.show_fuCon2Img {
width: 920px;
height: 540px;
}
.show_fuCon2Img img {
width: 100%;
height: 100%;
}
.show_fuCon2Txt {
width: 280px;
height: 540px;
padding: 180px 34px 0;
box-sizing: border-box;
background-color: white;
}
.show_fuCon2Txt2 {
font-size: 14px;
color: rgba(153, 153, 153, 1);
line-height: 22px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 6;
-webkit-box-orient: vertical;
}
\ No newline at end of file
... ...