日常渲染完善细节

@@ -278,7 +278,7 @@ class ActivityController extends HomeBaseController
         if ($request->isPost()) {
             $schedule_id = $request->param('schedule_id');
             $data = Db::name('activity_schedule')
-                ->field('id as schedule_id,price,start_time,end_time,real_join_num,addition_join_num,maximum')
+                ->field('id as schedule_id,price,start_time,end_time,real_join_num,addition_join_num,maximum,deadline')
                 ->where(['id' => $schedule_id])
                 ->find();
             if (!empty($data)) {
@@ -286,9 +286,15 @@ class ActivityController extends HomeBaseController
                 $data['end_time'] = date('Y.m.d', $data['end_time']);
                 $data['sales_num'] = $data['real_join_num'] + $data['addition_join_num'];
                 $data['residue_num'] = $data['maximum'] - $data['sales_num'];
+                if($data['deadline'] < time()) {
+                    $data['is_expire'] = 1;
+                }else {
+                    $data['is_expire'] = 0;
+                }
                 unset($data['real_join_num']);
                 unset($data['addition_join_num']);
                 unset($data['maximum']);
+                unset($data['deadline']);
                 echo json_encode(['data' => $data, 'code' => 20000]);
                 exit();
             } else {
@@ -301,4 +307,39 @@ class ActivityController extends HomeBaseController
         }
     }
 
+    /**
+     * @title 最近15天的活动
+     * @description 默认访问接口
+     * @author sᴏᴜʟ ᴏғ ᴄɪɴᴅᴇʀ
+     * @url /activity/Activity/daysFifteen
+     * @method POST
+     *
+     * @param name:keyword type:char require:1 default:跳楼 other: desc:关键词
+     */
+    public function daysFifteen()
+    {
+        $keyword = request()->param('keyword');
+        $ac = new ActivityModel;
+        $activity = $ac->latestFifteenDaysActivity($keyword);
+        $banner = Db::name('slide_item')->field('image,url')->where(['slide_id' => 1])->order('list_order')->select();
+        //分类
+        $type = Db::name('type')->field('id as t_id,type_name,type_url,type_icon')->order('listorder')->select();
+        $result = [
+            'banner' => $banner,
+            'type' => $type,
+            'activity' => $activity,
+            'type_name' => '即将出发',
+            't_id' => 6,
+            'keyword' => request()->param('keyword')
+        ];
+        if (request()->isPost()) {
+            echo json_encode(['data' => $result, 'code' => 20000]);
+            exit();
+        } else {
+            return $this->fetch(':days', [
+                'result' => $result
+            ]);
+        }
+    }
+
 }
\ No newline at end of file

@@ -20,12 +20,14 @@ class ActivityModel extends Model
      * @param null $keyword
      * @param null $isNew
      * @param null $isHot
+     * @param null $orderByHot
+     * @param null $theLatest
      * @return array
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public function activityList($tId = null, $nowTime, $userId, $keyword = null, $isNew = null, $isHot = null)
+    public function activityList($tId = null, $nowTime, $userId, $keyword = null, $isNew = null, $isHot = null, $orderByHot = null, $theLatest = null)
     {
         $where = [];
         if ($tId != null) {
@@ -55,7 +57,7 @@ class ActivityModel extends Model
 
     public function activityDetail($activityId)
     {
-        $info = Db::name('activity')->field('banner,name,is_down_payment,down_price,content,notice,display_price')->where(['id' => $activityId])->find();
+        $info = Db::name('activity')->field('id as activity_id,banner,name,is_down_payment,down_price,content,notice,display_price')->where(['id' => $activityId])->find();
         if (!empty($info)) {
             $arr = explode(',', $info['banner']);
             $banner = [];
@@ -190,4 +192,30 @@ class ActivityModel extends Model
         return $res;
     }
 
+    public function latestFifteenDaysActivity($keyword = null) {
+        if($keyword != null) {
+            $map['name'] = ['like', "%$keyword%"];
+        }
+        $map['start_time'] = ['gt', time()];
+        $res = Db::name('activity_schedule')->alias('s')
+            ->field('a.id,a.name,a.thumb,s.price,s.maximum,real_join_num,addition_join_num,s.start_time')
+            ->join('activity a', 'a.id=s.activity_id')
+            ->where($map)
+            ->order('start_time ASC')
+            ->limit(15)
+            ->select()->toArray();
+        $model = new ActivityModel;
+        foreach ($res as $k => $v) {
+            $v['start_time'] = date('Y.m.d', $v['start_time']);
+            $v['sales_num'] = $v['real_join_num'] + $v['addition_join_num'];
+            $v['residue_num'] = $v['maximum'] - $v['sales_num'];
+            unset($v['real_join_num']);
+            unset($v['addition_join_num']);
+            unset($v['maximum']);
+            $v['is_collect'] = $model->isCollect($v['id'], session('user.id'));
+            $res[$k] = $v;
+        }
+        return $res;
+    }
+
 }
\ No newline at end of file

@@ -39,6 +39,7 @@ class NewsController extends HomeBaseController
             ->where(['c.category_id' => $t_id])
             ->select();
         $collect = Db::name('collect_news')->field('post_id')->where(['user_id' => session('user.id')])->select();
+        $temp = [];
         foreach ($collect as $k => $v) {
             $temp[$k] = $v['post_id'];
         }
@@ -55,11 +56,19 @@ class NewsController extends HomeBaseController
         }
         $return = [
             'news_type' => $news_type,
+            't_id' => $t_id,
             'type_name' => Db::name('portal_category')->where(['id' => $t_id])->value('name'),
             'news_list' => $news_list
         ];
-        echo json_encode(['data' => $return, 'code' => 20000]);
-        exit();
+        if (request()->isPost()) {
+            echo json_encode(['data' => $return, 'code' => 20000]);
+            exit();
+        } else {
+            return $this->fetch(':list', [
+                'data' => $return
+            ]);
+        }
+
     }
 
     /**
@@ -134,4 +143,9 @@ class NewsController extends HomeBaseController
         return $this->fetch(':about_us');
     }
 
+    public function message()
+    {
+        return $this->fetch(':message');
+    }
+
 }
\ No newline at end of file

@@ -58,10 +58,6 @@ class TeamController extends HomeBaseController
                 echo json_encode(['msg' => $result, 'code' => 40000]);
                 exit();
             } else {
-                $post['address'] = $post['city'] . $post['county'] . $post['street'];
-                unset($post['city']);
-                unset($post['county']);
-                unset($post['street']);
                 if (Db::name('team_customization')->insert($post)) {
                     echo json_encode(['msg' => '提交成功', 'code' => 20000]);
                     exit();
@@ -71,7 +67,7 @@ class TeamController extends HomeBaseController
                 }
             }
         } else {
-            return $this->fetch();
+            return $this->fetch(':team');
         }
     }
 

@@ -168,8 +168,19 @@ class CenterController extends HomeBaseController
             $field .= ',bonus';
         }
         $res = Db::name('charge')->field($field)->where($where)->select()->toArray();
-        echo json_encode(['data' => $res, 'code' => 20000]);
-        exit();
+        if (request()->isPost()) {
+            echo json_encode(['data' => $res, 'code' => 20000]);
+            exit();
+        } else {
+            if ($is_bonus == 0) {
+                $view = ':charge';
+            } else {
+                $view = ':charge2';
+            }
+            return $this->fetch($view, [
+                'data' => $res
+            ]);
+        }
     }
 
     /**

@@ -35,6 +35,18 @@
       'cid' => '\d+',
     ),
   ),
+  '团队报导/:id' => 
+  array (
+    0 => 'portal/Article/index?cid=12',
+    1 => 
+    array (
+    ),
+    2 => 
+    array (
+      'id' => '\d+',
+      'cid' => '\d+',
+    ),
+  ),
   '户外频道' => 
   array (
     0 => 'portal/List/index?id=10',
@@ -68,4 +80,15 @@
       'id' => '\d+',
     ),
   ),
+  '团队报导' => 
+  array (
+    0 => 'portal/List/index?id=12',
+    1 => 
+    array (
+    ),
+    2 => 
+    array (
+      'id' => '\d+',
+    ),
+  ),
 );
\ No newline at end of file

@@ -63,30 +63,30 @@
         </li>
         </volist>
         <li>
-            <a href="popular.html">
+            <a href="html/popular.html">
                 <div class="li_imgbox"><img src="__TMPL__/static/images/people.png" alt="" /></div>
                 <div class="zhou zhou_txt">人气最多</div>
             </a>
         </li>
         <li>
-            <a href="start.html">
+            <a href="{:url('activity/Activity/daysFifteen',['t_id'=>6])}">
                 <div class="li_imgbox"><img src="__TMPL__/static/images/fa.png" alt="" /></div>
                 <div class="zhou zhou_txt">即将出发</div>
             </a>
         </li>
         <li>
-            <a href="teamorder.html">
+            <a href="{:url('team/Team/teamCustomization')}">
                 <div class="li_imgbox"><img src="__TMPL__/static/images/tuan.png" alt="" /></div>
                 <div class="zhou zhou_txt">团队定制</div>
             </a>
         </li>
+
         <li>
-            <a href="outdoorChannel.html">
+            <a href="{:url('news/News/newsList')}">
                 <div class="li_imgbox"><img src="__TMPL__/static/images/hu.png" alt="" /></div>
                 <div class="zhou zhou_txt">户外频道</div>
             </a>
         </li>
-
     </ul>
 </div>
 <div></div>

+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <title>{$result.type_name}</title>
+    <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0" />
+    <link rel="stylesheet" type="text/css" href="__TMPL__/static/assets/css/weui.min.css" />
+    <link rel="stylesheet" type="text/css" href="__TMPL__/static/assets/css/swiper-3.4.2.min.css" />
+    <link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_773803_1qg03k1415.css" />
+    <script type="text/javascript" src="__TMPL__/static/assets/font/iconfont.js"></script>
+    <script type="text/javascript" src="__TMPL__/static/js/base.js"></script>
+    <link rel="stylesheet" href="__TMPL__/static/css/Peripheral-short-term.css" />
+    <style type="text/css">
+        .swiper-container {
+            height: 3.6rem;
+        }
+
+        .swiper-container-horizontal>.swiper-pagination-bullets,
+        .swiper-pagination-custom,
+        .swiper-pagination-fraction {
+            left: 44%;
+        }
+
+        .lis .iconfont {
+            color: #999999;
+            font-size: 0.5rem;
+        }
+        .
+        .active {
+        }
+        a:visited {color: #c8c8cd}
+    </style>
+</head>
+
+<body>
+<div class="header_out">
+    <header>
+        <span class="left">
+            <i class="iconfont icon-dizhi"></i>
+            <span class="area" >天津</span>
+        </span>
+        <form action="{:url('Activity/daysFifteen')}" method="GET">
+        <span class="shu">
+            <i class="iconfont icon-sousuo fang"></i>
+            <input type="hidden" name="t_id" value="{$result.t_id}">
+            <input type="text" name="keyword" value="{$result.keyword}" class="in" placeholder="搜索活动名称" />
+            <input type="submit" id="S" style="display: none">
+        </span>
+        </form>
+        <label for="S"><span class="sousuo">搜索</span></label>
+    </header>
+</div>
+<div class="list">
+    <ul>
+        <volist name="result.type" id="vo">
+            <li class='activity_li'>
+                <a href="{:url('activity/Activity/_list',['t_id'=>$vo['t_id']])}">
+                    <div class='li_imgbox <if condition="$vo.t_id eq $result.t_id">imgbox_active</if>'><img src="{$vo.type_icon}" alt="" /></div>
+                    <div class="zhou zhou_txt">{$vo.type_name}</div>
+                </a>
+            </li>
+        </volist>
+        <li>
+            <a href="html/popular.html">
+                <div class="li_imgbox"><img src="__TMPL__/static/images/people.png" alt="" /></div>
+                <div class="zhou zhou_txt">人气最多</div>
+            </a>
+        </li>
+        <li>
+            <a href="{:url('activity/Activity/daysFifteen',['t_id'=>6])}">
+                <div <if condition="$result.t_id eq '6'">class="li_imgbox imgbox_active"<else/>class="li_imgbox"</if>><img src="__TMPL__/static/images/fa.png" alt="" /></div>
+                <div class="zhou zhou_txt">即将出发</div>
+            </a>
+        </li>
+        <li>
+            <a href="{:url('team/Team/teamCustomization')}">
+                <div class="li_imgbox"><img src="__TMPL__/static/images/tuan.png" alt="" /></div>
+                <div class="zhou zhou_txt">团队定制</div>
+            </a>
+        </li>
+
+        <li>
+            <a href="{:url('news/News/newsList')}">
+                <div class="li_imgbox"><img src="__TMPL__/static/images/hu.png" alt="" /></div>
+                <div class="zhou zhou_txt">户外频道</div>
+            </a>
+        </li>
+</ul>
+</div>
+<div></div>
+<div class="zhou1">
+    {$result.type_name}
+</div>
+<volist name="result.activity" id="vo">
+    <div class="short_line" data-target="{:url('Activity/detail',['id'=>$vo['id']])}">
+        <div class="picture">
+            <img src="{$vo.thumb}" alt="" />
+        </div>
+        <div class="qing">
+            <div class="qing_out">
+						 <span class="run">
+                             {$vo.name}
+					     </span>
+                <div class="year">
+                    <div class="act act2">
+                        <i class="iconfont icon-calendar"></i>
+                        <span class="txt">
+                        {$vo.start_time}
+                    </span>
+                    </div>
+                    <div class="act act1" data-id="{$vo.id}">
+                        <i <if condition="$vo.is_collect eq '1'">class='iconfont icon-wuxing'<else/>class='iconfont icon-shoucang'</if>></i>
+                        <span class="txt">
+                        收藏
+                    </span>
+                    </div>
+                </div>
+            </div>
+            <div class="mon">
+						<span class="jia">
+							￥{$vo.price}
+						</span>
+                <span class="shou">
+							售{$vo.sales_num}  剩{$vo.residue_num}
+						</span>
+            </div>
+        </div>
+    </div>
+</volist>
+<script type="text/javascript" src="__TMPL__/static/assets/js/jquery-2.1.0.js"></script>
+<script type="text/javascript" src="__TMPL__/static/assets/js/swiper-3.4.2.min.js"></script>
+<script type="text/javascript" src="__TMPL__/static/assets/js/weui.js"></script>
+<!--<script type="text/javascript" src="../index.js"></script>-->
+<script>
+    var mySwiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        autoplay: 1500, //可选选项，自动滑动
+        loop: true
+    })
+</script>
+</body>
+
+</html>
+<script>
+    $('.list li div').click(function(){
+        $(this).css('background','#FFEEDA')
+    })
+    $('.short_line').click(function(){
+        window.location.href=$(this).attr('data-target');
+    })
+    $('.act2').click(function(event){
+        event.stopPropagation();
+    });
+    //五星收藏阻止冒泡
+    $('.act1').click(function(event){
+        event.stopPropagation();
+        if($(this).find('.iconfont').attr('class')=='iconfont icon-wuxing'){
+            $(this).find('.iconfont').attr("class", "iconfont icon-shoucang");
+        }else{
+            $(this).find('.iconfont').attr("class", "iconfont icon-wuxing");
+        }
+
+        $.ajax({
+            url:"{:url('activity/Activity/collectDo')}",
+            data:{
+                id:$(this).attr('data-id')
+            },
+            type:"POST",
+            dataType:"JSON"
+        })
+    });
+
+
+</script>
\ No newline at end of file

@@ -86,14 +86,11 @@
             预定信息
             </li>
     </div>
+
     <div class="dis">
-				<span class="dingjin">
-							定金:&nbsp;600/总价1190
-					</span>
-        <span class="yishou">
-							已售，1剩余29
-					</span>
+
     </div>
+
     <div class="newxia2 " id="newxia2">
 				<span class="tao active1" id="tao">
 					     套餐详情
@@ -113,7 +110,7 @@
     </div>
 </div>
 <div class="xianshi_two">
-    <img src="../images/banner.png" alt="" />
+    <img src="__TMPL__/static/images/banner.png" alt="" />
 
 </div>
 <!--选项卡-->
@@ -138,11 +135,27 @@
 </volist>
 
 <!--====底部=====-->
-<a href="orders_submitted.html">
+<a onclick="return confirmOrder()">
     <footer class="foot ok">
         立即预定
     </footer>
 </a>
+<script>
+    function confirmOrder() {
+        var activity_id={$info.activity_id};
+        var schedule_id=$("#SID").val();
+        var is_expired=$("#EX").val();
+        if(schedule_id == '') {
+            alert('请先选择批次');
+        }else {
+            if(is_expired == 1) {
+                alert('该活动批次已过期');
+            }else {
+                window.location.href=''
+            }
+        }
+    }
+</script>
 <div class='mold_out'>
     <div class='mold_center'>
         <div class="scroll_out">
@@ -150,17 +163,17 @@
                 <volist name="info.schedule" id="vo">
                     <div class="money">
                         <div class="year_change">
-                            <img src="__TMPL__/static/images/circle.png"/>
+                            <img data-id="{$vo.schedule_id}" src="__TMPL__/static/images/circle.png"/>
                             <span>{$vo.start_time}&nbsp;至&nbsp;{$vo.end_time}</span>
                         </div>
                         <div class="price">￥{$vo.price}</div>
                     </div>
                 </volist>
             </div>
-
+            <input type="hidden" id="SID" value="">
+            <input type="hidden" id="EX" value="1">
             <button class="bottom_button" value="">确定</button>
         </div>
-
     </div>
 
 </div>
@@ -234,20 +247,15 @@
     $('.money img').click(function(event) {
         $(this).attr("src", "/themes/simpleboot3/static/images/circle1.png");
         $(this).parents('.money').siblings().find('img').attr("src", "/themes/simpleboot3/static/images/circle.png");
+        var schedule_id = $(this).attr('data-id');
+        $("#SID").val(schedule_id);
     });
     //点击确定弹框隐藏
     $('.count').click(function() {
-        if($('.mold_out').css('display') == 'block') {
-            $('.mold_out').css('display', 'none');
-        } else {
-            $('.mold_out').css('display', 'block');
-        }
+        $('.mold_out').css('display', 'block');
 
     })
-    //点击页面弹框隐藏
-    $('body').click(function() {
-        $('.mold_out').css('display', 'none');
-    })
+
     $('#change').click(function(event) {
         event.stopPropagation();
     })
@@ -262,16 +270,31 @@
             }
         }
         if(num == 0) {
-            $('.mold_out').css('display', 'none');
-        } else {
-            $('.showcang').html($('.mold_center').find('span').eq(index).html());
-            $('.mold_out').css('display', 'none');
-        }
+            var schedule_id=$("#SID").val();
+            if(schedule_id != '') {
+                $('.mold_out').css('display', 'none');
+                $.ajax({
+                    url:"{:url('activity/Activity/alterSchedule')}",
+                    data:{
+                        schedule_id:schedule_id
+                    },
+                    type:"POST",
+                    dataType:"JSON",
 
+                    success: function (data) {
+                        var text='<span class="dingjin">定金:{$info.down_price}&nbsp;总价'+data.data.price+'</span><span class="yishou">已售，'+data.data.sales_num+'剩余'+data.data.residue_num+' </span>';
+                        $(".dis").html(text);
+                        $('.showcang').html(data.data.start_time+'至'+data.data.end_time);
+                        if(data.data.is_expire == 0) {
+                            $("#EX").val(0)
+                        }
+                    }
+                })
+            }
+        }
     })
     $('.mold_out').click(function() {
         event.stopPropagation();
 
     })
-    change
 </script>
\ No newline at end of file

@@ -67,7 +67,7 @@
                     <!--2018.08.13-->
                     <!--</span>-->
                 </div>
-                <div class="act actlist">
+                <div class="act actlist" data-id="{$vo.id}">
                     <i class="iconfont icon-wuxing"></i>
                     <span class="txt">
                         取消收藏
@@ -80,19 +80,6 @@
     </volist>
 </div>
 <!---->
-<div class="confirm_cancel" >
-    <div class="confirm_main">
-        <div class="hint">
-            确认取消？
-        </div>
-        <div class="true">确定取消订单吗？</div>
-        <div class="choose">
-            <span class="confirm_yes">取消</span>
-            <span class="confirm_no">确定</span>
-        </div>
-    </div>
-</div>
-
 
 
 <script type="text/javascript" src="__TMPL__/static/assets/js/jquery-2.1.0.js"></script>
@@ -136,23 +123,6 @@
         $('.confirm_cancel').css('display','block');
     })
 
-    //确认取消弹出框
-    $('.btnright').click(function() {
-        var id = $(this).parents('.good_out').data("id");
-        console.log(id);
-        $('.confirm_cancel').css('display', 'block');
-        $('.confirm_yes').click(function() {
-            console.log("点击确定按钮获取整个li的id为：" + id);
-            $('.confirm_cancel').css('display', 'none');
-        })
-        $('.confirm_no').click(function() {
-            $('.confirm_cancel').css('display', 'none');
-        })
-        $('.confirm_main').click(function() {
-            event.stopPropagation();
-            //	 	$(this).css('display','none');
-        })
-    })
     //阻止按钮的点击冒泡
     $('.btnlist').click(function(event) {
         event.stopPropagation();
@@ -177,6 +147,15 @@
         } else {
             $(this).find('.iconfont').attr("class", "iconfont icon-wuxing");
         }
+        $.ajax({
+            url:"{:url('activity/Activity/collectDo')}",
+            data:{
+                id:$(this).attr('data-id')
+            },
+            type:"POST",
+            dataType:"JSON"
+        })
+
     });
     $('.center_mian').click(function() {
         window.location.href = $(this).attr('data-target');

@@ -95,7 +95,7 @@
 </div>
 <div class="phone">
     <span>客服电话：XXXXXX</span>
-    <a href="aboutus.html"><span class="yan">留言</span></a>
+    <a href="{:url('news/News/message')}"><span class="yan">留言</span></a>
 </div>
 <!--<div>
     <ul>

+
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <title>户外频道</title>
+    <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0" />
+    <link rel="stylesheet" type="text/css" href="__TMPL__/static/assets/css/weui.min.css" />
+    <link rel="stylesheet" type="text/css" href="__TMPL__/static/assets/css/swiper-3.4.2.min.css" />
+    <link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_773803_1qg03k1415.css" />
+    <script type="text/javascript" src="__TMPL__/static/assets/font/iconfont.js"></script>
+    <script type="text/javascript" src="__TMPL__/static/js/base.js"></script>
+    <link rel="stylesheet" href="__TMPL__/static/css/Outdoor channel.css" />
+    <style type="text/css">
+        a{color:#000}
+        .swiper-container {
+            height: 3.6rem;
+        }
+        .swiper-container-horizontal>.swiper-pagination-bullets,
+        .swiper-pagination-custom,
+        .swiper-pagination-fraction {
+            left: 44%;
+        }
+        .lis .iconfont{
+            color:#999999;
+            font-size: 0.5rem;
+        }
+        .active{
+            color:
+        }
+    </style>
+</head>
+
+<body>
+
+
+<div class="list">
+    <ul>
+        <volist name="data.news_type" id="vo">
+        <li>
+            <a href="{:url('News/newsList',['t_id'=>$vo['t_id']])}">
+                <div <if condition="$vo['t_id'] eq $data['t_id']">class="li_imgbox imgbox_active"<else/>class="li_imgbox imgbox"</if>><img src="{$vo.thumb}" alt="" /></div>
+                <div class="zhou zhou_txt">旅行报导</div>
+            </a>
+        </li>
+        </volist>
+    </ul>
+</div>
+<div></div>
+<div class="zhou1">
+    {$data.type_name}
+</div>
+<volist name="data.news_list" id="vo">
+<div class="center_mian" data-target="{:url('News/detail',['id'=>$vo['id']])}">
+    <div class="picture">
+        <img src="{$vo.thumb}" alt="" />
+    </div>
+    <div class="qing">
+        <div class="qing_out">
+					    <span class="run">
+						     {$vo.post_title}
+					    </span>
+            <div class="year">
+                <div class="act act_show" data-id="{$vo.id}">
+							<span class="wu">
+                                <if condition="$vo['is_collect'] eq '1'">
+								    <i class="iconfont icon-wuxing"></i>
+                                    <else/>
+                                    <i class="iconfont icon-shoucang"></i>
+                                </if>
+							</span>
+                    <span class="txt">
+							      收藏
+						    </span>
+                </div>
+            </div>
+
+        </div>
+
+        <div class="red">
+					<span class="circle">
+
+					</span>
+            <span class="mon">
+						<span class="mon">
+					   	阅读量{$vo.post_hits}
+					   </span>
+					</span>
+        </div>
+    </div>
+</div>
+</volist>
+<script type="text/javascript" src="__TMPL__/static/assets/js/jquery-2.1.0.js"></script>
+<script type="text/javascript" src="__TMPL__/static/assets/js/swiper-3.4.2.min.js"></script>
+<script type="text/javascript" src="__TMPL__/static/assets/js/weui.js"></script>
+<!--<script type="text/javascript" src="../index.js"></script>-->
+<script>
+    var mySwiper = new Swiper('.swiper-container', {
+        pagination: '.swiper-pagination',
+        autoplay: 1500,//可选选项，自动滑动
+        loop : true
+    })
+    $('.act_show').click(function(event) {
+        event.stopPropagation();
+        if($(this).find('.iconfont').attr('class')=='iconfont icon-wuxing'){
+            $(this).find('.iconfont').attr("class", "iconfont icon-shoucang");
+        }else{
+            $(this).find('.iconfont').attr("class", "iconfont icon-wuxing");
+        }
+        $.ajax({
+            url:"{:url('news/News/collect')}",
+            data:{
+                id:$(this).attr('data-id')
+            },
+            type:"POST",
+            dataType:"JSON",
+
+            success:function (data) {
+                console.log(data);
+            }
+        })
+    })
+    $('.center_mian').click(function(){
+        window.location.href=$(this).attr('data-target');
+    })
+    $('.act_show').click(function(event) {
+        event.stopPropagation();
+    });
+    $('.acte').click(function(event) {
+        event.stopPropagation();
+    });
+    $('.list li div').click(function(){
+        $(this).css('background','#FFEEDA')
+    })
+</script>
+</body>
+
+</html>
\ No newline at end of file

+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>关于我们</title>
+    <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0" />
+    <script type="text/javascript" src="__TMPL__/static/js/base.js"></script>
+    <link rel="stylesheet" type="text/css" href="__TMPL__/static/assets/css/weui.min.css" />
+    <link rel="stylesheet" type="text/css" href="__TMPL__/static/assets/css/swiper-3.4.2.min.css" />
+    <link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_773803_6y9erxzbkn2.css" />
+    <script type="text/javascript" src="__TMPL__/static/assets/font/iconfont.js">
+    </script>
+    <link rel="stylesheet" href="__TMPL__/static/css/aboutus.css" />
+</head>
+<body>
+<div class="pic">
+    <img src="__TMPL__/static/images/banner.png" alt="" />
+</div>
+<div class="show">
+    平台简介
+</div>
+<div class="text">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget.
+</div>
+<div class="phone">
+    <span>客服电话：XXXXXX</span>
+    <span class="liu">留言</span>
+</div>
+<div class="ideaout">
+    <textarea class="idea" placeholder=" 说说您的想法吧"></textarea>
+</div>
+<div class="dibu ">
+    <div  class="foot">
+        <div class="footer ok">
+            提交
+        </div>
+    </div>
+</div>
+
+
+</body>
+</html>

@@ -70,20 +70,20 @@
             </a>
         </li>
         <li>
-            <a href="html/start.html">
+            <a href="{:url('activity/Activity/daysFifteen',['t_id'=>6])}">
                 <div class="li_imgbox"><img src="__TMPL__/static/images/fa.png" alt="" /></div>
                 <div class="zhou zhou_txt">即将出发</div>
             </a>
         </li>
         <li>
-            <a href="html/teamorder.html">
+            <a href="{:url('team/Team/teamCustomization')}">
                 <div class="li_imgbox"><img src="__TMPL__/static/images/tuan.png" alt="" /></div>
                 <div class="zhou zhou_txt">团队定制</div>
             </a>
         </li>
 
         <li>
-            <a href="html/outdoorChannel.html">
+            <a href="{:url('news/News/newsList')}">
                 <div class="li_imgbox"><img src="__TMPL__/static/images/hu.png" alt="" /></div>
                 <div class="zhou zhou_txt">户外频道</div>
             </a>

@@ -38,17 +38,18 @@ body{
 	
 }
 .btn{
-/*width:40%;*/
+	width: 40%;
 	height: 0.88rem;
 	line-height: 0.88rem;
-	padding:0 0.3rem;
+	padding: 0 0rem;
 	margin: 0.5rem 0 0.3rem 0;
 	border: 0.02rem solid #3399FF;
-	border-radius:0.05rem ;
+	border-radius: 0.05rem;
 	background: #fff;
 	margin-bottom: -0.1rem;
-	font-size:0.36rem;
+	font-size: 0.36rem;
 	color: #333333;
+	text-align: center;
 }
 .btns{
 	padding: 0.3rem  0.3rem 0 0.3rem;

@@ -39,10 +39,10 @@ html{ background: #fff;}
 	
 }
 .btn{
-/*width:40%;*/
+    width: 40%;
 	height: 0.88rem;
 	line-height: 0.88rem;
-	padding:0 1rem;
+	padding:0 0rem;
 	margin: 0.5rem 0 0.3rem 0;
 	border: 0.02rem solid #3399FF;
 	border-radius:0.05rem ;
@@ -50,6 +50,7 @@ html{ background: #fff;}
 	margin-bottom: -0.1rem;
 	font-size:0.36rem;
 	color: #333333;
+	text-align: center;
 }
 .btns{
 	padding: 0.3rem  0.3rem 0 0.3rem;

+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <title>团队定制</title>
+    <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0" />
+    <link rel="stylesheet" type="text/css" href="__TMPL__/static/assets/css/weui.min.css" />
+
+    <link rel="stylesheet" type="text/css" href="__TMPL__/static/assets/css/weui.min.css" />
+    <link rel="stylesheet" type="text/css" href="__TMPL__/static/assets/css/swiper-3.4.2.min.css" />
+    <link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_773803_6y9erxzbkn2.css" />
+    <script src="__TMPL__/static/assets/js/citypicker.js"  type="text/javascript"></script>
+    <script type="text/javascript" src="__TMPL__/static/js/base.js"></script>
+    <link rel="stylesheet" href="__TMPL__/static/css/common.css" />
+    <link rel="stylesheet" href="__TMPL__/static/css/teamorder.css" />
+    <style>
+        .weui-picker__group {
+            font-size: 0.3rem;
+        }
+
+    </style>
+</head>
+
+<body>
+<div class="pic">
+    <img src="__TMPL__/static/images/banner.png" alt="" />
+</div>
+<ul class="team">
+    <li class="teamname">
+        <span class="tname">团队名称</span>
+        <input type="" name="" id="" placeholder="请填写团队名称"  class="name"/>
+    </li>
+    <li class="people">
+        <span class="tpeople">团队人数</span>
+        <input type="" name="" id="" placeholder="请填写团队人数"  class="number"/>
+    </li>
+    <li class="data street_out">
+        <span class="tpeople peoples">出行日期&nbsp;</span>
+        <sapn class="time">
+            <input type="" name="" id="" readonly placeholder="年/月/日"  class="start"/>&nbsp;<span class="zhi">至</span>
+            &nbsp;&nbsp;<input type="" name="" readonly id="" onclick="next_time()" placeholder="年/月/日"  class="end"/>
+        </sapn>
+    </li>
+    <li class="people ">
+        <span class="tpeople ">出发地点</span>
+        <input type="" name="" id='citypicker' onclick="citypicker($(this))" placeholder="出发城市"  class="street"/>
+        <!--<input type="" name="" id="city-picker" placeholder="区"  class="street"/>-->
+    </li>
+    <li class="contact">
+        <span class="tcontact streets details">具体街道&nbsp;&nbsp;&nbsp;</span>
+        <input type="" name="" id="" placeholder="请输入具体街道" class="contact2 streets_detail "/>
+    </li>
+    <li class="contact">
+        <span class="tcontact">联系人&nbsp;&nbsp;&nbsp;</span>
+        <input type="" name="" id="" placeholder="请填写联系人姓名" class="contact2"/>
+    </li>
+    <li class="contact">
+        <span class="tcontact">手机号码</span>
+        <input type="" name="" id="" placeholder="请填写手机号码" class="phone"/>
+    </li>
+    <li class="contact">
+        <span class="tcontact">微信号码</span>
+        <input type="" name="" id="" placeholder="请填写微信号码" class="weixin"/>
+    </li>
+</ul>
+<div class="require">
+    需求描述
+</div>
+<div class="describe">
+    <textarea name="" rows="" cols=""  class="des"></textarea>
+    <span class="limit">限200字以内</span>
+</div>
+<div class="submit">
+    <button class="ok">提交</button>
+</div>
+<div id="toast" style='display: none;'>
+    <div class="weui-mask_transparent"></div>
+    <div class="weui-toast">
+        <!--<i class="weui-icon-success-no-circle weui-icon_toast"></i>-->
+        <p class="weui-toast__content">已完成</p>
+    </div>
+</body>
+</html>
+<script type="text/javascript" src="__TMPL__/static/assets/js/jquery-2.1.0.js"></script>
+<script type="text/javascript" src="__TMPL__/static/assets/js/common.js"></script>
+<script type='text/javascript' src='__TMPL__/static/assets/js/Augly_Verification.js'></script>
+<script type="text/javascript" src="__TMPL__/static/assets/js/myweui.js"></script>
+<script type="text/javascript" src="__TMPL__/static/assets/js/weui.js"></script>
+<script type="text/javascript" src="__TMPL__/static/assets/font/iconfont.js"></script>
+<script>
+    $('.ok').click(function(){
+        if( $('.name').val()=='' ){
+            toast('请输入您的团队名称');
+        }else if($('.number').val()==''){
+            toast('请输入团队人数');
+        }else if($('.start').val()==''||$('.end').val()==''){
+            toast('请选择出行日期');
+        }else if($('.street').val()==''){
+            toast('城市 区 街道');
+        }
+        else if($('.contact2').val()==''){
+            toast('请输入联系人姓名');
+        }
+        else if($('.phone').val()==''){
+            toast('请输入手机号');
+        }
+
+        else if(!AuglyTest_phone.test($('.phone').val())){
+            toast('手机号码格式不正确');
+        }
+
+        else if($('.weixin').val()==''){
+            toast('请输入微信号码');
+        }
+        else if($('.des').val()==''){
+            toast('请输入填写需求描述');
+        }
+        else{
+            $.ajax({
+                url:"{:url('team/Team/teamCustomization')}",
+                data:{
+                    team_name:$('.name').val(),
+                    team_num:$('.number').val(),
+                    start_time:$('.start').val(),
+                    end_time:$('.end').val(),
+                    address:$('.street').val()+$('.details').val(),
+                    contact:$('.contact2').val(),
+                    tel:$('.phone').val(),
+                    wechat:$('.weixin').val(),
+                    desc:$('.des').val()
+                },
+                type:"POST",
+                dataType:"JSON",
+
+                success: function () {
+                    toast('保存成功');
+                }
+            })
+        }
+
+    })
+    var start_mon, start_day, end_mon, end_day;
+
+    $('.start').click(function(event) {
+        var _this = this;
+        weui.datePicker({
+            start: new Date(),
+            end: 2030,
+            defaultValue: [new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()],
+            onConfirm: function(result) {
+
+                start_year = result[0].value;
+                start_mon = result[1].value;
+                start_day = result[2].value;
+
+                $('.start').val(start_year+'/'+start_mon+'/'+start_day);
+
+                //setTimeout(function(){
+                //	next_time();
+                //},300)
+            }
+        });
+    });
+    function next_time(){
+        weui.datePicker({
+            start: new Date(),
+            end: 2030,
+            defaultValue: [new Date().getFullYear(), new Date().getMonth() + 1, new Date().getDate()],
+            onConfirm: function(result) {
+                start_year = result[0].value;
+                start_mon = result[1].value;
+                start_day = result[2].value;
+                $('.end').val(start_year+'/'+start_mon+'/'+start_day);
+
+            }
+        });
+    };
+</script>
\ No newline at end of file

+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <title>我要充值</title>
+    <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0" />
+    <script type="text/javascript" src="__TMPL__/static/js/base.js"></script>
+    <link rel="stylesheet" type="text/css" href="__TMPL__/static/assets/css/weui.min.css" />
+    <link rel="stylesheet" type="text/css" href="__TMPL__/static/assets/css/swiper-3.4.2.min.css" />
+    <link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_773803_6y9erxzbkn2.css" />
+    <script type="text/javascript" src="__TMPL__/static/assets/font/iconfont.js">
+    </script>
+    <link rel="stylesheet" href="__TMPL__/static/css/myWallet.css" />
+</head>
+
+<body>
+<div class="out">
+    <div class="btns">
+        <div class="pay">
+            充值套餐
+        </div>
+        <div class="activie">
+            <div class="ordinary">普通充值</div>
+            <a href="{:url('Center/charge',['is_bonus'=>1])}">
+                <div class="activity">活动专享</div>
+            </a>
+        </div>
+
+        <div class="btnlist">
+            <volist name="data" id="vo" key="k">
+                <div data-id="{$vo.id}" class="btn <if condition="$k eq '1'">active one</if>">￥{$vo.denomination}</div>
+            </volist>
+        </div>
+    </div>
+
+</div>
+<div class="footer ok">
+    一键充值
+</div>
+</body>
+
+</html>
+<script type="text/javascript" src="__TMPL__/static/assets/js/jquery-2.1.0.js"></script>
+<script type="text/javascript" src="__TMPL__/static/assets/js/swiper-3.4.2.min.js"></script>
+<script type="text/javascript" src="__TMPL__/static/assets/js/weui.js"></script>
+<script>
+    $('.btn').click(function(){
+        $(this).attr('class','btn active one');
+        $(this).siblings().attr('class','btn');
+    })
+
+</script>
\ No newline at end of file

+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="UTF-8">
+    <title>我要充值</title>
+    <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0" />
+    <script type="text/javascript" src="__TMPL__/static/js/base.js"></script>
+    <link rel="stylesheet" type="text/css" href="__TMPL__/static/assets/css/weui.min.css" />
+    <link rel="stylesheet" type="text/css" href="__TMPL__/static/assets/css/swiper-3.4.2.min.css" />
+    <link rel="stylesheet" type="text/css" href="http://at.alicdn.com/t/font_773803_6y9erxzbkn2.css" />
+    <script type="text/javascript" src="__TMPL__/static/assets/font/iconfont.js">
+    </script>
+    <link rel="stylesheet" href="__TMPL__/static/css/myWallet.css" />
+</head>
+
+<body>
+<div class="out">
+    <div class="btns">
+        <div class="pay">
+            充值套餐
+        </div>
+        <div class="activie">
+            <a href="{:url('Center/charge')}">
+                <div class="activity">普通充值</div>
+            </a>
+            <div class="ordinary">活动专享</div>
+        </div>
+
+        <div class="btnlist">
+            <volist name="data" id="vo" key="k">
+                <div data-id="{$vo.id}" class="btn <if condition="$k eq '1'">active one</if>">￥{$vo.denomination}送{$vo.bonus}</div>
+            </volist>
+    </div>
+</div>
+
+</div>
+<div class="footer ok">
+    一键充值
+</div>
+</body>
+
+</html>
+<script type="text/javascript" src="__TMPL__/static/assets/js/jquery-2.1.0.js"></script>
+<script type="text/javascript" src="__TMPL__/static/assets/js/swiper-3.4.2.min.js"></script>
+<script type="text/javascript" src="__TMPL__/static/assets/js/weui.js"></script>
+<script>
+    $('.btn').click(function(){
+        $(this).attr('class','btn active one');
+        $(this).siblings().attr('class','btn');
+    })
+
+</script>
\ No newline at end of file

@@ -35,7 +35,7 @@
     </div>
 </div>
 <ul class="list">
-    <a href="myWallet.html">
+    <a href="{:url('Center/charge')}">
         <li>
             <span class="real">我要充值</span>
             <i class="iconfont icon-common-jinru-copy"></i>