作者 lyh

gx

@@ -205,6 +205,7 @@ class ProductController extends BaseController @@ -205,6 +205,7 @@ class ProductController extends BaseController
205 ]); 205 ]);
206 $info = $product->read(['id'=>$this->param['id']]); 206 $info = $product->read(['id'=>$this->param['id']]);
207 $info = $this->handleParam($info); 207 $info = $this->handleParam($info);
  208 +
208 return $this->response('success',Code::SUCCESS,$info); 209 return $this->response('success',Code::SUCCESS,$info);
209 } 210 }
210 211
@@ -235,7 +236,10 @@ class ProductController extends BaseController @@ -235,7 +236,10 @@ class ProductController extends BaseController
235 $v['keyword_id_text'] = trim($v['keyword_id_text'],','); 236 $v['keyword_id_text'] = trim($v['keyword_id_text'],',');
236 } 237 }
237 $v['status_text'] = Product::statusMap()[$v['status']] ?? ''; 238 $v['status_text'] = Product::statusMap()[$v['status']] ?? '';
238 - $v['is_renovation'] = $this->getProductIsRenovation($v,$v['id']); 239 + //获取当前用户选择的模版
  240 + $templateSettingModel = new BSetting();
  241 + $templateInfo = $templateSettingModel->read(['project_id'=>$this->user['project_id']]);
  242 + $v['is_renovation'] = $this->getProductIsRenovation($templateInfo,$v['id']);
239 $v['url'] = $this->user['domain'].$v['route']; 243 $v['url'] = $this->user['domain'].$v['route'];
240 return $v; 244 return $v;
241 } 245 }
@@ -302,6 +302,7 @@ class ProjectLogic extends BaseLogic @@ -302,6 +302,7 @@ class ProjectLogic extends BaseLogic
302 return $this->success(); 302 return $this->success();
303 } 303 }
304 304
  305 +
305 /** 306 /**
306 * @remark :更新服务器为已使用 307 * @remark :更新服务器为已使用
307 * @name :updateServe 308 * @name :updateServe