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 @@ -15,10 +15,16 @@ class Index extends Frontend
15 protected $limit = 20; 15 protected $limit = 20;
16 protected $page = 1; 16 protected $page = 1;
17 protected $group = 8;//分组 17 protected $group = 8;//分组
  18 + protected $keys = '';
  19 + protected $description = '';
18 20
19 public function _initialize() 21 public function _initialize()
20 { 22 {
21 parent::_initialize(); 23 parent::_initialize();
  24 + $keys = Db::table('fa_config')->where('id',18)->find();
  25 + $this->keys = $keys['value'];
  26 + $description = Db::table('fa_config')->where('id',19)->find();
  27 + $this->description = $description['value'];
22 } 28 }
23 29
24 public function index() 30 public function index()
@@ -39,6 +45,10 @@ class Index extends Frontend @@ -39,6 +45,10 @@ class Index extends Frontend
39 } 45 }
40 } 46 }
41 $this->assign('custom',$arr); 47 $this->assign('custom',$arr);
  48 +
  49 + //关键字，描述
  50 + $this->assign('keys',$this->keys);
  51 + $this->assign('description',$this->description);
42 return $this->fetch(); 52 return $this->fetch();
43 } 53 }
44 54
@@ -65,6 +75,10 @@ class Index extends Frontend @@ -65,6 +75,10 @@ class Index extends Frontend
65 $this->assign('hot',$hot); 75 $this->assign('hot',$hot);
66 $this->assign('list',$news); 76 $this->assign('list',$news);
67 $this->assign('top',$top); 77 $this->assign('top',$top);
  78 +
  79 + //关键字，描述
  80 + $this->assign('keys',$this->keys);
  81 + $this->assign('description',$this->description);
68 return $this->fetch(); 82 return $this->fetch();
69 } 83 }
70 84
@@ -95,32 +109,51 @@ class Index extends Frontend @@ -95,32 +109,51 @@ class Index extends Frontend
95 } 109 }
96 $this->assign('hot',$hot); 110 $this->assign('hot',$hot);
97 $this->assign('detail',$detail); 111 $this->assign('detail',$detail);
  112 +
  113 + //关键字，描述
  114 + $this->assign('keys',$this->keys);
  115 + $this->assign('description',$this->description);
98 return $this->fetch(); 116 return $this->fetch();
99 } 117 }
100 118
101 public function map() 119 public function map()
102 { 120 {
103 - return $this->view->fetch(); 121 + //关键字，描述
  122 + $this->assign('keys',$this->keys);
  123 + $this->assign('description',$this->description);
  124 + return $this->fetch();
104 } 125 }
105 126
106 public function course() 127 public function course()
107 { 128 {
108 - return $this->view->fetch(); 129 + //关键字，描述
  130 + $this->assign('keys',$this->keys);
  131 + $this->assign('description',$this->description);
  132 + return $this->fetch();
109 } 133 }
110 134
111 public function contact() 135 public function contact()
112 { 136 {
113 - return $this->view->fetch(); 137 + //关键字，描述
  138 + $this->assign('keys',$this->keys);
  139 + $this->assign('description',$this->description);
  140 + return $this->fetch();
114 } 141 }
115 142
116 public function business() 143 public function business()
117 { 144 {
118 - return $this->view->fetch(); 145 + //关键字，描述
  146 + $this->assign('keys',$this->keys);
  147 + $this->assign('description',$this->description);
  148 + return $this->fetch();
119 } 149 }
120 150
121 public function about() 151 public function about()
122 { 152 {
123 - return $this->view->fetch(); 153 + //关键字，描述
  154 + $this->assign('keys',$this->keys);
  155 + $this->assign('description',$this->description);
  156 + return $this->fetch();
124 } 157 }
125 158
126 } 159 }
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
2 <html> 2 <html>
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
  5 + <meta name="keywords" content="{$keys}">
  6 + <meta name="description" content="{$description}">
5 <title>关于我们</title> 7 <title>关于我们</title>
6 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css"> 8 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
7 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/about.css"> 9 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/about.css">
@@ -244,7 +246,7 @@ @@ -244,7 +246,7 @@
244 </div> 246 </div>
245 </div> 247 </div>
246 <div class="footer2"> 248 <div class="footer2">
247 - <p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p> 249 + <p>备案号：京ICP备17069330号-2</p>
248 </div> 250 </div>
249 <script type="text/javascript" src="__CDN__/assets/jquery.js"></script> 251 <script type="text/javascript" src="__CDN__/assets/jquery.js"></script>
250 <script> 252 <script>
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
2 <html> 2 <html>
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
  5 + <meta name="keywords" content="{$keys}">
  6 + <meta name="description" content="{$description}">
5 <title>业务介绍</title> 7 <title>业务介绍</title>
6 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css"> 8 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
7 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/business.css"> 9 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/business.css">
@@ -145,7 +147,7 @@ @@ -145,7 +147,7 @@
145 </div> 147 </div>
146 </div> 148 </div>
147 <div class="footer2"> 149 <div class="footer2">
148 - <p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p> 150 + <p>备案号：京ICP备17069330号-2</p>
149 </div> 151 </div>
150 </body> 152 </body>
151 </html> 153 </html>
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
2 <html> 2 <html>
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
  5 + <meta name="keywords" content="{$keys}">
  6 + <meta name="description" content="{$description}">
5 <title>联系我们</title> 7 <title>联系我们</title>
6 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css"> 8 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
7 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/contact.css"> 9 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/contact.css">
@@ -145,7 +147,7 @@ @@ -145,7 +147,7 @@
145 </div> 147 </div>
146 </div> 148 </div>
147 <div class="footer2"> 149 <div class="footer2">
148 - <p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p> 150 + <p>备案号：京ICP备17069330号-2</p>
149 </div> 151 </div>
150 <script type="text/javascript" src="__CDN__/assets/js/jquery.js"></script> 152 <script type="text/javascript" src="__CDN__/assets/js/jquery.js"></script>
151 </body> 153 </body>
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html> 2 <html>
3 <head> 3 <head>
  4 + <meta charset="utf-8">
  5 + <meta name="keywords" content="{$keys}">
  6 + <meta name="description" content="{$description}">
  7 + <title>课程体系</title>
4 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css"> 8 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
5 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/course.css"> 9 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/course.css">
6 - <title>课程体系</title>  
7 </head> 10 </head>
8 <body> 11 <body>
9 <!-- header --> 12 <!-- header -->
@@ -162,7 +165,7 @@ @@ -162,7 +165,7 @@
162 </div> 165 </div>
163 </div> 166 </div>
164 <div class="footer2"> 167 <div class="footer2">
165 - <p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p> 168 + <p>备案号：京ICP备17069330号-2</p>
166 </div> 169 </div>
167 <script type="text/javascript" src="__CDN__/assets/jquery.js"></script> 170 <script type="text/javascript" src="__CDN__/assets/jquery.js"></script>
168 <script> 171 <script>
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
2 <html> 2 <html>
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
  5 + <meta name="keywords" content="{$keys}">
  6 + <meta name="description" content="{$description}">
5 <title>首页</title> 7 <title>首页</title>
6 <meta name="viewport" content="width=1200"> 8 <meta name="viewport" content="width=1200">
7 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css"> 9 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
@@ -240,7 +242,7 @@ @@ -240,7 +242,7 @@
240 </div> 242 </div>
241 </div> 243 </div>
242 <div class="footer2"> 244 <div class="footer2">
243 - <p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p> 245 + <p>备案号：京ICP备17069330号-2</p>
244 </div> 246 </div>
245 <script type="text/javascript" src="__CDN__/assets/jquery.js"></script> 247 <script type="text/javascript" src="__CDN__/assets/jquery.js"></script>
246 <script type="text/javascript" src="__CDN__/assets/css/swiper/swiper.min.js"></script> 248 <script type="text/javascript" src="__CDN__/assets/css/swiper/swiper.min.js"></script>
@@ -2,7 +2,9 @@ @@ -2,7 +2,9 @@
2 <html> 2 <html>
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 - <title></title> 5 + <meta name="keywords" content="{$keys}">
  6 + <meta name="description" content="{$description}">
  7 + <title>新闻资讯</title>
6 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css"> 8 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
7 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/swiper/swiper.min.css"> 9 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/swiper/swiper.min.css">
8 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/news.css"> 10 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/news.css">
@@ -163,7 +165,7 @@ @@ -163,7 +165,7 @@
163 </div> 165 </div>
164 </div> 166 </div>
165 <div class="footer2"> 167 <div class="footer2">
166 - <p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p> 168 + <p>备案号：京ICP备17069330号-2</p>
167 </div> 169 </div>
168 <script type="text/javascript" src="__CDN__/assets/js/jquery-3.2.1.min.js"></script> 170 <script type="text/javascript" src="__CDN__/assets/js/jquery-3.2.1.min.js"></script>
169 <script type="text/javascript" src="__CDN__/assets/css/swiper/swiper.min.js"></script> 171 <script type="text/javascript" src="__CDN__/assets/css/swiper/swiper.min.js"></script>
@@ -2,7 +2,9 @@ @@ -2,7 +2,9 @@
2 <html> 2 <html>
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 - <title></title> 5 + <meta name="keywords" content="{$keys}">
  6 + <meta name="description" content="{$description}">
  7 + <title>新闻资讯</title>
6 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css"> 8 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/public.css">
7 <link rel="stylesheet" type="text/css" href="__CDN__/assets/swiper/swiper.min.css"> 9 <link rel="stylesheet" type="text/css" href="__CDN__/assets/swiper/swiper.min.css">
8 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/news.css"> 10 <link rel="stylesheet" type="text/css" href="__CDN__/assets/css/news.css">
@@ -17,45 +19,46 @@ @@ -17,45 +19,46 @@
17 } 19 }
18 </style> 20 </style>
19 <body> 21 <body>
20 - <!-- header -->  
21 - <div class="header header_bg">  
22 - <div class="header_content">  
23 - <div class="logo">  
24 - <a href="index.html">  
25 - <img src="__CDN__/assets/images/logohei@2x.png">  
26 - </a>  
27 - <p>九州纵横</p>  
28 - </div>  
29 - <div class="nav">  
30 - <ul>  
31 - <li><a href="index.html">首页</a></li>  
32 - <li><a href="about.html">关于我们</a></li>  
33 - <li><a href="business.html">业务介绍</a></li>  
34 - <li><a href="course.html" >课程体系</a></li>  
35 - <li><a href="news.html" class="nav_active">新闻资讯</a></li>  
36 - <li><a href="contact.html">联系我们</a></li>  
37 - </ul> 22 + <div class="contentBox">
  23 + <!-- header -->
  24 + <div class="header header_bg">
  25 + <div class="header_content">
  26 + <div class="logo">
  27 + <a href="index.html">
  28 + <img src="__CDN__/assets/images/logohei@2x.png">
  29 + </a>
  30 + <p>九州纵横</p>
  31 + </div>
  32 + <div class="nav">
  33 + <ul>
  34 + <li><a href="index.html">首页</a></li>
  35 + <li><a href="about.html">关于我们</a></li>
  36 + <li><a href="business.html">业务介绍</a></li>
  37 + <li><a href="course.html" >课程体系</a></li>
  38 + <li><a href="news.html" class="nav_active">新闻资讯</a></li>
  39 + <li><a href="contact.html">联系我们</a></li>
  40 + </ul>
  41 + </div>
38 </div> 42 </div>
39 </div> 43 </div>
40 - </div>  
41 - <!-- banner 和右侧 热门 -->  
42 - <div class="main_box">  
43 - <div class="main_left">  
44 - <div class="left_title">  
45 - <span>当前位置：<a href="news.html">首页 > </a>职场资讯</span>  
46 - </div>  
47 - <div class="left_con">  
48 - <div class="left_con_title">  
49 - <h2>{$detail.name}</h2>  
50 - <p>发布时间：{$detail.createtime}</p> 44 + <!-- banner 和右侧 热门 -->
  45 + <div class="main_box">
  46 + <div class="main_left">
  47 + <div class="left_title">
  48 + <span>当前位置：<a href="news.html">首页 > </a>职场资讯</span>
51 </div> 49 </div>
52 - <!-- 内容 -->  
53 - <div class="left_con_txt">  
54 - {$detail.content} 50 + <div class="left_con">
  51 + <div class="left_con_title">
  52 + <h2>{$detail.name}</h2>
  53 + <p>发布时间：{$detail.createtime}</p>
  54 + </div>
  55 + <!-- 内容 -->
  56 + <div class="left_con_txt">
  57 + {$detail.content}
  58 + </div>
55 </div> 59 </div>
56 </div> 60 </div>
57 - </div>  
58 - <div class="main_right"> 61 + <div class="main_right">
59 <div class="main_tit"> 62 <div class="main_tit">
60 <img src="__CDN__/assets/images/leftbar_icon2.png"> 63 <img src="__CDN__/assets/images/leftbar_icon2.png">
61 <p>热门文章</p> 64 <p>热门文章</p>
@@ -74,57 +77,59 @@ @@ -74,57 +77,59 @@
74 </ul> 77 </ul>
75 </div> 78 </div>
76 </div> 79 </div>
77 - </div>  
78 - <!-- footer -->  
79 - <div class="footer">  
80 - <div class="footer_content">  
81 - <div class="footer_left">  
82 - <div class="footer_logo">  
83 - <a href="index.html">  
84 - <img src="__CDN__/assets/images/logobai@2x.png">  
85 - </a>  
86 - <h2>九州纵横</h2>  
87 - </div>  
88 - <div class="footer_leftTxt">  
89 - <p>官网 : www.chinacrossing.cn</p>  
90 - <p>地址:北京市朝阳区北四环中路27号盘古大观A座</p> 80 + </div>
  81 + <!-- footer -->
  82 + <div class="footer">
  83 + <div class="footer_content">
  84 + <div class="footer_left">
  85 + <div class="footer_logo">
  86 + <a href="index.html">
  87 + <img src="__CDN__/assets/images/logobai@2x.png">
  88 + </a>
  89 + <h2>九州纵横</h2>
  90 + </div>
  91 + <div class="footer_leftTxt">
  92 + <p>官网 : www.chinacrossing.cn</p>
  93 + <p>地址:北京市朝阳区北四环中路27号盘古大观A座</p>
  94 + </div>
  95 + <div class="footer_code">
  96 + <img src="__CDN__/assets/img/code.png">
  97 + <p>扫二维码关注我们</p>
  98 + </div>
91 </div> 99 </div>
92 - <div class="footer_code">  
93 - <img src="__CDN__/assets/img/code.png">  
94 - <p>扫二维码关注我们</p> 100 + <div class="footer_right">
  101 + <dl>
  102 + <dt><a href="business.html">业务介绍</a></dt>
  103 + <dd>股权问题</dd>
  104 + <dd>人才发展</dd>
  105 + <dd>学习发展</dd>
  106 + </dl>
  107 + <dl>
  108 + <dt><a href="course.html">课程体系</a></dt>
  109 + <dd>课程咨询</a></dd>
  110 + <dd>课程安排</dd>
  111 + </dl>
  112 + <dl>
  113 + <dt><a href="news.html">新闻资讯</a></dt>
  114 + <dd>最新资讯</dd>
  115 + <dd>人才招聘</dd>
  116 + </dl>
  117 + <dl>
  118 + <dt><a href="about.html">关于我们</a></dt>
  119 + <dd>公司简介</dd>
  120 + <dd>企业文化</dd>
  121 + </dl>
  122 + <dl>
  123 + <dt><a href="contact.html">联系我们</a>s</dt>
  124 + </dl>
95 </div> 125 </div>
96 </div> 126 </div>
97 - <div class="footer_right">  
98 - <dl>  
99 - <dt><a href="business.html">业务介绍</a></dt>  
100 - <dd>股权问题</dd>  
101 - <dd>人才发展</dd>  
102 - <dd>学习发展</dd>  
103 - </dl>  
104 - <dl>  
105 - <dt><a href="course.html">课程体系</a></dt>  
106 - <dd>课程咨询</a></dd>  
107 - <dd>课程安排</dd>  
108 - </dl>  
109 - <dl>  
110 - <dt><a href="news.html">新闻资讯</a></dt>  
111 - <dd>最新资讯</dd>  
112 - <dd>人才招聘</dd>  
113 - </dl>  
114 - <dl>  
115 - <dt><a href="about.html">关于我们</a></dt>  
116 - <dd>公司简介</dd>  
117 - <dd>企业文化</dd>  
118 - </dl>  
119 - <dl>  
120 - <dt><a href="contact.html">联系我们</a>s</dt>  
121 - </dl>  
122 - </div> 127 + </div>
  128 + <div class="footer2">
  129 + <p>备案号：京ICP备17069330号-2</p>
123 </div> 130 </div>
124 </div> 131 </div>
125 - <div class="footer2">  
126 - <p>Copyright@2007-2019 caihua168.com AII Rights Reserved</p>  
127 - </div> 132 +
128 <script type="text/javascript" src="__CDN__/assets/js/jquery-3.2.1.min.js"></script> 133 <script type="text/javascript" src="__CDN__/assets/js/jquery-3.2.1.min.js"></script>
129 </body> 134 </body>
130 </html> 135 </html>
@@ -224,4 +224,14 @@ @@ -224,4 +224,14 @@
224 } 224 }
225 .left_con_txt{ 225 .left_con_txt{
226 margin-top: 3.8%; 226 margin-top: 3.8%;
  227 +}
  228 +.contentBox{
  229 + display: flex;
  230 + display: -webkit-flex;
  231 + min-height: 100vh;
  232 + flex-direction: column;
  233 + -webkit-flex-direction: column;
  234 +}
  235 +.main_box{
  236 + flex: 1;
227 } 237 }