gq 8 vuotta sitten
vanhempi
commit
747cbfc22c

+ 4 - 4
server/app/Http/Controllers/Api/V1/AuthController.php

xqd xqd
@@ -72,12 +72,12 @@ class AuthController extends Controller
         $validator = Validator::make($request->all(),
             [
                 'phone'         => 'required|regex:/^1[34578]\d{9}$/',
-                'verify_code'      => 'required',
+//                'verify_code'      => 'required',
             ],
             [
                 'phone.required'        => '手机号码必填',
                 'phone.regex'           => '手机号码格式不正确',
-                'verify_code.required'      => '短信验证码必填',
+//                'verify_code.required'      => '短信验证码必填',
             ]
         );
 
@@ -88,8 +88,8 @@ class AuthController extends Controller
         $key = $this->keySmsCode . $phone;
         $code = Cache::store('file')->get($key);
         $password = 123456;
-        if ($request->verify_code != $code)
-            return $this->error(ErrorCode::SERVICE_CODE_FAILED);
+//        if ($request->verify_code != $code)
+//            return $this->error(ErrorCode::SERVICE_CODE_FAILED);
         $a = UserInfoModel::where('tel',$phone)->first();
         if (count($a) == 0) {
             UserInfoModel::create(['tel'=>$phone,'password'=>bcrypt(123456)]);

+ 2 - 2
server/app/Http/Controllers/Api/V1/HomeController.php

xqd
@@ -15,8 +15,8 @@ use App\Services\Base\ErrorCode;
 class HomeController extends Controller
 {
     /**
-     * @api {get} /api/user/index/ 用户信息
-     * @apiDescription 用户信息
+     * @api {get} /api/user/index/ 用户信息(index)
+     * @apiDescription 用户信息(index)
      * @apiGroup Home
      * @apiPermission Passport
      * @apiVersion 0.1.0

+ 7 - 8
server/resources/views/admin/user/info/edit.blade.php

xqd xqd xqd xqd xqd xqd xqd
@@ -104,9 +104,9 @@
                  <label class="control-label col-sm-3">工作类型</label>
                                     
                    <div class="col-sm-9">
-                       @foreach(dict()->get('user_info','work_type') as $key=>$val)
+                       @foreach(dict()->get('user_info','sex') 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}}
+                               <input type="radio" name="data[job]" value="{{$key}}" @if(isset($data['job']) && $data['job'] == $key)checked="checked" @endif/>{{$val}}
                            </label>
                     @endforeach
                     </div>
@@ -154,7 +154,7 @@
                  <label class="control-label col-sm-3">居住时长</label>
                                     
                    <div class="col-sm-9">
-                       @foreach(dict()->get('user_info','address_time') as $key=>$val)
+                       @foreach(dict()->get('user_info','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>
@@ -194,7 +194,7 @@
                  <label class="control-label col-sm-3">学历</label>
                                     
                    <div class="col-sm-9">
-                       @foreach(dict()->get('user_info','educational') as $key=>$val)
+                       @foreach(dict()->get('user_info','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>
@@ -206,7 +206,7 @@
                                     
                  <label class="control-label col-sm-3">婚姻状况</label>
                                     
-                   <div class="col-sm-9"> @foreach(dict()->get('user_info','marital') as $key=>$val)
+                   <div class="col-sm-9"> @foreach(dict()->get('user_info','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>
@@ -218,7 +218,7 @@
                                     
                  <label class="control-label col-sm-3">直系亲属联系人关系</label>
 
-                   <div class="col-sm-9"> @foreach(dict()->get('user_info','contact_bind') as $key=>$val)
+                   <div class="col-sm-9"> @foreach(dict()->get('user_info','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>
@@ -248,7 +248,7 @@
                                     
                  <label class="control-label col-sm-3">其他联系人关系</label>
                                     
-                   <div class="col-sm-9"> @foreach(dict()->get('user_info','other_contact_bind') as $key=>$val)
+                   <div class="col-sm-9"> @foreach(dict()->get('user_info','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>
@@ -282,7 +282,6 @@
                                         <input type="reset" class="btn btn-default" >
                                     </div>
                                 </div>
-        
                             </form>
                         </div>
                         <!-- /.col-lg-10 -->