正在显示
9 个修改的文件
包含
74 行增加
和
55 行删除
@@ -121,7 +121,7 @@ class RegionController extends HomeBaseController | @@ -121,7 +121,7 @@ class RegionController extends HomeBaseController | ||
121 | ->field($field) | 121 | ->field($field) |
122 | ->order('weigh desc') | 122 | ->order('weigh desc') |
123 | ->paginate(1); | 123 | ->paginate(1); |
124 | - $arr['data'] = $res; | 124 | + $arr['data'] = $res->toArray(); |
125 | $arr['page'] = $res->render(); | 125 | $arr['page'] = $res->render(); |
126 | return $arr; | 126 | return $arr; |
127 | } | 127 | } |
@@ -7,6 +7,7 @@ | @@ -7,6 +7,7 @@ | ||
7 | <meta http-equiv="X-UA-Compatible" content="ie=edge"> | 7 | <meta http-equiv="X-UA-Compatible" content="ie=edge"> |
8 | <title>明星访谈更多</title> | 8 | <title>明星访谈更多</title> |
9 | <link rel="stylesheet" href="__TMPL__/public/assets/css/layui.css"> | 9 | <link rel="stylesheet" href="__TMPL__/public/assets/css/layui.css"> |
10 | + <link rel="stylesheet" href="__TMPL__/public/assets/css/bootstrap4.0.css"> | ||
10 | <link rel="stylesheet" href="__TMPL__/public/assets/css/header.css"> | 11 | <link rel="stylesheet" href="__TMPL__/public/assets/css/header.css"> |
11 | <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css"> | 12 | <link rel="stylesheet" href="__TMPL__/public/assets/css/show.css"> |
12 | </head> | 13 | </head> |
@@ -100,16 +101,19 @@ | @@ -100,16 +101,19 @@ | ||
100 | <p>3</p> | 101 | <p>3</p> |
101 | <span> > </span> | 102 | <span> > </span> |
102 | </div> --> | 103 | </div> --> |
103 | - </div> | ||
104 | - <div class="pagination"> | ||
105 | - {$page|default=''} | 104 | + |
105 | + <!--分页--> | ||
106 | + <div class="pagination"> | ||
107 | + {$page|default=''} | ||
108 | + </div> | ||
109 | + | ||
106 | </div> | 110 | </div> |
107 | <!--<div id="page">--> | 111 | <!--<div id="page">--> |
108 | 112 | ||
109 | <!--</div>--> | 113 | <!--</div>--> |
110 | </div> | 114 | </div> |
111 | <!-- 底部 --> | 115 | <!-- 底部 --> |
112 | - <footer></footer> | 116 | + <include file="public@footer"> |
113 | <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script> | 117 | <script src="__TMPL__/public/assets/js/jquery-3.2.1.min.js"></script> |
114 | <script src="__TMPL__/public/assets/js/layui.js"></script> | 118 | <script src="__TMPL__/public/assets/js/layui.js"></script> |
115 | <script src="__TMPL__/public/assets/js/public.js"></script> | 119 | <script src="__TMPL__/public/assets/js/public.js"></script> |
此 diff 太大无法显示。
@@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
17 | #header .home_logo { | 17 | #header .home_logo { |
18 | width: 110px; | 18 | width: 110px; |
19 | height: 70px; | 19 | height: 70px; |
20 | - margin: 0 175px 0 210px; | 20 | + margin: 0 44px 0 0px; |
21 | } | 21 | } |
22 | 22 | ||
23 | #header .home_logo img { | 23 | #header .home_logo img { |
@@ -35,7 +35,7 @@ | @@ -35,7 +35,7 @@ | ||
35 | color: rgba(77, 77, 77, 1); | 35 | color: rgba(77, 77, 77, 1); |
36 | width: 70px; | 36 | width: 70px; |
37 | height: 76px; | 37 | height: 76px; |
38 | - margin: 0 30px; | 38 | + margin: 0 20px; |
39 | text-align: center; | 39 | text-align: center; |
40 | border-top: 4px solid rgba(255, 255, 255, 1); | 40 | border-top: 4px solid rgba(255, 255, 255, 1); |
41 | } | 41 | } |
@@ -112,7 +112,8 @@ | @@ -112,7 +112,8 @@ | ||
112 | 112 | ||
113 | #header .home_search { | 113 | #header .home_search { |
114 | position: relative; | 114 | position: relative; |
115 | - width: 308px; | 115 | + width: 222px; |
116 | + margin-left: 28px; | ||
116 | } | 117 | } |
117 | 118 | ||
118 | 119 | ||
@@ -120,7 +121,7 @@ | @@ -120,7 +121,7 @@ | ||
120 | 121 | ||
121 | #header .home_search .search_icon { | 122 | #header .home_search .search_icon { |
122 | position: absolute; | 123 | position: absolute; |
123 | - left: 85px; | 124 | + left: 22px; |
124 | top: 32px; | 125 | top: 32px; |
125 | background-image: url("../starImg/aicon_23.png"); | 126 | background-image: url("../starImg/aicon_23.png"); |
126 | background-repeat: no-repeat; | 127 | background-repeat: no-repeat; |
@@ -134,7 +135,7 @@ | @@ -134,7 +135,7 @@ | ||
134 | /* 输入框 */ | 135 | /* 输入框 */ |
135 | 136 | ||
136 | #header .home_search input { | 137 | #header .home_search input { |
137 | - margin: 0 16px 0 76px; | 138 | + margin: 0 16px 0 10px; |
138 | width: 160px; | 139 | width: 160px; |
139 | height: 33px; | 140 | height: 33px; |
140 | background: rgba(242, 242, 242, 1); | 141 | background: rgba(242, 242, 242, 1); |
@@ -673,6 +673,7 @@ p { | @@ -673,6 +673,7 @@ p { | ||
673 | } | 673 | } |
674 | 674 | ||
675 | .personal_narration p { | 675 | .personal_narration p { |
676 | + height: 90px; | ||
676 | overflow: hidden; | 677 | overflow: hidden; |
677 | text-overflow: ellipsis; | 678 | text-overflow: ellipsis; |
678 | display: -webkit-box; | 679 | display: -webkit-box; |
@@ -803,6 +804,7 @@ p { | @@ -803,6 +804,7 @@ p { | ||
803 | 804 | ||
804 | .scout_box h1 { | 805 | .scout_box h1 { |
805 | width: 237px; | 806 | width: 237px; |
807 | + height: 46px; | ||
806 | margin: 42px auto 0; | 808 | margin: 42px auto 0; |
807 | font-size: 16px; | 809 | font-size: 16px; |
808 | font-weight: 400; | 810 | font-weight: 400; |
@@ -260,6 +260,7 @@ body { | @@ -260,6 +260,7 @@ body { | ||
260 | } | 260 | } |
261 | 261 | ||
262 | .show_INMain_con2 p { | 262 | .show_INMain_con2 p { |
263 | + height: 90px; | ||
263 | font-size: 16px; | 264 | font-size: 16px; |
264 | color: rgba(102, 102, 102, 1); | 265 | color: rgba(102, 102, 102, 1); |
265 | line-height: 32px; | 266 | line-height: 32px; |
@@ -806,6 +807,7 @@ body { | @@ -806,6 +807,7 @@ body { | ||
806 | } | 807 | } |
807 | 808 | ||
808 | .show_3_list_txt p { | 809 | .show_3_list_txt p { |
810 | + height: 256px; | ||
809 | font-size: 16px; | 811 | font-size: 16px; |
810 | color: rgba(102, 102, 102, 1); | 812 | color: rgba(102, 102, 102, 1); |
811 | line-height: 32px; | 813 | line-height: 32px; |
@@ -54,4 +54,8 @@ $(function(){ | @@ -54,4 +54,8 @@ $(function(){ | ||
54 | }else{ | 54 | }else{ |
55 | $('.home_nav_act').children('a').addClass('home_nav_act'); | 55 | $('.home_nav_act').children('a').addClass('home_nav_act'); |
56 | } | 56 | } |
57 | + | ||
58 | + //改变分页图标 | ||
59 | + $('.page-item').eq(0).children().text('<'); | ||
60 | + $('.page-item:last').children().text('>'); | ||
57 | }); | 61 | }); |
1 | <!--头部 --> | 1 | <!--头部 --> |
2 | <div id="header"> | 2 | <div id="header"> |
3 | - <!-- logo --> | ||
4 | - <section class="home_logo"> | ||
5 | - <img src="__TMPL__/public/assets/starImg/logo.png" alt=""> | ||
6 | - </section> | ||
7 | - <!-- 导航栏 --> | ||
8 | - <section class="home_nav"> | ||
9 | - <ul> | ||
10 | - <li class="home_nav_act"> | ||
11 | - <a class="home_nav_act" href="/">首页</a> | ||
12 | - </li> | ||
13 | - <volist name="slide" id="vo"> | ||
14 | - <li class="slide_vo"> | ||
15 | - <a class="home_nav_act_A" href="{$vo.url}">{$vo.name}</a> | ||
16 | - <div class="home_nav_down"> | ||
17 | - <div class="home_nav_down2"> | ||
18 | - <img src="__TMPL__/public/assets/starImg/aicon_32.png" alt=""> | ||
19 | - <dl> | ||
20 | - <volist name="vo.child" id="voo"> | ||
21 | - <dd><a href="{$voo.url}">{$voo.name}</a></dd> | ||
22 | - </volist> | ||
23 | - </dl> | ||
24 | - </div> | ||
25 | - </div> | 3 | + <div style="width: 1200px;margin: auto"> |
4 | + <section class="home_logo"> | ||
5 | + <img src="__TMPL__/public/assets/starImg/logo.png" alt=""> | ||
6 | + </section> | ||
7 | + <!-- 导航栏 --> | ||
8 | + <section class="home_nav"> | ||
9 | + <ul> | ||
10 | + <li class="home_nav_act"> | ||
11 | + <a class="home_nav_act" href="/">首页</a> | ||
26 | </li> | 12 | </li> |
27 | - </volist> | ||
28 | - <!--<li>--> | 13 | + <volist name="slide" id="vo"> |
14 | + <li class="slide_vo"> | ||
15 | + <a class="home_nav_act_A" href="{$vo.url}">{$vo.name}</a> | ||
16 | + <div class="home_nav_down"> | ||
17 | + <div class="home_nav_down2"> | ||
18 | + <img src="__TMPL__/public/assets/starImg/aicon_32.png" alt=""> | ||
19 | + <dl> | ||
20 | + <volist name="vo.child" id="voo"> | ||
21 | + <dd><a href="{$voo.url}">{$voo.name}</a></dd> | ||
22 | + </volist> | ||
23 | + </dl> | ||
24 | + </div> | ||
25 | + </div> | ||
26 | + </li> | ||
27 | + </volist> | ||
28 | + <!--<li>--> | ||
29 | <!--<a href="">星球奇境</a>--> | 29 | <!--<a href="">星球奇境</a>--> |
30 | <!--<!– 下拉导航 –>--> | 30 | <!--<!– 下拉导航 –>--> |
31 | <!--<div class="home_nav_down">--> | 31 | <!--<div class="home_nav_down">--> |
32 | - <!--<div class="home_nav_down2">--> | ||
33 | - <!--<img src="__TMPL__/public/assets/starImg/aicon_32.png" alt="">--> | ||
34 | - <!--<dl>--> | ||
35 | - <!--<dd><a href="">地标1</a></dd>--> | ||
36 | - <!--<dd><a href="">地标1</a></dd>--> | ||
37 | - <!--<dd><a href="">地标1</a></dd>--> | ||
38 | - <!--<dd><a href="">地标1</a></dd>--> | ||
39 | - <!--</dl>--> | ||
40 | - <!--</div>--> | 32 | + <!--<div class="home_nav_down2">--> |
33 | + <!--<img src="__TMPL__/public/assets/starImg/aicon_32.png" alt="">--> | ||
34 | + <!--<dl>--> | ||
35 | + <!--<dd><a href="">地标1</a></dd>--> | ||
36 | + <!--<dd><a href="">地标1</a></dd>--> | ||
37 | + <!--<dd><a href="">地标1</a></dd>--> | ||
38 | + <!--<dd><a href="">地标1</a></dd>--> | ||
39 | + <!--</dl>--> | ||
41 | <!--</div>--> | 40 | <!--</div>--> |
42 | - <!--</li>--> | ||
43 | - </ul> | ||
44 | - </section> | ||
45 | - <!-- 搜索框 --> | ||
46 | - <section class="home_search"> | ||
47 | - <i class="search_icon"></i> | ||
48 | - <input type="text" placeholder="巴厘岛"> | ||
49 | - </section> | ||
50 | - <!-- 登录注册 --> | ||
51 | - <section class="home_login"> | 41 | + <!--</div>--> |
42 | + <!--</li>--> | ||
43 | + </ul> | ||
44 | + </section> | ||
45 | + <!-- 搜索框 --> | ||
46 | + <section class="home_search"> | ||
47 | + <i class="search_icon"></i> | ||
48 | + <input type="text" placeholder="巴厘岛"> | ||
49 | + </section> | ||
50 | + <!-- 登录注册 --> | ||
51 | + <section class="home_login"> | ||
52 | <span> | 52 | <span> |
53 | <p>注册</p> | 53 | <p>注册</p> |
54 | <p>登录</p> | 54 | <p>登录</p> |
55 | </span> | 55 | </span> |
56 | - </section> | 56 | + </section> |
57 | + </div> | ||
58 | + <!-- logo --> | ||
59 | + | ||
57 | </div> | 60 | </div> |
-
请 注册 或 登录 后发表评论