diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue index fa0dce3b7be693a44003a6a605f2cb7feb7d8803..fc40eec3ede642313437cdf32e1ff403ccad846a 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 c9bd03ba58447f14bdf3ead025df4ddc02bbe50f..faf88b29d33d0a2f0a2e6d3865957feb463cf6ac 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -22,8 +22,8 @@ import Team from './components/Team/index.vue';
-
- +
+
访问数
@@ -35,7 +35,7 @@ import Team from './components/Team/index.vue';
- +
消息数
@@ -47,7 +47,7 @@ import Team from './components/Team/index.vue';
- +
收入金额
@@ -58,7 +58,7 @@ import Team from './components/Team/index.vue';
- +
订单数
@@ -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 479c2331cb0d28703e0393c84665d5f524d5e4eb..3aa61b49615a69227f10aa69ef5c40ac51b15ff1 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 60049ef85f1f17de1cf42d5769a07a551505031b..4d038fc4bfe2548da0b7b1f3db98f3e0721249f4 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)" > - +