修改过期时间

@@ -152,6 +152,12 @@
             {:build_radios('row[identity]', ['1'=>'普通会员','2'=>'黄金会员','3'=>'钻石会员'], $row['identity'])}
             {:build_radios('row[identity]', ['1'=>'普通会员','2'=>'黄金会员','3'=>'钻石会员'], $row['identity'])}
         </div>
         </div>
     </div>
     </div>
+    <div class="form-group">
+        <label for="c-expirationtime" class="control-label col-xs-12 col-sm-2">{:__('到期时间')}:</label>
+        <div class="col-xs-12 col-sm-4">
+            <input id="c-expirationtime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[expirationtime]" type="text" value="{$row.expirationtime|datetime}">
+        </div>
+    </div>
     <div class="form-group layer-footer">
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">

@@ -512,17 +512,27 @@ class Login extends Api
         }
         }
         if(empty($param['file_pwd'])){
         if(empty($param['file_pwd'])){
             unset($param['file_pwd']);
             unset($param['file_pwd']);
-        }
-        $param['salt'] = Random::alnum();
-        $param['pwd'] = $param['password'];
-        $param['password'] = md5(md5($param['pwd']) . $param['salt']);
-        $data = Db::name('user')->where('id',$user_id)->update($param);
-        if(empty($data)){
-            $this->error('修改失败');
+            $data = Db::name('user')->where('id',$user_id)->update($param);
+            if(empty($data)){
+                $this->error('修改失败');
+            }else{
+                $this->success('SUCCESS');
+            }
+
         }else{
         }else{
-            $this->success('SUCCESS');
+            $param['salt'] = Random::alnum();
+            $param['pwd'] = $param['password'];
+            $param['password'] = md5(md5($param['pwd']) . $param['salt']);
+            $param['whiteip_ids'] = '';
+            $data = Db::name('user')->where('id',$user_id)->update($param);
+            if(empty($data)){
+                $this->error('修改失败');
+            }else{
+                $this->success('SUCCESS');
+            }
         }
         }
 
 
+
     }
     }
 
 
 
 

@@ -5621,6 +5621,7 @@
     "is_open": 1,
     "is_open": 1,
     "is_real": 1,
     "is_real": 1,
     "is_white": 1
     "is_white": 1
+    "is_subscribe"://是否订阅 1订阅2未订阅
     }
     }
     ]
     ]
     }
     }
@@ -9091,7 +9092,7 @@
 
 
             <div class="row mt0 footer">
             <div class="row mt0 footer">
                 <div class="col-md-6" align="left">
                 <div class="col-md-6" align="left">
-                    Generated on 2020-08-17 09:58:09                </div>
+                    Generated on 2020-08-18 09:28:58                </div>
                 <div class="col-md-6" align="right">
                 <div class="col-md-6" align="right">
                     <a href="./" target="_blank">彩云盘</a>
                     <a href="./" target="_blank">彩云盘</a>
                 </div>
                 </div>

@@ -33,6 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'avatar', title: __('Avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate: false},
                         {field: 'avatar', title: __('Avatar'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate: false},
                         {field: 'audit', title: __('审核状态'), searchList: {"0":"待审核","1":"审核通过","2":'审核未通过'},formatter: Table.api.formatter.status},
                         {field: 'audit', title: __('审核状态'), searchList: {"0":"待审核","1":"审核通过","2":'审核未通过'},formatter: Table.api.formatter.status},
                         {field: 'identity', title: __('身份标识'), searchList: {"1":"普通会员","2":"黄金会员","3":'钻石会员'},formatter: Table.api.formatter.flag},
                         {field: 'identity', title: __('身份标识'), searchList: {"1":"普通会员","2":"黄金会员","3":'钻石会员'},formatter: Table.api.formatter.flag},
+                        {field: 'expirationtime', title: __('过期时间'), formatter: Table.api.formatter.datetime, operate: 'RANGE', addclass: 'datetimerange', sortable: true},
                         // {field: 'level', title: __('Level'), operate: 'BETWEEN', sortable: true},
                         // {field: 'level', title: __('Level'), operate: 'BETWEEN', sortable: true},
                         // {field: 'gender', title: __('Gender'), visible: false, searchList: {1: __('Male'), 0: __('Female')}},
                         // {field: 'gender', title: __('Gender'), visible: false, searchList: {1: __('Male'), 0: __('Female')}},
                         // {field: 'score', title: __('Score'), operate: 'BETWEEN', sortable: true},
                         // {field: 'score', title: __('Score'), operate: 'BETWEEN', sortable: true},