用户和教练的手机号用不到了

application/admin/controller/user/User.php

@@ -87,13 +87,13 @@ class User extends Backend
         $lastname  = input('lastname');
 
         $countrycode = input('countrycode',65,'intval');
-        $mobile      = input('mobile');
+        $mobile      = input('mobile','');
 
         $email        = input('email');
 
         $password     = input('password');
 
-        if (!$firstname || !$lastname || !$mobile || !$email || !$password) {
+        if (!$firstname || !$lastname || !$email || !$password) {
             $this->error(__('Invalid parameters'));
         }
 

application/admin/model/User.php

@@ -25,6 +25,7 @@ class User extends Model
 
     // 追加属性
     protected $append = [
+        'birthday_text',
         'prevtime_text',
         'logintime_text',
         'jointime_text',
@@ -76,6 +77,13 @@ class User extends Model
     }
 
 
+    public function getBirthdayTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['birthday']) ? $data['birthday'] : '');
+        return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+
     public function getLogintimeTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['logintime']) ? $data['logintime'] : '');
@@ -142,6 +150,11 @@ class User extends Model
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
     }
 
+    protected function setBirthdayAttr($value)
+    {
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
     protected function setLogintimeAttr($value)
     {
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);

application/admin/view/user/user/add.html

@@ -15,19 +15,19 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Firstname')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-firstname" class="form-control" name="firstname" type="text" value="">
+            <input id="c-firstname" data-rule="required" class="form-control" name="firstname" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Lastname')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-lastname" class="form-control" name="lastname" type="text" value="">
+            <input id="c-lastname" data-rule="required" class="form-control" name="lastname" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-password" class="form-control" name="password" type="text" value="">
+            <input id="c-password" data-rule="required" class="form-control" name="password" type="text" value="">
         </div>
     </div>
     <!--<div class="form-group">
@@ -39,7 +39,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-email" class="form-control" name="email" type="text" value="">
+            <input id="c-email" data-rule="required" class="form-control" name="email" type="text" value="">
         </div>
     </div>
     <!--<div class="form-group">
@@ -54,7 +54,7 @@
             <input id="c-simplemobile" class="form-control" name="simplemobile" type="text" value="">
         </div>
     </div>-->
-    <!--<div class="form-group">
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Avatar')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
@@ -67,7 +67,7 @@
             </div>
             <ul class="row list-inline faupload-preview" id="p-avatar"></ul>
         </div>
-    </div>-->
+    </div>
     <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Level')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -239,7 +239,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Whatsapp')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-whatsapp" class="form-control" name="whatsapp" type="text" value="">
+            <input id="c-whatsapp" data-rule="required" class="form-control" name="whatsapp" type="text" value="">
         </div>
     </div>
     <div class="form-group">

application/admin/view/user/user/edit.html

@@ -15,13 +15,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Firstname')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-firstname" class="form-control" name="row[firstname]" type="text" value="{$row.firstname|htmlentities}">
+            <input id="c-firstname" data-rule="required" class="form-control" name="row[firstname]" type="text" value="{$row.firstname|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Lastname')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-lastname" class="form-control" name="row[lastname]" type="text" value="{$row.lastname|htmlentities}">
+            <input id="c-lastname" data-rule="required" class="form-control" name="row[lastname]" type="text" value="{$row.lastname|htmlentities}">
         </div>
     </div>
     <!--<div class="form-group">
@@ -39,7 +39,7 @@
     <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Email')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-email" class="form-control" name="row[email]" type="text" value="{$row.email|htmlentities}">
+            <input id="c-email" data-rule="required" class="form-control" name="row[email]" type="text" value="{$row.email|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -79,14 +79,14 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-gender" data-rule="required" min="0" class="form-control" name="row[gender]" type="number" value="{$row.gender|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Birthday')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-birthday" class="form-control" name="row[birthday]" type="number" value="{$row.birthday|htmlentities}">
+            <input id="c-birthday" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[birthday]" type="text" value="{$row.birthday?datetime($row.prevtime):''}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Bio')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-bio" class="form-control" name="row[bio]" type="text" value="{$row.bio|htmlentities}">
@@ -194,12 +194,12 @@
             <input id="c-weight" class="form-control" name="row[weight]" type="text" value="{$row.weight|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Address')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-address" class="form-control" name="row[address]" type="text" value="{$row.address|htmlentities}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Notice_email')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -239,7 +239,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Whatsapp')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-whatsapp" class="form-control" name="row[whatsapp]" type="text" value="{$row.whatsapp|htmlentities}">
+            <input id="c-whatsapp" data-rule="required" class="form-control" name="row[whatsapp]" type="text" value="{$row.whatsapp|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -266,7 +266,7 @@
             <input id="c-emergency_phone" class="form-control" name="row[emergency_phone]" type="text" value="{$row.emergency_phone|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Is_first')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
@@ -277,7 +277,7 @@
             </select>
 
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Residential')}:</label>
         <div class="col-xs-12 col-sm-8">

application/api/controller/coach/User.php

@@ -115,7 +115,7 @@ class User extends Apic
     public function profile()
     {
         $field = [
-            'mobile',
+//            'mobile',
             //'email',
             'avatar',
             'firstname',
@@ -132,12 +132,12 @@ class User extends Apic
             }
         }*/
 
-        if(isset($data['mobile'])){
+        /*if(isset($data['mobile'])){
             $check_mobile = Db::name('coach')->where('mobile',$data['mobile'])->where('id','neq',$this->auth->id)->find();
             if($check_mobile){
                 $this->error('手机号已被其他人使用');
             }
-        }
+        }*/
 
         $update_rs = Db::name('coach')->where('id',$this->auth->id)->update($data);
 

application/common/library/Auth.php

@@ -170,10 +170,10 @@ class Auth
                 return false;
             }
         }
-        if ($mobile && User::getByMobile($mobile)) {
+        /*if ($mobile && User::getByMobile($mobile)) {
             $this->setError('Mobile already exist');
             return false;
-        }
+        }*/
 
         $ip = request()->ip();
         $time = time();