正在显示
2 个修改的文件
包含
9 行增加
和
8 行删除
| @@ -37,7 +37,8 @@ class ProductController extends BaseController | @@ -37,7 +37,8 @@ class ProductController extends BaseController | ||
| 37 | $this->map['category_id'] = ['like','%'.$this->map['category_id'].'%']; | 37 | $this->map['category_id'] = ['like','%'.$this->map['category_id'].'%']; |
| 38 | } | 38 | } |
| 39 | $this->map['project_id'] = $this->user['project_id']; | 39 | $this->map['project_id'] = $this->user['project_id']; |
| 40 | - $filed = ['id', 'project_id', 'title', 'sort' ,'thumb', 'product_type' , 'route' ,'category_id', 'keyword_id', 'status', 'created_uid', 'created_at', 'updated_at']; | 40 | + $filed = ['id', 'project_id', 'title', 'sort' ,'thumb', 'product_type' , 'route' , |
| 41 | + 'category_id', 'keyword_id', 'status', 'created_uid', 'created_at', 'updated_at']; | ||
| 41 | $lists = $product->lists($this->map,$this->page,$this->row,$this->order,$filed); | 42 | $lists = $product->lists($this->map,$this->page,$this->row,$this->order,$filed); |
| 42 | if(!empty($lists['list'])){ | 43 | if(!empty($lists['list'])){ |
| 43 | foreach ($lists['list'] as $k=>$v){ | 44 | foreach ($lists['list'] as $k=>$v){ |
| @@ -174,8 +174,8 @@ class BTemplateLogic extends BaseLogic | @@ -174,8 +174,8 @@ class BTemplateLogic extends BaseLogic | ||
| 174 | */ | 174 | */ |
| 175 | public function templateSave(){ | 175 | public function templateSave(){ |
| 176 | //查询当前模版是否已保存 | 176 | //查询当前模版是否已保存 |
| 177 | - DB::beginTransaction(); | ||
| 178 | - try { | 177 | +// DB::beginTransaction(); |
| 178 | +// try { | ||
| 179 | $info = $this->webTemplateInfo($this->param['template_id'],$this->param['source'],$this->param['source_id']); | 179 | $info = $this->webTemplateInfo($this->param['template_id'],$this->param['source'],$this->param['source_id']); |
| 180 | //字符串截取 | 180 | //字符串截取 |
| 181 | $this->param = $this->stringProcessing($this->param); | 181 | $this->param = $this->stringProcessing($this->param); |
| @@ -186,11 +186,11 @@ class BTemplateLogic extends BaseLogic | @@ -186,11 +186,11 @@ class BTemplateLogic extends BaseLogic | ||
| 186 | $this->model->edit($this->param,['id'=>$info['id']]); | 186 | $this->model->edit($this->param,['id'=>$info['id']]); |
| 187 | } | 187 | } |
| 188 | $this->setTemplateLog($this->param); | 188 | $this->setTemplateLog($this->param); |
| 189 | - DB::commit(); | ||
| 190 | - }catch (\Exception $e){ | ||
| 191 | - DB::rollBack(); | ||
| 192 | - $this->fail('error'); | ||
| 193 | - } | 189 | +// DB::commit(); |
| 190 | +// }catch (\Exception $e){ | ||
| 191 | +// DB::rollBack(); | ||
| 192 | +// $this->fail('error'); | ||
| 193 | +// } | ||
| 194 | //通知更新 | 194 | //通知更新 |
| 195 | $this->homeOrProduct($this->param['source'],$this->param['source_id']); | 195 | $this->homeOrProduct($this->param['source'],$this->param['source_id']); |
| 196 | return $this->success(); | 196 | return $this->success(); |
-
请 注册 或 登录 后发表评论