景龙 / xingqiu · 提交

转到一个项目

作者 zhangwei
提交 4fbdac3d82fd0d8b49dc61ce45716e576197ef3b 2 个父辈 183cb6da bd9089de

Merge branch 'master' of http://114.215.101.231:8099/jinglong/xingqiu

内嵌 并排对比
正在显示 6 个修改的文件 包含 11 行增加 和 10 行删除
@@ -230,10 +230,9 @@ class LoginController extends HomeBaseController @@ -230,10 +230,9 @@ class LoginController extends HomeBaseController
230 ->join('city_category c','p.city_id = c.id','LEFT') 230 ->join('city_category c','p.city_id = c.id','LEFT')
231 ->join('portal_category_post c_p','p.id = c_p.post_id','LEFT') 231 ->join('portal_category_post c_p','p.id = c_p.post_id','LEFT')
232 ->where('p.post_title','like','%'.$keyword.'%') 232 ->where('p.post_title','like','%'.$keyword.'%')
233 - ->where('c_p.category_id','<>',CityCategoryModel::xqyy)  
234 ->where('c_p.category_id','<>',CityCategoryModel::xyhl) 233 ->where('c_p.category_id','<>',CityCategoryModel::xyhl)
235 ->where('p.delete_time', 0) 234 ->where('p.delete_time', 0)
236 - ->field('p.id,p.post_title,p.post_excerpt,p.post_favorites,c.name city_name') 235 + ->field('p.id,p.post_title,p.post_excerpt,p.post_favorites,c.name city_name,c.id city_id')
237 ->order('p.weigh desc') 236 ->order('p.weigh desc')
238 ->paginate($limit,false,['query'=>request()->param()]); 237 ->paginate($limit,false,['query'=>request()->param()]);
239 $data = $res->toArray(); 238 $data = $res->toArray();
@@ -253,7 +252,7 @@ class LoginController extends HomeBaseController @@ -253,7 +252,7 @@ class LoginController extends HomeBaseController
253 foreach($category as $item){ 252 foreach($category as $item){
254 if($value['id'] == $item['post_id']){ 253 if($value['id'] == $item['post_id']){
255 $value['category_name'] = $item['name']; 254 $value['category_name'] = $item['name'];
256 - $value['post_url'] = $this->getDetailUrl($item['id']); 255 + $value['post_url'] = $this->getDetailUrl($item['id'],$value['city_id']);
257 } 256 }
258 } 257 }
259 } 258 }
@@ -263,7 +262,6 @@ class LoginController extends HomeBaseController @@ -263,7 +262,6 @@ class LoginController extends HomeBaseController
263 ->alias('p') 262 ->alias('p')
264 ->join('portal_category_post c_p','p.id = c_p.post_id','LEFT') 263 ->join('portal_category_post c_p','p.id = c_p.post_id','LEFT')
265 ->where('p.post_title','like','%'.$keyword.'%') 264 ->where('p.post_title','like','%'.$keyword.'%')
266 - ->where('c_p.category_id','<>',CityCategoryModel::xqyy)  
267 ->where('c_p.category_id','<>',CityCategoryModel::xyhl) 265 ->where('c_p.category_id','<>',CityCategoryModel::xyhl)
268 ->where('p.delete_time', 0) 266 ->where('p.delete_time', 0)
269 ->count(); 267 ->count();
@@ -279,12 +277,15 @@ class LoginController extends HomeBaseController @@ -279,12 +277,15 @@ class LoginController extends HomeBaseController
279 } 277 }
280 278
281 //获取各个板块详情页位置 279 //获取各个板块详情页位置
282 - public function getDetailUrl($c_id){ 280 + public function getDetailUrl($c_id,$city_id){
283 $url = ''; 281 $url = '';
284 switch ($c_id) { 282 switch ($c_id) {
285 case CityCategoryModel::xqgs: 283 case CityCategoryModel::xqgs:
286 $url = '/portal/star/getStoryDetail'; 284 $url = '/portal/star/getStoryDetail';
287 break; 285 break;
  286 + case CityCategoryModel::xqyy:
  287 + $url = '/portal/region/getMoreVideo?city_id='.$city_id;
  288 + break;
288 case CityCategoryModel::whmj: 289 case CityCategoryModel::whmj:
289 $url = '/portal/star/getSceneryDetail'; 290 $url = '/portal/star/getSceneryDetail';
290 break; 291 break;
@@ -129,7 +129,7 @@ $(function(){ @@ -129,7 +129,7 @@ $(function(){
129 }); 129 });
130 }); 130 });
131 //关于我们 131 //关于我们
132 - $('#about_us').click(function(){ 132 + $('#about_us,#about_us1').click(function(){
133 window.location.href = '/portal/index/aboutUs'; 133 window.location.href = '/portal/index/aboutUs';
134 }); 134 });
135 //搜索 135 //搜索
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 <!-- 关于我们 --> 9 <!-- 关于我们 -->
10 <div class="about_top"> 10 <div class="about_top">
11 <!-- 标题 --> 11 <!-- 标题 -->
12 - <span class="title"> 12 + <span class="title" id="about_us1" style="cursor: pointer;">
13 <p class="ch">关于我们</p> 13 <p class="ch">关于我们</p>
14 <p class="eg">About Us</p> 14 <p class="eg">About Us</p>
15 </span> 15 </span>
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <div class="hp_dyCon"> 28 <div class="hp_dyCon">
29 <ul> 29 <ul>
30 <volist name="res['data']" id="vo"> 30 <volist name="res['data']" id="vo">
31 - <a href="/portal/star/getHotelDetail?id={$vo.id}"> 31 + <a href="/portal/star/getEcologyDetail?id={$vo.id}">
32 <li> 32 <li>
33 <div class="hp_dyConImg"> 33 <div class="hp_dyConImg">
34 <img src="{:cmf_get_image_url($vo.thumbnail)}" alt="" /> 34 <img src="{:cmf_get_image_url($vo.thumbnail)}" alt="" />
@@ -163,7 +163,7 @@ $(function() { @@ -163,7 +163,7 @@ $(function() {
163 }); 163 });
164 }); 164 });
165 //关于我们 165 //关于我们
166 - $('#about_us').click(function() { 166 + $('#about_us,#about_us1').click(function() {
167 window.location.href = '/portal/index/aboutUs'; 167 window.location.href = '/portal/index/aboutUs';
168 }); 168 });
169 //搜索 169 //搜索
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <link rel="stylesheet" href="__TMPL__/public/assets/css/footer.css"> 2 <link rel="stylesheet" href="__TMPL__/public/assets/css/footer.css">
3 <div class="bottom_nav"> 3 <div class="bottom_nav">
4 <div class="bottom_nav_title"> 4 <div class="bottom_nav_title">
5 - <div class="bottom_nav_ch">关于我们</div> 5 + <div class="bottom_nav_ch" id="about_us1">关于我们</div>
6 <div class="bottom_nav_en">About Us</div> 6 <div class="bottom_nav_en">About Us</div>
7 </div> 7 </div>
8 <div class="bottom_nav_contant"> 8 <div class="bottom_nav_contant">