a

server/app/Http/Controllers/Admin/Base/SettingsController.php

@@ -10,8 +10,9 @@ namespace App\Http\Controllers\Admin\Base;
 use App\Http\Controllers\Admin\Controller;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
-use App\Repositories\Base\Criteria\MultiWhere;
-use App\Repositories\Base\SettingsRepository;
+use App\Repositories\Settings\Criteria\MultiWhere;
+use App\Repositories\Settings\SettingsRepository;
+use App\Models\BaseSettingsModel;
 
 class SettingsController extends Controller
 {
@@ -54,7 +55,9 @@ class SettingsController extends Controller
         if($reqeust->method() == 'POST') {
             return $this->_createSave();
         }
-        return view('admin.base.settings.edit');
+        return view('admin.base.settings.edit', [
+            'categories' => BaseSettingsModel::where('category', '=', 'category')->get(),
+        ]);
     }
 
     /**
@@ -62,6 +65,12 @@ class SettingsController extends Controller
      */
     private function _createSave(){
         $data = (array) request('data');
+        if ($this->repository->where(['category' => $data['category'], 'key' => $data['key']])->exists()) {
+            $url[] = array('url'=>U( 'Base/Settings/index'),'title'=>'返回列表');
+            return $this->showWarning('该类别下已有相同键存在!',$url);
+        }
+        $data['sort'] = empty($request->sort) ? 0 : $request->sort;
+
         $id = $this->repository->create($data);
         if($id) {
             $url[] = array('url'=>U( 'Base/Settings/index'),'title'=>'返回列表');
@@ -84,7 +93,8 @@ class SettingsController extends Controller
             return $this->_updateSave();
         }
         $data = $this->repository->find($reqeust->get('id'));
-        return view('admin.base.settings.edit',compact('data'));
+        $categories = BaseSettingsModel::where('category', '=', 'category')->get();
+        return view('admin.base.settings.edit',compact('data','categories'));
     }
 
     /**
@@ -92,6 +102,10 @@ class SettingsController extends Controller
      */
     private function _updateSave() {
         $data = (array) request('data');
+        if ($this->repository->where(['category' => $data['category'], 'key' => $data['key']])->exists()) {
+            $url[] = array('url'=>U( 'Base/Settings/index'),'title'=>'返回列表');
+            return $this->showWarning('该类别下已有相同键存在!',$url);
+        }
         $ok = $this->repository->update(request('id'),$data);
         if($ok) {
             $url[] = array('url'=>U( 'Base/Settings/index'),'title'=>'返回列表');

server/app/Http/Controllers/Admin/User/InfoController.php

@@ -1,9 +1,9 @@
 <?php
 /**
- *  用户列表
+ *  用户表
  *  @author  system
  *  @version    1.0
- *  @date 2017-05-31 07:46:45
+ *  @date 2017-05-30 12:16:56
  *
  */
 namespace App\Http\Controllers\Admin\User;

server/app/Models/BaseSettingsModel.php

@@ -39,4 +39,22 @@ class BaseSettingsModel extends BaseModel
                            'status'
                           ];
 
+    public static function _tree($data, $pid = 0, $level = 0) {
+        $result = [];
+        foreach ($data as $k => $v) {
+            if ($v->pid == $pid) {
+                $node = [
+                    'level'     => $level,
+                    'data'      => $v,
+                    'children'  => self::_tree($data, $v->id, $level + 1),
+                ];
+                $result[] = $node;
+            }
+        }
+        return $result;
+    }
+
+    public static function tree() {
+        return self::_tree(self::all(), 0, 0);
+    }
 }

server/app/Models/UserInfoModel.php

@@ -2,10 +2,10 @@
 namespace App\Models;
 use App\Models\BaseModel;
 /**
- *  @description 用户列表
+ *  @description 用户表
  *  @author  system;
  *  @version    1.0
- *  @date 2017-05-31 07:46:45
+ *  @date 2017-05-30 12:16:56
  *
  */
 class UserInfoModel extends BaseModel
@@ -31,18 +31,16 @@ class UserInfoModel extends BaseModel
      * @var string
      */
     protected $fillable = [
-                           'tel',
-                           'pwd',
-                           'nickname',
-                           'money',
-                           'sex',
-                           'signture',
-                           'tall',
-                           'job',
-                           'emotion',
-                           'address',
-                           'detail_address',
-                           'status',
+                           'password',
+                           'email',
+                           'area',
+                           'name',
+                           'vip',
+                           'level',
+                           'idcard',
+                           'contact',
+                           'prize',
+                           'openid',
                            'remember_token'
                           ];
 

server/app/Repositories/Base/Criteria/MultiWhere.php → server/app/Repositories/Settings/Criteria/MultiWhere.php

@@ -6,9 +6,7 @@
  * Time: 17:52
  */
 
-namespace App\Repositories\Base\Criteria;
-
-
+namespace App\Repositories\Settings\Criteria;
 
 
 use App\Repositories\Base\Criteria;
@@ -35,11 +33,14 @@ class MultiWhere extends Criteria {
     */
     public function apply($model, Repository $repository)
     {
-          if(isset($this->search['deleted_at']) && $this->search['deleted_at']) {
-                                    $model = $model->where('deleted_at',$this->search['deleted_at']);
-                                 }
-
-         return $model;
+        if(isset($this->search['keyword']) && ! empty($this->search['keyword'])) {
+            $keywords = '%' . $this->search['keyword'] . '%';
+            $model = $model->where(function ($query) use ($keywords) {
+                $query->where('key'  , 'like', $keywords)
+                    ->orwhere('value', 'like', $keywords);
+            });
+        }
+        return $model;
     }
 
 }

server/app/Repositories/Base/SettingsRepository.php → server/app/Repositories/Settings/SettingsRepository.php

@@ -6,7 +6,7 @@
  *  @date 2017-05-31 04:56:09
  *
  */
-namespace App\Repositories\Base;
+namespace App\Repositories\Settings;
 
 use App\Repositories\Base\Repository;
 

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

@@ -35,11 +35,14 @@ class MultiWhere extends Criteria {
     */
     public function apply($model, Repository $repository)
     {
-          if(isset($this->search['deleted_at']) && $this->search['deleted_at']) {
-                                    $model = $model->where('deleted_at',$this->search['deleted_at']);
-                                 }
-
-         return $model;
+        if(isset($this->search['keyword']) && ! empty($this->search['keyword'])) {
+            $keywords = '%' . $this->search['keyword'] . '%';
+            $model = $model->where(function ($query) use ($keywords) {
+                $query->where('id'  , 'like', $keywords)
+                    ->orwhere('mobile', 'like', $keywords);
+            });
+        }
+        return $model;
     }
 
 }

server/app/Repositories/User/InfoRepository.php

@@ -1,9 +1,9 @@
 <?php
 /**
- *   用户列表
+ *   用户表
  *  @author  system
  *  @version    1.0
- *  @date 2017-05-31 07:46:45
+ *  @date 2017-05-30 12:16:56
  *
  */
 namespace App\Repositories\User;

server/app/Services/CRUD/CRUD.php

@@ -467,7 +467,7 @@ class CRUD extends BaseProcess
 
                 }
                 $editTdStr .=" \r\n                    </div>
-                                \r\n                    </div>";
+                                \r\n                </div>";
 
             }
         }

server/app/Widget/Tools/Setting.php

@@ -8,6 +8,8 @@
 
 namespace App\Widget\Tools;
 
+use App\Models\BaseSettingsModel;
+
 class Setting
 {
     private function _treeSelect($tree, $fid, $prefix) {
@@ -36,7 +38,7 @@ class Setting
 
     public function treeSelect($field, $fid = 0, $prefix = '    ')
     {
-        $chTree = Setting::tree();
+        $chTree = BaseSettingsModel::tree();
         $select = '<select class="form-control input-sm" name="' . $field . '">';
         $select .= '<option value="0">~~无~~</option>';
         if(count($chTree) > 0) {

server/database/migrations/2017_05_30_203524_create_base_settings_table.php

@@ -31,9 +31,8 @@ class CreateBaseSettingsTable extends Migration
             $table->index('key', 'idx_code');
             $table->index('pid', 'idx_pid');
 
-            
-
         });
+        DB::update("ALTER TABLE base_settings AUTO_INCREMENT = 1000;");
     }
 
     /**

server/database/seeds/init.sql

@@ -1069,5 +1069,8 @@ VALUES
 
 
 
+INSERT INTO `base_settings` (`id`, `key`, `value`, `sort`, `category`, `pid`, `status`, `created_at`, `updated_at`, `deleted_at`)
+VALUES
+	(1, 'category', '类别定义', 0, 'category', 0, 1, NULL, NULL, NULL);
 
 

server/resources/views/admin/base/settings/edit.blade.php

@@ -38,16 +38,16 @@
                                     
                 <div class="form-group">
                                     
-                 <label class="control-label col-sm-3">配置代码</label>
+                 <label class="control-label col-sm-3">键</label>
                                     
                    <div class="col-sm-9">
                      <input id="data_key" name="data[key]" class="form-control" value="{{ $data['key'] or ''}}" required="" aria-required="true"  placeholder=""> 
                     </div>
                                 
-                    </div>    
+                </div>
                 <div class="form-group">
                                     
-                 <label class="control-label col-sm-3">配置名称</label>
+                 <label class="control-label col-sm-3">值</label>
                                     
                    <div class="col-sm-9">
                      <input id="data_value" name="data[value]" class="form-control" value="{{ $data['value'] or ''}}" required="" aria-required="true"  placeholder=""> 
@@ -65,28 +65,38 @@
                     </div>    
                 <div class="form-group">
                                     
-                 <label class="control-label col-sm-3">配置类型</label>
+                 <label class="control-label col-sm-3">配置类别</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_category" name="data[category]" class="form-control" value="{{ $data['category'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                       <select  aria-required="true" class="form-control" name="category">
+                       @foreach($categories as $cat)
+                           <option value="{{ $cat->key }}" @if(isset($data['category']))  {!! $cat->key == $data['category'] ? ' selected' : '' !!}  @endif>{{ $cat->value }}</option>
+                       @endforeach
+                       </select>
                     </div>
                                 
                     </div>    
                 <div class="form-group">
                                     
-                 <label class="control-label col-sm-3">父id</label>
+                 <label class="control-label col-sm-3">父节点</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_pid" name="data[pid]" class="form-control" value="{{ $data['pid'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                       @if(isset($data['pid']))
+                           {!!  widget('Tools.Setting')->treeSelect('pid', $data['pid']) !!}
+                       @else
+                           {!!  widget('Tools.Setting')->treeSelect('pid', 0) !!}
+                       @endif
                     </div>
                                 
                     </div>    
                 <div class="form-group">
                                     
-                 <label class="control-label col-sm-3">图片状态</label>
+                 <label class="control-label col-sm-3">状态</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_status" name="data[status]" class="form-control" value="{{ $data['status'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                           <input type="radio" name="data[status]" value="1" @if(!isset($data['status']) || $data['status'] == "1")checked="checked" @endif>启用
+                           &nbsp; &nbsp; &nbsp;
+                           <input type="radio" name="data[status]" value="0" @if(isset($data['status']) && $data['status'] == "0")checked="checked" @endif>禁用
                     </div>
                                 
                     </div>

server/resources/views/admin/base/settings/index.blade.php

@@ -37,12 +37,12 @@
     						<tr>
 								
             <th class="sorting" data-sort="id">  </th>
-            <th class="sorting" data-sort="key"> 配置代码 </th>
-            <th class="sorting" data-sort="value"> 配置名称 </th>
+            <th class="sorting" data-sort="key"> 键 </th>
+            <th class="sorting" data-sort="value"> 值 </th>
             <th class="sorting" data-sort="sort"> 排序 </th>
-            <th class="sorting" data-sort="category"> 配置类型 </th>
+            <th class="sorting" data-sort="category"> 配置类别 </th>
             <th class="sorting" data-sort="pid"> 父id </th>
-            <th class="sorting" data-sort="status"> 图片状态 </th>
+            <th class="sorting" data-sort="status"> 状态 </th>
         						<th width="22%">相关操作</th>
         					</tr>
 						</thead>
@@ -56,8 +56,9 @@
             <td>{{ $item->sort }}</td>
             <td>{{ $item->category }}</td>
             <td>{{ $item->pid }}</td>
-            <td>{{ $item->status }}</td>
+			<td>{{ $item->status == '0' ? '禁用':'启用' }}</td>
 								<td>
+									@if($item->id>=1000)
 									<div class="btn-group">
 										<button data-toggle="dropdown"
 											class="btn btn-warning btn-sm dropdown-toggle"
@@ -78,6 +79,7 @@
 
 										</ul>
 									</div>
+									@endif
 								@if(role('Base/Settings/view'))
 										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Base/Settings/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
 									@endif

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

@@ -6,7 +6,7 @@
 			<div class="col-sm-12">
 				<div class="ibox float-e-margins">
 					<div class="ibox-title">
-						<h5>用户列表</h5>
+						<h5>用户管理</h5>
 						<div class="ibox-tools">
 							<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
 							</a>
@@ -38,12 +38,33 @@
 								<th><input class="btSelectAll" name="btSelectAll" type="checkbox"></th>
 								
             <th class="sorting" data-sort="id"> 用户ID </th>
-            <th class="sorting" data-sort="tel"> 电话 </th>
-            <th class="sorting" data-sort="pwd"> 密码 </th>
-            <th class="sorting" data-sort="nickname"> 昵称 </th>
-            <th class="sorting" data-sort="money"> 余额 </th>
-            <th class="sorting" data-sort="sex"> 性别 </th>
-            <th class="sorting" data-sort="signture"> 个性签名 </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>
@@ -54,12 +75,33 @@
 									<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->tel }}</td>
-            <td>{{ $item->pwd }}</td>
-            <td>{{ $item->nickname }}</td>
-            <td>{{ $item->money }}</td>
-            <td>{{ $item->sex }}</td>
-            <td>{{ $item->signture }}</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>

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

@@ -16,7 +16,7 @@
 		<div class="col-sm-12">
 			<div class="ibox float-e-margins">
 				<div class="ibox-title">
-					<h5>用户列表</h5>
+					<h5>用户管理</h5>
 					<div class="ibox-tools">
 						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
 						</a>
@@ -38,10 +38,19 @@
                                     
                 <div class="form-group">
                                     
-                 <label class="control-label col-sm-3">电话</label>
+                 <label class="control-label col-sm-3">登录名</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_tel" name="data[tel]" class="form-control" value="{{ $data['tel'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <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>    
@@ -50,25 +59,34 @@
                  <label class="control-label col-sm-3">密码</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_pwd" name="data[pwd]" class="form-control" value="{{ $data['pwd'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <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">昵称</label>
+                 <label class="control-label col-sm-3">EMAIL</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_nickname" name="data[nickname]" class="form-control" value="{{ $data['nickname'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <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>
+                 <label class="control-label col-sm-3">手机号</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_money" name="data[money]" class="form-control" value="{{ $data['money'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <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>    
@@ -77,83 +95,184 @@
                  <label class="control-label col-sm-3">性别</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_sex" name="data[sex]" class="form-control" value="{{ $data['sex'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <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>
                                     
-                 <label class="control-label col-sm-3">个性签名</label>
+                   <div class="col-sm-9">
+                       @foreach(dict()->get('user_info','work_type') as $key=>$val)
+                           <label class="radio-inline">
+                               <input type="radio" name="data[work_type]" value="{{$key}}" @if(isset($data['work_type']) && $data['work_type'] == $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_signture" name="data[signture]" class="form-control" value="{{ $data['signture'] or ''}}" required="" aria-required="true"  placeholder=""> 
+
+                     <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>
+                 <label class="control-label col-sm-3">居住时长</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_tall" name="data[tall]" class="form-control" value="{{ $data['tall'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                       @foreach(dict()->get('user_info','address_time') 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>
+                 <label class="control-label col-sm-3">身份证号</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_job" name="data[job]" class="form-control" value="{{ $data['job'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <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>
+                 <label class="control-label col-sm-3">身份证正面</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_emotion" name="data[emotion]" class="form-control" value="{{ $data['emotion'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                       {!!  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>
+                 <label class="control-label col-sm-3">身份证背面</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_address" name="data[address]" class="form-control" value="{{ $data['address'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                       {!!  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>
+                 <label class="control-label col-sm-3">学历</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_detail_address" name="data[detail_address]" class="form-control" value="{{ $data['detail_address'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                       @foreach(dict()->get('user_info','educational') 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('user_info','marital') 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>
+                 <label class="control-label col-sm-3">直系亲属联系人关系</label>
+
+                   <div class="col-sm-9"> @foreach(dict()->get('user_info','contact_bind') 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_status" name="data[status]" class="form-control" value="{{ $data['status'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <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">token</label>
+                 <label class="control-label col-sm-3">直系亲属联系人手机</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_remember_token" name="data[remember_token]" class="form-control" value="{{ $data['remember_token'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <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('user_info','other_contact_bind') 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">

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

@@ -6,7 +6,7 @@
 		<div class="col-sm-12">
 			<div class="ibox float-e-margins">
 				<div class="ibox-title">
-					<h5>用户列表</h5>
+					<h5>用户管理</h5>
 					<div class="ibox-tools">
 						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
 						</a>
@@ -37,26 +37,28 @@
     						<tr>
 								
             <th class="sorting" data-sort="id"> 用户ID </th>
-            <th class="sorting" data-sort="tel"> 电话 </th>
-            <th class="sorting" data-sort="pwd"> 密码 </th>
-            <th class="sorting" data-sort="nickname"> 昵称 </th>
-            <th class="sorting" data-sort="money"> 余额 </th>
-            <th class="sorting" data-sort="sex"> 性别 </th>
-            <th class="sorting" data-sort="signture"> 个性签名 </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->tel }}</td>
-            <td>{{ $item->pwd }}</td>
-            <td>{{ $item->nickname }}</td>
-            <td>{{ $item->money }}</td>
-            <td>{{ $item->sex }}</td>
-            <td>{{ $item->signture }}</td>
+							@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"

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

@@ -14,112 +14,196 @@
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">电话</h3>
+                   <h3 class="list-group-item-heading">登录名</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['tel'] or ''}}</p>
+                   <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['pwd'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['password'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">昵称</h3>
+                   <h3 class="list-group-item-heading">EMAIL</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['nickname'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['email'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">余额</h3>
+                   <h3 class="list-group-item-heading">手机号</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['money'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['mobile'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">性别</h3>
+                   <h3 class="list-group-item-heading">用户头像</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['sex'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['avatar'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">个性签名</h3>
+                   <h3 class="list-group-item-heading">性别,1:男,2:女,参照数据字典</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['signture'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['gender'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">身高</h3>
+                   <h3 class="list-group-item-heading">居住地址省</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['tall'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['province'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">职业</h3>
+                   <h3 class="list-group-item-heading">居住地址市</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['job'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['city'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">情感状态</h3>
+                   <h3 class="list-group-item-heading">居住地址区县</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['emotion'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['county'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">省市区地址</h3>
+                   <h3 class="list-group-item-heading">工作类型：上班，自由职业者</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['address'] or ''}}</p>
+                   <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['detail_address'] or ''}}</p>
+                   <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>
+                   <h3 class="list-group-item-heading">直系亲属联系人姓名</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['status'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['other_contact_name'] or ''}}</p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">token</h3>
+                   <h3 class="list-group-item-heading">直系亲属联系人手机</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['remember_token'] or ''}}</p>
+                   <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>
+                   <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>
+                   <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>
+                   <h3 class="list-group-item-heading">删除时间</h3>
                                                    
                    <p class="list-group-item-text"> {{ $data['deleted_at'] or ''}}</p>