diff --git a/view/css/admin_style.css b/view/css/admin_style.css index 5bda095..96f4342 100644 --- a/view/css/admin_style.css +++ b/view/css/admin_style.css @@ -109,7 +109,6 @@ body{ background: #FFFFFF; box-shadow: 0px 2px 8px 0px rgba(217,221,229,0.5000); border-radius: 3px; - padding-bottom: 22px; } .bottom-layui-row{ margin-top: 20px; @@ -225,7 +224,8 @@ body{ font-size: 28px; font-family: DINAlternate-Bold; color: #000000; - margin-top: 34px; + margin-top: 78px; + padding-left: 32px !important; } .admin-card-text-2 span{ width: 14px; @@ -254,7 +254,7 @@ body{ font-size: 14px; font-family: PingFangSC-Regular; color: #F21019; - margin-top: 54px; + margin-top: 78px; overflow-y: auto; } .admin-index-bottom-item{ diff --git a/view/css/common.css b/view/css/common.css index cb50701..2599270 100644 --- a/view/css/common.css +++ b/view/css/common.css @@ -1,10 +1,10 @@ @font-face { font-family: 'icomoon'; - src: url('/font/icomoon.eot?ylpdjd'); - src: url('/font/icomoon.eot?ylpdjd#iefix') format('embedded-opentype'), - url('/font/icomoon.ttf?ylpdjd') format('truetype'), - url('/font/icomoon.woff?ylpdjd') format('woff'), - url('/font/icomoon.svg?ylpdjd#icomoon') format('svg'); + src: url('/font/icomoon.eot?45awda'); + src: url('/font/icomoon.eot?45awda#iefix') format('embedded-opentype'), + url('/font/icomoon.ttf?45awda') format('truetype'), + url('/font/icomoon.woff?45awda') format('woff'), + url('/font/icomoon.svg?45awda#icomoon') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -25,6 +25,65 @@ -moz-osx-font-smoothing: grayscale; } +.icon-LOGO .path1:before { + content: "\e911"; + color: rgb(255, 255, 255); +} +.icon-LOGO .path2:before { + content: "\e919"; + margin-left: -8.25em; + color: rgb(255, 255, 255); +} +.icon-LOGO .path3:before { + content: "\e91a"; + margin-left: -8.25em; + color: rgb(255, 255, 255); +} +.icon-LOGO .path4:before { + content: "\e91b"; + margin-left: -8.25em; + color: rgb(255, 255, 255); +} +.icon-LOGO .path5:before { + content: "\e91c"; + margin-left: -8.25em; + color: rgb(255, 255, 255); +} +.icon-LOGO .path6:before { + content: "\e91d"; + margin-left: -8.25em; + color: rgb(0, 0, 0); +} +.icon-LOGO .path7:before { + content: "\e91e"; + margin-left: -8.25em; + color: rgb(255, 123, 21); +} +.icon-LOGO .path8:before { + content: "\e91f"; + margin-left: -8.25em; + color: rgb(0, 0, 0); +} +.icon-LOGO .path9:before { + content: "\e920"; + margin-left: -8.25em; + color: rgb(255, 123, 21); +} +.icon-LOGO .path10:before { + content: "\e921"; + margin-left: -8.25em; + color: rgb(0, 0, 0); +} +.icon-LOGO .path11:before { + content: "\e922"; + margin-left: -8.25em; + color: rgb(255, 123, 21); +} +.icon-LOGO .path12:before { + content: "\e923"; + margin-left: -8.25em; + color: rgb(255, 123, 21); +} .icon--6:before { content: "\e900"; color: #636c78; @@ -85,10 +144,6 @@ content: "\e910"; color: #1890ff; } -.icon-LOGO:before { - content: "\e911"; - color: #fff; -} .icon-uniE90E:before { content: "\e90e"; color: #1890ff; diff --git a/view/font/icomoon.eot b/view/font/icomoon.eot index 6f4edb8..09df3dd 100644 Binary files a/view/font/icomoon.eot and b/view/font/icomoon.eot differ diff --git a/view/font/icomoon.svg b/view/font/icomoon.svg index 80ad3e4..1fd32d9 100644 --- a/view/font/icomoon.svg +++ b/view/font/icomoon.svg @@ -24,7 +24,7 @@ - + @@ -32,4 +32,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/view/font/icomoon.ttf b/view/font/icomoon.ttf index 996e7f6..7858591 100644 Binary files a/view/font/icomoon.ttf and b/view/font/icomoon.ttf differ diff --git a/view/font/icomoon.woff b/view/font/icomoon.woff index b2e0d97..a62679d 100644 Binary files a/view/font/icomoon.woff and b/view/font/icomoon.woff differ diff --git a/view/templates/include/admin_header.html b/view/templates/include/admin_header.html index f830801..ee7fc77 100644 --- a/view/templates/include/admin_header.html +++ b/view/templates/include/admin_header.html @@ -1,7 +1,10 @@
- @@ -117,10 +117,10 @@
{$total_data.total_countdown_order_count} 单
-
+
这些订单还有12h超时!
@@ -130,10 +130,10 @@
{$total_data.total_wait_deliver_goods_count} 单
-
+
有新增的订单啦
@@ -144,10 +144,10 @@
{$total_data.total_platform_processing_count} 单
-
+
这些订单官方客服已介入
@@ -158,10 +158,10 @@
{$total_data.total_wait_after_sale_count} 单
-
+
这些顾客想要退款