周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 753a1d7de362adce9792da2bb89abb4c48ca650b 2 个父辈 7159436e c08ea8f3

合并分支 'lyh-server' 到 'master' 

Lyh server



查看合并请求 !2272
内嵌 并排对比
正在显示 4 个修改的文件 包含 17 行增加 和 3 行删除
@@ -90,7 +90,7 @@ class GeoQuestionController extends BaseController @@ -90,7 +90,7 @@ class GeoQuestionController extends BaseController
90 * @param : keywords->提交的关键字 90 * @param : keywords->提交的关键字
91 * @param : status->状态(0:可执行 1：禁止执行) 91 * @param : status->状态(0:可执行 1：禁止执行)
92 * @param : project_id->项目id 92 * @param : project_id->项目id
93 - * @param : type->类型（1：品牌 2：营销） 93 + * @param : type->类型（）
94 */ 94 */
95 public function saveGeoQuestion(){ 95 public function saveGeoQuestion(){
96 $this->request->validate([ 96 $this->request->validate([
@@ -40,7 +40,6 @@ class GeoQuestionResController extends BaseController @@ -40,7 +40,6 @@ class GeoQuestionResController extends BaseController
40 public function getType(){ 40 public function getType(){
41 $questionModel = new GeoQuestion(); 41 $questionModel = new GeoQuestion();
42 $data['type'] = $questionModel->brandType(); 42 $data['type'] = $questionModel->brandType();
43 - $data['frequency'] = $questionModel->frequency;  
44 $geoPlatformModel = new GeoPlatform(); 43 $geoPlatformModel = new GeoPlatform();
45 $data['platform'] = $geoPlatformModel->getList(); 44 $data['platform'] = $geoPlatformModel->getList();
46 return $this->success($data); 45 return $this->success($data);
@@ -39,6 +39,21 @@ class GeoLogic extends BaseLogic @@ -39,6 +39,21 @@ class GeoLogic extends BaseLogic
39 } 39 }
40 40
41 /** 41 /**
  42 + * @remark :获取类型
  43 + * @name :getType
  44 + * @author :lyh
  45 + * @method :post
  46 + * @time :2025/7/3 10:47
  47 + */
  48 + public function getType(){
  49 + $data['type'] = $this->model->brandType();
  50 + $data['frequency'] = $this->model->frequency;
  51 + $geoPlatformModel = new GeoPlatform();
  52 + $data['platform'] = $geoPlatformModel->getList();
  53 + return $this->success($data);
  54 + }
  55 +
  56 + /**
42 * @remark :获取问题列表 57 * @remark :获取问题列表
43 * @name :getGeoQuestionList 58 * @name :getGeoQuestionList
44 * @author :lyh 59 * @author :lyh
@@ -255,7 +255,6 @@ Route::middleware(['aloginauth'])->group(function () { @@ -255,7 +255,6 @@ Route::middleware(['aloginauth'])->group(function () {
255 Route::post('/', [Aside\WorkOrder\AsideTicketController::class, 'store'])->name('admin.tickets.store')->summary('A端创建工单'); 255 Route::post('/', [Aside\WorkOrder\AsideTicketController::class, 'store'])->name('admin.tickets.store')->summary('A端创建工单');
256 Route::get('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'show'])->name('admin.tickets.show')->summary('A端工单详情'); 256 Route::get('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'show'])->name('admin.tickets.show')->summary('A端工单详情');
257 Route::post('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'update'])->name('admin.tickets.update')->summary('A端更新工单,审核，邀请同事'); 257 Route::post('/{id}', [Aside\WorkOrder\AsideTicketController::class, 'update'])->name('admin.tickets.update')->summary('A端更新工单,审核，邀请同事');
258 - Route::get('/pushNotify/{id}', [Aside\WorkOrder\AsideTicketController::class, 'pushNotify'])->name('admin.tickets.pushNotify')->summary('A端工单推送企微群');  
259 Route::get('/projects/{search}', [Aside\WorkOrder\AsideTicketController::class, 'getProjects'])->name('admin.tickets.projects')->summary('A端V5V6项目列表'); 258 Route::get('/projects/{search}', [Aside\WorkOrder\AsideTicketController::class, 'getProjects'])->name('admin.tickets.projects')->summary('A端V5V6项目列表');
260 Route::get('/v56_projects/list', [Aside\WorkOrder\AsideTicketController::class, 'projectList'])->name('admin.tickets.projectList')->summary('A端V5V6项目列表'); 259 Route::get('/v56_projects/list', [Aside\WorkOrder\AsideTicketController::class, 'projectList'])->name('admin.tickets.projectList')->summary('A端V5V6项目列表');
261 Route::post('/log/{id}', [Aside\WorkOrder\AsideTicketLogController::class, 'update'])->name('admin.tickets.log.update')->summary('A端工单操作日志更新,完成工单'); 260 Route::post('/log/{id}', [Aside\WorkOrder\AsideTicketLogController::class, 'update'])->name('admin.tickets.log.update')->summary('A端工单操作日志更新,完成工单');
@@ -556,6 +555,7 @@ Route::middleware(['aloginauth'])->group(function () { @@ -556,6 +555,7 @@ Route::middleware(['aloginauth'])->group(function () {
556 //geo设置 555 //geo设置
557 Route::prefix('geo')->group(function () { 556 Route::prefix('geo')->group(function () {
558 Route::any('/setGeoStatus', [Aside\Geo\GeoQuestionController::class, 'setGeoStatus'])->name('admin.geo_setGeoStatus');//开启与关闭geo设置 557 Route::any('/setGeoStatus', [Aside\Geo\GeoQuestionController::class, 'setGeoStatus'])->name('admin.geo_setGeoStatus');//开启与关闭geo设置
  558 + Route::any('/getType', [Aside\Geo\GeoQuestionController::class, 'getType'])->name('admin.geo_getType');//geo设置类型
559 Route::prefix('question')->group(function () { 559 Route::prefix('question')->group(function () {
560 Route::any('/getGeoQuestionList', [Aside\Geo\GeoQuestionController::class, 'getGeoQuestionList'])->name('admin.geo_question_getGeoQuestionList'); 560 Route::any('/getGeoQuestionList', [Aside\Geo\GeoQuestionController::class, 'getGeoQuestionList'])->name('admin.geo_question_getGeoQuestionList');
561 Route::any('/saveGeoQuestion', [Aside\Geo\GeoQuestionController::class, 'saveGeoQuestion'])->name('admin.geo_question_saveGeoQuestion'); 561 Route::any('/saveGeoQuestion', [Aside\Geo\GeoQuestionController::class, 'saveGeoQuestion'])->name('admin.geo_question_saveGeoQuestion');