Merge branch 'dev'
This commit is contained in:
@@ -147,7 +147,7 @@ class TopsNas extends BaseController
|
||||
'id',
|
||||
'pid',
|
||||
'name',
|
||||
'picture',
|
||||
'picture'
|
||||
])
|
||||
->where('isshow', '=', 1)
|
||||
->where('country_code', '=', $this->country_code)
|
||||
@@ -264,7 +264,6 @@ class TopsNas extends BaseController
|
||||
|
||||
return $this->fetch();
|
||||
}
|
||||
|
||||
// 根据分类获取文章
|
||||
private function getArticleByCategory($categorys, $limit = null)
|
||||
{
|
||||
|
||||
@@ -11,6 +11,9 @@
|
||||
</style>
|
||||
{include file='include/head-nas'/}
|
||||
<style type="text/css">
|
||||
[class*=' icon-'] {
|
||||
color: #000;
|
||||
}
|
||||
.narsZTPC {
|
||||
width: 100%;
|
||||
height: 100vh;
|
||||
|
||||
@@ -4,8 +4,11 @@
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>元创官网</title>
|
||||
{include file='include/head-nas' /}
|
||||
{include file='include/head-nas'/}
|
||||
<style type="text/css">
|
||||
.icon-menu-svg,.icon-search-svg,.icon-lag-svg{
|
||||
color: #000 !important;
|
||||
}
|
||||
.header {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
@@ -148,7 +148,7 @@
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.narsjswdMbPage .narsjswd-mb-list .jswdmb-item .jswdmb-tags .jswdmb-tag {
|
||||
font-size: 0.75rem;
|
||||
|
||||
Reference in New Issue
Block a user