new

app/Http/Controllers/VoteController.php

@@ -31,7 +31,15 @@ class VoteController extends Controller
 
         // 变量要验证, 不然会报错
         $groups = \App\Group::get();
-        return view('front.vote.index', ['groups'=>$groups, 'activity_info'=>$activity_info]);
+        $player_count = Player::count();
+        $vote_count = Vote::count();
+        $votes = [];
+        $players = Player::orderBy("no")
+            ->get();
+        foreach($players as $player) {
+            $votes[$player->id] = Vote::where('player_id', $player->id)->count();
+        }
+        return view('front.vote.index', ['vote_count'=>$vote_count ,'player_count'=>$player_count , 'groups'=>$groups, 'votes'=>$votes, 'activity_info'=>$activity_info ]);
     }
 
     /**
@@ -44,36 +52,28 @@ class VoteController extends Controller
             $activity_info->count_views = $activity_info->count_views + 1;
             $activity_info->save();
         }
-
-        $keywords = $request->keywords;
         $group_id = $request->group_id;
-        if(!empty($keywords)) { // 关键词非空
-            $players = Player::where('name', 'like', '%'.$keywords.'%')
-                ->orWhere('no', 'like', '%'.$keywords.'%')
-                ->orderBy("no")
-                ->get();
-        }else {
-            $players = Player::where('group_id', $group_id)
-                ->orderBy("no")
-                ->get();
-        }
 
-        $group = Group::find($group_id);
-        $player_count = Player::count();
-        $vote_count = Vote::count();
-        $status = empty($request->status) ? null : $request->status;
         $votes = [];
+        $players = Player::where('group_id',$group_id)
+            ->orderBy("no")
+            ->get();
         foreach($players as $player) {
             $votes[$player->id] = Vote::where('player_id', $player->id)->count();
         }
-        return view('front.vote.group', ['players'=>$players, 'votes'=>$votes, 'group'=>$group, 'player_count'=>$player_count, 'vote_count'=>$vote_count, 'activity_info'=>$activity_info, 'status'=>$status]);
+        $group = Group::find($group_id);
+        $player_count = Player::count();
+        $status = empty($request->status) ? null : $request->status;
+
+        return view('front.vote.group', ['players'=>$players, 'group'=>$group, 'votes'=>$votes,'status'=>$status]);
     }
 
     /**
      * 排名显示
      * */
-    public function rank($group_id) {
-//        $we_user = session('wechat.oauth_user');    // 微信授权用户信息
+    public function rank() {
+        $player_count = Player::count();
+        $vote_count = Vote::count();
         $activity_info = ActivityInfo::first();
 //        if(Cache::get($we_user->getId()) == null) {
 //            Cache::put($we_user->getId(), '1', 60*24);  // 将openid存入cache
@@ -83,13 +83,11 @@ class VoteController extends Controller
 
         $rank_color = ['#007500', '#996600', '#666666', '#3399CC', '#548C00', '#336633', '#CC9900', '#FF3300', '#CC0033', '#FFCC00', '#FF6600', '#669900', '#FF9900', '#CCCC00', '#CC6600'];
 
-        $sql = "SELECT *,(SELECT COUNT(*) FROM votes WHERE votes.player_id = players.id) AS count_votes FROM players WHERE group_id = :group_id ORDER BY count_votes DESC";
-        $players = DB::select($sql, ['group_id' => $group_id]);
+        $sql = "SELECT *,(SELECT COUNT(*) FROM votes WHERE votes.player_id = players.id) AS count_votes FROM players ORDER BY count_votes DESC";
+        $players = DB::select($sql);
 
-        $group = Group::find($group_id);
 
-        return view('front.vote.rank', ['players'=>$players, 'rank_color'=>$rank_color, 'group'=>$group,
-            'activity_info'=>$activity_info]);
+        return view('front.vote.rank', ['vote_count'=>$vote_count ,'player_count'=>$player_count , 'players'=>$players, 'rank_color'=>$rank_color, 'activity_info'=>$activity_info]);
     }
 
     /**

public/css/style.css

@@ -79,8 +79,8 @@
     background-color: #ececec;
     float: left;
     margin-bottom: 20px;
-    width: 48%;
-    margin-right:3%;
+    width: 32%;
+    margin-right:2%;
 }
 .wxopimg {
     text-align:center;

resources/views/front/vote/group.blade.php

@@ -3,59 +3,34 @@
 @section('content')
         <div class="page__bd">
             <article class="weui-article">
-                <img src="http://cdnvote.9026.com/images/WechatIMG5.jpeg" >
+                {{--        http://cdnvote.9026.com            --}}
+                <img src="/images/banner.jpg">
                 <section>
                     <h2 class="title" align="center">{{$group->group_name}}投票</h2>
-                    <div class="vote_info">
-                        <ul class="info_ul">
-                            <li class="info_list"><i class="fa fa-user"></i>参与选手<br>{{$player_count}}</li>
-                            <li class="border_list"><i class="fa fa-globe"></i>访问次数<br>{{$activity_info->count_views}}</li>
-                            <li class="border_list"><i class="fa
-                            fa-sticky-note-o"></i>累计投票<br><span id="count_votes">{{$vote_count}}</span></li>
-                        </ul>
-                    </div>
-                    <h3><i class="fa fa-clock-o"></i>活动开始时间:&nbsp;&nbsp;{{$activity_info->start_time}}</h3>
-                    <h3><i class="fa fa-clock-o"></i>活动结束时间:&nbsp;&nbsp;{{$activity_info->end_time}}</h3>
-                    <h3><i class="fa fa-warning "></i>活动规则:&nbsp;&nbsp;{{$activity_info->activity_rule}}</h3>
-                    <h3><i class="fa fa-bar-chart"></i>重要提示:&nbsp;&nbsp;<i class="fa fa-angle-double-right"
-                                                                        id="show_desc"></i></h3>
-                    <script type="text/javascript">
-                        $(function(){
-                            $("#show_desc").on('click', function(){
-                                $("#vote_desc").toggle("normal", function(){
-                                    if( $("#show_desc").attr('class')=='fa fa-angle-double-down' ){
-                                        $("#show_desc").attr('class','fa fa-angle-double-right');
-                                    }else {
-                                        $("#show_desc").attr('class','fa fa-angle-double-down');
-                                    }
-                                });
-                            });
-                        })
-                    </script>
-                    <p id="vote_desc" style="display:none;">投票后票数有时不会立即变化，这是为了防止刷票服务器在做处理，稍等一段时间即可看到票数变化。</p>
+
                 </section>
-                <div class="weui-search-bar" id="searchBar" >
-                    <form class="weui-search-bar__form" action="/vote/group/{{$group->id}}" method="get">
-                        <div class="weui-search-bar__box">
-                            <i class="weui-icon-search"></i>
-                            <input type="search" class="weui-search-bar__input" id="searchInput" placeholder="请输入选手编号或名称" required="" name="keywords">
-                            <a href="#" class="weui-icon-clear" id="searchClear"></a>
-                        </div>
-                        <label class="weui-search-bar__label" id="searchText" style="transform-origin: 0px 0px 0px; opacity: 1; transform: scale(1, 1);">
-                            <i class="weui-icon-search"></i>
-                            <span>搜索</span>
-                        </label>
-                    </form>
-                    <a href="#" class="weui-search-bar__cancel-btn" id="searchCancel">取消</a>
-                </div>
-                
-                <a href="/vote/rank/{{$group->id}}" class="weui-btn weui-btn_primary"><i class="fa fa-bar-chart"></i>查看排名</a>
+                <br />
+                {{--<div class="weui-search-bar" id="searchBar" >--}}
+                    {{--<form class="weui-search-bar__form" action="/vote/group/{{$group->id}}" method="get">--}}
+                        {{--<div class="weui-search-bar__box">--}}
+                            {{--<i class="weui-icon-search"></i>--}}
+                            {{--<input type="search" class="weui-search-bar__input" id="searchInput" placeholder="请输入选手编号或名称" required="" name="keywords">--}}
+                            {{--<a href="#" class="weui-icon-clear" id="searchClear"></a>--}}
+                        {{--</div>--}}
+                        {{--<label class="weui-search-bar__label" id="searchText" style="transform-origin: 0px 0px 0px; opacity: 1; transform: scale(1, 1);">--}}
+                            {{--<i class="weui-icon-search"></i>--}}
+                            {{--<span>搜索</span>--}}
+                        {{--</label>--}}
+                    {{--</form>--}}
+                    {{--<a href="#" class="weui-search-bar__cancel-btn" id="searchCancel">取消</a>--}}
+                {{--</div>--}}
+
                 
                 <div class="voteoplist">
                     <div class="plistleft leftoptions" style="float:left;width:100%;">
 
                         @foreach($players as $player)
-                            @if( $loop->iteration % 2 == 0)
+                            @if( $loop->iteration % 3 == 0)
                                 <div class="wxop" style="margin-right:0;">
                                     <div class="wxopimg">
                                         {{--<img src="http://cdnvote.9026.com/images/{{$player->image}}" class="wxopimg_img">--}}
@@ -66,7 +41,7 @@
                                     </div>
                                     <div class="wxopvotediv" >
                                         <div class="wxvbtn" align="center">
-                                            <a href="/vote/process/{{$player->id}}" class="weui-btn weui-btn_mini weui-btn_primary" style="width:90%;background-color:#2ECC71;"><i class="fa fa-thumbs-o-up"></i>
+                                            <a href="/vote/process/{{$player->id}}" class="weui-btn weui-btn_mini weui-btn_primary" style="background-color:#2ECC71;"><i class="fa fa-thumbs-o-up"></i>
                                                 投票</a>
 
                                         </div>
@@ -88,7 +63,7 @@
                                         <div class="wxvbtn" align="center">
                                             <a href="/vote/process/{{$player->id}}" class="weui-btn
                                             weui-btn_mini
-                                            weui-btn_primary" style="width:90%;background-color:#2ECC71;"><i class="fa fa-thumbs-o-up"></i>
+                                            weui-btn_primary" style="background-color:#2ECC71;"><i class="fa fa-thumbs-o-up"></i>
                                                 投票</a>
                                         </div>
                                         <div class="wxvinfo">

resources/views/front/vote/index.blade.php

@@ -3,7 +3,8 @@
 @section('content')
     <div class="page__bd">
         <article class="weui-article">
-            <img src="http://cdnvote.9026.com/images/WechatIMG5.jpeg">
+            {{--        http://cdnvote.9026.com            --}}
+            <img src="/images/banner.jpg">
             <section>
                 <h2 class="title" align="center">{{$activity_info->activity_title}}</h2>
                 <section>
@@ -14,26 +15,38 @@
                     </p>
                     <hr style="height:2px;border:none;border-top:2px dotted #95C9A5;" />
                 </section>
+
+                <section>
+                    <div class="vote_info">
+                        <ul class="info_ul">
+                            <li class="info_list"><i class="fa fa-user"></i>参与选手<br>{{$player_count}}</li>
+                            <li class="border_list"><i class="fa fa-globe"></i>访问次数<br>{{$activity_info->count_views}}</li>
+                            <li class="border_list"><i class="fa
+                            fa-sticky-note-o"></i>累计投票<br><span id="count_votes">{{$vote_count}}</span></li>
+                        </ul>
+                    </div>
+                    <h3><i class="fa fa-clock-o"></i>活动开始时间:&nbsp;&nbsp;{{$activity_info->start_time}}</h3>
+                    <h3><i class="fa fa-clock-o"></i>活动结束时间:&nbsp;&nbsp;{{$activity_info->end_time}}</h3>
+                    <h3><i class="fa fa-warning "></i>活动规则:&nbsp;&nbsp;{{$activity_info->activity_rule}}</h3>
+                    <a href="/vote/rank" class="weui-btn weui-btn_primary"><i class="fa fa-bar-chart"></i>查看排名</a>
+                </section>
+
             </section>
+
         </article>
     </div>
 
     <div class="weui-panel">
         <div class="weui-panel__bd">
-            <div class="weui-media-box weui-media-box_small-appmsg">
-                <div class="weui-cells">
-
-                    @foreach($groups as $group)
-                    <a class="weui-cell weui-cell_access" href="/vote/group/{{$group->id}}">
-                        <div class="weui-cell__bd weui-cell_primary">
-                            <p>{{$group->group_name}}：{{$group->group_desc}}</p>
-                        </div>
-                        <span class="weui-cell__ft"></span>
-                    </a>
-                    @endforeach
-
-                </div>
+            <div class="weui-grids">
+
+                @foreach($groups as $group)
+                <a href="/vote/group/{{$group->id}}" class="weui-grid">
+                    <p class="weui-grid__label">{{$group->group_desc}}</p>
+                </a>
+                @endforeach
             </div>
+
         </div>
     </div>
 

resources/views/front/vote/rank.blade.php

@@ -3,26 +3,21 @@
 @section('content')
         <div class="page__bd">
             <article class="weui-article">
-                <img src="http://cdnvote.9026.com/images/WechatIMG5.jpeg">
+                <img src="/images/banner.jpg">
                 <section>
-                    <h2 class="title" align="center">{{$group->group_name}}投票</h2>
+                    <div class="vote_info">
+                        <ul class="info_ul">
+                            <li class="info_list"><i class="fa fa-user"></i>参与选手<br>{{$player_count}}</li>
+                            <li class="border_list"><i class="fa fa-globe"></i>访问次数<br>{{$activity_info->count_views}}</li>
+                            <li class="border_list"><i class="fa
+                            fa-sticky-note-o"></i>累计投票<br><span id="count_votes">{{$vote_count}}</span></li>
+                        </ul>
+                    </div>
+                    <h2 class="title" align="center">{{$activity_info->title}}投票</h2>
                     <h3><i class="fa fa-clock-o"></i>活动开始时间:&nbsp;&nbsp;{{$activity_info->start_time}}</h3>
                     <h3><i class="fa fa-clock-o"></i>活动结束时间:&nbsp;&nbsp;{{$activity_info->end_time}}</h3>
                     <h3><i class="fa fa-warning "></i>活动规则:&nbsp;&nbsp;{{$activity_info->activity_rule}}</h3>
-                    <h3><i class="fa fa-bar-chart"></i>重要提示:&nbsp;&nbsp;<i class="fa fa-angle-double-right"
-                                                                           id="show_desc"></i></h3>
-                    <script type="text/javascript">
-                        $("#show_desc").on('click', function(){
-                            $("#vote_desc").toggle("normal", function(){
-                                if( $("#show_desc").attr('class')=='fa fa-angle-double-down' ){
-                                    $("#show_desc").attr('class','fa fa-angle-double-right');
-                                }else {
-                                    $("#show_desc").attr('class','fa fa-angle-double-down');
-                                }
-                            });
-                        });
-                    </script>
-                    <p id="vote_desc" style="display:none;">投票后票数有时不会立即变化，这是为了防止刷票服务器在做处理，稍等一段时间即可看到票数变化。</p>
+
                 </section>
                 
                 <h1 class="title" align="center" style="font-weight:bold;">最新排名</h1>

resources/views/layouts/app.blade.php

@@ -8,7 +8,7 @@
     <meta name="keywords" content="2016年四川省乡村（城市）学校少年宫专题视频节目展播网络评选">
     <link href="http://cdn.bootcss.com/weui/1.1.0/style/weui.min.css" rel="stylesheet">
     <link rel="stylesheet" href="http://cdn.bootcss.com/font-awesome/4.7.0/css/font-awesome.min.css" type="text/css"/>
-    <link rel="stylesheet" href="http://cdnvote.9026.com/css/style.css?v=161128" type="text/css"/>
+    <link rel="stylesheet" href="/css/style.css?v=161128" type="text/css"/>
     <link href="http://cdn.bootcss.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
     <script src="{{asset('js/zepto.min.js')}}" type="text/javascript"></script>
 </head>

routes/web.php

@@ -27,9 +27,9 @@ Route::any('/wechat', 'WechatController@serve');
     Route::get('/menu', 'MenuController@menu');
 });*/
 
-Route::get('/vote/index', 'VoteController@index');
+Route::get('/vote', 'VoteController@index');
 Route::get('/vote/group/{group_id}', 'VoteController@group')->name('vote.group');
-Route::get('/vote/rank/{group_id}', 'VoteController@rank');
+Route::get('/vote/rank', 'VoteController@rank');
 
 Route::group(['middleware' => ['web', 'wechat.oauth']], function () {
     Route::get('/vote/process/{player_id}', 'VoteController@process');