shawn před 9 roky
rodič
revize
d7e3805600

+ 10 - 0
app/Group.php

xqd
@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Group extends Model
+{
+    //
+}

+ 5 - 3
app/Http/Controllers/VoteController.php

xqd xqd
@@ -17,7 +17,9 @@ class VoteController extends Controller
      * 投票首页显示
      * */
     public function index() {
-        return view('front.vote.index');
+        $groups = \App\Group::get();
+        dd($groups);
+        return view('front.vote.index', ['groups'=>$groups]);
     }
 
     /**
@@ -40,9 +42,9 @@ class VoteController extends Controller
      * @param $info 微信用户信息
      * */
     public function process($player_id) {
-        /*$we_user = session('wechat.oauth_user'); // 拿到授权用户资料
+        $we_user = session('wechat.oauth_user'); // 拿到授权用户资料
         $user = $this->wechat->user->get($we_user->getId());
-        dd($user);*/
+        return $user;
         //echo json_encode(['status'=>'1']);
         echo json_encode(['status'=>'0']);
     }

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

xqd
@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddColumnGroupsGroupDesc extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('groups', function (Blueprint $table) {
+            $table->string('group_desc', 120)->comment('分组描述');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::drop('groups');
+    }
+}

+ 3 - 3
resources/views/front/vote/group.blade.php

xqd xqd
@@ -62,7 +62,8 @@
                 
                 <div class="voteoplist">
                     <div class="plistleft leftoptions" style="float:left;">
-                    
+
+
                         <div class="wxop">
                             <div class="wxopimg">
                                 <img src="{{asset('images/s1.png')}}" class="wxopimg_img">
@@ -78,9 +79,8 @@
                                     1375票
                                 </div>	
                             </div>
-
                         </div>
-                        
+
                         <div class="wxop" style="margin-right:0;">
                             <div class="wxopimg">
                                 <img src="{{asset('images/s2.png')}}" class="wxopimg_img">

+ 3 - 1
resources/views/front/vote/index.blade.php

xqd
@@ -34,12 +34,14 @@
             <div class="weui-media-box weui-media-box_small-appmsg">
                 <div class="weui-cells">
 
-                    <a class="weui-cell weui-cell_access" href="/vote/group">
+                    @foreach($groups as $group)
+                    <a class="weui-cell weui-cell_access" href="/vote/group/{{$group->}}">
                         <div class="weui-cell__bd weui-cell_primary">
                             <p>第一组:成都</p>
                         </div>
                         <span class="weui-cell__ft"></span>
                     </a>
+                    @endforeach
 
                     <a class="weui-cell weui-cell_access" href="#">
                         <div class="weui-cell__bd weui-cell_primary">