修复安卓微信端无法上传的BUG

修复cdnurl在二级目录下获取完整链接的BUG

@@ -86,15 +86,8 @@ if (!function_exists('cdnurl')) {
     {
     {
         $url = preg_match("/^https?:\/\/(.*)/i", $url) ? $url : \think\Config::get('upload.cdnurl') . $url;
         $url = preg_match("/^https?:\/\/(.*)/i", $url) ? $url : \think\Config::get('upload.cdnurl') . $url;
         if ($domain && !preg_match("/^(http:\/\/|https:\/\/)/i", $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;
         return $url;
     }
     }

@@ -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>',
             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: {
         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) {
             onPostInit: function (up) {
 
 

@@ -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>',
             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: {
         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) {
             onPostInit: function (up) {