Merge branch 'master' of https://git-online.zhco.com/wjd/rui-neng

app/controller/backend/WebsiteController.php

@@ -408,7 +408,7 @@ class WebsiteController extends BaseController
             $param['sub_content']['author'] = '';
             $param['sub_content']['status'] = '1';
             $param['sub_content']['url'] = '';
-            $param['sub_content']['is_top'] = '';
+            $param['sub_content']['is_top'] = '2'; // 置顶 1 置顶 2 否
             $param['sub_content']['is_recommend'] = '';
             $param['sub_content']['sort'] = '';
             $param['sub_content']['seo_title'] = '';

app/service/ContentService.php

@@ -626,7 +626,7 @@ class ContentService {
      * @throws \app\exception\ModelException
      * @throws \ReflectionException
      */
-    public function saveContent($param): array
+    public function saveContent($param, $fromExport=0): array
     {
         $moduleModel = new Module();
         $module = $moduleModel->getModule(['id'=>$param['module_id'],'seller_id'=> $param['admin']['seller_id']],['moduleField','category'])['data']->toArray();
@@ -781,8 +781,11 @@ class ContentService {
             Db::rollback();
             return dataReturn(50012,$e->getMessage(), $e->getTrace());
         }
+        if($fromExport == 1){
+            return $subRes->toArray();
+        }
         return dataReturn(0,lang('保存成功'),$subRes);
-        // return $subRes->toArray();
+
     }
 
     /**