Merge branch 'master' of http://git.9026.com/shawn/wechat-vote

.gitignore

@@ -5,3 +5,4 @@
 Homestead.json
 Homestead.yaml
 .env
+/文档

database/seeds/PlayerSeeder.php

@@ -15,7 +15,7 @@ class PlayerSeeder extends Seeder
         $school_name = [
             '成都市青白江区人和学校乡村学校少年宫',
             '成都新都大丰小学乡村学校少年宫',
-            '成都新都大丰小学乡村学校少年宫',
+            '成都郫县崇宁小学',
             '成都市新津县乡村学校少年宫',
             '成都市广汉七一小学乡村学校少年宫',
             '自贡五宝小学',

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

@@ -77,7 +77,7 @@
                             @else
                                 <div class="wxop">
                                     <div class="wxopimg">
-                                        <img src="http://cdnvote.9026.com/{{$player->image}}" class="wxopimg_img">
+                                        <img src="http://cdnvote.9026.com/images/{{$player->image}}" class="wxopimg_img">
                                     </div>
                                     <div class="wxoptxt">
                                         {{$player->no}}. {{$player->name}}
@@ -131,7 +131,7 @@
     <div id="toast_4" style="display: none;">
         <div class="weui-mask_transparent"></div>
         <div class="weui-toast">
-            <p class="weui-toast__content" style="margin-top:40px;">对不起,您今天的机会已用完ip!</p>
+            <p class="weui-toast__content" style="margin-top:40px;">对不起,您今天的机会已用完!</p>
         </div>
     </div>
     <div id="toast_5" style="display: none;">
@@ -188,20 +188,48 @@
         });
     });
 
-    @if($status == 5)
-
-        var $toast = $('#toast_5');
-        //if ($toast.css('display') != 'none') return;
-        // 得票数加1
-        //$("#votes_"+player_id).text(parseInt($("#votes_"+player_id).text())+1);
-        // 总票数加1
-        //$("#count_votes").text(parseInt($("#count_votes").text())+1);
-
+    // status=1 : 投票成功
+    // status=0 : 今日机会用完
+    // status=2 : 未关注公众号
+    // status=3 : 投票已结束
+    // status=4 : 限制ip
+    // status=5 : 活动未开始
+    @if($status == 0)
+        var $toast = $('#toast_0');
         $toast.fadeIn(100);
         setTimeout(function () {
             $toast.fadeOut(100);
         }, 2000);
-
+    @elseif($status == 1)
+        var $toast = $('#toast_1');
+        $toast.fadeIn(100);
+        setTimeout(function () {
+            $toast.fadeOut(100);
+        }, 2000);
+    @elseif($status == 2)
+        var $toast = $('#toast_2');
+        $toast.fadeIn(100);
+        setTimeout(function () {
+        $toast.fadeOut(100);
+        }, 2000);
+    @elseif($status == 3)
+        var $toast = $('#toast_3');
+        $toast.fadeIn(100);
+        setTimeout(function () {
+        $toast.fadeOut(100);
+        }, 2000);
+    @elseif($status == 4)
+        var $toast = $('#toast_4');
+        $toast.fadeIn(100);
+        setTimeout(function () {
+        $toast.fadeOut(100);
+        }, 2000);
+    @elseif($status == 5)
+        var $toast = $('#toast_5');
+        $toast.fadeIn(100);
+        setTimeout(function () {
+        $toast.fadeOut(100);
+        }, 2000);
     @endif
 
     /*function vote(player_id){