作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !123
... ... @@ -263,7 +263,7 @@ class ProjectUpdate extends Command
$type_arr[] = 2;
} elseif ($cate['parent'] == 0 && $cate['name'] == 'Hot Products') {
$type_arr[] = 3;
}else{
} else {
$new_category[] = $cate;
}
}
... ... @@ -509,6 +509,7 @@ class ProjectUpdate extends Command
'pid' => $pid,
'keywords' => $item['keywords'] ?? '',
'describe' => $item['description'] ?? '',
'original_id' => $item['id'],
'route' => $route
]);
$this->set_map($route, RouteMap::SOURCE_PRODUCT_CATE, $parent_id, $project_id);
... ... @@ -518,8 +519,6 @@ class ProjectUpdate extends Command
}
} else {
$parent_id = $parent['id'];
$model->edit(['original_id'=>$item['id']],['id'=>$parent_id]);
}
if (!empty($item['children'])) {
... ...