From af21c68626af53eddd90f16917cd6279b5101b9f Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Wed, 6 Mar 2019 10:55:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=8D=93=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E7=AB=AF=E6=97=A0=E6=B3=95=E4=B8=8A=E4=BC=A0=E7=9A=84?=
 =?UTF-8?q?BUG=20=E4=BF=AE=E5=A4=8Dcdnurl=E5=9C=A8=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=8B=E8=8E=B7=E5=8F=96=E5=AE=8C=E6=95=B4?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common.php                  | 11 ++---------
 public/assets/js/require-backend.min.js |  7 +++++++
 public/assets/js/require-upload.js      |  7 +++++++
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/application/common.php b/application/common.php
index 32a29a18..2eea8480 100755
--- a/application/common.php
+++ b/application/common.php
@@ -86,15 +86,8 @@ if (!function_exists('cdnurl')) {
     {
         $url = preg_match("/^https?:\/\/(.*)/i", $url) ? $url : \think\Config::get('upload.cdnurl') . $url;
         if ($domain && !preg_match("/^(http:\/\/|https:\/\/)/i", $url)) {
-            if (is_bool($domain)) {
-                $public = \think\Config::get('view_replace_str.__PUBLIC__');
-                $url = rtrim($public, '/') . $url;
-                if (!preg_match("/^(http:\/\/|https:\/\/)/i", $url)) {
-                    $url = request()->domain() . $url;
-                }
-            } else {
-                $url = $domain . $url;
-            }
+            $domain = is_bool($domain) ? request()->domain() : $domain;
+            $url = $domain . $url;
         }
         return $url;
     }
diff --git a/public/assets/js/require-backend.min.js b/public/assets/js/require-backend.min.js
index 0def1513..23935be2 100644
--- a/public/assets/js/require-backend.min.js
+++ b/public/assets/js/require-backend.min.js
@@ -6181,6 +6181,13 @@ define('upload',['jquery', 'bootstrap', 'plupload', 'template'], function ($, un
             previewtpl: '<li class="col-xs-3"><a href="<%=fullurl%>" data-url="<%=url%>" target="_blank" class="thumbnail"><img src="<%=fullurl%>" onerror="this.src=\'https://tool.fastadmin.net/icon/\'+\'<%=fullurl%>\'.split(\'.\').pop()+\'.png\';this.onerror=null;" class="img-responsive"></a><a href="javascript:;" class="btn btn-danger btn-xs btn-trash"><i class="fa fa-trash"></i></a></li>',
         },
         events: {
+            onInit: function (up) {
+                //修复少数安卓浏览器无法上传图片的Bug
+                var input = $("input[type=file]", $(up.settings.button).next());
+                if (input && input.prop("accept").match(/image\/jpeg/)) {
+                    input.prop("accept", "image/jpg," + input.prop("accept"));
+                }
+            },
             //初始化完成
             onPostInit: function (up) {
 
diff --git a/public/assets/js/require-upload.js b/public/assets/js/require-upload.js
index 27b43280..154e0f36 100755
--- a/public/assets/js/require-upload.js
+++ b/public/assets/js/require-upload.js
@@ -7,6 +7,13 @@ define(['jquery', 'bootstrap', 'plupload', 'template'], function ($, undefined,
             previewtpl: '<li class="col-xs-3"><a href="<%=fullurl%>" data-url="<%=url%>" target="_blank" class="thumbnail"><img src="<%=fullurl%>" onerror="this.src=\'https://tool.fastadmin.net/icon/\'+\'<%=fullurl%>\'.split(\'.\').pop()+\'.png\';this.onerror=null;" class="img-responsive"></a><a href="javascript:;" class="btn btn-danger btn-xs btn-trash"><i class="fa fa-trash"></i></a></li>',
         },
         events: {
+            onInit: function (up) {
+                //修复少数安卓浏览器无法上传图片的Bug
+                var input = $("input[type=file]", $(up.settings.button).next());
+                if (input && input.prop("accept").match(/image\/jpeg/)) {
+                    input.prop("accept", "image/jpg," + input.prop("accept"));
+                }
+            },
             //初始化完成
             onPostInit: function (up) {