From c81396c114092b2e8e77be4fbf24596debd4c7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Violet=5Fice=E7=B4=AB=E5=86=B0?= <violetice@aliyun.com>
Date: Mon, 29 Mar 2021 14:31:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E8=A3=85=E4=BA=91?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E6=8F=92=E4=BB=B6=E5=90=8E=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=A4=B4=E5=83=8F=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/view/common/header.html         |  4 ++--
 application/admin/view/common/menu.html           |  2 +-
 application/admin/view/general/profile/index.html |  4 ++--
 application/common.php                            | 12 ++++++++++++
 public/assets/js/backend/general/profile.js       |  6 +++---
 public/assets/js/backend/index.js                 |  2 +-
 6 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/application/admin/view/common/header.html b/application/admin/view/common/header.html
index a0ca7d66b..f83e547ae 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 3e0ff5c39..cd2ec2034 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 db2a2c28c..6dc45553e 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 67bf8e02f..12e38f9b0 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 adfd61a99..5ce2c96d2 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 464d41b0e..c7b123fa5 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);
             }
 
-- 
Gitee