周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 0f025b8e79ca22a2a5938f012b97c94a73f1d54a 2 个父辈 b4626fd9 548c5b41

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

Lyh server



查看合并请求 !2883
内嵌 并排对比
正在显示 2 个修改的文件 包含 10 行增加 和 9 行删除
@@ -88,7 +88,7 @@ class TicketUploadDataController extends BaseController @@ -88,7 +88,7 @@ class TicketUploadDataController extends BaseController
88 * @method :post 88 * @method :post
89 * @time :2025/9/29 17:18 89 * @time :2025/9/29 17:18
90 */ 90 */
91 - public function cateText($type,$category_id,$is_array = false) 91 + public function cateText($type,$category_id,$keyword_id = [],$is_array = false)
92 { 92 {
93 if(empty($category_id)){ 93 if(empty($category_id)){
94 return ''; 94 return '';
@@ -108,7 +108,7 @@ class TicketUploadDataController extends BaseController @@ -108,7 +108,7 @@ class TicketUploadDataController extends BaseController
108 ->pluck($filed, 'id') 108 ->pluck($filed, 'id')
109 ->toArray(); 109 ->toArray();
110 if($type == 1){ 110 if($type == 1){
111 - $keywod_arr = $keywodModel->whereIn('id', (array)$category_id) 111 + $keywod_arr = $keywodModel->whereIn('id', (array)$keyword_id)
112 ->pluck($filed, 'id') 112 ->pluck($filed, 'id')
113 ->toArray(); 113 ->toArray();
114 return ['keywod_arr' => $keywod_arr, 'cate_arr' => $cate_arr]; 114 return ['keywod_arr' => $keywod_arr, 'cate_arr' => $cate_arr];
@@ -141,7 +141,7 @@ class TicketUploadDataController extends BaseController @@ -141,7 +141,7 @@ class TicketUploadDataController extends BaseController
141 $this->response('当前数据不存在或已被删除',Code::SYSTEM_ERROR); 141 $this->response('当前数据不存在或已被删除',Code::SYSTEM_ERROR);
142 } 142 }
143 ProjectServer::useProject($info['project_id']); 143 ProjectServer::useProject($info['project_id']);
144 - $info['text']['cate_name'] = $this->cateText($info['type'],$info['text']['category_id'] ?? [],true); 144 + $info['text']['cate_name'] = $this->cateText($info['type'],$info['text']['category_id'] ?? [],$info['text']['keyword_id'] ?? [],true);
145 $info = $this->getHandleFileImage($info); 145 $info = $this->getHandleFileImage($info);
146 DB::disconnect('custom_mysql'); 146 DB::disconnect('custom_mysql');
147 $this->response('success', Code::SUCCESS, $info); 147 $this->response('success', Code::SUCCESS, $info);
@@ -85,7 +85,7 @@ class TicketUploadDataLogic extends BaseLogic @@ -85,7 +85,7 @@ class TicketUploadDataLogic extends BaseLogic
85 * @method :post 85 * @method :post
86 * @time :2025/9/29 17:18 86 * @time :2025/9/29 17:18
87 */ 87 */
88 - public function cateText($type,$category_id,$is_array = false) 88 + public function cateText($type,$category_id = [],$keyword_id = [],$is_array = false)
89 { 89 {
90 if(empty($category_id)){ 90 if(empty($category_id)){
91 return ''; 91 return '';
@@ -105,7 +105,7 @@ class TicketUploadDataLogic extends BaseLogic @@ -105,7 +105,7 @@ class TicketUploadDataLogic extends BaseLogic
105 ->pluck($filed, 'id') 105 ->pluck($filed, 'id')
106 ->toArray(); 106 ->toArray();
107 if($type == 1){ 107 if($type == 1){
108 - $keywod_arr = $keywodModel->whereIn('id', (array)$category_id) 108 + $keywod_arr = $keywodModel->whereIn('id', (array)$keyword_id)
109 ->pluck($filed, 'id') 109 ->pluck($filed, 'id')
110 ->toArray(); 110 ->toArray();
111 return ['keywod_arr' => $keywod_arr, 'cate_arr' => $cate_arr]; 111 return ['keywod_arr' => $keywod_arr, 'cate_arr' => $cate_arr];
@@ -131,7 +131,7 @@ class TicketUploadDataLogic extends BaseLogic @@ -131,7 +131,7 @@ class TicketUploadDataLogic extends BaseLogic
131 $this->fail('当前数据不存在或已被删除'); 131 $this->fail('当前数据不存在或已被删除');
132 } 132 }
133 ProjectServer::useProject($info['project_id']); 133 ProjectServer::useProject($info['project_id']);
134 - $info['text']['cate_name'] = $this->cateText($info['type'],$info['text']['category_id'] ?? [],true); 134 + $info['text']['cate_name'] = $this->cateText($info['type'],$info['text']['category_id'] ?? [],$info['text']['keyword_id'] ?? [],true);
135 $info = $this->getHandleFileImage($info); 135 $info = $this->getHandleFileImage($info);
136 DB::disconnect('custom_mysql'); 136 DB::disconnect('custom_mysql');
137 return $this->success($info); 137 return $this->success($info);
@@ -186,17 +186,18 @@ class TicketUploadDataLogic extends BaseLogic @@ -186,17 +186,18 @@ class TicketUploadDataLogic extends BaseLogic
186 $v['url'] = str_replace_url($v['url']); 186 $v['url'] = str_replace_url($v['url']);
187 $info['text']['image'][$k] = $v; 187 $info['text']['image'][$k] = $v;
188 } 188 }
  189 + $thumb = Arr::a2s($info['text']['image'][0] ?? []);
189 $info['text']['image'] = Arr::a2s($info['text']['image'] ?? []); 190 $info['text']['image'] = Arr::a2s($info['text']['image'] ?? []);
190 }else{ 191 }else{
191 - $info['text']['image'] = Arr::a2s([]); 192 + $thumb = $info['text']['image'] = Arr::a2s([]);
192 } 193 }
193 try { 194 try {
194 $productModel = new Product(); 195 $productModel = new Product();
195 $data = [ 196 $data = [
196 'project_id' => $info['project_id'], 197 'project_id' => $info['project_id'],
197 'title' => $info['text']['title'], 198 'title' => $info['text']['title'],
198 - 'thumb'=>json_encode($info['text']['image'][0] ?? [],true),  
199 - 'gallery'=>json_encode($info['text']['image'] ?? [],true), 199 + 'thumb'=>$thumb,
  200 + 'gallery'=>$info['text']['image'] ?? [],
200 'intro'=>$info['text']['remark'], 201 'intro'=>$info['text']['remark'],
201 'category_id'=>$category_id ?? '', 202 'category_id'=>$category_id ?? '',
202 'keyword_id'=>$keyword_id ?? '', 203 'keyword_id'=>$keyword_id ?? '',