Merge remote-tracking branch 'origin/master' into akun

@@ -412,13 +412,8 @@ class AsideTicketController extends BaseController
      */
      */
     public function getorderTypeOptions()
     public function getorderTypeOptions()
     {
     {
-        $this->request->validate([
-            'project_cate'=>'required'
-        ],[
-            'project_cate.required' => 'project_cate不能为空'
-        ]);
         $ticket = new Tickets();
         $ticket = new Tickets();
-        $data = $ticket->getOrderTypeOptions($this->param['project_cate']);
+        $data = $ticket->getOrderTypeOptions();
         $this->response('success', Code::SUCCESS, $data);
         $this->response('success', Code::SUCCESS, $data);
     }
     }
 }
 }

@@ -153,7 +153,7 @@ class Tickets extends Base
      * @method :post
      * @method :post
      * @time   :2025/11/24 14:43
      * @time   :2025/11/24 14:43
      */
      */
-    public function getorderTypeOptions($project_cate = 1)
+    public function getorderTypeOptions()
     {
     {
         $data = [
         $data = [
             '1' => ['资料上传', '美工设计', '网站修改', '优化问题', '优化报告', '网站同步', '页面翻译', '其他问题','关键词相关','上线审核','研发工单(客户不可见)'],
             '1' => ['资料上传', '美工设计', '网站修改', '优化问题', '优化报告', '网站同步', '页面翻译', '其他问题','关键词相关','上线审核','研发工单(客户不可见)'],
@@ -162,13 +162,13 @@ class Tickets extends Base
             '4' => ['账号问题', '报告分析', '效果问题', '发帖问题', '视频问题', '美工设计', '其他问题','研发工单(客户不可见)']
             '4' => ['账号问题', '报告分析', '效果问题', '发帖问题', '视频问题', '美工设计', '其他问题','研发工单(客户不可见)']
         ];
         ];
         $dataSon = [
         $dataSon = [
-            '研发工单(客户不可见)'=>[
-                '1'=>[],
-                '2'=>[],
-                '3'=>[],
-                '4'=>[],
+            '研发工单'=>[
+                '1'=>['工单系统'=>'李宇航','页面及可视化'=>'刘俊杰','翻译'=>'李文涛','v5问题'=>'张关杰','其他问题'=>''],
+                '2'=>['工单系统'=>'李宇航','oa管理系统'=>'李宇航','v6管理系统'=>'李宇航','社媒分享'=>'李宇航','C端页面生成'=>'李小龙','页面及可视化'=>'刘俊杰','翻译'=>'李文涛','其他问题'=>''],
+                '3'=>['Whatsapp'=>'赵彬吉','邮件群发'=>'邓超','社媒'=>'何正兵','AI模型'=>'何正兵','其他问题'=>'朱世亮'],
+                '4'=>['Whatsapp'=>'赵彬吉','邮件群发'=>'邓超','社媒'=>'何正兵','AI模型'=>'何正兵','其他问题'=>'朱世亮'],
             ]
             ]
         ];
         ];
-        return ['type'=>$data[$project_cate], 'data'=>$dataSon['研发工单(客户不可见)'][$project_cate]];
+        return ['type'=>$data, 'data'=>$dataSon];
     }
     }
 }
 }