|
|
@@ -6,6 +6,7 @@ use app\http\validates\user\AddressValidate;
|
|
|
use app\models\system\SystemCity;
|
|
|
use app\models\system\SystemGroupLevel;
|
|
|
use app\models\system\SystemUserLevel;
|
|
|
+use app\models\system\SystemUserTask;
|
|
|
use app\models\user\UserGroupLevel;
|
|
|
use app\models\user\UserVisit;
|
|
|
use think\db\exception\DataNotFoundException;
|
|
|
@@ -113,7 +114,12 @@ class UserController
|
|
|
$info['level_name'] = SystemUserLevel::where('id', $info['level'])->value('name');
|
|
|
// $info['group_level_name'] = SystemGroupLevel::where('id', $info['group_level'])->value('name');
|
|
|
// 等级任务
|
|
|
- SystemUserLevel::getLevelList($info['uid']);
|
|
|
+// SystemUserLevel::getLevelList($info['uid']);
|
|
|
+ $list = self::setWhere()->field('name,discount,image,icon,explain,id,grade')->order('grade asc')->select();
|
|
|
+ foreach ($list as &$item){
|
|
|
+ $task = SystemUserTask::getTashList($item['id'], $info['uid']);
|
|
|
+ }
|
|
|
+
|
|
|
return app('json')->success($info);
|
|
|
}
|
|
|
|