add

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

@@ -8,6 +8,7 @@
  */
 namespace App\Http\Controllers\Admin\User;
 use App\Http\Controllers\Admin\Controller;
+use App\Models\BaseAttachmentModel;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\User\Criteria\MultiWhere;
@@ -51,6 +52,7 @@ class InfoController extends Controller
     public function create(Request $reqeust)
     {
         if($reqeust->method() == 'POST') {
+
             return $this->_createSave();
         }
         return view('admin.user.info.edit');
@@ -60,7 +62,9 @@ class InfoController extends Controller
      * 保存修改
      */
     private function _createSave(){
+        $avatar =  request('avatar');
         $data = (array) request('data');
+        $data['avatar'] = $avatar;
         $id = $this->repository->create($data);
         if($id) {
             $url[] = array('url'=>U( 'User/Info/index'),'title'=>'返回列表');
@@ -90,7 +94,15 @@ class InfoController extends Controller
      * 保存修改
      */
     private function _updateSave() {
+        $old_avatar = $this->repository->find(request('id'))->avatar;
         $data = (array) request('data');
+        if (!empty(request('avatar'))) {
+            if (is_file('.'.$old_avatar)) {
+                unlink('.'.$old_avatar);
+                BaseAttachmentModel::where('url',$old_avatar)->delete();
+            }
+            $data['avatar'] = request('avatar');
+        }
         $ok = $this->repository->update(request('id'),$data);
         if($ok) {
             $url[] = array('url'=>U( 'User/Info/index'),'title'=>'返回列表');

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

@@ -47,7 +47,18 @@ class DreamController extends Controller
                 "sign": "",
                 "created_at": "2017-06-25 11:47:45",
                 "updated_at": "2017-06-25 15:10:50",
-                "imgs": [                          梦想图片
+                "is_collection" : 1                         1已收藏  0未收藏
+                "top3user": [                              支持者前三
+                    {
+                        "id": 2,
+                        "phone": "13880642881",
+                        "nickname": "name2",
+                        "avatar": "https://timgsa.baidu.com/timg?imamb.224_0.jpeg",
+                        "score": 2399
+                    }
+                ],
+                "number": 1                                支持乘数
+                "imgs": [                                  梦想图片
                     {
                         "title": "",
                         "pic": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1498372396639&di=43f031aa703d741f2adbd0e6a501aaaf&imgtype=0&src=http%3A%2F%2Fimg2.touxiang.cn%2Ffile%2F20170524%2Feaca9092ca852e6e9c6ec46b7b14f12f.jpg"
@@ -86,17 +97,7 @@ class DreamController extends Controller
                     "updated_at": "2017-06-25 15:20:11",
                     "deleted_at": null
                 }
-            },
-            "top3user": [                              支持者前三
-                {
-                    "id": 2,
-                    "phone": "13880642881",
-                    "nickname": "name2",
-                    "avatar": "https://timgsa.baidu.com/timg?imamb.224_0.jpeg",
-                    "score": 2399
-                }
-            ],
-            "number": 1                                支持乘数
+            }
         }
     }
      * @apiErrorExample {json} Error-Response:
@@ -110,8 +111,11 @@ class DreamController extends Controller
      */
     public function show(Request $request)
     {
+        $user = $this->getUser();
         $type = $request->type;    //类型
         $id = $request->id;    //梦想ID
+        $user_care_dream = UserCareDream::where('user_id',$user->id)->where('dream_id',$id)->first();
+        $is_collection = empty($user_care_dream) ? 0 :1 ;
         if (empty($id)) return $this->error(ErrorCode::KEY_ERROR);
 
         $support_dream = SupportDreamModel::where('dream_id',$id)->get();
@@ -158,7 +162,10 @@ class DreamController extends Controller
         $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'));
+        $dream->top3user = $top3user;
+        $dream->number = $number;
+        $dream->is_collection = $is_collection;
+        return $this->api(compact('dream'));
     }
 
     /**
@@ -171,26 +178,60 @@ class DreamController extends Controller
      * @apiParam {int} id 梦想ID
      * @apiSuccessExample {json} Success-Response:
      * HTTP/1.1 200 OK
-     *{
-     *   "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                             支持乘数
-     *  }
-     *}
+    {
+        "status": true,
+        "status_code": 0,
+        "message": "",
+        "data": {
+            "dream": {
+                "id": 12,
+                "user_id": 2,
+                "name": "用户2梦想标题166",
+                "about": "用户2梦想介绍666",
+                "coin": 2500,
+                "time": 21,
+                "get_coin": 704,
+                "status": 0,
+                "video": null,
+                "score": 158730,
+                "mark": 158730,
+                "sign": "",
+                "created_at": "2017-06-25 13:10:56",
+                "updated_at": "2017-06-27 18:16:02",
+                "top3user": [                               支持者前三
+                    {
+                        "id": 1,
+                        "phone": "13880642880",
+                        "nickname": "name1",
+                        "avatar": "https://timgsa.bumb.224_0.jpeg",
+                        "birthday": "2000-06-21",
+                        "sign": 0,
+                        "money": 0,
+                        "coin": 596,
+                        "sex": 1,
+                        "signture": "我的个性签名1",
+                        "height": 170,
+                        "work": "网红",
+                        "emotion": 1,
+                        "address": "",
+                        "city": "上海",
+                        "detail_address": "",
+                        "status": 1,
+                        "wechat": "",
+                        "weibo": "",
+                        "remember_token": "",
+                        "created_at": "2017-06-25 10:27:08",
+                        "updated_at": "2017-06-27 18:16:02",
+                        "deleted_at": null,
+                        "score": 5062
+                        "is_collection" : 1              1已收藏   0未收藏
+                    }
+                ]
+            },
+            "user_coin": 596,
+            "number": 4.8
+        }
+    }
      * @apiErrorExample {json} Error-Response:
      *HTTP/1.1 400 Bad Request
      * {
@@ -223,13 +264,14 @@ class DreamController extends Controller
         if($validator->fails()) return $this->validatorError($validator->messages()->all(),ErrorCode::CLIENT_WRONG_PARAMS);
         $user = $this->getUser();
         $dream_id = $request->id;
-        $dream_info = DreamInfoModel::find($dream_id);
-        $user_id = $dream_info->user_id;
+        $dream = DreamInfoModel::find($dream_id);
+        $user_id = $dream->user_id;
         $coin = $request->coin;
-
+        $user_care_dream = UserCareDream::where('user_id',$user->id)->where('dream_id',$dream_id)->first();
+        $is_collection = empty($user_care_dream) ? 0 :1 ;
         $setting = BaseSettingsModel::where('category','score')->select('key','value')->first();
         $a = count($setting) > 0 ? $setting->key : '';
-        $b =  intval((time()-strtotime($dream_info->created_at))/60) ;
+        $b =  intval((time()-strtotime($dream->created_at))/60) ;
         $c = count($setting) > 0 ? $setting->value : '';
         //Todo 支持乘数目公式
         $number =round( -$a * $b + $c,1);
@@ -240,9 +282,9 @@ class DreamController extends Controller
         }else{
             $user->coin  -= $coin;
             $user->save();
-            $dream_info->get_coin += $coin;
-            $dream_info->mark += $coin*$number;
-            $dream_info->save();
+            $dream->get_coin += $coin;
+            $dream->mark += $coin*$number;
+            $dream->save();
             $data = [
                 'user_id'=>$user->id,
                 'dream_id'=>$dream_id,
@@ -290,10 +332,10 @@ class DreamController extends Controller
                 if(count($top3user) <= 2) $top3user[] = $user ;
             }
 //            梦想分 mark
-            $mark = $dream_info->mark;
-            $get_coin = $dream_info->get_coin;
+            $dream->top3user = $top3user;
+            $dream->is_collection = $is_collection;
             $user_coin = $user->coin;
-            return $this->api(compact('top3user','mark','get_coin','user_coin','number'));
+            return $this->api(compact('dream','user_coin','number'));
         }
     }
 
@@ -470,6 +512,7 @@ class DreamController extends Controller
 
         $data = $request->except('_token','pics');
         $data['user_id'] = $user->id;
+        $data['time'] = 21*3600;
         \Log::debug(' care_num:'.$care_num.' a:'.$a.' b:'.$b.' t:'.$t);
         if ($care_num == 0) {
             $data['score'] = (($a/$t) + $b)*100000000 ;

server/app/Models/DreamInfoModel.php

@@ -40,7 +40,7 @@ class DreamInfoModel extends BaseModel
                            'status'
                           ];
 
-    protected $hidden = ['deleted_at','mark'];
+    protected $hidden = ['deleted_at'];
 
 
     public function user()

server/app/Models/UserInfoModel.php

@@ -41,6 +41,7 @@ class UserInfoModel extends Authenticatable
                            'sign',
                            'avatar',
                            'money',
+                           'coin',
                             'sex',
                             'city',
                            'signture',

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

@@ -23,256 +23,115 @@
 					</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_phone" name="data[phone]" isMobile="true" class="form-control" value="{{ $data['phone'] 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_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">
+                                    <label class="control-label col-sm-3">昵称</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="">
+                                    </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','avatar',"avatar", isset($data['avatar'])? $data['avatar'] : "") !!}
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-3">生日</label>
+                                    <div class="col-sm-9">
+                                         <input id="data_birthday" name="data[birthday]"  class="form-control" value="{{ $data['birthday'] 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_coin" name="data[coin]" class="form-control" value="{{ $data['coin'] or ''}}" required="" aria-required="true"  placeholder="">
+                                     </div>
+                                </div>
 
-                     <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 class="form-group">
+                                    <label class="control-label col-sm-3">性别</label>
+                                   <div class="col-sm-9">
+                                       @foreach(dict()->get('user_info','sex') as $key=>$val)
+                                           <label class="radio-inline">
+                                               <input type="radio" name="data[sex]" value="{{$key}}" @if(isset($data['sex']) && $data['sex'] == $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','emotion') as $key=>$val)
+                                            <label class="radio-inline">
+                                                <input type="radio" name="data[emotion]" value="{{$key}}" @if(isset($data['emotion']) && $data['emotion'] == $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_signturen" name="data[signture]" class="form-control" value="{{ $data['signture'] or ''}}" required="" aria-required="true"  placeholder="">
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label class="control-label col-sm-3">身高(cm)</label>
+                                    <div class="col-sm-9">
+                                        <input id="data_height" name="data[height]" class="form-control" value="{{ $data['height'] 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_work" name="data[work]" class="form-control" value="{{ $data['work'] or ''}}" required="" aria-required="true"  placeholder="">
+                                    </div>
+                                </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 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="data[address]"></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['address'] or '' }}"//默认县
+                                            });
+                                        </script>
+                                    </div>
+                                </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">所在城市</label>
+                                    <div class="col-sm-9">
+                                        <input id="data_city" name="data[city]" stringCheck="true" class="form-control" value="{{ $data['city'] 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">
@@ -292,5 +151,4 @@
 		</div>
 	</div>
 </div>
-
 @endsection

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

@@ -60,16 +60,16 @@
 											<img style="width: 40%;height: 40%;" src="{{ $item->avatar }}" alt="">
 										</a>
 									</td>
-									<td>{{ $item->sex }}</td>
+									<td>{{ dict()->get('user_info','sex',$item->sex) }}</td>
 									<td>{{ $item->birthday }}</td>
 									<td>{{ $item->signture }}</td>
-									<td>{{ $item->height }}</td>
+									<td>{{ $item->height }}cm</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>{{ $item->status == 1 ? '正常' : '禁用' }}</td>
 								<td>
 									<div class="btn-group">
 										<button data-toggle="dropdown"

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

@@ -14,177 +14,94 @@
                </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['username'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['nickname'] 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['real_name'] or ''}}</p>
+                   <p class="list-group-item-text">
+                       <img style="width: 40%;height: 40%;" src=" {{ $data['avatar'] or ''}}" alt="">
+                   </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['password'] or ''}}</p>
+                   <p class="list-group-item-text">
+                       {{ dict()->get('user_info','sex',$data['sex']) }}
+                   </p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">EMAIL</h3>
+                   <h3 class="list-group-item-heading">年龄</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['email'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['birthday'] 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['mobile'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['signture'] 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['avatar'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['height'] or ''}}cm</p>
                                                  
                </div>                     
                <div class="list-group-item">
                                                   
-                   <h3 class="list-group-item-heading">性别,1:男,2:女,参照数据字典</h3>
+                   <h3 class="list-group-item-heading">职业</h3>
                                                    
-                   <p class="list-group-item-text"> {{ $data['gender'] or ''}}</p>
+                   <p class="list-group-item-text"> {{ $data['work'] 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['province'] or ''}}</p>
+                   <p class="list-group-item-text">
+                       {{ dict()->get('user_info','emotion',$data['emotion']) }}
+                   </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['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>
+                   <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>
+                   <p class="list-group-item-text"> {{ $data['phone'] 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['other_contact_name'] or ''}}</p>
+                   <p class="list-group-item-text">{{ $data['coin'] 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['other_contact_mobile'] or ''}}</p>
+                   <p class="list-group-item-text">
+                       {{ $data['status'] == 1 ? '正常' : '禁用'}}
+                   </p>
                                                  
                </div>                     
                <div class="list-group-item">
@@ -201,13 +118,6 @@
                    <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>