diff --git a/app/Admin/Controllers/UserScoreController.php b/app/Admin/Controllers/UserScoreController.php index 90ee928..eedb6a2 100644 --- a/app/Admin/Controllers/UserScoreController.php +++ b/app/Admin/Controllers/UserScoreController.php @@ -130,22 +130,23 @@ class UserScoreController extends AdminController public function detail(): Form { - return $this->baseDetail()->title('')->body([ - amisMake()->TextControl()->name('id')->label(__('user_score.id'))->static(), - amisMake()->TextControl()->name('type.name')->label(__('user_score.type_id'))->static(), - amisMake()->TextControl()->name('cate.name')->label(__('user_score.cate_id'))->static(), - amisMake()->TextControl()->name('user.name')->label(__('user_score.user_id'))->static(), - amisMake()->TextControl()->name('title')->label(__('user_score.title'))->static(), - amisMake()->TextareaControl()->name('content')->label(__('user_score.content'))->static(), - amisMake()->TextControl()->name('images')->label(__('user_score.images'))->static()->staticSchema(amisMake()->Images()), - amisMake()->TextControl()->name('file')->label(__('user_score.file'))->static()->staticSchema(amisMake()->Link()->body('${file}')->href('${file}')->blank()), - amisMake()->TextControl()->name('check_status_text')->label(__('user_score.check_status'))->static(), - amisMake()->TextControl()->name('check_user.name')->label(__('user_score.check_user_id'))->static(), - amisMake()->TextControl()->name('check_remarks')->label(__('user_score.check_remarks'))->static(), - amisMake()->TextControl()->name('check_at')->label(__('user_score.check_at'))->static(), - amisMake()->TextControl()->name('score')->label(__('user_score.score'))->static(), - amisMake()->TextControl()->name('created_at')->label(__('user_score.created_at'))->static(), - ]); + return $this->baseDetail()->title('')->body(amisMake()->Property()->items([ + ['label' => __('user_score.user_id'), 'content' => '${user.name}'], + ['label' => __('user_score.cate_id'), 'content' => '${cate.name}'], + ['label' => __('user_score.type_id'), 'content' => '${type.name}'], + ['label' => __('user_score.check_status'), 'content' => '${check_status_text}'], + ['label' => __('user_score.check_user_id'), 'content' => '${check_user.name}'], + ['label' => __('user_score.check_remarks'), 'content' => '${check_remarks}'], + + ['label' => __('user_score.score'), 'content' => '${score}'], + ['label' => __('user_score.created_at'), 'content' => '${created_at}', 'span' => 2], + + ['label' => __('user_score.title'), 'content' => '${title}', 'span' => 3], + ['label' => __('user_score.content'), 'content' => amisMake()->TextareaControl()->labelWidth('0px')->static()->value('${content}'), 'span' => 3], + ['label' => __('user_score.content'), 'content' => amisMake()->Images()->source('${images}')->defaultImage(null), 'span' => 3], + ['label' => __('user_score.file'), 'content' => amisMake()->Link()->body('${file}')->href('${file}')->blank(), 'span' => 3], + + ])); } public function check($id, Request $request) diff --git a/app/Http/Controllers/Api/KeywordController.php b/app/Http/Controllers/Api/KeywordController.php index dc9f778..7db6e73 100644 --- a/app/Http/Controllers/Api/KeywordController.php +++ b/app/Http/Controllers/Api/KeywordController.php @@ -15,4 +15,11 @@ class KeywordController extends Controller return $this->response()->success(KeywordResource::collection($list)); } + + public function show($id) + { + $info = Keyword::findOrFail($id); + + return $this->response()->success(KeywordResource::make($info)); + } } diff --git a/app/Http/Controllers/Api/UserScoreController.php b/app/Http/Controllers/Api/UserScoreController.php index 984b64f..d3af227 100644 --- a/app/Http/Controllers/Api/UserScoreController.php +++ b/app/Http/Controllers/Api/UserScoreController.php @@ -40,15 +40,21 @@ class UserScoreController extends Controller return $this->response()->fail($service->getError()); } - public function update(Request $request) + public function update($id, Request $request) { $user = auth('api')->user(); $info = $user->scores()->findOrFail($id); if ($info->check_status == CheckStatus::Success) { return $this->response()->fail('审核已通过, 无法修改'); } - - $info->update($request->only(['title', 'content', 'images', 'file'])); + $params = $request->only(['title', 'content', 'images', 'file']); + if ($info->check_status == CheckStatus::Fail) { + $params['created_at'] = now(); + $params['check_status'] = CheckStatus::None; + $params['check_at'] = null; + $params['check_user_id'] = null; + } + $info->update($params); return $this->response()->success(); } diff --git a/public/h5/index.html b/public/h5/index.html index d960f39..a11a691 100644 --- a/public/h5/index.html +++ b/public/h5/index.html @@ -1,2 +1,2 @@