作者 李宇航

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

变更数据



查看合并请求 !2980
@@ -93,7 +93,7 @@ class ProductLogic extends BaseLogic @@ -93,7 +93,7 @@ class ProductLogic extends BaseLogic
93 $route = $param['route']; 93 $route = $param['route'];
94 $is_upgrade = $param['is_upgrade'] ?? 0;//1:5.0数据 0:6.0 94 $is_upgrade = $param['is_upgrade'] ?? 0;//1:5.0数据 0:6.0
95 $six_read = $param['six_read'] ?? 0;//是否按6.0显示 95 $six_read = $param['six_read'] ?? 0;//是否按6.0显示
96 - if($six_read == 0 && $is_upgrade == 1){ 96 + if($six_read == 1 && $is_upgrade == 1){
97 unset($param['route']); 97 unset($param['route']);
98 }else{ 98 }else{
99 $param['route'] = RouteMap::setRoute($param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']); 99 $param['route'] = RouteMap::setRoute($param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);