合并分支 'zhl' 到 'master'

Zhl



查看合并请求 !338

@@ -8,6 +8,8 @@
 namespace App\Http\Controllers\Api;
 namespace App\Http\Controllers\Api;
 
 
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
+use App\Models\Product\Category;
+use App\Models\Product\Product;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\OnlineCheck;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
@@ -60,18 +62,37 @@ class PrivateController extends BaseController
         $domain = DomainInfo::where(['project_id' => $project_id])->first();
         $domain = DomainInfo::where(['project_id' => $project_id])->first();
         $host = FALSE == empty($domain) ? 'https://' . $domain->domain . '/' : $project->deploy_build->test_domain;
         $host = FALSE == empty($domain) ? 'https://' . $domain->domain . '/' : $project->deploy_build->test_domain;
 
 
-        $list = RouteMap::where(['project_id' => $project_id])
-            ->when($type, function ($query) use ($type) {
-                return $query->whereIn('source', $type);
-            })
-            ->get();
-
+        // 需要标题， 不能直接查询map表
+//        $list = RouteMap::where(['project_id' => $project_id])
+//            ->when($type, function ($query) use ($type) {
+//                return $query->whereIn('source', $type);
+//            })
+//            ->get();
+//
+//        $result = [];
+//        foreach ($list as $val) {
+//            // 排除首页
+//            if ($val->source == RouteMap::SOURCE_PAGE && in_array($val->route, ['index', '']))
+//                continue;
+//            $result[$val->source][] = $host . $val->route;
+//        }
         $result = [];
         $result = [];
-        foreach ($list as $val) {
-            // 排除首页
-            if ($val->source == RouteMap::SOURCE_PAGE && in_array($val->route, ['index', '']))
-                continue;
-            $result[$val->source][] = $host . $val->route;
+        $product = Product::where(['status' => Product::STATUS_ON])->get(['title', 'route'])->toArray();
+        foreach ($product as $val) {
+            $val['route'] = $host . $val['route'];
+            // FALSE == preg_match('/(\.html|\.htm)$/', $val['route'])
+            if (FALSE === strpos($val['route'], '.htm')) {
+                $val['route'] .= '/';
+            }
+            $result[RouteMap::SOURCE_PRODUCT][] = $val;
+        }
+        $product_category= Category::get(['title', 'route'])->toArray();
+        foreach ($product_category as $val) {
+            $val['route'] = $host . $val['route'];
+            if (FALSE === strpos($val['route'], '.htm')) {
+                $val['route'] .= '/';
+            }
+            $result[RouteMap::SOURCE_PRODUCT_CATE][] = $val;
         }
         }
         return $this->success($result);
         return $this->success($result);
     }
     }