diff --git a/application/admin/view/common/header.html b/application/admin/view/common/header.html
index a0ca7d66bb1df3daa94abf04ed976fa13eb26f8a..f83e547aea067f973fe35e900aa9a9891710514b 100755
--- a/application/admin/view/common/header.html
+++ b/application/admin/view/common/header.html
@@ -65,13 +65,13 @@
                 <!-- 账号信息下拉框 -->
                 <li class="dropdown user user-menu">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                        <img src="{$admin.avatar|cdnurl|htmlentities}" class="user-image" alt="">
+                        <img src="{$admin.avatar|avatar_url|htmlentities}" class="user-image" alt="">
                         <span class="hidden-xs">{$admin.nickname|htmlentities}</span>
                     </a>
                     <ul class="dropdown-menu">
                         <!-- User image -->
                         <li class="user-header">
-                            <img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" alt="">
+                            <img src="{$admin.avatar|avatar_url|htmlentities}" class="img-circle" alt="">
 
                             <p>
                                 {$admin.nickname|htmlentities}
diff --git a/application/admin/view/common/menu.html b/application/admin/view/common/menu.html
index 3e0ff5c39bace196fd5cca4edfc6ab0a9a301094..cd2ec2034dd886a328ab3181b918092a03dfc71a 100644
--- a/application/admin/view/common/menu.html
+++ b/application/admin/view/common/menu.html
@@ -3,7 +3,7 @@
     <!-- 管理员信息 -->
     <div class="user-panel hidden-xs">
         <div class="pull-left image">
-            <a href="general/profile" class="addtabsit"><img src="{$admin.avatar|cdnurl|htmlentities}" class="img-circle" /></a>
+            <a href="general/profile" class="addtabsit"><img src="{$admin.avatar|avatar_url|htmlentities}" class="img-circle" /></a>
         </div>
         <div class="pull-left info">
             <p>{$admin.nickname|htmlentities}</p>
diff --git a/application/admin/view/general/profile/index.html b/application/admin/view/general/profile/index.html
index db2a2c28c712e1b38644e9a64e6c18bf7dd9606d..6dc45553eb421de4cf847e579333c62bb8aee9ff 100644
--- a/application/admin/view/general/profile/index.html
+++ b/application/admin/view/general/profile/index.html
@@ -51,9 +51,9 @@
                     <div class="box-body box-profile">
 
                         <div class="profile-avatar-container">
-                            <img class="profile-user-img img-responsive img-circle" src="{$admin.avatar|cdnurl|htmlentities}" alt="">
+                            <img class="profile-user-img img-responsive img-circle" src="{$admin.avatar|avatar_url|htmlentities}" alt="">
                             <div class="profile-avatar-text img-circle">{:__('Click to edit')}</div>
-                            <button type="button" id="faupload-avatar" class="faupload" data-input-id="c-avatar"><i class="fa fa-upload"></i> {:__('Upload')}</button>
+                            <button type="button" id="fachoose-avatar" class="fachoose" data-input-id="c-avatar"></button>
                         </div>
 
                         <h3 class="profile-username text-center">{$admin.username|htmlentities}</h3>
diff --git a/application/common.php b/application/common.php
index 67bf8e02fb968164af5f24df970da69695fe829e..12e38f9b0ecac65ec47d2e88a9ef2bd9cc5c921d 100755
--- a/application/common.php
+++ b/application/common.php
@@ -460,3 +460,15 @@ if (!function_exists('xss_clean')) {
         return \app\common\library\Security::instance()->xss_clean($content, $is_image);
     }
 }
+
+if (!function_exists('avatar_url')) {
+    /**
+     * 用于修复默认头像的展示错误
+     * @param $url
+     * @return string
+     */
+    function avatar_url($url)
+    {
+        return $url === '/assets/img/avatar.png' ? $url : cdnurl($url);
+    }
+}
diff --git a/public/assets/js/backend/general/profile.js b/public/assets/js/backend/general/profile.js
index adfd61a99dce1f193e7529ea536dbede234ce9a7..5ce2c96d282358f9ec5a978f85d10e83639416f5 100755
--- a/public/assets/js/backend/general/profile.js
+++ b/public/assets/js/backend/general/profile.js
@@ -38,10 +38,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'upload'], function (
             Table.api.bindevent(table);//当内容渲染完成后
 
             // 给上传按钮添加上传成功事件
-            $("#faupload-avatar").data("upload-success", function (data) {
-                var url = Backend.api.cdnurl(data.url);
+            $("#c-avatar").change(function () {
+                var url = Backend.api.cdnurl($(this).val());
                 $(".profile-user-img").prop("src", url);
-                Toastr.success("上传成功！");
+                Toastr.success("选择成功！");
             });
 
             // 给表单绑定事件
diff --git a/public/assets/js/backend/index.js b/public/assets/js/backend/index.js
index 464d41b0e1dc7a414bf21453b1675c2871fd6158..c7b123fa58ba5719d051745ef7fabbc8e1b83bbd 100755
--- a/public/assets/js/backend/index.js
+++ b/public/assets/js/backend/index.js
@@ -364,7 +364,7 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'form'], functi
             var lastlogin = localStorage.getItem("lastlogin");
             if (lastlogin) {
                 lastlogin = JSON.parse(lastlogin);
-                $("#profile-img").attr("src", Backend.api.cdnurl(lastlogin.avatar));
+                $("#profile-img").attr("src", lastlogin.avatar);
                 $("#profile-name").val(lastlogin.username);
             }