Commit c321963d authored by liukang's avatar liukang

修改提交

parent 1a388236
...@@ -17,7 +17,9 @@ class Join extends Base ...@@ -17,7 +17,9 @@ class Join extends Base
$join_cate = new JoinCate(); $join_cate = new JoinCate();
$join = new mjoin(); $join = new mjoin();
$join_list = $join->where('isdeleted',0)->order('join_cate_id','asc')->order('current','desc')->select(); $join_list = $join->where('isdeleted',0)->order('join_cate_id','asc')->order('current','desc')->select();
$join_list = $this->dealData($join_list);
$join_cate_list = $join_cate->where('isdeleted',0)->order('id','asc')->select(); $join_cate_list = $join_cate->where('isdeleted',0)->order('id','asc')->select();
$join_cate_list = $this->dealData($join_cate_list);
$this->assign('url',$this->url); $this->assign('url',$this->url);
$this->assign('join_cate_list',$join_cate_list); $this->assign('join_cate_list',$join_cate_list);
$this->assign('join_list',$join_list); $this->assign('join_list',$join_list);
......
...@@ -14,7 +14,8 @@ class News extends Base ...@@ -14,7 +14,8 @@ class News extends Base
public function list(){ public function list(){
$pageSize = 5; $pageSize = 5;
$news_list = m_news::where('isdeleted',0)->order('current','desc')->paginate($pageSize); $web_type = config('app.web_type');
$news_list = m_news::where('isdeleted',0)->where('packs','like',"%{$web_type}%")->order('current','desc')->paginate($pageSize);
$pattern = '/\[\d+\]/'; $pattern = '/\[\d+\]/';
$matches = array(); $matches = array();
......
This diff is collapsed.
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
</div> </div>
<div class="swiper-pagination swiper-pagination-clickable"><span class="swiper-pagination-bullet swiper-pagination-bullet-active"></span></div> <div class="swiper-pagination swiper-pagination-clickable"><span class="swiper-pagination-bullet swiper-pagination-bullet-active"></span></div>
</section> </section>
{if !empty(join_cate_list)}
<section class="section2"> <section class="section2">
<p>在这里,你将拥有宽松、愉悦、平等的工作环境,你将收获友爱、尊重、温暖的创业伙伴,更重要的是, </p> <p>在这里,你将拥有宽松、愉悦、平等的工作环境,你将收获友爱、尊重、温暖的创业伙伴,更重要的是, </p>
<p>你有可能实现自己最大的价值。</p> <p>你有可能实现自己最大的价值。</p>
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
{/volist} {/volist}
<!--end of foreach--> <!--end of foreach-->
</section> </section>
{/if}
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment