样式调整

frontend/saas-web/app/Application.scss

@@ -389,4 +389,22 @@ div::-webkit-scrollbar-track {
 .x-monthpicker-buttons .x-btn-default-toolbar-small{
   padding: 2px 2px 2px 2px;
   min-width: 56px;
+}
+
+/** charts **/
+.x-tip-default {
+  background-color: #485465;
+  border-color: #485465;
+}
+
+/** datepicker icon **/
+.x-form-field-date .x-form-date-trigger {
+  background: #F1F9FF;
+  border-left: 1px solid #D2D6E5;
+  
+  &:before {
+    content: "\e80f";
+    font-family: font-saas;
+    color: #5AC6F8;
+  }
 }

frontend/saas-web/app/view/home/HomeModel.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.home.HomeModel', {
         month_out: '0', // 本月支出合计
 
         insetPadding: '12 0 0 0', // 图表insetPadding
-        maxBarWidth: 20, // 最大柱宽
+        maxBarWidth: 25, // 最大柱宽
     },
 
     stores: {

frontend/saas-web/app/view/home/charts/MonthIO.js

@@ -31,10 +31,6 @@ Ext.define('saas.view.home.charts.MonthIO', {
                     insetPadding: '{insetPadding}',
                     store: '{month_io}'
                 },
-                // legend: {
-                //     type: 'sprite',
-                //     docked: 'bottom'
-                // },
                 legend: {
                     type: 'dom',
                     docked: 'top',
@@ -50,6 +46,7 @@ Ext.define('saas.view.home.charts.MonthIO', {
                     fields: ['main'],
                     minimum: 0,
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     grid: {
@@ -69,6 +66,7 @@ Ext.define('saas.view.home.charts.MonthIO', {
                     position: 'bottom',
                     fields: ['x'],
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     style: {

frontend/saas-web/app/view/home/charts/MonthIO.scss

@@ -11,6 +11,7 @@
         .x-legend-container {
 
             .x-legend-item {
+                font-size: 12px;
                 border: none !important;
                 outline: none !important;
                 text-align: left;

frontend/saas-web/app/view/home/charts/MonthPurchase.js

@@ -26,6 +26,7 @@ Ext.define('saas.view.home.charts.MonthPurchase', {
                     fields: ['x'],
                     position: 'bottom',
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     style: {
@@ -46,6 +47,7 @@ Ext.define('saas.view.home.charts.MonthPurchase', {
                         }
                     },
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465',
                         textAlign: 'end'
                     },

frontend/saas-web/app/view/home/charts/MonthSale.scss

@@ -6,6 +6,7 @@
         .x-legend-container {
 
             .x-legend-item {
+                font-size: 12px;
                 border: none !important;
                 outline: none !important;
                 text-align: left;

frontend/saas-web/app/view/home/charts/PurchaseTrend.js

@@ -30,6 +30,7 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                     fields: ['x'],
                     position: 'bottom',
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     style: {
@@ -50,6 +51,7 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                         }
                     },
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     style: {

frontend/saas-web/app/view/home/charts/SaleTrend.js

@@ -36,6 +36,7 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                     fields: ['x'],
                     position: 'bottom',
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465',
                     },
                     style: {
@@ -56,6 +57,7 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                         }
                     },
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465',
                     },
                     style: {

frontend/saas-web/app/view/home/charts/StockAmount.js

@@ -30,6 +30,7 @@ Ext.define('saas.view.home.charts.StockAmount', {
                     fields: ['x'],
                     position: 'bottom',
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     style: {
@@ -50,6 +51,7 @@ Ext.define('saas.view.home.charts.StockAmount', {
                         }
                     },
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     style: {

frontend/saas-web/app/view/main/MainContainerWrap.js

@@ -38,6 +38,7 @@ Ext.define('saas.view.main.MainContainerWrap', {
             })],
             items: [
                 {
+                    iconCls: 'x-sa sa-home',
                     xtype: 'home',
                     title: '首页',
                     closable: false

frontend/saas-web/app/view/main/MainController.js

@@ -35,7 +35,7 @@ Ext.define('saas.view.main.MainController', {
         navigationList = refs.navigationTreeList,
         navCollapsed = !navigationList.navCollapsed,
         new_width = navCollapsed ? viewModel.get('smallNavWidth') : viewModel.get('navWidth'),
-        newLogoImgStyle = navCollapsed ? { width: 40, height: 40, top: 10, left: 10 } : { width: 32, height: 32, top: 16, left: 42 },
+        newLogoImgStyle = navCollapsed ? { width: 36, height: 36, top: 12, left: 12 } : { width: 32, height: 32, top: 16, left: 42 },
         newLogoTextStyle = navCollapsed ? {
             5: { opacity: 0 },
             10: { opacity: 0 },

frontend/saas-web/app/view/main/Navigation.js

@@ -81,19 +81,21 @@ Ext.define('saas.view.main.Navigation', {
                     '<div class="nav-menu-body">',
                     '<tpl for=".">',
                     '<div class="menu">',
-                    '<h3 class="menu-title">{text}</h3>',
-                    '<div class="menu-content">',
-                    '<tpl for="items">',
-                    '<div class="menuitem">',
-                    '<div class="item-text" title="{text}" data-config="{config}" data-id="{id}" data-text="{text}" data-type="query" data-viewType="{viewType}">',
-                    '{text}',
-                    '</div>',
-                    '<tpl if="{addType}">',
-                    '<div class="item-icon" data-id="{id}" data-text="{text}" data-type="form" data-viewType="{addType}">新增</div>',
-                    '</tpl>',
-                    '</div>',
-                    '</tpl>',
-                    '</div>',
+                        '<div class="menu-title">',
+                            '<span class="menu-title-text">{text}</span>',
+                        '</div>',
+                        '<div class="menu-content">',
+                            '<tpl for="items">',
+                            '<div class="menuitem">',
+                                '<div class="item-text" title="{text}" data-config="{config}" data-id="{id}" data-text="{text}" data-type="query" data-viewType="{viewType}">',
+                                    '{text}',
+                                '</div>',
+                                '<tpl if="{addType}">',
+                                '<div class="item-icon" data-id="{id}" data-text="{text}" data-type="form" data-viewType="{addType}">新增</div>',
+                                '</tpl>',
+                            '</div>',
+                            '</tpl>',
+                        '</div>',
                     '</div>',
                     '</tpl>',
                     '</div>',

frontend/saas-web/app/view/main/Navigation.scss

@@ -102,61 +102,67 @@ $nav-font-color-over: #fff;
     top: 0;
     background: white;
     overflow: hidden;
-    // animation: name duration timing-function delay iteration-count direction;
 
     .nav-menu-body {
         display: flex;
-        padding: 5px;
         border-top-right-radius: 4px;
         border-bottom-right-radius: 4px;
 
         .menu {
-            
+
+            &:first-child {
+                .menu-content {
+                    border-right: 1px solid #EEF9FE;
+                }
+            }
+
             width: 200px;
-            border-right: 1px dashed #ccc;
             letter-spacing: 1px;
-            color: #444;
 
-            &:last-child {
-                border: none;
-            }
-            
             .menu-title {
-                margin: 5px;
+                padding-left: 30px;
+                background: #EEF9FE;
+
+                .menu-title-text {
+                    height: 40px;
+                    line-height: 40px;
+                    font-size: 16px;
+                    color: #4F5170;
+                    letter-spacing: 0.64px;
+                    text-align: left;
+                }
             }
 
             .menu-content {
-                list-style: none;
-                padding-left: 10px;
-                padding-right: 10px;
 
                 .menuitem {
-                    padding: 5px;
+                    padding-left: 25px;
+                    margin: 6px;
                     display: flex;
-                    border-radius: 4px;
                     align-content: space-between;
 
                     .item-text {
+                        color: #4F5170;
                         cursor: pointer;
-                        line-height: 24px;
+                        height: 34px;
+                        line-height: 34px;
                         white-space: nowrap;
-                        width: 130px;
+                        flex: 1;
                         overflow: hidden;
+                        font-size: 14px;
                         text-overflow: ellipsis;
                     }
 
                     .item-icon {
                         cursor: pointer;
-                        float: right;
-                        display: none;
                         background: #64b448;
                         color: #fff;
-                        font-size: 11px;
+                        display: none;
                         padding: 3px 6px;
                         border-radius: 3px;
                         margin-right: 5px;
-                        font-weight: 400;
-                        width: 40px;
+                        height: 24px;
+                        margin-top: 5px;
 
                         &:hover {
                             opacity: 0.7;
@@ -164,6 +170,7 @@ $nav-font-color-over: #fff;
                     }
 
                     &:hover {
+                        border-radius: 4px;
                         background-color: #E4E4E4;
 
                         .item-icon {

frontend/saas-web/packages/font-saas/sass/etc/icons.scss

@@ -1,36 +1,45 @@
+.sa-home:before { content: "\e817"; }
 
-.sa-purchase:before { content: "\e800"; }
+.sa-bar:before { content: "\e814"; }
 
 .sa-tuichu:before { content: "\e811"; }
 
 .sa-feedback:before { content: "\e810"; }
 
+.sa-money:before { content: "\e805"; }
+
+.sa-setting:before { content: "\e803"; }
+
 .sa-document:before { content: "\e804"; }
 
 .sa-switch-on:before { content: "\e807"; }
 
+.sa-tag:before { content: "\e815"; }
+
 .sa-edit:before { content: "\e806"; }
 
 .sa-help:before { content: "\e813"; }
 
 .sa-sale:before { content: "\e801"; }
 
+.sa-info:before { content: "\e816"; }
+
 .sa-userBook:before { content: "\e80b"; }
 
 .sa-arrows-left:before { content: "\e809"; }
 
+.sa-purchase:before { content: "\e800"; }
+
 .sa-serviceOnline:before { content: "\e80c"; }
 
 .sa-accountCenter:before { content: "\e812"; }
 
-.sa-warehouse:before { content: "\e802"; }
+.sa-date:before { content: "\e80f"; }
 
-.sa-setting:before { content: "\e803"; }
+.sa-warehouse:before { content: "\e802"; }
 
 .sa-saas:before { content: "\e808"; }
 
-.sa-money:before { content: "\e805"; }
-
 .sa-question:before { content: "\e80d"; }
 
 .sa-arrows-right:before { content: "\e80a"; }

frontend/saas-web/resources/json/navigation.json

@@ -38,7 +38,7 @@
     }]
 }, {
     "text": "销售",
-    "iconCls": "x-fa fa-shopping-cart",
+    "iconCls": "x-sa sa-tag",
     "items": [{
         "text": "制单",
         "items": [{
@@ -80,7 +80,7 @@
     }]
 }, {
     "text": "库存",
-    "iconCls": "x-fa fa-home",
+    "iconCls": "x-sa sa-bar",
     "items": [{
         "text": "制单",
         "items": [{
@@ -190,7 +190,7 @@
     }]
 }, {
     "text": "资料",
-    "iconCls": "x-fa fa-book",
+    "iconCls": "x-sa sa-info",
     "items": [{
         "text": "基础资料",
         "items": [{