|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
namespace App\Http\Controllers;
|
|
|
|
|
|
+use App\Models\DistAppearanceTemplate;
|
|
|
use Illuminate\Http\Request;
|
|
|
use App\Services\LiquidRenderer;
|
|
|
use App\Models\SitePage;
|
|
@@ -122,8 +123,14 @@ class PageController extends Controller
|
|
|
|
|
|
if(!empty($page->template_file ))
|
|
|
{
|
|
|
- $template_file=$page->template_file;
|
|
|
+ //查找当前外观是否存在这文件,找不到就用默认的
|
|
|
+ $dist=app('dist');
|
|
|
+ $appearanceId = $dist->appearance->id;
|
|
|
+ if (DistAppearanceTemplate::hasFileName($page->template_file,getDistId(),$appearanceId) == true) {
|
|
|
+ $template_file=$page->template_file;
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
return $this->liquidRenderer->render($template_file,
|
|
|
[
|
|
|
'page' => $page,
|