后台：用户

application/admin/controller/user/User.php

@@ -23,8 +23,8 @@ class User extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\User;
+        $this->view->assign("genderList", $this->model->getGenderList());
         $this->view->assign("statusList", $this->model->getStatusList());
-        $this->view->assign("idcardStatusList", $this->model->getIdcardStatusList());
     }
 
 
@@ -53,7 +53,7 @@ class User extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['group','wallet'])
+                    ->with(['group'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
@@ -61,7 +61,6 @@ class User extends Backend
             foreach ($list as $row) {
                 
                 $row->getRelation('group')->visible(['name']);
-                $row->getRelation('wallet')->visible(['money']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());
@@ -71,24 +70,4 @@ class User extends Backend
         return $this->view->fetch();
     }
 
-    /**
-     * 选择核销商品
-     */
-    public function editproduct(){
-        $ids = input('id');
-        $row = $this->model->get($ids);
-        if (!$row) {
-            $this->error(__('No Results were found'));
-        }
-
-        if (false === $this->request->isPost()) {
-            $this->view->assign('row', $row);
-            return $this->view->fetch();
-        }
-
-        $product_ids = input('product_ids','');
-        $rs = Db::name('user')->where('id',$ids)->update(['product_ids'=>$product_ids]);
-
-        $this->success();
-    }
 }

application/admin/model/User.php

@@ -25,23 +25,32 @@ class User extends Model
 
     // 追加属性
     protected $append = [
+        'gender_text',
         'prevtime_text',
         'logintime_text',
         'jointime_text',
         'status_text',
-        'idcard_status_text'
+        'birthday_text',
     ];
     
 
     
+    public function getGenderList()
+    {
+        return ['1' => __('Gender 1'), '0' => __('Gender 0')];
+    }
+
     public function getStatusList()
     {
         return ['1' => __('Status 1'), '0' => __('Status 0'), '-1' => __('Status -1')];
     }
 
-    public function getIdcardStatusList()
+
+    public function getGenderTextAttr($value, $data)
     {
-        return ['-1' => __('Idcard_status -1'), '0' => __('Idcard_status 0'), '1' => __('Idcard_status 1'), '2' => __('Idcard_status 2')];
+        $value = $value ? $value : (isset($data['gender']) ? $data['gender'] : '');
+        $list = $this->getGenderList();
+        return isset($list[$value]) ? $list[$value] : '';
     }
 
 
@@ -52,6 +61,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'] : '');
@@ -73,14 +89,6 @@ class User extends Model
         return isset($list[$value]) ? $list[$value] : '';
     }
 
-
-    public function getIdcardStatusTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['idcard_status']) ? $data['idcard_status'] : '');
-        $list = $this->getIdcardStatusList();
-        return isset($list[$value]) ? $list[$value] : '';
-    }
-
     protected function setPrevtimeAttr($value)
     {
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
@@ -96,15 +104,15 @@ class User extends Model
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
     }
 
-
-    public function group()
+    protected function setBirthdayAttr($value)
     {
-        return $this->belongsTo('UserGroup', 'group_id', 'id', [], 'LEFT')->setEagerlyType(0);
+        return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
     }
 
 
-    public function wallet()
+
+    public function group()
     {
-        return $this->belongsTo('Userwallet', 'id', 'user_id', [], 'LEFT')->setEagerlyType(0);
+        return $this->belongsTo('UserGroup', 'group_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 }

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

@@ -7,12 +7,6 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Intro_uid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-intro_uid" class="form-control" name="row[intro_uid]" type="number" value="0">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-username" class="form-control" name="row[username]" type="text" value="">
@@ -63,39 +57,39 @@
         </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">
-            <input id="c-level" data-rule="required" min="0" class="form-control" name="row[level]" type="number" value="0">
-        </div>
-    </div>
-    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>
         <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="0">
+                        
+            <select  id="c-gender" data-rule="required" min="0" class="form-control selectpicker" name="row[gender]">
+                {foreach name="genderList" item="vo"}
+                    <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </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 datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[birthday]" type="text" value="{:date('Y-m-d')}">
+            <input id="c-birthday" class="form-control" name="row[birthday]" type="number">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Bio')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Height')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-bio" class="form-control" name="row[bio]" type="text" value="">
+            <input id="c-height" class="form-control" name="row[height]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Successions')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Weight')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-successions" data-rule="required" min="0" class="form-control" name="row[successions]" type="number" value="1">
+            <input id="c-weight" class="form-control" name="row[weight]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Maxsuccessions')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Bio')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-maxsuccessions" data-rule="required" min="0" class="form-control" name="row[maxsuccessions]" type="number" value="1">
+            <input id="c-bio" class="form-control" name="row[bio]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -153,21 +147,9 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Verification')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-verification" class="form-control" name="row[verification]" type="text" value="">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Idcard_status')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Wxmini_openid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="idcardStatusList" item="vo"}
-            <label for="row[idcard_status]-{$key}"><input id="row[idcard_status]-{$key}" name="row[idcard_status]" type="radio" value="{$key}" {in name="key" value="-1"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
-
+            <input id="c-wxmini_openid" class="form-control" name="row[wxmini_openid]" type="text" value="">
         </div>
     </div>
     <div class="form-group layer-footer">

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

@@ -6,12 +6,6 @@
             <input id="c-group_id" data-rule="required" min="0" data-source="user/group/index" class="form-control selectpage" name="row[group_id]" type="text" value="{$row.group_id|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Intro_uid')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-intro_uid" class="form-control" name="row[intro_uid]" type="number" value="{$row.intro_uid|htmlentities}">
-        </div>
-    </div>
     <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Username')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -24,7 +18,7 @@
             <input id="c-nickname" class="form-control" name="row[nickname]" type="text" value="{$row.nickname|htmlentities}">
         </div>
     </div>
-    <!--<div class="form-group">
+   <!-- <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="row[password]" type="text" value="{$row.password|htmlentities}">
@@ -62,40 +56,40 @@
             <ul class="row list-inline faupload-preview" id="p-avatar"></ul>
         </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">
-            <input id="c-level" data-rule="required" min="0" class="form-control" name="row[level]" type="number" value="{$row.level|htmlentities}">
-        </div>
-    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gender')}:</label>
         <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}">
+                        
+            <select  id="c-gender" data-rule="required" min="0" class="form-control selectpicker" name="row[gender]">
+                {foreach name="genderList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.gender"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </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 datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[birthday]" type="text" value="{$row.birthday}">
+            <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.birthday):''}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Bio')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Height')}:</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}">
+            <input id="c-height" class="form-control" name="row[height]" type="text" value="{$row.height|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Successions')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Weight')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-successions" data-rule="required" min="0" class="form-control" name="row[successions]" type="number" value="{$row.successions|htmlentities}">
+            <input id="c-weight" class="form-control" name="row[weight]" type="text" value="{$row.weight|htmlentities}">
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Maxsuccessions')}:</label>
+    <!--<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-maxsuccessions" data-rule="required" min="0" class="form-control" name="row[maxsuccessions]" type="number" value="{$row.maxsuccessions|htmlentities}">
+            <input id="c-bio" class="form-control" name="row[bio]" type="text" value="{$row.bio|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -153,21 +147,9 @@
         </div>
     </div>
     <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Verification')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-verification" class="form-control" name="row[verification]" type="text" value="{$row.verification|htmlentities}">
-        </div>
-    </div>-->
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Idcard_status')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Wxmini_openid')}:</label>
         <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="idcardStatusList" item="vo"}
-            <label for="row[idcard_status]-{$key}"><input id="row[idcard_status]-{$key}" name="row[idcard_status]" type="radio" value="{$key}" {in name="key" value="$row.idcard_status"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
-
+            <input id="c-wxmini_openid" class="form-control" name="row[wxmini_openid]" type="text" value="{$row.wxmini_openid|htmlentities}">
         </div>
     </div>-->
     <div class="form-group layer-footer">

application/admin/view/user/user/index.html

@@ -17,26 +17,25 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/user/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/user/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
-                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/user/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('user/user/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('user/user/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
+<!--                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('user/user/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
                         
 
-                        <div class="dropdown btn-group {:$auth->check('user/user/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
-                            <ul class="dropdown-menu text-left" role="menu">
-                                {foreach name="statusList" item="vo"}
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>
-                                {/foreach}
-                            </ul>
-                        </div>-->
+<!--                        <div class="dropdown btn-group {:$auth->check('user/user/multi')?'':'hide'}">-->
+<!--                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
+<!--                            <ul class="dropdown-menu text-left" role="menu">-->
+<!--                                {foreach name="statusList" item="vo"}-->
+<!--                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:" data-params="status={$key}">{:__('Set status to ' . $key)}</a></li>-->
+<!--                                {/foreach}-->
+<!--                            </ul>-->
+<!--                        </div>-->
 
                         
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
                            data-operate-edit="{:$auth->check('user/user/edit')}"
                            data-operate-del="{:$auth->check('user/user/del')}"
-                           data-operate-editproduct="{:$auth->check('user/user/editproduct')}"
                            width="100%">
                     </table>
                 </div>

application/common/library/Auth.php

@@ -26,7 +26,7 @@ class Auth
     //默认配置
     protected $config = [];
     protected $options = [];
-    protected $allowFields = ['id', 'nickname', 'mobile', 'avatar', 'group_id','gender','height','weight','birthday'];
+    protected $allowFields = ['id', 'nickname', 'mobile', 'avatar', 'group_id','gender','height','weight','birthday','wxmini_openid'];
 
     public function __construct($options = [])
     {
@@ -385,6 +385,9 @@ class Auth
 
         $userinfo['avatar'] = localpath_to_netpath($userinfo['avatar']);
         $userinfo['birthday'] = date('Y-m-d',$userinfo['birthday']);
+        $userinfo['uuid'] = $userinfo['wxmini_openid'];
+
+        unset($userinfo['wxmini_openid']);
 
         //是否弹出未领取的优惠券