Răsfoiți Sursa

增加工作地点

linwu 2 ani în urmă
părinte
comite
31aa3e007d

+ 2 - 1
app/admin/controller/Comjobs.php

@@ -309,7 +309,8 @@ class Comjobs extends BaseController
             $map[]        = ['createtime', '>= time', trim($daterangearr[0])];
             $map[]        = ['createtime', '<= time', trim($daterangearr[1])];
         }
-        $list  = ComjobsModel::with(['worker', 'comjobsCate'])->withCount(['comjobsLog'])->where($map)->order(['priority' => 'desc', 'id' => 'desc',])->limit($limit)->page($page)->append(['wtype_text', 'status_text'])->select();
+//        $list  = ComjobsModel::with(['worker', 'comjobsCate'])->withCount(['comjobsLog'])->where($map)->order(['priority' => 'desc', 'id' => 'desc'])->limit($limit)->page($page)->append(['wtype_text', 'status_text'])->select();
+        $list  = ComjobsModel::with(['worker', 'comjobsCate'])->withCount(['comjobsLog'])->where($map)->order(['updatetime' => 'desc'])->limit($limit)->page($page)->append(['wtype_text', 'status_text'])->select();
         $count = ComjobsModel::where($map)->count();
 
         $list = $list->toArray();

+ 2 - 0
app/common/model/User.php

@@ -45,6 +45,7 @@ class User extends Model
         'is_public'      => 'int',
         'volume'         => 'int',
         'deletetime'     => 'int',
+        'work_place'     => 'string',
     ];
 
     // 设置字段自动转换类型
@@ -53,6 +54,7 @@ class User extends Model
         'createtime' => 'timestamp:Y-m-d H:i:s',
         'emp_time'   => 'json',
         'com_cate'   => 'json',
+        'work_place' => 'json',
     ];
     protected $jsonAssoc = true;
 

+ 7 - 6
app/mainapp/controller/Login.php

@@ -154,6 +154,7 @@ class Login
             'bankcard'       => ['openbank' => "", 'account' => "", 'number' => ""],
             'emp_time'       => [],
             'com_cate'       => [],
+            'work_place'     => [],
         ];
         $resdata  = array_merge($data, $userdata);
         $user     = new UserModel;
@@ -348,8 +349,8 @@ class Login
             page_result(1, "该手机号已注册");
         }
         $smscode = mt_rand(100000, 999999);
-        $sms = new Chuanglan();
-        $sms->send($identifier,['message'=>"尊敬的用户,您的短信验证码为{$smscode},5分钟内有效。若非本人操作请忽略。"]);
+        $sms     = new Chuanglan();
+        $sms->send($identifier, ['message' => "尊敬的用户,您的短信验证码为{$smscode},5分钟内有效。若非本人操作请忽略。"]);
         page_result(0, "", ['smscodepass' => md5($identifier . $smscode)]);
     }
 
@@ -366,8 +367,8 @@ class Login
             page_result(1, "用户记录不存在");
         }
         $smscode = mt_rand(100000, 999999);
-        $sms = new Chuanglan();
-        $sms->send($identifier,['message'=>"尊敬的用户,您的短信验证码为{$smscode},5分钟内有效。若非本人操作请忽略。"]);
+        $sms     = new Chuanglan();
+        $sms->send($identifier, ['message' => "尊敬的用户,您的短信验证码为{$smscode},5分钟内有效。若非本人操作请忽略。"]);
         page_result(0, "", ['smscodepass' => md5($identifier . $smscode)]);
     }
 
@@ -384,8 +385,8 @@ class Login
         // 	page_result(1, "用户记录不存在");
         // }
         $smscode = mt_rand(100000, 999999);
-        $sms = new Chuanglan();
-        $sms->send($identifier,['message'=>"尊敬的用户,您的短信验证码为{$smscode},5分钟内有效。若非本人操作请忽略。"]);
+        $sms     = new Chuanglan();
+        $sms->send($identifier, ['message' => "尊敬的用户,您的短信验证码为{$smscode},5分钟内有效。若非本人操作请忽略。"]);
         page_result(0, "", ['smscodepass' => md5($identifier . $smscode)]);
     }
 

+ 1 - 1
app/mainapp/controller/My.php

@@ -427,7 +427,7 @@ class My extends BaseController
         }
         $field       = input('field/s');
         $value       = input('value');
-        $field_array = ['emp_time', 'com_cate'];
+        $field_array = ['emp_time', 'com_cate','work_place'];
         if (in_array($field, $field_array)) {
             $value = json_decode($value, true);
         }