Merge branch 'gq' of http://git.9026.com/roobe/miao

server/app/Http/Controllers/Api/V1/DreamController.php

@@ -152,10 +152,10 @@ class DreamController extends Controller
         $setting = BaseSettingsModel::where('category','score')->select('key','value')->first()->moey;
         $a = count($setting) > 0 ? $setting->key : '';
         $created_at = $dream_info ? $dream_info->created_at : 0;
-        $b =  intval((time()-strtotime($created_at))/3600) ;
+        $b =  intval((time()-strtotime($created_at))/60) ;
         $c = count($setting) > 0 ? $setting->value : '';
         //Todo 支持乘数目公式
-        $number = -$a * $b + $c;
+        $number =round( -$a * $b + $c,1);
         if ($number <= 1) $number = 1;
         $dream = DreamInfoModel::with(['imgs','user'])->find($id);
         return $this->api(compact('dream','top3user','number'));
@@ -169,14 +169,27 @@ class DreamController extends Controller
      * @apiVersion 0.1.0
      * @apiParam {int} coin 支持梦想币数量
      * @apiParam {int} id 梦想ID
-     * @apiParam {int} number 支持乘数
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
      *{
-     *      "status": true,
-     *      "status_code": 0,
-     *      "message": "",
-     *      "data": ""
+     *   "status": true,
+     *  "status_code": 0,
+     *  "message": "",
+     *  "data": {
+     *      "top3user": [
+     *          {
+     *              "id": 1,
+     *              "phone": "13880642880",
+     *              "nickname": "name1",
+     *              "avatar": "https://timgsa.baidu.cb9999_1.224_0.jpeg",
+     *              "score": 4640                   支持总分数
+     *          }
+     *      ],
+     *      "mark": 4640,                           梦想的分数
+     *      "get_coin": 616,                        梦想获得的梦想币
+     *      "user_coin": 684,                       当前用户剩余梦想币
+     *      "number": 5                             支持乘数
+     *  }
      *}
      * @apiErrorExample {json} Error-Response:
      *HTTP/1.1 400 Bad Request
@@ -190,7 +203,7 @@ class DreamController extends Controller
      * {
      *       "status": false,
      *       "status_code": 1303,
-     *       "message": "商户余额不足",
+     *       "message": "余额不足",
      *       "data": null
      *  }
      *
@@ -216,10 +229,10 @@ class DreamController extends Controller
 
         $setting = BaseSettingsModel::where('category','score')->select('key','value')->first();
         $a = count($setting) > 0 ? $setting->key : '';
-        $b =  intval((time()-strtotime($dream_info->created_at))/3600) ;
+        $b =  intval((time()-strtotime($dream_info->created_at))/60) ;
         $c = count($setting) > 0 ? $setting->value : '';
         //Todo 支持乘数目公式
-        $number = -$a * $b + $c;
+        $number =round( -$a * $b + $c,1);
         if ($number <= 1) $number = 1;
 
         if ($user->coin < $coin) {
@@ -228,6 +241,7 @@ class DreamController extends Controller
             $user->coin  -= $coin;
             $user->save();
             $dream_info->get_coin += $coin;
+            $dream_info->mark += $coin*$number;
             $dream_info->save();
             $data = [
                 'user_id'=>$user->id,
@@ -258,7 +272,28 @@ class DreamController extends Controller
             ];
             SystemInfoModel::create($info);
 
-            return $this->api($number);
+//            支持成功返回数据到当前页面   top3user
+            $support_dream = SupportDreamModel::where('dream_id',$dream_id)->get();
+            $top = [] ;
+            $top3user = [];   //  支持用户排行前三
+            foreach ($support_dream as $item) {
+                if (!array_key_exists($item->user_id,$top)) {
+                    $top[$item->user_id] = $item->score;
+                }else{
+                    $top[$item->user_id] += $item->score;
+                }
+            }
+            arsort($top);
+            foreach ($top as $user_id => $score){
+                $user = UserInfoModel::find($user_id);
+                $user->score = $score;
+                if(count($top3user) <= 2) $top3user[] = $user ;
+            }
+//            梦想分 mark
+            $mark = $dream_info->mark;
+            $get_coin = $dream_info->get_coin;
+            $user_coin = $user->coin;
+            return $this->api(compact('top3user','mark','get_coin','user_coin','number'));
         }
     }
 

server/app/Repositories/User/Criteria/MultiWhere.php

@@ -39,7 +39,7 @@ class MultiWhere extends Criteria {
             $keywords = '%' . $this->search['keyword'] . '%';
             $model = $model->where(function ($query) use ($keywords) {
                 $query->where('id'  , 'like', $keywords)
-                    ->orwhere('mobile', 'like', $keywords);
+                    ->orwhere('nickname', 'like', $keywords);
             });
         }
         return $model;

server/resources/views/admin/user/info/index.blade.php

@@ -18,32 +18,34 @@
 
 				        <div class="col-sm-4">
 				            <div class="input-group">
-								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
+								<input type="text" value="{{Request::get('keyword')}}"	placeholder="id/昵称" name="keyword"class="input-sm form-control">
 								<span class="input-group-btn">
 									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
 								</span>
     						</div>
 				        </div>
 				        </form>
-						@if(role('User/Info/create'))
     					<div class="col-sm-3 pull-right">
     					   <a href="{{ U('User/Info/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
     					</div>
-						@endif
 					</div>
 					
 					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
 						<thead>
     						<tr>
-								
-            <th class="sorting" data-sort="id"> 用户ID </th>
-            <th class="sorting" data-sort="real_name"> 姓名 </th>
-            <th class="sorting" data-sort="email"> EMAIL </th>
-            <th class="sorting" data-sort="mobile"> 手机号 </th>
-            <th class="sorting" data-sort="idcard_back"> 工作类型 </th>
-            <th class="sorting" data-sort="educational"> 学历 </th>
-								<th class="sorting" data-sort="last_login_time"> 最后登陆时间 </th>
-
+								<th class="sorting" data-sort="id"> 用户ID </th>
+								<th class="sorting" data-sort="nickname"> 昵称 </th>
+								<th class="sorting" data-sort="avatar"> 头像 </th>
+								<th class="sorting" data-sort="sex"> 性别 </th>
+								<th class="sorting" data-sort="birthday"> 年龄 </th>
+								<th class="sorting" data-sort="signture"> 个性签名 </th>
+								<th class="sorting" data-sort="height"> 身高 </th>
+								<th class="sorting" data-sort="work"> 职业 </th>
+								<th class="sorting" data-sort="emotion"> 情感状态 </th>
+								<th class="sorting" data-sort="city"> 所在城市 </th>
+								<th class="sorting" data-sort="phone"> 手机号 </th>
+								<th class="sorting" data-sort="coin"> 剩余梦想币 </th>
+								<th class="sorting" data-sort="coin"> 状态 </th>
         						<th width="22%">相关操作</th>
         					</tr>
 						</thead>
@@ -52,13 +54,22 @@
 							@foreach($list as $key => $item)
 								<tr>
 									<td>{{ $item->id }}</td>
-									<td>{{ $item->real_name }}</td>
-									<td>{{ $item->email }}</td>
-									<td>{{ $item->mobile }}</td>
-									<td>{{ dict()->get('user_info','work_type',$item->work_type) }}</td>
-									<td>{{ $item->educational }}</td>
-									<td>{{ $item->last_login_time }}</td>
-
+									<td>{{ $item->nickname }}</td>
+									<td>
+										<a href="{{ $item->avatar }}" target="_blank">
+											<img style="width: 40%;height: 40%;" src="{{ $item->avatar }}" alt="">
+										</a>
+									</td>
+									<td>{{ $item->sex }}</td>
+									<td>{{ $item->birthday }}</td>
+									<td>{{ $item->signture }}</td>
+									<td>{{ $item->height }}</td>
+									<td>{{ $item->work }}</td>
+									<td>{{ dict()->get('user_info','emotion',$item->emotion) }}</td>
+									<td>{{ $item->city }}</td>
+									<td>{{ $item->phone }}</td>
+									<td>{{ $item->coin }}</td>
+									<td>{{ $item->状态 }}</td>
 								<td>
 									<div class="btn-group">
 										<button data-toggle="dropdown"

server/resources/views/admin/user_blade/info/check.blade.php

@@ -0,0 +1,134 @@
+@extends('admin.layout')
+
+@section('content')
+	<div class="wrapper wrapper-content animated fadeInRight">
+		<div class="row">
+			<div class="col-sm-12">
+				<div class="ibox float-e-margins">
+					<div class="ibox-title">
+						<h5>用户管理</h5>
+						<div class="ibox-tools">
+							<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+							</a>
+						</div>
+					</div>
+					<div class="ibox-content">
+						<div class="row">
+							<form method="GET" action="" accept-charset="UTF-8">
+
+								<div class="col-sm-4">
+									<div class="input-group">
+										<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control">
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+									</div>
+								</div>
+							</form>
+							@if(role('User/Info/create'))
+								<div class="col-sm-3 pull-right">
+									<a href="{{ U('User/Info/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+								</div>
+							@endif
+						</div>
+
+						<table class="table table-striped table-bordered table-hover dataTables-example dataTable dataCheckTable">
+							<thead>
+							<tr>
+								<th><input class="btSelectAll" name="btSelectAll" type="checkbox"></th>
+								
+            <th class="sorting" data-sort="id"> 用户ID </th>
+            <th class="sorting" data-sort="username"> 登录名 </th>
+            <th class="sorting" data-sort="real_name"> 姓名 </th>
+            <th class="sorting" data-sort="password"> 密码 </th>
+            <th class="sorting" data-sort="email"> EMAIL </th>
+            <th class="sorting" data-sort="mobile"> 手机号 </th>
+            <th class="sorting" data-sort="avatar"> 用户头像 </th>
+            <th class="sorting" data-sort="gender"> 性别,1:男,2:女,参照数据字典 </th>
+            <th class="sorting" data-sort="province"> 居住地址省 </th>
+            <th class="sorting" data-sort="city"> 居住地址市 </th>
+            <th class="sorting" data-sort="county"> 居住地址区县 </th>
+            <th class="sorting" data-sort="work_type"> 工作类型：上班，自由职业者 </th>
+            <th class="sorting" data-sort="address"> 详细地址 </th>
+            <th class="sorting" data-sort="address_time"> 居住时长 </th>
+            <th class="sorting" data-sort="idcard"> 身份证号 </th>
+            <th class="sorting" data-sort="idcard_positive"> 身份证正面 </th>
+            <th class="sorting" data-sort="idcard_back"> 身份证背面 </th>
+            <th class="sorting" data-sort="educational"> 学历 </th>
+            <th class="sorting" data-sort="marital"> 婚姻状况 </th>
+            <th class="sorting" data-sort="last_login_time"> 最后一次登录时间 </th>
+            <th class="sorting" data-sort="contact_bind"> 直系亲属联系人关系 </th>
+            <th class="sorting" data-sort="contact_name"> 直系亲属联系人姓名 </th>
+            <th class="sorting" data-sort="contact_mobile"> 直系亲属联系人手机 </th>
+            <th class="sorting" data-sort="other_contact_bind"> 其他联系人关系 </th>
+            <th class="sorting" data-sort="other_contact_name"> 直系亲属联系人姓名 </th>
+            <th class="sorting" data-sort="other_contact_mobile"> 直系亲属联系人手机 </th>
+            <th class="sorting" data-sort="created_at"> 创建时间 </th>
+            <th class="sorting" data-sort="updated_at"> 更新时间 </th>
+								<th width="22%">相关操作</th>
+							</tr>
+							</thead>
+							<tbody>
+							@if(isset($list))
+								@foreach($list as $key => $item)
+									<tr>
+									<td><input data-json='{!! json_encode($item) !!}'  name="btSelectItem" class="data_key" type="checkbox" value="{{ $item->id or 0 }}" /></td>
+									
+            <td>{{ $item->id }}</td>
+            <td>{{ $item->username }}</td>
+            <td>{{ $item->real_name }}</td>
+            <td>{{ $item->password }}</td>
+            <td>{{ $item->email }}</td>
+            <td>{{ $item->mobile }}</td>
+            <td>{{ $item->avatar }}</td>
+            <td>{{ $item->gender }}</td>
+            <td>{{ $item->province }}</td>
+            <td>{{ $item->city }}</td>
+            <td>{{ $item->county }}</td>
+            <td>{{ dict()->get('user_info','work_type',$item->work_type) }}</td>
+            <td>{{ $item->address }}</td>
+            <td>{{ dict()->get('user_info','address_time',$item->address_time) }}</td>
+            <td>{{ $item->idcard }}</td>
+            <td>{{ $item->idcard_positive }}</td>
+            <td>{{ $item->idcard_back }}</td>
+            <td>{{ $item->educational }}</td>
+            <td>{{ dict()->get('user_info','marital',$item->marital) }}</td>
+            <td>{{ $item->last_login_time }}</td>
+            <td>{{ dict()->get('user_info','contact_bind',$item->contact_bind) }}</td>
+            <td>{{ $item->contact_name }}</td>
+            <td>{{ $item->contact_mobile }}</td>
+            <td>{{ dict()->get('user_info','other_contact_bind',$item->other_contact_bind) }}</td>
+            <td>{{ $item->other_contact_name }}</td>
+            <td>{{ $item->other_contact_mobile }}</td>
+            <td>{{ $item->created_at }}</td>
+            <td>{{ $item->updated_at }}</td>
+									<td>
+										@if(role('User/Info/view'))
+											<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('User/Info/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+										@endif
+									</td>
+								</tr>
+								@endforeach
+							@endif
+
+							</tbody>
+						</table>
+						<div class="row">
+							<div class="col-sm-6">
+								<div class="dataTables_info" id="DataTables_Table_0_info"
+									 role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+							</div>
+							<div class="col-sm-6">
+								<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+									{!! $list->setPath('')->appends(Request::all())->render() !!}
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	@include('admin.tools.check_script');
+
+@endsection

server/resources/views/admin/user_blade/info/edit.blade.php

@@ -0,0 +1,296 @@
+@extends('admin.layout')
+
+@section('content')
+
+<?php
+    if(!isset($data)) $data = array();
+    if(!$data && session("data")){
+        $data = session("data");
+    }
+    if(!$data && session('_old_input')){
+        $data = session("_old_input");
+    }
+?>
+<div class="wrapper wrapper-content animated fadeInRight">
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>用户管理</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+                    @if(role('User/Info/index'))
+				    <div class="row">
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('User/Info/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+    					</div>
+					</div>
+                    @endif
+
+		            <div class="row">
+                        <div class="col-lg-10">
+                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
+
+                                    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">登录名</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_username" name="data[username]" class="form-control" value="{{ $data['username'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">姓名</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_real_name" name="data[real_name]" isChinese class="form-control" value="{{ $data['real_name'] or ''}}" required="" aria-required="true"  placeholder="">
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">密码</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_password" name="data[password]" class="form-control" value="{{ $data['password'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">EMAIL</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_email" name="data[email]" email="true" class="form-control" value="{{ $data['email'] or ''}}" required="" aria-required="true"  placeholder="">
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">手机号</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_mobile" name="data[mobile]" isMobile="true" class="form-control" value="{{ $data['mobile'] or ''}}" required="" aria-required="true"  placeholder="">
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">用户头像</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_avatar" name="data[avatar]" class="form-control" value="{{ $data['avatar'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">性别</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_gender" name="data[gender]" class="form-control" value="{{ $data['gender'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                    </div>
+                                
+                    </div>    
+
+                <div class="form-group">
+                 <label class="control-label col-sm-3">工作类型</label>
+                                    
+                   <div class="col-sm-9">
+                       @foreach(dict()->get('global','sex') as $key=>$val)
+                           <label class="radio-inline">
+                               <input type="radio" name="data[job]" value="{{$key}}" @if(isset($data['job']) && $data['job'] == $key)checked="checked" @endif/>{{$val}}
+                           </label>
+                    @endforeach
+                    </div>
+                                
+                    </div>
+                    <div class="form-group">
+
+                        <label class="control-label col-sm-3">居住地址省</label>
+
+                        <div class="col-sm-9">
+                            <div class="col-sm-2">
+                                <select class="form-control" id="cmbProvince" name="place_province_id"></select>
+                            </div>
+                            <div class="col-sm-2">
+                                <select class="form-control" id="cmbCity" name="place_city_id"></select>
+                            </div>
+                            <div class="col-sm-2">
+                                <select class="form-control" id="cmbArea" name=""></select>
+                            </div>
+                            <script type="text/javascript" src="/base/js/areadata.min.js"></script>
+                            <script type="text/javascript">
+                                areadata({_cmbProvince:'cmbProvince',//省
+                                    _cmbCity:'cmbCity',//市
+                                    _cmbArea:'cmbArea',//县
+                                    _infoname:'place_area_id',
+                                    _default:"{{ $data['place_area_id'] or '' }}"//默认县
+                                });
+                            </script>
+                        </div>
+
+                    </div>
+
+                                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">详细地址</label>
+                                    
+                   <div class="col-sm-9">
+
+                     <input id="data_address" name="data[address]" stringCheck="true" class="form-control" value="{{ $data['address'] or ''}}" required="" aria-required="true"  placeholder="">
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">居住时长</label>
+                                    
+                   <div class="col-sm-9">
+                       @foreach(dict()->get('global','sex') as $key=>$val)
+                               <label class="radio-inline">
+                                   <input type="radio" name="data[address_time]" value="{{$key}}" @if(isset($data['address_time']) && $data['address_time'] == $key)checked="checked" @endif/>{{$val}}
+                               </label>
+                        @endforeach
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">身份证号</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_idcard" name="data[idcard]" isIdCardNo="true" class="form-control" value="{{ $data['idcard'] or ''}}" required="" aria-required="true"  placeholder="">
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">身份证正面</label>
+                                    
+                   <div class="col-sm-9">
+                       {!!  widget('Tools.ImgUpload')->single2('/upload/user','idcard_positive',"idcard_positive", isset($data['idcard_positive'])? $data['idcard_positive'] : "") !!}
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">身份证背面</label>
+                                    
+                   <div class="col-sm-9">
+                       {!!  widget('Tools.ImgUpload')->single2('/upload/user','idcard_back',"idcard_back", isset($data['idcard_back'])? $data['idcard_back'] : "") !!}
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">学历</label>
+                                    
+                   <div class="col-sm-9">
+                       @foreach(dict()->get('global','sex') as $key=>$val)
+                           <label class="radio-inline">
+                               <input type="radio" name="data[educational]" value="{{$key}}" @if(isset($data['educational']) && $data['educational'] == $key)checked="checked" @endif/>{{$val}}
+                           </label>
+                       @endforeach
+                    </div>
+                                
+                </div>
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">婚姻状况</label>
+                                    
+                   <div class="col-sm-9"> @foreach(dict()->get('global','sex') as $key=>$val)
+                                                   <label class="radio-inline">
+                                                       <input type="radio" name="data[marital]" value="{{$key}}" @if(isset($data['marital']) && $data['marital'] == $key)checked="checked" @endif/>{{$val}}
+                                                   </label>
+                                            @endforeach 
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">直系亲属联系人关系</label>
+
+                   <div class="col-sm-9"> @foreach(dict()->get('global','sex') as $key=>$val)
+                                                   <label class="radio-inline">
+                                                       <input type="radio" name="data[contact_bind]" value="{{$key}}" @if(isset($data['contact_bind']) && $data['contact_bind'] == $key)checked="checked" @endif/>{{$val}}
+                                                   </label>
+                                            @endforeach
+                    </div>
+
+                    </div>
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">直系亲属联系人姓名</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_contact_name" name="data[contact_name]" isChinese="true" class="form-control" value="{{ $data['contact_name'] or ''}}" required="" aria-required="true"  placeholder="">
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">直系亲属联系人手机</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_contact_mobile" isMobile="true"  name="data[contact_mobile]" class="form-control" value="{{ $data['contact_mobile'] or ''}}" required="" aria-required="true"  placeholder="">
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">其他联系人关系</label>
+                                    
+                   <div class="col-sm-9"> @foreach(dict()->get('global','sex') as $key=>$val)
+                                                   <label class="radio-inline">
+                                                       <input type="radio" name="data[other_contact_bind]" value="{{$key}}" @if(isset($data['other_contact_bind']) && $data['other_contact_bind'] == $key)checked="checked" @endif/>{{$val}}
+                                                   </label>
+                                            @endforeach 
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">直系亲属联系人姓名</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_other_contact_name" isChinese="true" name="data[other_contact_name]" class="form-control" value="{{ $data['other_contact_name'] or ''}}" required="" aria-required="true"  placeholder="">
+                    </div>
+                                
+                    </div>    
+                <div class="form-group">
+                                    
+                 <label class="control-label col-sm-3">直系亲属联系人手机</label>
+                                    
+                   <div class="col-sm-9">
+                     <input id="data_other_contact_mobile" isMobile="true"  name="data[other_contact_mobile]" class="form-control" value="{{ $data['other_contact_mobile'] or ''}}" required="" aria-required="true"  placeholder="">
+                    </div>
+                    </div>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-3">&nbsp;</label>
+                                    <div class="col-sm-9">
+                                        <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
+                                        <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
+                                        <input type="submit" class="btn btn-success" style="margin-right:20px;">
+                                        <input type="reset" class="btn btn-default" >
+                                    </div>
+                                </div>
+                            </form>
+                        </div>
+                        <!-- /.col-lg-10 -->
+                    </div>
+                    <!-- /.row -->
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+@endsection

server/resources/views/admin/user_blade/info/index.blade.php

@@ -0,0 +1,109 @@
+@extends('admin.layout') 
+
+@section('content')
+<div class="wrapper wrapper-content animated fadeInRight">
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="ibox float-e-margins">
+				<div class="ibox-title">
+					<h5>用户管理</h5>
+					<div class="ibox-tools">
+						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+						</a>
+					</div>
+				</div>
+				<div class="ibox-content">
+				    <div class="row">
+				        <form method="GET" action="" accept-charset="UTF-8">
+
+				        <div class="col-sm-4">
+				            <div class="input-group">
+								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
+								<span class="input-group-btn">
+									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
+								</span>
+    						</div>
+				        </div>
+				        </form>
+						@if(role('User/Info/create'))
+    					<div class="col-sm-3 pull-right">
+    					   <a href="{{ U('User/Info/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+    					</div>
+						@endif
+					</div>
+					
+					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+						<thead>
+    						<tr>
+								
+            <th class="sorting" data-sort="id"> 用户ID </th>
+            <th class="sorting" data-sort="real_name"> 姓名 </th>
+            <th class="sorting" data-sort="email"> EMAIL </th>
+            <th class="sorting" data-sort="mobile"> 手机号 </th>
+            <th class="sorting" data-sort="idcard_back"> 工作类型 </th>
+            <th class="sorting" data-sort="educational"> 学历 </th>
+								<th class="sorting" data-sort="last_login_time"> 最后登陆时间 </th>
+
+        						<th width="22%">相关操作</th>
+        					</tr>
+						</thead>
+						<tbody>
+						@if(isset($list))
+							@foreach($list as $key => $item)
+								<tr>
+									<td>{{ $item->id }}</td>
+									<td>{{ $item->real_name }}</td>
+									<td>{{ $item->email }}</td>
+									<td>{{ $item->mobile }}</td>
+									<td>{{ dict()->get('user_info','work_type',$item->work_type) }}</td>
+									<td>{{ $item->educational }}</td>
+									<td>{{ $item->last_login_time }}</td>
+
+								<td>
+									<div class="btn-group">
+										<button data-toggle="dropdown"
+											class="btn btn-warning btn-sm dropdown-toggle"
+											aria-expanded="false">
+											操作 <span class="caret"></span>
+										</button>
+										<ul class="dropdown-menu">
+
+
+											@if(role('User/Info/update'))
+											<li><a href="{{ U('User/Info/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
+											@endif
+
+											@if(role('User/Info/destroy'))
+											<li class="divider"></li>
+											<li><a href="{{ U('User/Info/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+											@endif
+
+										</ul>
+									</div>
+								@if(role('User/Info/view'))
+										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('User/Info/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
+									@endif
+								</td>
+							</tr>
+							@endforeach
+							@endif
+
+						</tbody>
+					</table>
+					<div class="row">
+						<div class="col-sm-6">
+							<div class="dataTables_info" id="DataTables_Table_0_info"
+								role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
+						</div>
+						<div class="col-sm-6">
+						<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+						{!! $list->setPath('')->appends(Request::all())->render() !!}
+						</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+@endsection

server/resources/views/admin/user_blade/info/view.blade.php

@@ -0,0 +1,214 @@
+@extends('admin.layout')
+
+@section('content')
+<div class="row">
+    <div class="ibox-content">
+        <div class="list-group">
+                                 
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">用户ID</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['id'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">登录名</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['username'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">姓名</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['real_name'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">密码</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['password'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">EMAIL</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['email'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">手机号</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['mobile'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">用户头像</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['avatar'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">性别,1:男,2:女,参照数据字典</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['gender'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">居住地址省</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['province'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">居住地址市</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['city'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">居住地址区县</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['county'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">工作类型：上班，自由职业者</h3>
+                                                   
+                   <p class="list-group-item-text">{{ dict()->get('user_info','work_type',$data['work_type']) }}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">详细地址</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['address'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">居住时长</h3>
+                                                   
+                   <p class="list-group-item-text">{{ dict()->get('user_info','address_time',$data['address_time']) }}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">身份证号</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['idcard'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">身份证正面</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['idcard_positive'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">身份证背面</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['idcard_back'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">学历</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['educational'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">婚姻状况</h3>
+                                                   
+                   <p class="list-group-item-text">{{ dict()->get('user_info','marital',$data['marital']) }}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">最后一次登录时间</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['last_login_time'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">直系亲属联系人关系</h3>
+                                                   
+                   <p class="list-group-item-text">{{ dict()->get('user_info','contact_bind',$data['contact_bind']) }}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">直系亲属联系人姓名</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['contact_name'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">直系亲属联系人手机</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['contact_mobile'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">其他联系人关系</h3>
+                                                   
+                   <p class="list-group-item-text">{{ dict()->get('user_info','other_contact_bind',$data['other_contact_bind']) }}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">直系亲属联系人姓名</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['other_contact_name'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">直系亲属联系人手机</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['other_contact_mobile'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">创建时间</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['created_at'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">更新时间</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['updated_at'] or ''}}</p>
+                                                 
+               </div>                     
+               <div class="list-group-item">
+                                                  
+                   <h3 class="list-group-item-heading">删除时间</h3>
+                                                   
+                   <p class="list-group-item-text"> {{ $data['deleted_at'] or ''}}</p>
+                                                 
+               </div>
+        </div>
+    </div>
+</div>
+@endsection