wesmiler 更新第5期更新代码合并

app/weixin/validate/MemberValidate.php

@@ -64,7 +64,9 @@ class MemberValidate extends Validate
         'idcard.idcard' => '请填写正确格式的身份证号码',
         'graduate.require' => '请填写毕业学校名称',
         'eduacation.require' => '请选择您的学历',
-        'company.require' => '请填写就职公司名称',
+        'eduacation.length' => '学历长度为2-20位',
+        'company.require' => '请填写工作单位名称',
+        'company.length' => '工作单位名称长度为2-30位',
         'occupation.require' => '请选择职业',
     ];
 

vendor/thinkcmf/cmf-app/src/admin/controller/MainController.php

@@ -89,14 +89,14 @@ class MainController extends AdminBaseController
         $counts['todayUserCount'] = Db::name('user')->alias('u')
             ->leftJoin('user_profile up','up.userid=u.id')
             ->where(['u.user_type' => 2, 'u.user_status' => 1, 'u.agent_type' => 0, 'up.idcard_check' => 2])
-            ->where('u.create_time', '>', $time - 86400)
-            ->where('u.create_time', '<=', $time)
+            ->where('u.create_time', '>', $time)
+            ->where('u.create_time', '<=', time())
             ->where('u.openid', 'not in', '')
             ->count('u.id');
         $counts['monthUserCount'] = Db::name('user')->alias('u')
             ->leftJoin('user_profile up','up.userid=u.id')
             ->where(['u.user_type' => 2, 'u.user_status' => 1, 'u.agent_type' => 0, 'up.idcard_check' => 2])
-            ->where('u.create_time', '>', $monthTime)
+            ->where('u.create_time', '>=', $monthTime)
             ->where('u.create_time', '<=', time())
             ->where('u.openid', 'not in', '')
             ->count('u.id');