diff --git a/admin/src/App.vue b/admin/src/App.vue
index 17c20261..607114ae 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -34,6 +34,7 @@
轮播图配置
允许客户端
用户
+ 考核
热销商品配置
新品上线配置
为你推荐配置
diff --git a/admin/src/main.js b/admin/src/main.js
index c59aae01..ffda6dee 100644
--- a/admin/src/main.js
+++ b/admin/src/main.js
@@ -1,14 +1,98 @@
import { createApp } from 'vue'
-import { ElButton, ElContainer, ElAside, ElHeader, ElMain, ElFooter, ElMenu, ElSubmenu, ElMenuItemGroup, ElMenuItem, ElForm, ElFormItem, ElInput, ElPopover, ElTag, ElCard, ElTable, ElTableColumn, ElPagination, ElDialog, ElPopconfirm, ElUpload, ElLoading, ElSelect, ElOption, ElRadioGroup, ElRadio, ElCascader, ElCheckbox, ElInputNumber } from 'element-plus'
+import {
+ ElAlert,
+ ElAside,
+ ElAutocomplete,
+ ElAvatar,
+ ElBacktop,
+ ElBadge,
+ ElBreadcrumb,
+ ElBreadcrumbItem,
+ ElButton,
+ ElButtonGroup,
+ ElCalendar,
+ ElCard,
+ ElCarousel,
+ ElCarouselItem,
+ ElCascader,
+ ElCascaderPanel,
+ ElCheckbox,
+ ElCheckboxButton,
+ ElCheckboxGroup,
+ ElCol,
+ ElCollapse,
+ ElCollapseItem,
+ ElCollapseTransition,
+ ElColorPicker,
+ ElContainer,
+ ElDatePicker,
+ ElDialog,
+ ElDivider,
+ ElDrawer,
+ ElDropdown,
+ ElDropdownItem,
+ ElDropdownMenu,
+ ElFooter,
+ ElForm,
+ ElFormItem,
+ ElHeader,
+ ElIcon,
+ ElImage,
+ ElInput,
+ ElInputNumber,
+ ElLink,
+ ElMain,
+ ElMenu,
+ ElMenuItem,
+ ElMenuItemGroup,
+ ElOption,
+ ElOptionGroup,
+ ElPageHeader,
+ ElPagination,
+ ElPopconfirm,
+ ElPopover,
+ ElPopper,
+ ElProgress,
+ ElRadio,
+ ElRadioButton,
+ ElRadioGroup,
+ ElRate,
+ ElRow,
+ ElScrollbar,
+ ElSelect,
+ ElSlider,
+ ElStep,
+ ElSteps,
+ ElSubmenu,
+ ElSwitch,
+ ElTabPane,
+ ElTable,
+ ElTableColumn,
+ ElTabs,
+ ElTag,
+ ElTimePicker,
+ ElTimeSelect,
+ ElTimeline,
+ ElTimelineItem,
+ ElTooltip,
+ ElTransfer,
+ ElTree,
+ ElUpload,
+ ElInfiniteScroll,
+ ElLoading,
+ ElMessage,
+ ElMessageBox,
+ ElNotification
+} from 'element-plus'
import App from './App.vue'
import router from './router/index'
import 'dayjs/locale/zh-cn'
import locale from 'element-plus/lib/locale/lang/zh-cn'
-// import 'element-plus/lib/theme-chalk/index.css'
+import 'element-plus/lib/theme-chalk/index.css'
// 修改后的主题样式必须放在最后面
-import '../theme/index.css'
+// import '../theme/index.css'
const orderStatus = {
0: '待支付',
diff --git a/admin/src/router/index.js b/admin/src/router/index.js
index b624b697..97ec9df9 100644
--- a/admin/src/router/index.js
+++ b/admin/src/router/index.js
@@ -108,8 +108,22 @@ const router = createRouter({
path: '/user-form',
name: 'user-form',
component: () => import(/* webpackChunkName: "account" */ '../views/user/form.vue'),
- }
-
+ },
+ {
+ path: '/user-detail',
+ name: 'user-detail',
+ component: () => import(/* webpackChunkName: "account" */ '../views/user/detail.vue'),
+ },
+ {
+ path: '/exam',
+ name: 'exam',
+ component: () => import(/* webpackChunkName: "account" */ '../views/exam/index.vue'),
+ },
+ {
+ path: '/exam-form',
+ name: 'exam-form',
+ component: () => import(/* webpackChunkName: "account" */ '../views/exam/form.vue'),
+ },
]
})
diff --git a/admin/src/utils/api.js b/admin/src/utils/api.js
index 6b3a45a1..9b6874ef 100644
--- a/admin/src/utils/api.js
+++ b/admin/src/utils/api.js
@@ -26,6 +26,25 @@ const api = {
storeUser: (params = {}) => {
return axios.post(baseUrl + 'user', params);
},
+
+ listExam: (params = {}) => {
+ return axios.get(baseUrl + 'exam', {params: params});
+ },
+ storeExam: (params = {}) => {
+ return axios.post(baseUrl + 'exam', params);
+ },
+ updateExam: (id, params = {}) => {
+ return axios.put(baseUrl + 'exam/' + id, params);
+ },
+ getExam: (id) => {
+ return axios.get(baseUrl + 'exam/' + id);
+ },
+ deleteExam: (id) => {
+ return axios.delete(baseUrl + 'exam/' + id);
+ },
+ listClass: (params = {}) => {
+ return axios.get(baseUrl + 'class', {params: params});
+ },
}
export default api
diff --git a/admin/src/utils/index.js b/admin/src/utils/index.js
index 339e2318..3c61e428 100644
--- a/admin/src/utils/index.js
+++ b/admin/src/utils/index.js
@@ -46,5 +46,7 @@ export const pathMap = {
"agent-allow": "允许客户端",
"agent-allow-form": "允许客户端表单",
"user": "用户",
- "user-form": "用户表单"
+ "user-form": "用户表单",
+ "exam": "考核",
+ "exam-form": "考核表单",
}
diff --git a/admin/src/views/exam/form.vue b/admin/src/views/exam/form.vue
new file mode 100644
index 00000000..ea114f82
--- /dev/null
+++ b/admin/src/views/exam/form.vue
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+ {{value}}
+
+
+
+
+ {{ id ? '立即修改' : '立即创建' }}
+
+
+
+
+
+
+
+
+
diff --git a/admin/src/views/exam/index.vue b/admin/src/views/exam/index.vue
new file mode 100644
index 00000000..493eb4df
--- /dev/null
+++ b/admin/src/views/exam/index.vue
@@ -0,0 +1,245 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/admin/src/views/user/detail.vue b/admin/src/views/user/detail.vue
new file mode 100644
index 00000000..b7fa3e06
--- /dev/null
+++ b/admin/src/views/user/detail.vue
@@ -0,0 +1,171 @@
+
+
+
+
+
+
+
+
+ {{'列表内容 ' + o }}
+
+
+
+
+
+
+
+
+
+ {{'列表内容 ' + o }}
+
+
+
+
+
+
+
+
+
diff --git a/admin/src/views/user/index.vue b/admin/src/views/user/index.vue
index e466eb80..55e3f76d 100644
--- a/admin/src/views/user/index.vue
+++ b/admin/src/views/user/index.vue
@@ -84,7 +84,7 @@
width="100"
>
-
+ 详情
@@ -193,6 +193,14 @@ export default {
query: {id: id}
})
}
+ // 修改轮播图
+ const handleDetail = (id) => {
+ console.log("id", id)
+ router.push({
+ name: "user-detail",
+ query: {id: id}
+ })
+ }
// 选择项
const handleSelectionChange = (val) => {
state.multipleSelection = val
@@ -231,6 +239,7 @@ export default {
addGood,
handleAdd,
handleEdit,
+ handleDetail,
handleDelete,
handleDeleteOne,
getCarousels,
diff --git a/app/Http/Controllers/AgentAllowController.php b/app/Http/Controllers/AgentAllowController.php
index 9223a28b..805002b9 100644
--- a/app/Http/Controllers/AgentAllowController.php
+++ b/app/Http/Controllers/AgentAllowController.php
@@ -17,7 +17,7 @@ class AgentAllowController extends Controller
{
$result = AgentAllow::query()->orderBy('id', 'desc')->paginate();
$resource = AgentAllowResource::collection($result);
- return success('agent allow list', $resource);
+ return $this->success($resource);
}
/**
@@ -41,7 +41,7 @@ class AgentAllowController extends Controller
{
$result = AgentAllow::query()->findOrFail($id);
$resource = new AgentAllowResource($result);
- return success('agent allow detail', $resource);
+ return $this->success($resource);
}
/**
@@ -56,7 +56,7 @@ class AgentAllowController extends Controller
$result = AgentAllow::query()->findOrFail($id);
$result->update($request->all());
$resource = new AgentAllowResource($result);
- return success('agent allow update', $resource);
+ return $this->success($resource);
}
/**
@@ -69,6 +69,6 @@ class AgentAllowController extends Controller
{
$result = AgentAllow::query()->findOrFail($id);
$deleted = $result->delete();
- return success('agent allow delete', [$deleted]);
+ return $this->success([$deleted]);
}
}
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index a0a2a8a3..e29c5bfb 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -6,8 +6,51 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Str;
class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+
+ public function success($data, $msg = null)
+ {
+ if (is_null($msg)) {
+ $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+ $caller = $backtrace[1];
+ $msg = $this->getReturnMsg($caller);
+ }
+ return success($msg, $data);
+ }
+
+ public function fail($data, $msg = null)
+ {
+ if (is_null($msg)) {
+ $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+ $caller = $backtrace[1];
+ $msg = $this->getReturnMsg($caller);
+ }
+ return fail($msg, $data);
+ }
+
+ protected function getReturnMsg(array $backtrace)
+ {
+ $title = $this->title ?? '';
+ if (empty($title)) {
+ $title = $backtrace['class'];
+ $pos = strripos($title, '\\');
+ $title = substr($title, $pos + 1);
+ $title = str_replace('Controller', '', $title);
+ }
+ $action = $backtrace['function'];
+ $map = [
+ 'index' => 'list',
+ 'show' => 'detail',
+ 'update' => 'update',
+ 'destroy' => 'delete',
+ ];
+ if (isset($map[$action])) {
+ $action = $map[$action];
+ }
+ return Str::slug("$title.$action", '.');
+ }
}
diff --git a/app/Http/Controllers/ExamController.php b/app/Http/Controllers/ExamController.php
new file mode 100644
index 00000000..1623a0a2
--- /dev/null
+++ b/app/Http/Controllers/ExamController.php
@@ -0,0 +1,98 @@
+repository = $repository;
+ }
+
+ /**
+ * Display a listing of the resource.
+ *
+ * @param Request $request
+ * @return array
+ */
+ public function index(Request $request)
+ {
+ $result = $this->repository->getList($request->all());
+ $resource = ExamResource::collection($result);
+ return $this->success($resource);
+ }
+
+ /**
+ * Store a newly created resource in storage.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @return array
+ */
+ public function store(Request $request)
+ {
+ $rules = [
+ 'name' => 'required|string',
+ 'begin' => 'required|date_format:Y-m-d H:i:s',
+ 'end' => 'required|date_format:Y-m-d H:i:s',
+ 'requires' => 'required|array|min:1',
+ 'filters' => 'required|array|min:1',
+ ];
+ $request->validate($rules);
+ $result = $this->repository->store($request->all());
+ $resource = new ExamResource($result);
+ return $this->success($resource);
+ }
+
+ /**
+ * Display the specified resource.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function show($id)
+ {
+ //
+ }
+
+ /**
+ * Update the specified resource in storage.
+ *
+ * @param \Illuminate\Http\Request $request
+ * @param int $id
+ * @return array
+ */
+ public function update(Request $request, $id)
+ {
+ $rules = [
+ 'name' => 'required|string',
+ 'begin' => 'required|date_format:Y-m-d H:i:s',
+ 'end' => 'required|date_format:Y-m-d H:i:s',
+ 'requires' => 'required|array|min:1',
+ 'filters' => 'required|array|min:1',
+ ];
+ $request->validate($rules);
+ $result = $this->repository->update($request->all(), $id);
+ $resource = new ExamResource($result);
+ return $this->success($resource);
+ }
+
+ /**
+ * Remove the specified resource from storage.
+ *
+ * @param int $id
+ * @return \Illuminate\Http\Response
+ */
+ public function destroy($id)
+ {
+ //
+ }
+
+}
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index aaccff93..0f979246 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -8,11 +8,11 @@ use Illuminate\Http\Request;
class UserController extends Controller
{
- private $user;
+ private $repository;
- public function __construct(UserRepository $user)
+ public function __construct(UserRepository $repository)
{
- $this->user = $user;
+ $this->repository = $repository;
}
/**
@@ -23,9 +23,9 @@ class UserController extends Controller
*/
public function index(Request $request)
{
- $result = $this->user->getList($request->all());
+ $result = $this->repository->getList($request->all());
$resource = UserResource::collection($result);
- return success('user list', $resource);
+ return $this->success($resource);
}
/**
@@ -43,9 +43,9 @@ class UserController extends Controller
'password_confirmation' => 'required|string|same:password'
];
$request->validate($rules);
- $result = $this->user->store($request->all());
+ $result = $this->repository->store($request->all());
$resource = new UserResource($result);
- return success('user store', $resource);
+ return $this->success($resource);
}
/**
@@ -90,8 +90,14 @@ class UserController extends Controller
'password_confirmation' => 'required|same:password',
];
$request->validate($rules);
- $result = $this->user->resetPassword($request->username, $request->password, $request->password_confirmation);
+ $result = $this->repository->resetPassword($request->repositoryname, $request->password, $request->password_confirmation);
$resource = new UserResource($result);
- return success('user reset password', $resource);
+ return $this->success($resource);
+ }
+
+ public function classes()
+ {
+ $result = $this->repository->listClass();
+ return $this->success($result);
}
}
diff --git a/app/Http/Resources/ExamResource.php b/app/Http/Resources/ExamResource.php
new file mode 100644
index 00000000..5b22e0ea
--- /dev/null
+++ b/app/Http/Resources/ExamResource.php
@@ -0,0 +1,28 @@
+ $this->id,
+ 'name' => $this->name,
+ 'description' => $this->description,
+ 'begin' => $this->begin,
+ 'end' => $this->end,
+ 'filters' => $this->filters,
+ 'requires' => $this->requires,
+ 'status' => $this->status,
+ ];
+ }
+}
diff --git a/app/Models/Exam.php b/app/Models/Exam.php
new file mode 100644
index 00000000..9c0f6989
--- /dev/null
+++ b/app/Models/Exam.php
@@ -0,0 +1,13 @@
+ ['text' => 'Peasant'],
+ self::CLASS_USER => ['text' => 'User'],
+ self::CLASS_POWER_USER => ['text' => 'Power User'],
+ self::CLASS_ELITE_USER => ['text' => 'Elite User'],
+ self::CLASS_CRAZY_USER => ['text' => 'Crazy User'],
+ self::CLASS_INSANE_USER => ['text' => 'Insane User'],
+ self::CLASS_VETERAN_USER => ['text' => 'Veteran User'],
+ self::CLASS_EXTREME_USER => ['text' => 'Extreme User'],
+ self::CLASS_ULTIMATE_USER => ['text' => 'Eltimate User'],
+ self::CLASS_NEXUS_MASTER => ['text' => 'Nexus Master'],
+ self::CLASS_VIP => ['text' => 'Vip'],
+ self::CLASS_RETIREE => ['text' => 'Retiree'],
+ self::CLASS_UPLOADER => ['text' => 'Uploader'],
+ self::CLASS_FORUM_MODERATOR => ['text' => 'Forum Moderator'],
+ self::CLASS_MODERATOR => ['text' => 'Moderator'],
+ self::CLASS_ADMINISTRATOR => ['text' => 'Administrator'],
+ self::CLASS_SYSOP => ['text' => 'Sysop'],
+ self::CLASS_STAFFLEADER => ['text' => 'Staff Leader'],
+ ];
+
+ public function getClassTextAttribute()
+ {
+ return self::$classes[$this->class]['text'] ?? '';
+ }
+
+
/**
* 为数组 / JSON 序列化准备日期。
diff --git a/app/Repositories/ExamRepository.php b/app/Repositories/ExamRepository.php
new file mode 100644
index 00000000..0f835846
--- /dev/null
+++ b/app/Repositories/ExamRepository.php
@@ -0,0 +1,31 @@
+getSortFieldAndType($params);
+ $query->orderBy($sortField, $sortType);
+ return $query->paginate();
+ }
+
+ public function store(array $params)
+ {
+ $exam = Exam::query()->create($params);
+ return $exam;
+ }
+
+ public function update(array $params, $id)
+ {
+ $exam = Exam::query()->findOrFail($id);
+ $exam->update($params);
+ return $exam;
+ }
+
+}
diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php
index 685f2c21..8f1a0868 100644
--- a/app/Repositories/UserRepository.php
+++ b/app/Repositories/UserRepository.php
@@ -53,4 +53,13 @@ class UserRepository extends BaseRepository
$user->update($update);
return $user;
}
+
+ public function listClass()
+ {
+ $out = [];
+ foreach(User::$classes as $key => $value) {
+ $out[(string)$key] = $value['text'];
+ }
+ return $out;
+ }
}
diff --git a/database/migrations/2014_10_12_100000_create_password_resets_table.php b/database/migrations/2014_10_12_100000_create_password_resets_table.php
deleted file mode 100644
index 0ee0a36a..00000000
--- a/database/migrations/2014_10_12_100000_create_password_resets_table.php
+++ /dev/null
@@ -1,32 +0,0 @@
-string('email')->index();
- $table->string('token');
- $table->timestamp('created_at')->nullable();
- });
- }
-
- /**
- * Reverse the migrations.
- *
- * @return void
- */
- public function down()
- {
- Schema::dropIfExists('password_resets');
- }
-}
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2021_04_19_061650_create_exams_table.php
similarity index 53%
rename from database/migrations/2014_10_12_000000_create_users_table.php
rename to database/migrations/2021_04_19_061650_create_exams_table.php
index 621a24eb..46f0d6a4 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2021_04_19_061650_create_exams_table.php
@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
-class CreateUsersTable extends Migration
+class CreateExamsTable extends Migration
{
/**
* Run the migrations.
@@ -13,13 +13,15 @@ class CreateUsersTable extends Migration
*/
public function up()
{
- Schema::create('users', function (Blueprint $table) {
+ Schema::create('exams', function (Blueprint $table) {
$table->id();
$table->string('name');
- $table->string('email')->unique();
- $table->timestamp('email_verified_at')->nullable();
- $table->string('password');
- $table->rememberToken();
+ $table->text('description')->nullable();
+ $table->dateTime('begin');
+ $table->dateTime('end');
+ $table->text('filters');
+ $table->text('requires');
+ $table->tinyInteger('status')->default(0);
$table->timestamps();
});
}
@@ -31,6 +33,6 @@ class CreateUsersTable extends Migration
*/
public function down()
{
- Schema::dropIfExists('users');
+ Schema::dropIfExists('exams');
}
}
diff --git a/database/migrations/2021_04_19_062743_create_exam_progress_table.php b/database/migrations/2021_04_19_062743_create_exam_progress_table.php
new file mode 100644
index 00000000..4436d092
--- /dev/null
+++ b/database/migrations/2021_04_19_062743_create_exam_progress_table.php
@@ -0,0 +1,36 @@
+id();
+ $table->integer('exam_id')->index();
+ $table->integer('uid')->index();
+ $table->integer('type_id');
+ $table->integer('value');
+ $table->timestamps();
+ $table->index('created_at');
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('exam_progress');
+ }
+}
diff --git a/routes/api.php b/routes/api.php
index e4c5ad13..634d6e67 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -16,4 +16,7 @@ use Illuminate\Support\Facades\Route;
Route::group([], function () {
Route::resource('agent-allow', \App\Http\Controllers\AgentAllowController::class);
+ Route::resource('user', \App\Http\Controllers\UserController::class);
+ Route::resource('exam', \App\Http\Controllers\ExamController::class);
+ Route::get('class', [\App\Http\Controllers\UserController::class, 'classes']);
});