root / liepin · 提交

转到一个项目

作者 魏强
提交 df3d2a3f98cd674b9fb07484ab25ca9fc148ecf7 2 个父辈 89dad6b1 ac7080ff

Merge branch 'master' of http://114.215.101.231:8099/root/liepin

内嵌 并排对比
正在显示 9 个修改的文件 包含 155 行增加 和 94 行删除
... ... @@ -15,10 +15,16 @@ class Index extends Frontend
protected $limit = 20;
protected $page = 1;
protected $group = 8;//分组
protected $keys = '';
protected $description = '';
public function _initialize()
{
parent::_initialize();
$keys = Db::table('fa_config')->where('id',18)->find();
$this->keys = $keys['value'];
$description = Db::table('fa_config')->where('id',19)->find();
$this->description = $description['value'];
}
public function index()
... ... @@ -39,6 +45,10 @@ class Index extends Frontend
}
}
$this->assign('custom',$arr);
//关键字，描述
$this->assign('keys',$this->keys);
$this->assign('description',$this->description);
return $this->fetch();
}
... ... @@ -65,6 +75,10 @@ class Index extends Frontend
$this->assign('hot',$hot);
$this->assign('list',$news);
$this->assign('top',$top);
//关键字，描述
$this->assign('keys',$this->keys);
$this->assign('description',$this->description);
return $this->fetch();
}
... ... @@ -95,32 +109,51 @@ class Index extends Frontend
}
$this->assign('hot',$hot);
$this->assign('detail',$detail);
//关键字，描述
$this->assign('keys',$this->keys);
$this->assign('description',$this->description);
return $this->fetch();
}
public function map()
{
return $this->view->fetch();
//关键字，描述
$this->assign('keys',$this->keys);
$this->assign('description',$this->description);
return $this->fetch();
}
public function course()
{
return $this->view->fetch();
//关键字，描述
$this->assign('keys',$this->keys);
$this->assign('description',$this->description);
return $this->fetch();
}
public function contact()
{
return $this->view->fetch();
//关键字，描述
$this->assign('keys',$this->keys);
$this->assign('description',$this->description);
return $this->fetch();
}
public function business()
{
return $this->view->fetch();
//关键字，描述
$this->assign('keys',$this->keys);
$this->assign('description',$this->description);
return $this->fetch();
}
public function about()
{
return $this->view->fetch();
//关键字，描述
$this->assign('keys',$this->keys);
$this->assign('description',$this->description);
return $this->fetch();
}
}
... ...
... ... @@ -2,6 +2,8 @@
<html>
<head>
<meta charset="utf-8">
<meta name="keywords" content="{$keys}">
<meta name="description" content="{$description}">
<title>关于我们</title>
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/about.css">
... ... @@ -244,7 +246,7 @@
</div>
</div>
<div class="footer2">
<p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p>
<p>备案号：京ICP备17069330号-2</p>
</div>
<script type="text/javascript" src="__CDN__/assets/jquery.js"></script>
<script>
... ...
... ... @@ -2,6 +2,8 @@
<html>
<head>
<meta charset="utf-8">
<meta name="keywords" content="{$keys}">
<meta name="description" content="{$description}">
<title>业务介绍</title>
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/business.css">
... ... @@ -145,7 +147,7 @@
</div>
</div>
<div class="footer2">
<p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p>
<p>备案号：京ICP备17069330号-2</p>
</div>
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -2,6 +2,8 @@
<html>
<head>
<meta charset="utf-8">
<meta name="keywords" content="{$keys}">
<meta name="description" content="{$description}">
<title>联系我们</title>
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/contact.css">
... ... @@ -145,7 +147,7 @@
</div>
</div>
<div class="footer2">
<p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p>
<p>备案号：京ICP备17069330号-2</p>
</div>
<script type="text/javascript" src="__CDN__/assets/js/jquery.js"></script>
</body>
... ...
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="keywords" content="{$keys}">
<meta name="description" content="{$description}">
<title>课程体系</title>
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/course.css">
<title>课程体系</title>
</head>
<body>
<!-- header -->
... ... @@ -162,7 +165,7 @@
</div>
</div>
<div class="footer2">
<p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p>
<p>备案号：京ICP备17069330号-2</p>
</div>
<script type="text/javascript" src="__CDN__/assets/jquery.js"></script>
<script>
... ...
... ... @@ -2,6 +2,8 @@
<html>
<head>
<meta charset="utf-8">
<meta name="keywords" content="{$keys}">
<meta name="description" content="{$description}">
<title>首页</title>
<meta name="viewport" content="width=1200">
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
... ... @@ -240,7 +242,7 @@
</div>
</div>
<div class="footer2">
<p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p>
<p>备案号：京ICP备17069330号-2</p>
</div>
<script type="text/javascript" src="__CDN__/assets/jquery.js"></script>
<script type="text/javascript" src="__CDN__/assets/css/swiper/swiper.min.js"></script>
... ...
... ... @@ -2,7 +2,9 @@
<html>
<head>
<meta charset="utf-8">
<title></title>
<meta name="keywords" content="{$keys}">
<meta name="description" content="{$description}">
<title>新闻资讯</title>
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/swiper/swiper.min.css">
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/news.css">
... ... @@ -163,7 +165,7 @@
</div>
</div>
<div class="footer2">
<p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p>
<p>备案号：京ICP备17069330号-2</p>
</div>
<script type="text/javascript" src="__CDN__/assets/js/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="__CDN__/assets/css/swiper/swiper.min.js"></script>
... ...
... ... @@ -2,7 +2,9 @@
<html>
<head>
<meta charset="utf-8">
<title></title>
<meta name="keywords" content="{$keys}">
<meta name="description" content="{$description}">
<title>新闻资讯</title>
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
<link rel="stylesheet" type="text/css" href="__CDN__/assets/swiper/swiper.min.css">
<link rel="stylesheet" type="text/css" href="__CDN__/assets/css/news.css">
... ... @@ -17,45 +19,46 @@
}
</style>
<body>
<!-- header -->
<div class="header header_bg">
<div class="header_content">
<div class="logo">
<a href="index.html">
<img src="__CDN__/assets/images/logohei@2x.png">
</a>
<p>九州纵横</p>
</div>
<div class="nav">
<ul>
<li><a href="index.html">首页</a></li>
<li><a href="about.html">关于我们</a></li>
<li><a href="business.html">业务介绍</a></li>
<li><a href="course.html" >课程体系</a></li>
<li><a href="news.html" class="nav_active">新闻资讯</a></li>
<li><a href="contact.html">联系我们</a></li>
</ul>
<div class="contentBox">
<!-- header -->
<div class="header header_bg">
<div class="header_content">
<div class="logo">
<a href="index.html">
<img src="__CDN__/assets/images/logohei@2x.png">
</a>
<p>九州纵横</p>
</div>
<div class="nav">
<ul>
<li><a href="index.html">首页</a></li>
<li><a href="about.html">关于我们</a></li>
<li><a href="business.html">业务介绍</a></li>
<li><a href="course.html" >课程体系</a></li>
<li><a href="news.html" class="nav_active">新闻资讯</a></li>
<li><a href="contact.html">联系我们</a></li>
</ul>
</div>
</div>
</div>
</div>
<!-- banner 和右侧 热门 -->
<div class="main_box">
<div class="main_left">
<div class="left_title">
<span>当前位置：<a href="news.html">首页 > </a>职场资讯</span>
</div>
<div class="left_con">
<div class="left_con_title">
<h2>{$detail.name}</h2>
<p>发布时间：{$detail.createtime}</p>
<!-- banner 和右侧 热门 -->
<div class="main_box">
<div class="main_left">
<div class="left_title">
<span>当前位置：<a href="news.html">首页 > </a>职场资讯</span>
</div>
<!-- 内容 -->
<div class="left_con_txt">
{$detail.content}
<div class="left_con">
<div class="left_con_title">
<h2>{$detail.name}</h2>
<p>发布时间：{$detail.createtime}</p>
</div>
<!-- 内容 -->
<div class="left_con_txt">
{$detail.content}
</div>
</div>
</div>
</div>
<div class="main_right">
<div class="main_right">
<div class="main_tit">
<img src="__CDN__/assets/images/leftbar_icon2.png">
<p>热门文章</p>
... ... @@ -74,57 +77,59 @@
</ul>
</div>
</div>
</div>
<!-- footer -->
<div class="footer">
<div class="footer_content">
<div class="footer_left">
<div class="footer_logo">
<a href="index.html">
<img src="__CDN__/assets/images/logobai@2x.png">
</a>
<h2>九州纵横</h2>
</div>
<div class="footer_leftTxt">
<p>官网 : www.chinacrossing.cn</p>
<p>地址:北京市朝阳区北四环中路27号盘古大观A座</p>
</div>
<!-- footer -->
<div class="footer">
<div class="footer_content">
<div class="footer_left">
<div class="footer_logo">
<a href="index.html">
<img src="__CDN__/assets/images/logobai@2x.png">
</a>
<h2>九州纵横</h2>
</div>
<div class="footer_leftTxt">
<p>官网 : www.chinacrossing.cn</p>
<p>地址:北京市朝阳区北四环中路27号盘古大观A座</p>
</div>
<div class="footer_code">
<img src="__CDN__/assets/img/code.png">
<p>扫二维码关注我们</p>
</div>
</div>
<div class="footer_code">
<img src="__CDN__/assets/img/code.png">
<p>扫二维码关注我们</p>
<div class="footer_right">
<dl>
<dt><a href="business.html">业务介绍</a></dt>
<dd>股权问题</dd>
<dd>人才发展</dd>
<dd>学习发展</dd>
</dl>
<dl>
<dt><a href="course.html">课程体系</a></dt>
<dd>课程咨询</a></dd>
<dd>课程安排</dd>
</dl>
<dl>
<dt><a href="news.html">新闻资讯</a></dt>
<dd>最新资讯</dd>
<dd>人才招聘</dd>
</dl>
<dl>
<dt><a href="about.html">关于我们</a></dt>
<dd>公司简介</dd>
<dd>企业文化</dd>
</dl>
<dl>
<dt><a href="contact.html">联系我们</a>s</dt>
</dl>
</div>
</div>
<div class="footer_right">
<dl>
<dt><a href="business.html">业务介绍</a></dt>
<dd>股权问题</dd>
<dd>人才发展</dd>
<dd>学习发展</dd>
</dl>
<dl>
<dt><a href="course.html">课程体系</a></dt>
<dd>课程咨询</a></dd>
<dd>课程安排</dd>
</dl>
<dl>
<dt><a href="news.html">新闻资讯</a></dt>
<dd>最新资讯</dd>
<dd>人才招聘</dd>
</dl>
<dl>
<dt><a href="about.html">关于我们</a></dt>
<dd>公司简介</dd>
<dd>企业文化</dd>
</dl>
<dl>
<dt><a href="contact.html">联系我们</a>s</dt>
</dl>
</div>
</div>
<div class="footer2">
<p>备案号：京ICP备17069330号-2</p>
</div>
</div>
<div class="footer2">
<p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p>
</div>
<script type="text/javascript" src="__CDN__/assets/js/jquery-3.2.1.min.js"></script>
</body>
</html>
... ...
... ... @@ -224,4 +224,14 @@
}
.left_con_txt{
margin-top: 3.8%;
}
.contentBox{
display: flex;
display: -webkit-flex;
min-height: 100vh;
flex-direction: column;
-webkit-flex-direction: column;
}
.main_box{
flex: 1;
}
\ No newline at end of file
... ...