作者 lyh

gx

@@ -240,6 +240,7 @@ class ProductController extends BaseController @@ -240,6 +240,7 @@ class ProductController extends BaseController
240 } 240 }
241 $v['status_text'] = Product::statusMap()[$v['status']] ?? ''; 241 $v['status_text'] = Product::statusMap()[$v['status']] ?? '';
242 //获取当前用户选择的模版 242 //获取当前用户选择的模版
  243 + $v['video'] = json_decode($v['video']);
243 $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL); 244 $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);
244 $v['is_renovation'] = $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']); 245 $v['is_renovation'] = $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id']);
245 $v['url'] = $this->user['domain'].$v['route']; 246 $v['url'] = $this->user['domain'].$v['route'];
@@ -214,6 +214,9 @@ class CustomModuleCategoryLogic extends BaseLogic @@ -214,6 +214,9 @@ class CustomModuleCategoryLogic extends BaseLogic
214 public function delRoute($id) 214 public function delRoute($id)
215 { 215 {
216 $info = $this->model->read(['id' => $id], ['id', 'route','module_id']); 216 $info = $this->model->read(['id' => $id], ['id', 'route','module_id']);
  217 + if($info === false){
  218 + return $this->success();
  219 + }
217 RouteMap::delRoute(RouteMap::SOURCE_MODULE_CATE, $id, $this->user['project_id']); 220 RouteMap::delRoute(RouteMap::SOURCE_MODULE_CATE, $id, $this->user['project_id']);
218 //通知 221 //通知
219 $this->curlDelRoute(['route'=>$info['route']]); 222 $this->curlDelRoute(['route'=>$info['route']]);
@@ -205,7 +205,7 @@ return [ @@ -205,7 +205,7 @@ return [
205 'Date' => Illuminate\Support\Facades\Date::class, 205 'Date' => Illuminate\Support\Facades\Date::class,
206 'DB' => Illuminate\Support\Facades\DB::class, 206 'DB' => Illuminate\Support\Facades\DB::class,
207 'Eloquent' => Illuminate\Database\Eloquent\Model::class, 207 'Eloquent' => Illuminate\Database\Eloquent\Model::class,
208 - 'Event' => Illuminate\Support\Facades\Event::class, 208 + 'Events' => Illuminate\Support\Facades\Event::class,
209 'File' => Illuminate\Support\Facades\File::class, 209 'File' => Illuminate\Support\Facades\File::class,
210 'Gate' => Illuminate\Support\Facades\Gate::class, 210 'Gate' => Illuminate\Support\Facades\Gate::class,
211 'Hash' => Illuminate\Support\Facades\Hash::class, 211 'Hash' => Illuminate\Support\Facades\Hash::class,