Merge branch 'develop'

app/Http/Controllers/ConfigController.php

@@ -23,6 +23,16 @@ class ConfigController extends Controller
     }
     public function index()
     {
+        $reportCategory = [
+            1 => '搬运抄袭',
+            0 => '广告内容',
+            2 => '不友善内容',
+            3 => '造谣，伪科学',
+            4 => '虚假互动数据',
+            5 => '色情低俗',
+            6 => '违法违规',
+            7 => '其它',
+        ];
         $data = [
             //商品类型
             'order_expired_time' => config('customer.order_expired_time'),
@@ -34,6 +44,7 @@ class ConfigController extends Controller
             'suggest_img' => config('customer.suggest_img'),
             'share_post_bean' => (int) config('customer.share_post_bean'),
             'share_invite_bean' => (int) config('customer.share_invite_bean'),
+            'report_category' => $reportCategory,
         ];
         return $this->jsonSuccess($data, '成功');
     }