重建user

application/admin/controller/user/User.php

@@ -23,7 +23,8 @@ class User extends Backend
         parent::_initialize();
         $this->model = new \app\admin\model\User;
         $this->view->assign("statusList", $this->model->getStatusList());
-        $this->view->assign("noticeTypeList", $this->model->getNoticeTypeList());
+        $this->view->assign("noticeEmailList", $this->model->getNoticeEmailList());
+        $this->view->assign("noticeWhatsappList", $this->model->getNoticeWhatsappList());
     }
 
 

application/admin/lang/zh-cn/user/user.php

@@ -1,42 +1,45 @@
 <?php
 
 return [
-    'Id'             => 'ID',
-    'Username'       => '用户名',
-    'Nickname'       => '昵称',
-    'Firstname'      => '名',
-    'Lastname'       => '姓',
-    'Password'       => '密码',
-    'Salt'           => '密码盐',
-    'Email'          => '电子邮箱',
-    'Mobile'         => '手机号',
-    'Simplemobile'   => '短手机号',
-    'Avatar'         => '头像',
-    'Level'          => '等级',
-    'Gender'         => '性别',
-    'Birthday'       => '生日',
-    'Bio'            => '格言',
-    'Successions'    => '连续登录天数',
-    'Maxsuccessions' => '最大连续登录天数',
-    'Prevtime'       => '上次登录时间',
-    'Logintime'      => '登录时间',
-    'Loginip'        => '登录IP',
-    'Loginfailure'   => '失败次数',
-    'Joinip'         => '加入IP',
-    'Jointime'       => '加入时间',
-    'Createtime'     => '创建时间',
-    'Updatetime'     => '更新时间',
-    'Token'          => 'Token',
-    'Status'         => '状态',
-    'Status 0'       => '禁用',
-    'Status 1'       => '正常',
-    'Verification'   => '验证',
-    'Height'         => '身高',
-    'Age'            => '年龄',
-    'Weight'         => '体重',
-    'Address'        => '联系地址',
-    'Notice_type'    => '通知方式',
-    'Notice_type 1'  => 'Email',
-    'Notice_type 2'  => 'WhatsApp',
-    'Whatsapp'       => 'whatsapp账号'
+    'Id'                => 'ID',
+    'Username'          => '用户名',
+    'Nickname'          => '昵称',
+    'Firstname'         => '名',
+    'Lastname'          => '姓',
+    'Password'          => '密码',
+    'Salt'              => '密码盐',
+    'Email'             => '电子邮箱',
+    'Mobile'            => '手机号',
+    'Simplemobile'      => '短手机号',
+    'Avatar'            => '头像',
+    'Level'             => '等级',
+    'Gender'            => '性别',
+    'Birthday'          => '生日',
+    'Bio'               => '格言',
+    'Successions'       => '连续登录天数',
+    'Maxsuccessions'    => '最大连续登录天数',
+    'Prevtime'          => '上次登录时间',
+    'Logintime'         => '登录时间',
+    'Loginip'           => '登录IP',
+    'Loginfailure'      => '失败次数',
+    'Joinip'            => '加入IP',
+    'Jointime'          => '加入时间',
+    'Createtime'        => '创建时间',
+    'Updatetime'        => '更新时间',
+    'Token'             => 'Token',
+    'Status'            => '状态',
+    'Status 0'          => '禁用',
+    'Status 1'          => '正常',
+    'Verification'      => '验证',
+    'Height'            => '身高',
+    'Age'               => '年龄',
+    'Weight'            => '体重',
+    'Address'           => '联系地址',
+    'Notice_email'      => '邮件通知',
+    'Notice_email 1'    => '开',
+    'Notice_email 0'    => '关',
+    'Notice_whatsapp'   => 'whatsapp通知',
+    'Notice_whatsapp 1' => '开',
+    'Notice_whatsapp 0' => '关',
+    'Whatsapp'          => 'whatsapp账号'
 ];

application/admin/model/User.php

@@ -29,7 +29,8 @@ class User extends Model
         'logintime_text',
         'jointime_text',
         'status_text',
-        'notice_type_text'
+        'notice_email_text',
+        'notice_whatsapp_text'
     ];
     
 
@@ -39,9 +40,14 @@ class User extends Model
         return ['0' => __('Status 0'), '1' => __('Status 1')];
     }
 
-    public function getNoticeTypeList()
+    public function getNoticeEmailList()
     {
-        return ['1' => __('Notice_type 1'), '2' => __('Notice_type 2')];
+        return ['1' => __('Notice_email 1'), '0' => __('Notice_email 0')];
+    }
+
+    public function getNoticeWhatsappList()
+    {
+        return ['1' => __('Notice_whatsapp 1'), '0' => __('Notice_whatsapp 0')];
     }
 
 
@@ -74,10 +80,18 @@ class User extends Model
     }
 
 
-    public function getNoticeTypeTextAttr($value, $data)
+    public function getNoticeEmailTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['notice_email']) ? $data['notice_email'] : '');
+        $list = $this->getNoticeEmailList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getNoticeWhatsappTextAttr($value, $data)
     {
-        $value = $value ? $value : (isset($data['notice_type']) ? $data['notice_type'] : '');
-        $list = $this->getNoticeTypeList();
+        $value = $value ? $value : (isset($data['notice_whatsapp']) ? $data['notice_whatsapp'] : '');
+        $list = $this->getNoticeWhatsappList();
         return isset($list[$value]) ? $list[$value] : '';
     }
 

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

@@ -189,11 +189,11 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Notice_type')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Notice_email')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-notice_type" class="form-control selectpicker" name="row[notice_type]">
-                {foreach name="noticeTypeList" item="vo"}
+            <select  id="c-notice_email" class="form-control selectpicker" name="row[notice_email]">
+                {foreach name="noticeEmailList" item="vo"}
                     <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
@@ -201,9 +201,21 @@
         </div>
     </div>
     <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Notice_whatsapp')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-notice_whatsapp" class="form-control selectpicker" name="row[notice_whatsapp]">
+                {foreach name="noticeWhatsappList" item="vo"}
+                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <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">
+            <input id="c-whatsapp" class="form-control" name="row[whatsapp]" type="text" value="">
         </div>
     </div>
     <div class="form-group layer-footer">

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

@@ -189,12 +189,24 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Notice_type')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Notice_email')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-notice_type" class="form-control selectpicker" name="row[notice_type]">
-                {foreach name="noticeTypeList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.notice_type"}selected{/in}>{$vo}</option>
+            <select  id="c-notice_email" class="form-control selectpicker" name="row[notice_email]">
+                {foreach name="noticeEmailList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.notice_email"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Notice_whatsapp')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-notice_whatsapp" class="form-control selectpicker" name="row[notice_whatsapp]">
+                {foreach name="noticeWhatsappList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.notice_whatsapp"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 

public/assets/js/backend/user/user.js

@@ -42,6 +42,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'age', title: __('Age'), operate: 'LIKE'},
                         {field: 'weight', title: __('Weight'), operate: 'LIKE'},
                         {field: 'address', title: __('Address'), operate: 'LIKE'},
+                        {field: 'notice_email', title: __('Notice_email'), searchList: {"1":__('Notice_email 1'),"0":__('Notice_email 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'notice_whatsapp', title: __('Notice_whatsapp'), searchList: {"1":__('Notice_whatsapp 1'),"0":__('Notice_whatsapp 0')}, formatter: Table.api.formatter.normal},
                         {field: 'whatsapp', title: __('Whatsapp'), operate: 'LIKE'},
 
 //                        {field: 'level', title: __('Level')},