作者 lyh

gx

@@ -95,7 +95,7 @@ class ProductController extends BaseController @@ -95,7 +95,7 @@ class ProductController extends BaseController
95 } 95 }
96 $v['status_text'] = Product::statusMap()[$v['status']] ?? ''; 96 $v['status_text'] = Product::statusMap()[$v['status']] ?? '';
97 $v['created_uid_text'] = (new User())->read(['id'=>$v['created_uid']])['name'] ?? ''; 97 $v['created_uid_text'] = (new User())->read(['id'=>$v['created_uid']])['name'] ?? '';
98 - $v['url'] = $this->user['domain'].'/'.$v['route']; 98 + $v['url'] = $this->user['domain'].$v['route'];
99 return $v; 99 return $v;
100 } 100 }
101 101
@@ -26,7 +26,7 @@ class CustomTemplateController extends BaseController @@ -26,7 +26,7 @@ class CustomTemplateController extends BaseController
26 $lists = $customTemplateLogic->customTemplateLists($this->map,$this->page,$this->row,$this->order); 26 $lists = $customTemplateLogic->customTemplateLists($this->map,$this->page,$this->row,$this->order);
27 if (!empty($lists)){ 27 if (!empty($lists)){
28 foreach ($lists['list'] as $k => $v){ 28 foreach ($lists['list'] as $k => $v){
29 - $v['url'] = $this->user['domain'].'/'.$v['url']; 29 + $v['url'] = $this->user['domain'].$v['url'];
30 $lists['list'][$k] = $v; 30 $lists['list'][$k] = $v;
31 } 31 }
32 } 32 }
@@ -55,16 +55,16 @@ class BlogLogic extends BaseLogic @@ -55,16 +55,16 @@ class BlogLogic extends BaseLogic
55 */ 55 */
56 public function blogAdd(){ 56 public function blogAdd(){
57 //拼接参数 57 //拼接参数
58 -// DB::beginTransaction();  
59 -// try { 58 + DB::beginTransaction();
  59 + try {
60 $this->param = $this->paramProcessing($this->param); 60 $this->param = $this->paramProcessing($this->param);
61 $rs = $this->model->insertGetId($this->param); 61 $rs = $this->model->insertGetId($this->param);
62 $route = $this->param['url'] = RouteMap::setRoute($this->param['url'] ?: $this->param['name'], RouteMap::SOURCE_BLOG, $rs, $this->user['project_id']); 62 $route = $this->param['url'] = RouteMap::setRoute($this->param['url'] ?: $this->param['name'], RouteMap::SOURCE_BLOG, $rs, $this->user['project_id']);
63 -// DB::commit();  
64 -// }catch (\Exception $e){  
65 -// DB::rollBack();  
66 -// $this->fail('error');  
67 -// } 63 + DB::commit();
  64 + }catch (\Exception $e){
  65 + DB::rollBack();
  66 + $this->fail('error');
  67 + }
68 //通知更新 68 //通知更新
69 $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_BLOG, 'route'=>$route]); 69 $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_BLOG, 'route'=>$route]);
70 return $this->success(); 70 return $this->success();