diff --git a/admin/controller/extension/module/d_vuefront.php b/admin/controller/extension/module/d_vuefront.php index 90eef8b..11903b1 100644 --- a/admin/controller/extension/module/d_vuefront.php +++ b/admin/controller/extension/module/d_vuefront.php @@ -163,6 +163,10 @@ public function vf_turn_on() $catalog_url_info = parse_url($catalog); $catalog_path = $catalog_url_info['path']; + $document_path = $catalog_path; + if(!empty($this->request->server['DOCUMENT_ROOT'])) { + $document_path = str_replace(realpath($this->request->server['DOCUMENT_ROOT']), '', $rootFolder) . '/'; + } if (strpos($_SERVER["SERVER_SOFTWARE"], "Apache") !== false) { @@ -212,12 +216,12 @@ public function vf_turn_on() # VueFront home page RewriteCond %{REQUEST_URI} !.*(images|index.php|.html|admin|.js|.css|.png|.jpeg|.ico|wp-json|wp-admin|checkout) RewriteCond %{QUERY_STRING} !.*(rest_route) -RewriteCond %{DOCUMENT_ROOT}".$catalog_path."vuefront/index.html -f +RewriteCond %{DOCUMENT_ROOT}".$document_path."vuefront/index.html -f RewriteRule ^$ vuefront/index.html [L] RewriteCond %{REQUEST_URI} !.*(images|index.php|.html|admin|.js|.css|.png|.jpeg|.ico|wp-json|wp-admin|checkout) RewriteCond %{QUERY_STRING} !.*(rest_route) -RewriteCond %{DOCUMENT_ROOT}".$catalog_path."vuefront/index.html !-f +RewriteCond %{DOCUMENT_ROOT}".$document_path."vuefront/index.html !-f RewriteRule ^$ vuefront/200.html [L] # VueFront page if exists html file @@ -225,7 +229,7 @@ public function vf_turn_on() RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_URI} !.*(images|index.php|.html|admin|.js|.css|.png|.jpeg|.ico|wp-json|wp-admin|checkout) RewriteCond %{QUERY_STRING} !.*(rest_route) -RewriteCond %{DOCUMENT_ROOT}".$catalog_path."vuefront/$1.html -f +RewriteCond %{DOCUMENT_ROOT}".$document_path."vuefront/$1.html -f RewriteRule ^([^?]*) vuefront/$1.html [L,QSA] # VueFront page if not exists html file @@ -233,7 +237,7 @@ public function vf_turn_on() RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_URI} !.*(images|index.php|.html|admin|.js|.css|.png|.jpeg|.ico|wp-json|wp-admin|checkout) RewriteCond %{QUERY_STRING} !.*(rest_route) -RewriteCond %{DOCUMENT_ROOT}".$catalog_path."vuefront/$1.html !-f +RewriteCond %{DOCUMENT_ROOT}".$document_path."vuefront/$1.html !-f RewriteRule ^([^?]*) vuefront/200.html [L,QSA]"; $content = file_get_contents($rootFolder . '/.htaccess'); diff --git a/admin/view/javascript/d_pax/components/header/Account.vue b/admin/view/javascript/d_pax/components/header/Account.vue index 3663a0a..2023b70 100755 --- a/admin/view/javascript/d_pax/components/header/Account.vue +++ b/admin/view/javascript/d_pax/components/header/Account.vue @@ -1,5 +1,8 @@