合并分支 'akun' 到 'master'
Akun 查看合并请求 !174
正在显示
2 个修改的文件
包含
16 行增加
和
10 行删除
| @@ -349,10 +349,12 @@ class HtmlCollect extends Command | @@ -349,10 +349,12 @@ class HtmlCollect extends Command | ||
| 349 | $js_css_source = $result_source[1] ?? []; | 349 | $js_css_source = $result_source[1] ?? []; |
| 350 | if ($js_css_source) { | 350 | if ($js_css_source) { |
| 351 | foreach ($js_css_source as $vjs) { | 351 | foreach ($js_css_source as $vjs) { |
| 352 | - if (substr($vjs, 0, 2) == './') { | 352 | + $vjs = str_replace('"', '', $vjs); |
| 353 | + | ||
| 354 | + if (substr($vjs, 0, 1) != '/') { | ||
| 353 | //相对路径 | 355 | //相对路径 |
| 354 | $url_arr = explode('/', $vs['url']); | 356 | $url_arr = explode('/', $vs['url']); |
| 355 | - $url_arr[count($url_arr) - 1] = substr($vjs, 2); | 357 | + $url_arr[count($url_arr) - 1] = $vjs; |
| 356 | $vjs_down = implode('/', $url_arr); | 358 | $vjs_down = implode('/', $url_arr); |
| 357 | } else { | 359 | } else { |
| 358 | $vjs_down = $vjs; | 360 | $vjs_down = $vjs; |
| @@ -399,11 +401,12 @@ class HtmlCollect extends Command | @@ -399,11 +401,12 @@ class HtmlCollect extends Command | ||
| 399 | $js_css_source = $result_source[1] ?? []; | 401 | $js_css_source = $result_source[1] ?? []; |
| 400 | if ($js_css_source) { | 402 | if ($js_css_source) { |
| 401 | foreach ($js_css_source as $vjs) { | 403 | foreach ($js_css_source as $vjs) { |
| 402 | - if (substr($vjs, 0, 2) == './') { | 404 | + $vjs = str_replace('"', '', $vjs); |
| 405 | + | ||
| 406 | + if (substr($vjs, 0, 1) != '/') { | ||
| 403 | //相对路径 | 407 | //相对路径 |
| 404 | $url_arr = explode('/', $vs['url']); | 408 | $url_arr = explode('/', $vs['url']); |
| 405 | - $url_arr[count($url_arr) - 1] = substr($vjs, 2); | ||
| 406 | - $vjs = implode('/', $url_arr); | 409 | + $url_arr[count($url_arr) - 1] = $vjs; |
| 407 | $vjs_down = implode('/', $url_arr); | 410 | $vjs_down = implode('/', $url_arr); |
| 408 | } else { | 411 | } else { |
| 409 | $vjs_down = $vjs; | 412 | $vjs_down = $vjs; |
| @@ -349,11 +349,12 @@ class HtmlLanguageCollect extends Command | @@ -349,11 +349,12 @@ class HtmlLanguageCollect extends Command | ||
| 349 | $js_css_source = $result_source[1] ?? []; | 349 | $js_css_source = $result_source[1] ?? []; |
| 350 | if ($js_css_source) { | 350 | if ($js_css_source) { |
| 351 | foreach ($js_css_source as $vjs) { | 351 | foreach ($js_css_source as $vjs) { |
| 352 | - if (substr($vjs, 0, 2) == './') { | 352 | + $vjs = str_replace('"', '', $vjs); |
| 353 | + | ||
| 354 | + if (substr($vjs, 0, 1) != '/') { | ||
| 353 | //相对路径 | 355 | //相对路径 |
| 354 | $url_arr = explode('/', $vs['url']); | 356 | $url_arr = explode('/', $vs['url']); |
| 355 | - $url_arr[count($url_arr) - 1] = substr($vjs, 2); | ||
| 356 | - $vjs = implode('/', $url_arr); | 357 | + $url_arr[count($url_arr) - 1] = $vjs; |
| 357 | $vjs_down = implode('/', $url_arr); | 358 | $vjs_down = implode('/', $url_arr); |
| 358 | } else { | 359 | } else { |
| 359 | $vjs_down = $vjs; | 360 | $vjs_down = $vjs; |
| @@ -400,10 +401,12 @@ class HtmlLanguageCollect extends Command | @@ -400,10 +401,12 @@ class HtmlLanguageCollect extends Command | ||
| 400 | $js_css_source = $result_source[1] ?? []; | 401 | $js_css_source = $result_source[1] ?? []; |
| 401 | if ($js_css_source) { | 402 | if ($js_css_source) { |
| 402 | foreach ($js_css_source as $vjs) { | 403 | foreach ($js_css_source as $vjs) { |
| 403 | - if (substr($vjs, 0, 2) == './') { | 404 | + $vjs = str_replace('"', '', $vjs); |
| 405 | + | ||
| 406 | + if (substr($vjs, 0, 1) != '/') { | ||
| 404 | //相对路径 | 407 | //相对路径 |
| 405 | $url_arr = explode('/', $vs['url']); | 408 | $url_arr = explode('/', $vs['url']); |
| 406 | - $url_arr[count($url_arr) - 1] = substr($vjs, 2); | 409 | + $url_arr[count($url_arr) - 1] = $vjs; |
| 407 | $vjs_down = implode('/', $url_arr); | 410 | $vjs_down = implode('/', $url_arr); |
| 408 | } else { | 411 | } else { |
| 409 | $vjs_down = $vjs; | 412 | $vjs_down = $vjs; |
-
请 注册 或 登录 后发表评论