From 37c2197e76eb809846a99963335cf4e24da89554 Mon Sep 17 00:00:00 2001
From: horizons <1490493387@qq.com>
Date: Fri, 9 Sep 2022 22:33:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20svg-icon=E7=BB=84=E4=BB=B6=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 35e4c7754d862589b404d61f71f22cbce9c40628
---
 src/components/SvgIcon/index.vue            |  3 +-
 src/views/dashboard/index.vue               | 66 +++++++--------------
 src/views/login/components/SocialSignin.vue |  2 +-
 src/views/system/role/index.vue             |  2 +-
 4 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue
index fa0dce3b..fc40eec3 100644
--- a/src/components/SvgIcon/index.vue
+++ b/src/components/SvgIcon/index.vue
@@ -21,8 +21,7 @@ const props = defineProps({
     required: false
   },
   color: {
-    type: String,
-    default: '#fff'
+    type: String
   },
   size: {
     type: String,
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index c9bd03ba..faf88b29 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -22,8 +22,8 @@ import Team from './components/Team/index.vue';
     <el-row :gutter="40" class="card-panel__col">
       <el-col :xs="24" :sm="12" :lg="6" class="card-panel__col">
         <div class="card-panel">
-          <div class="card-panel-icon-wrapper icon-people">
-            <svg-icon icon-class="uv" class-name="card-panel-icon" />
+          <div class="card-panel-icon-wrapper icon-user">
+            <svg-icon icon-class="uv" size="4em" />
           </div>
           <div class="card-panel-description">
             <div class="card-panel-text">访问数</div>
@@ -35,7 +35,7 @@ import Team from './components/Team/index.vue';
       <el-col :xs="24" :sm="12" :lg="6" class="card-panel__col">
         <div class="card-panel">
           <div class="card-panel-icon-wrapper icon-message">
-            <svg-icon icon-class="message" class-name="card-panel-icon" />
+            <svg-icon icon-class="message" size="4em" />
           </div>
           <div class="card-panel-description">
             <div class="card-panel-text">消息数</div>
@@ -47,7 +47,7 @@ import Team from './components/Team/index.vue';
       <el-col :xs="24" :sm="12" :lg="6" class="card-panel__col">
         <div class="card-panel">
           <div class="card-panel-icon-wrapper icon-money">
-            <svg-icon icon-class="money" class-name="card-panel-icon" />
+            <svg-icon icon-class="money" size="4em" />
           </div>
           <div class="card-panel-description">
             <div class="card-panel-text">收入金额</div>
@@ -58,7 +58,7 @@ import Team from './components/Team/index.vue';
       <el-col :xs="24" :sm="12" :lg="6" class="card-panel__col">
         <div class="card-panel">
           <div class="card-panel-icon-wrapper icon-shopping">
-            <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+            <svg-icon icon-class="shopping" size="4em" />
           </div>
           <div class="card-panel-description">
             <div class="card-panel-text">订单数</div>
@@ -171,16 +171,28 @@ import Team from './components/Team/index.vue';
     box-shadow: 4px 4px 40px rgba(0, 0, 0, 0.05);
     border-color: rgba(0, 0, 0, 0.05);
 
+    .icon-message {
+      color: #36a3f7;
+    }
+
+    .icon-user {
+      color: #40c9c6;
+    }
+
+    .icon-money {
+      color: #f4516c;
+    }
+
+    .icon-shopping {
+      color: #34bfa3;
+    }
+
     &:hover {
       .card-panel-icon-wrapper {
         color: #fff;
       }
 
       .icon-user {
-        background: #e77541;
-      }
-
-      .icon-people {
         background: #40c9c6;
       }
 
@@ -197,42 +209,6 @@ import Team from './components/Team/index.vue';
       }
     }
 
-    .icon-people {
-      color: #40c9c6;
-
-      .svg-icon {
-        width: 4em !important;
-        height: 4em !important;
-      }
-    }
-
-    .icon-message {
-      color: #36a3f7;
-
-      .svg-icon {
-        width: 4em !important;
-        height: 4em !important;
-      }
-    }
-
-    .icon-money {
-      color: #f4516c;
-
-      .svg-icon {
-        width: 4em !important;
-        height: 4em !important;
-      }
-    }
-
-    .icon-shopping {
-      color: #34bfa3;
-
-      .svg-icon {
-        width: 4em !important;
-        height: 4em !important;
-      }
-    }
-
     .card-panel-icon-wrapper {
       float: left;
       margin: 14px 0 0 14px;
diff --git a/src/views/login/components/SocialSignin.vue b/src/views/login/components/SocialSignin.vue
index 479c2331..3aa61b49 100644
--- a/src/views/login/components/SocialSignin.vue
+++ b/src/views/login/components/SocialSignin.vue
@@ -33,7 +33,7 @@ function youlaiHandleClick(thirdpart: string) {
   // const appid = 'xxxxx'
   // const redirect_uri = encodeURIComponent('xxx/redirect?redirect=' + window.location.origin + '/auth-redirect')
   const url =
-    'http://localhost:9999/oauth2/authorization/gateway-client-authorization-code?redirect_uri=http://localhost:3000/dashboard';
+    'http://localhost:9999/oauth2/authorization/gateway-client-authorization-code?redirect_uri=http://localhost:3000/#/dashboard';
   window.open(url, thirdpart);
 }
 
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 60049ef8..4d038fc4 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -347,7 +347,7 @@ onMounted(() => {
               plain
               @click.stop="openRoleResourceDialog(scope.row)"
             >
-              <svg-icon icon-class="perm" color="#67C23A" />
+              <svg-icon icon-class="perm" />
             </el-button>
           </el-tooltip>