shawn пре 9 година
родитељ
комит
e824aa8a7e

+ 10 - 4
app/Http/Controllers/VoteController.php

xqd xqd xqd xqd
@@ -99,7 +99,7 @@ class VoteController extends Controller
         $we_user = session('wechat.oauth_user'); // 拿到授权用户资料
         $user = $this->wechat->user->get($we_user->getId());
 
-        // 今日投票总和, 根据openid
+        // 根据openid, 获取今日投票总和
         $today_count = Vote::where('openid', $user->openid)->where('created_at', 'like', '%'.date('Y-m-d', time()).'%')->count();
         // 结束时间 和 开始时间
         $time_obj = ActivityInfo::select('end_time', 'start_time')->first();
@@ -107,6 +107,8 @@ class VoteController extends Controller
         $vote_ip = $request->ip();
         // 获取group_id
         $player = Player::select('group_id')->find($player_id);
+        // 根据openid, 获取分组投票总和
+        $group_count = Vote::where('openid', $user->openid)->where('group_id', $player->group_id)->where('created_at', 'like', '%'.date('Y-m-d', time()).'%')->count();
 
 // ************* 测试服务器时区是否正确 *****************
 //        dump($end_time_obj->end_time);
@@ -125,12 +127,15 @@ class VoteController extends Controller
         } elseif( time() >= strtotime($time_obj->end_time) ) {
             // 3, 投票结束
             return redirect()->route('vote.group', ['group_id' => $player->group_id , 'status' => '3']);
-        }elseif($user->subscribe != 1) {
+        }/*elseif($user->subscribe != 1) {
             // 2, 没有关注
             return redirect()->route('vote.group', ['group_id' => $player->group_id , 'status' => '2']);
-        }elseif($today_count >= 5) {
-            // 0, 微信号投票限制, 已经投了5
+        }*/elseif($today_count >= 20) {
+            // 0, 微信号投票限制, 已经投了20
             return redirect()->route('vote.group', ['group_id' => $player->group_id , 'status' => '6']);
+        }elseif($group_count >= 5) {
+            // 7, 分组投票限制, 已经投了5票
+            return redirect()->route('vote.group', ['group_id' => $player->group_id , 'status' => '5']);
         }/*elseif( Cache::get($vote_ip) >= 10 ) {
             // 4, 投票ip限制,防止刷票
             return redirect()->route('vote.group', ['group_id' => $player->group_id , 'status' => '4']);
@@ -138,6 +143,7 @@ class VoteController extends Controller
             // 1, 投票成功
             $votes = new Vote;
             $votes->player_id = $player_id;
+            $votes->group_id = $player->group_id;
             $votes->openid = $user->openid;
             $votes->we_nickname = $user->nickname;
             $votes->we_image = $user->headimgurl;

+ 30 - 0
database/migrations/2016_11_27_210923_add_column_votes_group_id.php

xqd
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddColumnVotesGroupId extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('votes', function(Blueprint $table) {
+            $table->integer('group_id')->unsigned()->comment('分组id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

+ 12 - 0
resources/views/front/vote/group.blade.php

xqd xqd
@@ -142,6 +142,12 @@
             <p class="weui-toast__content" style="margin-top:40px;">对不起,活动未开始!</p>
         </div>
     </div>
+    <div id="toast_7" style="display: none;">
+        <div class="weui-mask_transparent"></div>
+        <div class="weui-toast">
+            <p class="weui-toast__content" style="margin-top:40px;">对不起,您在本分组的机会已用完!</p>
+        </div>
+    </div>
 
 
 <script type="text/javascript">
@@ -232,6 +238,12 @@
         setTimeout(function () {
         $toast.fadeOut(100);
         }, 2000);
+    @elseif($status == 7)
+        var $toast = $('#toast_7');
+        $toast.fadeIn(100);
+        setTimeout(function () {
+    $toast.fadeOut(100);
+    }, 2000);
     @endif
 
 </script>

BIN
文档/节目名单(排序).docx