diff --git a/app/common/services/ComponentService.php b/app/common/services/ComponentService.php index 9294c149..0fb3fa02 100644 --- a/app/common/services/ComponentService.php +++ b/app/common/services/ComponentService.php @@ -401,6 +401,8 @@ class ComponentService ['name' => '带货直播列表', 'mini_url' => '/packageD/directSeeding/liveList/liveList', 'url' => 'liveList', 'plugin_name' => 'room'], ['name' => '拼团列表', 'mini_url' => '/packageB/member/group/GroupList/GroupList', 'url' => 'group_list', 'plugin_name' => 'fight-groups'], ['name' => '我的拼团', 'mini_url' => '/packageB/member/group/MyGroups/MyGroups', 'url' => 'mygroups', 'plugin_name' => 'fight-groups'], + ['name' => '帮助中心（旧）', 'mini_url' => '', 'url' => 'member/helpcenter'], + ['name' => '帮助中心（新）', 'mini_url' => '', 'url' => 'member/new_help/index'], ['name' => '典藏室', 'mini_url' => '', 'url' => 'member/collection_room'], ['name' => '关于我们', 'mini_url' => '', 'url' => 'member/tool/about_us'], ]; diff --git a/plugins/help-center/src/admin/HelpCenterSetController.php b/plugins/help-center/src/admin/HelpCenterSetController.php index 0f8b4eca..444f489b 100644 --- a/plugins/help-center/src/admin/HelpCenterSetController.php +++ b/plugins/help-center/src/admin/HelpCenterSetController.php @@ -1,91 +1,32 @@ setdata; -// -// $url = Url::absoluteWeb('plugin.help-center.admin.help-center-set.index'); -// -// if ($requestData) { -// //将数据赋值到model -// $helpCenterModel->fill($requestData); -// //字段检测 -// $validator = $helpCenterModel->validator(); -// if ($validator->fails()) { -// //验证失败 -// $this->error($validator->messages()); -// } else { -// //保存数据 -// if ($helpCenterModel->save()) { -// //显示信息并跳转 -// return $this->message('保存成功',$url); -// } else { -// $this->error('保存失败'); -// } -// } -// } -// -// $pluginName = $helpCenterService->get('plugin_name'); -// -// return view('Yunshop\HelpCenter::admin.set', [ -// 'pluginName' => $pluginName, -// 'set' => $set, -// ])->render(); -// } - - public function index() - { - $helpCenterService = new HelpCenterService(); - $set = Setting::get('help-center.status'); - - $pluginName = $helpCenterService->get('plugin_name'); - - $data_title = Setting::get('help-center.title'); - $data_icon = Setting::get('help-center.icon'); - $data_description = Setting::get('help-center.description'); - - $share_data['title'] = $data_title; - $share_data['icon'] = yz_tomedia($data_icon); - $share_data['description'] = $data_description; +class HelpCenterSetController extends UploadVerificationBaseController{ + public function index(){ $requestData = \YunShop::request()->setdata; + if($requestData){ + \Setting::set('help-center', $requestData); - if ($requestData) { - $result = SetService::storeSet($requestData); - if ($result === true) { - return $this->message('保存设置成功', Url::absoluteWeb('plugin.help-center.admin.help-center-set.index')); - } - $this->error($result); + return $this->message('保存设置成功',Url::absoluteWeb('plugin.help-center.admin.help-center-set.index')); } - return view('Yunshop\HelpCenter::admin.set', [ - 'set' => $set, + // 获取信息 + $helpCenterService = new HelpCenterService(); + $set = Setting::get('help-center'); + $pluginName = $helpCenterService->get('plugin_name'); + $formList = DiyformTypeModel::getDiyformList()->select(['id','title'])->orderBy('id', 'desc')->get()->toArray(); + + return view('Yunshop\HelpCenter::admin.set',[ + 'set' => $set, 'pluginName' => $pluginName, - 'share_data' => $share_data, + 'form_list' => $formList, ]); } - } \ No newline at end of file diff --git a/plugins/help-center/src/api/ContentController.php b/plugins/help-center/src/api/ContentController.php index 0db4aa06..783769bf 100644 --- a/plugins/help-center/src/api/ContentController.php +++ b/plugins/help-center/src/api/ContentController.php @@ -13,9 +13,10 @@ use app\common\components\ApiController; use app\common\facades\Setting; use app\frontend\modules\member\controllers\ServiceController; use Yunshop\HelpCenter\models\HelpCenterAddModel; +use Yunshop\HelpCenter\services\HelpCenterService; + +class ContentController extends ApiController{ -class ContentController extends ApiController -{ public function info() { $set_data = HelpCenterAddModel::select('title', 'content')->uniacid()->orderBy('sort')->get()->toarray(); @@ -39,4 +40,38 @@ class ContentController extends ApiController return $this->successJson('ok', ['set_data' => $set_data, 'customer_service' => $customer_service]); } + /** + * Common: 获取基本配置信息 + * Author: wu-hui + * Time: 2023/10/26 17:03 + * @return \Illuminate\Http\JsonResponse + */ + public function homeInfo(){ + $set = Setting::get('help-center'); + $set['plugin_name'] = (new HelpCenterService())->get('plugin_name'); + + return $this->successJson('ok',$set); + } + /** + * Common: 获取问题列表 + * Author: wu-hui + * Time: 2023/10/26 17:08 + * @return \Illuminate\Http\JsonResponse + */ + public function questionList(){ + // 参数获取 + $searchText = request()->input('search_text'); + // 列表获取 + $list = HelpCenterAddModel::uniacid() + ->select(['id','title','content']) + ->when(!empty($searchText),function($query) use ($searchText){ + $query->where('title','like',"%{$searchText}%"); + }) + ->orderBy('sort','DESC') + ->get() + ->toArray(); + + return $this->successJson('ok',$list); + } + } diff --git a/plugins/help-center/views/admin/set.blade.php b/plugins/help-center/views/admin/set.blade.php index 67935105..a40dc23c 100644 --- a/plugins/help-center/views/admin/set.blade.php +++ b/plugins/help-center/views/admin/set.blade.php @@ -2,66 +2,105 @@ @section('content') @section('title', trans($pluginName)) - - {{----}} - +
-
-
- -
基础设置:
- -
- -
- - +
+
+ +
+
+ +
+
+
+ {{--基本设置--}} +
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ {{--分享设置--}} +
+
+ +
+ +
+
+
+ +
+ {!! app\common\helpers\ImageHelper::tplFormFieldImage('setdata[icon]', $set['icon']) !!} +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
- -
分享设置:
- -
- -
- -
-
- -
- -
- {!! app\common\helpers\ImageHelper::tplFormFieldImage('setdata[icon]', $share_data['icon']) !!} -
-
- -
- -
- -
-
- -
- -
- -
-
-
- -
+ + + + @endsection