优化调整

admin/package-lock.json

@@ -2526,11 +2526,18 @@
       }
     },
     "vue-router": {
-      "version": "4.0.12",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.12.tgz",
-      "integrity": "sha512-CPXvfqe+mZLB1kBWssssTiWg4EQERyqJZes7USiqfW9B5N2x+nHlnsM1D3b5CaJ6qgCvMmYJnz+G0iWjNCvXrg==",
+      "version": "4.0.14",
+      "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.0.14.tgz",
+      "integrity": "sha512-wAO6zF9zxA3u+7AkMPqw9LjoUCjSxfFvINQj3E/DceTt6uEz1XZLraDhdg2EYmvVwTBSGlLYsUw8bDmx0754Mw==",
       "requires": {
-        "@vue/devtools-api": "^6.0.0-beta.18"
+        "@vue/devtools-api": "^6.0.0"
+      },
+      "dependencies": {
+        "@vue/devtools-api": {
+          "version": "6.1.4",
+          "resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.1.4.tgz",
+          "integrity": "sha512-IiA0SvDrJEgXvVxjNkHPFfDx6SXw0b/TUkqMcDZWNg9fnCAHbTpoo59YfJ9QLFkwa3raau5vSlRVzMSLDnfdtQ=="
+        }
       }
     },
     "vue-tsc": {

admin/src/assets/font/demo.css

@@ -2,13 +2,10 @@
 @font-face {
     font-family: 'iconfont logo';
     src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
-    src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix')
-            format('embedded-opentype'),
+    src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
         url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
-        url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834')
-            format('truetype'),
-        url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont')
-            format('svg');
+        url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+        url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
 }
 
 .logo {

admin/src/assets/font/iconfont.css

@@ -1,8 +1,7 @@
 @font-face {
-    font-family: 'iconfont'; /* Project id 3112541 */
-    src: url('iconfont.woff2?t=1640939015921') format('woff2'),
-        url('iconfont.woff?t=1640939015921') format('woff'),
-        url('iconfont.ttf?t=1640939015921') format('truetype');
+    font-family: 'iconfont'; /* Project id 2786219 */
+    src: url('iconfont.woff2?t=1638503419755') format('woff2'), url('iconfont.woff?t=1638503419755') format('woff'),
+        url('iconfont.ttf?t=1638503419755') format('truetype');
 }
 
 .iconfont {
@@ -13,14 +12,354 @@
     -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-quanxian:before {
+.icon_kdzs_mdsz:before {
+    content: '\e7c2';
+}
+
+.icon_xpdy_mbgl:before {
+    content: '\e6f9';
+}
+
+.icon_xcxzb_zb:before {
+    content: '\e701';
+}
+
+.icon_xycj_cj:before {
+    content: '\e752';
+}
+
+.icon_kdzs_fjrmb:before {
+    content: '\e75a';
+}
+
+.operation:before {
+    content: '\e75c';
+}
+
+.icon_pcshop:before {
+    content: '\e75d';
+}
+
+.icon_xpdy_dyjgl:before {
+    content: '\e75e';
+}
+
+.icon_kdzs_pldy:before {
+    content: '\e772';
+}
+
+.icon_kdzs_mdmb:before {
+    content: '\e7cc';
+}
+
+.icon_qudao_h5:before {
+    content: '\e753';
+}
+
+.icon_fenxiao_goods:before {
+    content: '\e75b';
+}
+
+.icon_kanjia:before {
+    content: '\e6d1';
+}
+
+.icon_hexiao_order:before {
+    content: '\e7b4';
+}
+
+.icon_pintuan:before {
+    content: '\e7cf';
+}
+
+.carryout:before {
+    content: '\e7d3';
+}
+
+.icon_qiandao_jilu:before {
+    content: '\e7d4';
+}
+
+.icon_notice:before {
+    content: '\e7da';
+}
+
+.icon_notice_mail:before {
+    content: '\e7de';
+}
+
+.gift:before {
+    content: '\e842';
+}
+
+.icon_notice_buyer:before {
+    content: '\e8e8';
+}
+
+.Field-time:before {
+    content: '\e90e';
+}
+
+.icon_hexiao_member2:before {
+    content: '\e747';
+}
+
+.icon_coupons:before {
+    content: '\e74a';
+}
+
+.icon_coupons_data:before {
+    content: '\e74b';
+}
+
+.icon_fenxiao_member:before {
+    content: '\e74c';
+}
+
+.icon_qiandao_guize:before {
+    content: '\e751';
+}
+
+.icon_pintuan2:before {
+    content: '\e759';
+}
+
+.icon_notice_seller:before {
+    content: '\e76a';
+}
+
+.icon_pintuan_data:before {
+    content: '\e76b';
+}
+
+.icon_fenxiao_data:before {
+    content: '\e76c';
+}
+
+.icon_ziti_store:before {
+    content: '\e76f';
+}
+
+.wallet:before {
+    content: '\e774';
+}
+
+.icon_kefu_comments:before {
+    content: '\e7b2';
+}
+
+.tradingdata:before {
+    content: '\e7b5';
+}
+
+.icon_fenxiao_order:before {
+    content: '\e7c4';
+}
+
+.icon_hexiao_member:before {
+    content: '\e7c9';
+}
+
+.icon_fenxiao_set:before {
+    content: '\e7ca';
+}
+
+.icon_fenxiao_grade:before {
+    content: '\e7d5';
+}
+
+.yiguanzhugongyingshang:before {
+    content: '\e7d6';
+}
+
+.icon_user_gaikuang:before {
+    content: '\e834';
+}
+
+.icon_qudao_weixin:before {
+    content: '\e833';
+}
+
+.icon_qudao_app:before {
+    content: '\e827';
+}
+
+.icon_qudao_xiaochengxu:before {
+    content: '\e6b4';
+}
+
+.icon_dianpu_daohang:before {
+    content: '\e857';
+}
+
+.icon_yingxiao_qipao:before {
+    content: '\e860';
+}
+
+.icon_set_jiaoyi:before {
+    content: '\e88f';
+}
+
+.icon_caiwu_yue:before {
+    content: '\e82c';
+}
+
+.icon_caiwu_tixian:before {
+    content: '\e828';
+}
+
+.icon_caiwu_jifen:before {
+    content: '\e829';
+}
+
+.icon_shuju_liuliang:before {
+    content: '\e82b';
+}
+
+.icon_user_dengji:before {
+    content: '\e82f';
+}
+
+.icon_user_guanli:before {
+    content: '\e830';
+}
+
+.icon_user_biaoqian:before {
+    content: '\e831';
+}
+
+.icon_order_shouhou:before {
+    content: '\e82a';
+}
+
+.icon_copy:before {
+    content: '\e861';
+}
+
+.icon_set_product:before {
+    content: '\e880';
+}
+
+.icon_set_save:before {
+    content: '\e887';
+}
+
+.icon_dianpu_fenlei:before {
+    content: '\e889';
+}
+
+.icon_dianpu_fengge:before {
+    content: '\e896';
+}
+
+.icon_dianpu_sucai:before {
+    content: '\e897';
+}
+
+.icon_dianpu_xiangqing:before {
+    content: '\e8a1';
+}
+
+.icon_order_guanli:before {
+    content: '\e8a9';
+}
+
+.icon_caiwu:before {
+    content: '\e826';
+}
+
+.icon_user:before {
+    content: '\e82d';
+}
+
+.icon_set_user:before {
+    content: '\e82e';
+}
+
+.icon_shuju:before {
+    content: '\e832';
+}
+
+.icon_dianpu_home:before {
+    content: '\e84c';
+}
+
+.icon_yingyongcenter:before {
+    content: '\e84f';
+}
+
+.icon_qudao:before {
+    content: '\e853';
+}
+
+.icon_qudao2:before {
+    content: '\e854';
+}
+
+.icon_set_store:before {
+    content: '\e85c';
+}
+
+.icon_dianpu_weiyem:before {
+    content: '\e85d';
+}
+
+.icon_set_quanxian:before {
+    content: '\e866';
+}
+
+.icon_hide:before {
+    content: '\e86f';
+}
+
+.icon_show:before {
+    content: '\e870';
+}
+
+.icon_wallet:before {
+    content: '\e871';
+}
+
+.icon_set_pay:before {
+    content: '\e872';
+}
+
+.icon_set_weihu:before {
+    content: '\e875';
+}
+
+.icon_set_peisong:before {
+    content: '\e877';
+}
+
+.icon_yingxiaowf:before {
+    content: '\e879';
+}
+
+.icon_dianpu_shoppingCar:before {
+    content: '\e87e';
+}
+
+.icon_goods:before {
+    content: '\e657';
+}
+
+.icon_sort:before {
     content: '\e658';
 }
 
-.icon-setting:before {
-    content: '\e659';
+.icon_danwei:before {
+    content: '\e653';
 }
 
-.icon-home:before {
-    content: '\e65a';
+.icon_pingjia:before {
+    content: '\e654';
+}
+
+.icon_pinpai:before {
+    content: '\e655';
+}
+
+.icon_gongyingshang:before {
+    content: '\e656';
 }

admin/src/assets/font/iconfont.json

@@ -1,30 +1,625 @@
 {
-    "id": "3112541",
-    "name": "likesadmin",
+    "id": "2786219",
+    "name": "菜单图标",
     "font_family": "iconfont",
-    "css_prefix_text": "icon-",
+    "css_prefix_text": "",
     "description": "",
     "glyphs": [
         {
-            "icon_id": "26923968",
-            "name": "quanxian",
-            "font_class": "quanxian",
+            "icon_id": "13087831",
+            "name": "分层配置",
+            "font_class": "icon_kdzs_mdsz",
+            "unicode": "e7c2",
+            "unicode_decimal": 59330
+        },
+        {
+            "icon_id": "11474291",
+            "name": "integral",
+            "font_class": "icon_xpdy_mbgl",
+            "unicode": "e6f9",
+            "unicode_decimal": 59129
+        },
+        {
+            "icon_id": "11474324",
+            "name": "play",
+            "font_class": "icon_xcxzb_zb",
+            "unicode": "e701",
+            "unicode_decimal": 59137
+        },
+        {
+            "icon_id": "11488055",
+            "name": "gift",
+            "font_class": "icon_xycj_cj",
+            "unicode": "e752",
+            "unicode_decimal": 59218
+        },
+        {
+            "icon_id": "11488086",
+            "name": "office-supplies",
+            "font_class": "icon_kdzs_fjrmb",
+            "unicode": "e75a",
+            "unicode_decimal": 59226
+        },
+        {
+            "icon_id": "11488090",
+            "name": "operation",
+            "font_class": "operation",
+            "unicode": "e75c",
+            "unicode_decimal": 59228
+        },
+        {
+            "icon_id": "11488094",
+            "name": "phone",
+            "font_class": "icon_pcshop",
+            "unicode": "e75d",
+            "unicode_decimal": 59229
+        },
+        {
+            "icon_id": "11488099",
+            "name": "print",
+            "font_class": "icon_xpdy_dyjgl",
+            "unicode": "e75e",
+            "unicode_decimal": 59230
+        },
+        {
+            "icon_id": "11488203",
+            "name": "invoice",
+            "font_class": "icon_kdzs_pldy",
+            "unicode": "e772",
+            "unicode_decimal": 59250
+        },
+        {
+            "icon_id": "13087859",
+            "name": "cascades",
+            "font_class": "icon_kdzs_mdmb",
+            "unicode": "e7cc",
+            "unicode_decimal": 59340
+        },
+        {
+            "icon_id": "11488057",
+            "name": "image-text",
+            "font_class": "icon_qudao_h5",
+            "unicode": "e753",
+            "unicode_decimal": 59219
+        },
+        {
+            "icon_id": "11488091",
+            "name": "packaging",
+            "font_class": "icon_fenxiao_goods",
+            "unicode": "e75b",
+            "unicode_decimal": 59227
+        },
+        {
+            "icon_id": "16322380",
+            "name": "砍价",
+            "font_class": "icon_kanjia",
+            "unicode": "e6d1",
+            "unicode_decimal": 59089
+        },
+        {
+            "icon_id": "4766459",
+            "name": "file done",
+            "font_class": "icon_hexiao_order",
+            "unicode": "e7b4",
+            "unicode_decimal": 59316
+        },
+        {
+            "icon_id": "4766779",
+            "name": "shopping",
+            "font_class": "icon_pintuan",
+            "unicode": "e7cf",
+            "unicode_decimal": 59343
+        },
+        {
+            "icon_id": "4766856",
+            "name": "carry out",
+            "font_class": "carryout",
+            "unicode": "e7d3",
+            "unicode_decimal": 59347
+        },
+        {
+            "icon_id": "4766857",
+            "name": "calendar-check",
+            "font_class": "icon_qiandao_jilu",
+            "unicode": "e7d4",
+            "unicode_decimal": 59348
+        },
+        {
+            "icon_id": "4766907",
+            "name": "sound",
+            "font_class": "icon_notice",
+            "unicode": "e7da",
+            "unicode_decimal": 59354
+        },
+        {
+            "icon_id": "4766918",
+            "name": "mail",
+            "font_class": "icon_notice_mail",
+            "unicode": "e7de",
+            "unicode_decimal": 59358
+        },
+        {
+            "icon_id": "4936458",
+            "name": "gift",
+            "font_class": "gift",
+            "unicode": "e842",
+            "unicode_decimal": 59458
+        },
+        {
+            "icon_id": "6598316",
+            "name": "comment",
+            "font_class": "icon_notice_buyer",
+            "unicode": "e8e8",
+            "unicode_decimal": 59624
+        },
+        {
+            "icon_id": "9229178",
+            "name": "Field-time",
+            "font_class": "Field-time",
+            "unicode": "e90e",
+            "unicode_decimal": 59662
+        },
+        {
+            "icon_id": "11488002",
+            "name": "certified-supplier",
+            "font_class": "icon_hexiao_member2",
+            "unicode": "e747",
+            "unicode_decimal": 59207
+        },
+        {
+            "icon_id": "11488015",
+            "name": "coupons",
+            "font_class": "icon_coupons",
+            "unicode": "e74a",
+            "unicode_decimal": 59210
+        },
+        {
+            "icon_id": "11488023",
+            "name": "data",
+            "font_class": "icon_coupons_data",
+            "unicode": "e74b",
+            "unicode_decimal": 59211
+        },
+        {
+            "icon_id": "11488024",
+            "name": "Customer management",
+            "font_class": "icon_fenxiao_member",
+            "unicode": "e74c",
+            "unicode_decimal": 59212
+        },
+        {
+            "icon_id": "11488044",
+            "name": "feeds",
+            "font_class": "icon_qiandao_guize",
+            "unicode": "e751",
+            "unicode_decimal": 59217
+        },
+        {
+            "icon_id": "11488081",
+            "name": "New user zone",
+            "font_class": "icon_pintuan2",
+            "unicode": "e759",
+            "unicode_decimal": 59225
+        },
+        {
+            "icon_id": "11488152",
+            "name": "trade alert",
+            "font_class": "icon_notice_seller",
+            "unicode": "e76a",
+            "unicode_decimal": 59242
+        },
+        {
+            "icon_id": "11488153",
+            "name": "top sales",
+            "font_class": "icon_pintuan_data",
+            "unicode": "e76b",
+            "unicode_decimal": 59243
+        },
+        {
+            "icon_id": "11488154",
+            "name": "trading volume",
+            "font_class": "icon_fenxiao_data",
+            "unicode": "e76c",
+            "unicode_decimal": 59244
+        },
+        {
+            "icon_id": "11488170",
+            "name": "store",
+            "font_class": "icon_ziti_store",
+            "unicode": "e76f",
+            "unicode_decimal": 59247
+        },
+        {
+            "icon_id": "11488210",
+            "name": "wallet",
+            "font_class": "wallet",
+            "unicode": "e774",
+            "unicode_decimal": 59252
+        },
+        {
+            "icon_id": "12011693",
+            "name": "comments",
+            "font_class": "icon_kefu_comments",
+            "unicode": "e7b2",
+            "unicode_decimal": 59314
+        },
+        {
+            "icon_id": "12012167",
+            "name": "trading data",
+            "font_class": "tradingdata",
+            "unicode": "e7b5",
+            "unicode_decimal": 59317
+        },
+        {
+            "icon_id": "13087832",
+            "name": "申请记录",
+            "font_class": "icon_fenxiao_order",
+            "unicode": "e7c4",
+            "unicode_decimal": 59332
+        },
+        {
+            "icon_id": "13087848",
+            "name": "中间人",
+            "font_class": "icon_hexiao_member",
+            "unicode": "e7c9",
+            "unicode_decimal": 59337
+        },
+        {
+            "icon_id": "13087852",
+            "name": "账户操作",
+            "font_class": "icon_fenxiao_set",
+            "unicode": "e7ca",
+            "unicode_decimal": 59338
+        },
+        {
+            "icon_id": "13119207",
+            "name": "通讯录",
+            "font_class": "icon_fenxiao_grade",
+            "unicode": "e7d5",
+            "unicode_decimal": 59349
+        },
+        {
+            "icon_id": "13119208",
+            "name": "已关注供应商",
+            "font_class": "yiguanzhugongyingshang",
+            "unicode": "e7d6",
+            "unicode_decimal": 59350
+        },
+        {
+            "icon_id": "23974314",
+            "name": "icon_164",
+            "font_class": "icon_user_gaikuang",
+            "unicode": "e834",
+            "unicode_decimal": 59444
+        },
+        {
+            "icon_id": "6154432",
+            "name": "微信",
+            "font_class": "icon_qudao_weixin",
+            "unicode": "e833",
+            "unicode_decimal": 59443
+        },
+        {
+            "icon_id": "23974200",
+            "name": "icon_59",
+            "font_class": "icon_qudao_app",
+            "unicode": "e827",
+            "unicode_decimal": 59431
+        },
+        {
+            "icon_id": "15643755",
+            "name": "小程序设置",
+            "font_class": "icon_qudao_xiaochengxu",
+            "unicode": "e6b4",
+            "unicode_decimal": 59060
+        },
+        {
+            "icon_id": "23974663",
+            "name": "icon_511",
+            "font_class": "icon_dianpu_daohang",
+            "unicode": "e857",
+            "unicode_decimal": 59479
+        },
+        {
+            "icon_id": "23974709",
+            "name": "icon_563",
+            "font_class": "icon_yingxiao_qipao",
+            "unicode": "e860",
+            "unicode_decimal": 59488
+        },
+        {
+            "icon_id": "23974926",
+            "name": "icon_777",
+            "font_class": "icon_set_jiaoyi",
+            "unicode": "e88f",
+            "unicode_decimal": 59535
+        },
+        {
+            "icon_id": "23974194",
+            "name": "icon_52",
+            "font_class": "icon_caiwu_yue",
+            "unicode": "e82c",
+            "unicode_decimal": 59436
+        },
+        {
+            "icon_id": "23974189",
+            "name": "icon_48",
+            "font_class": "icon_caiwu_tixian",
+            "unicode": "e828",
+            "unicode_decimal": 59432
+        },
+        {
+            "icon_id": "23974193",
+            "name": "icon_41",
+            "font_class": "icon_caiwu_jifen",
+            "unicode": "e829",
+            "unicode_decimal": 59433
+        },
+        {
+            "icon_id": "23974195",
+            "name": "icon_56",
+            "font_class": "icon_shuju_liuliang",
+            "unicode": "e82b",
+            "unicode_decimal": 59435
+        },
+        {
+            "icon_id": "23974284",
+            "name": "icon_136",
+            "font_class": "icon_user_dengji",
+            "unicode": "e82f",
+            "unicode_decimal": 59439
+        },
+        {
+            "icon_id": "23974285",
+            "name": "icon_141",
+            "font_class": "icon_user_guanli",
+            "unicode": "e830",
+            "unicode_decimal": 59440
+        },
+        {
+            "icon_id": "23974287",
+            "name": "icon_137",
+            "font_class": "icon_user_biaoqian",
+            "unicode": "e831",
+            "unicode_decimal": 59441
+        },
+        {
+            "icon_id": "23974238",
+            "name": "icon_95",
+            "font_class": "icon_order_shouhou",
+            "unicode": "e82a",
+            "unicode_decimal": 59434
+        },
+        {
+            "icon_id": "23974703",
+            "name": "icon_551",
+            "font_class": "icon_copy",
+            "unicode": "e861",
+            "unicode_decimal": 59489
+        },
+        {
+            "icon_id": "23974857",
+            "name": "icon_710",
+            "font_class": "icon_set_product",
+            "unicode": "e880",
+            "unicode_decimal": 59520
+        },
+        {
+            "icon_id": "23974892",
+            "name": "icon_744",
+            "font_class": "icon_set_save",
+            "unicode": "e887",
+            "unicode_decimal": 59527
+        },
+        {
+            "icon_id": "23974902",
+            "name": "icon_754",
+            "font_class": "icon_dianpu_fenlei",
+            "unicode": "e889",
+            "unicode_decimal": 59529
+        },
+        {
+            "icon_id": "23974956",
+            "name": "icon_808",
+            "font_class": "icon_dianpu_fengge",
+            "unicode": "e896",
+            "unicode_decimal": 59542
+        },
+        {
+            "icon_id": "23974958",
+            "name": "icon_810",
+            "font_class": "icon_dianpu_sucai",
+            "unicode": "e897",
+            "unicode_decimal": 59543
+        },
+        {
+            "icon_id": "23974996",
+            "name": "icon_850",
+            "font_class": "icon_dianpu_xiangqing",
+            "unicode": "e8a1",
+            "unicode_decimal": 59553
+        },
+        {
+            "icon_id": "23975028",
+            "name": "icon_880",
+            "font_class": "icon_order_guanli",
+            "unicode": "e8a9",
+            "unicode_decimal": 59561
+        },
+        {
+            "icon_id": "23974187",
+            "name": "icon_30",
+            "font_class": "icon_caiwu",
+            "unicode": "e826",
+            "unicode_decimal": 59430
+        },
+        {
+            "icon_id": "23974276",
+            "name": "icon_130",
+            "font_class": "icon_user",
+            "unicode": "e82d",
+            "unicode_decimal": 59437
+        },
+        {
+            "icon_id": "23974282",
+            "name": "icon_138",
+            "font_class": "icon_set_user",
+            "unicode": "e82e",
+            "unicode_decimal": 59438
+        },
+        {
+            "icon_id": "23974320",
+            "name": "icon_170",
+            "font_class": "icon_shuju",
+            "unicode": "e832",
+            "unicode_decimal": 59442
+        },
+        {
+            "icon_id": "23974561",
+            "name": "icon_415",
+            "font_class": "icon_dianpu_home",
+            "unicode": "e84c",
+            "unicode_decimal": 59468
+        },
+        {
+            "icon_id": "23974584",
+            "name": "icon_436",
+            "font_class": "icon_yingyongcenter",
+            "unicode": "e84f",
+            "unicode_decimal": 59471
+        },
+        {
+            "icon_id": "23974606",
+            "name": "icon_460",
+            "font_class": "icon_qudao",
+            "unicode": "e853",
+            "unicode_decimal": 59475
+        },
+        {
+            "icon_id": "23974607",
+            "name": "icon_457",
+            "font_class": "icon_qudao2",
+            "unicode": "e854",
+            "unicode_decimal": 59476
+        },
+        {
+            "icon_id": "23974689",
+            "name": "icon_542",
+            "font_class": "icon_set_store",
+            "unicode": "e85c",
+            "unicode_decimal": 59484
+        },
+        {
+            "icon_id": "23974694",
+            "name": "icon_545",
+            "font_class": "icon_dianpu_weiyem",
+            "unicode": "e85d",
+            "unicode_decimal": 59485
+        },
+        {
+            "icon_id": "23974743",
+            "name": "icon_595",
+            "font_class": "icon_set_quanxian",
+            "unicode": "e866",
+            "unicode_decimal": 59494
+        },
+        {
+            "icon_id": "23974791",
+            "name": "icon_643",
+            "font_class": "icon_hide",
+            "unicode": "e86f",
+            "unicode_decimal": 59503
+        },
+        {
+            "icon_id": "23974792",
+            "name": "icon_644",
+            "font_class": "icon_show",
+            "unicode": "e870",
+            "unicode_decimal": 59504
+        },
+        {
+            "icon_id": "23974793",
+            "name": "icon_645",
+            "font_class": "icon_wallet",
+            "unicode": "e871",
+            "unicode_decimal": 59505
+        },
+        {
+            "icon_id": "23974795",
+            "name": "icon_646",
+            "font_class": "icon_set_pay",
+            "unicode": "e872",
+            "unicode_decimal": 59506
+        },
+        {
+            "icon_id": "23974814",
+            "name": "icon_663",
+            "font_class": "icon_set_weihu",
+            "unicode": "e875",
+            "unicode_decimal": 59509
+        },
+        {
+            "icon_id": "23974823",
+            "name": "icon_673",
+            "font_class": "icon_set_peisong",
+            "unicode": "e877",
+            "unicode_decimal": 59511
+        },
+        {
+            "icon_id": "23974833",
+            "name": "icon_684",
+            "font_class": "icon_yingxiaowf",
+            "unicode": "e879",
+            "unicode_decimal": 59513
+        },
+        {
+            "icon_id": "23974842",
+            "name": "icon_695",
+            "font_class": "icon_dianpu_shoppingCar",
+            "unicode": "e87e",
+            "unicode_decimal": 59518
+        },
+        {
+            "icon_id": "24076801",
+            "name": "menu_goods",
+            "font_class": "icon_goods",
+            "unicode": "e657",
+            "unicode_decimal": 58967
+        },
+        {
+            "icon_id": "24076802",
+            "name": "menu_sort",
+            "font_class": "icon_sort",
             "unicode": "e658",
             "unicode_decimal": 58968
         },
         {
-            "icon_id": "26923969",
-            "name": "setting",
-            "font_class": "setting",
-            "unicode": "e659",
-            "unicode_decimal": 58969
+            "icon_id": "24069361",
+            "name": "menu_danwei",
+            "font_class": "icon_danwei",
+            "unicode": "e653",
+            "unicode_decimal": 58963
         },
         {
-            "icon_id": "26923970",
-            "name": "home",
-            "font_class": "home",
-            "unicode": "e65a",
-            "unicode_decimal": 58970
+            "icon_id": "24069362",
+            "name": "menu_pingjia",
+            "font_class": "icon_pingjia",
+            "unicode": "e654",
+            "unicode_decimal": 58964
+        },
+        {
+            "icon_id": "24069363",
+            "name": "menu_pinpai",
+            "font_class": "icon_pinpai",
+            "unicode": "e655",
+            "unicode_decimal": 58965
+        },
+        {
+            "icon_id": "24069364",
+            "name": "menu_gongyingshang",
+            "font_class": "icon_gongyingshang",
+            "unicode": "e656",
+            "unicode_decimal": 58966
         }
     ]
 }

admin/src/views/permission/menu/edit.vue

@@ -2,6 +2,8 @@
     <div class="menu-edit">
         <el-card shadow="never">
             <el-page-header :content="id ? '编辑菜单' : '新增菜单'" @back="$router.back()" />
+
+            <select-icon class="m-t-20"></select-icon>
         </el-card>
 
         <el-card class="m-t-15" shadow="never">
@@ -52,7 +54,7 @@
                     </el-form-item>
 
                     <div v-if="(formData.menuType == menuDataType.BUTTON) == ''">
-                        <el-form-item label="菜单图标">
+                        <el-form-item label="请选择图标">
                             <el-input
                                 v-model="formData.menuIcon"
                                 show-word-limit
@@ -156,85 +158,6 @@
                             </el-radio-group>
                         </el-form-item>
                     </div>
-
-                    <!-- <el-form-item label="父级菜单">
-                        <el-cascader
-                            v-model="formData.pid"
-                            style="width: 340px"
-                            :options="menuList"
-                            :props="{
-                                checkStrictly: true,
-                                emitPath: false,
-                                label: 'menuName',
-                                value: 'id'
-                            }"
-                            clearable
-                        ></el-cascader>
-                    </el-form-item>
-
-                    <el-form-item label="菜单类型">
-                        <el-radio-group v-model="formData.menuType">
-                            <el-radio :label="menuDataType.CATALOG">目录</el-radio>
-                            <el-radio :label="menuDataType.MENU">菜单</el-radio>
-                            <el-radio :label="menuDataType.BUTTON">按钮</el-radio>
-                        </el-radio-group>
-                    </el-form-item>
-
-                    <el-form-item label="菜单名称">
-                        <el-input
-                            v-model="formData.menuName"
-                            show-word-limit
-                            placeholder="请输入名称"
-                        ></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="菜单图标">
-                        <el-input
-                            v-model="formData.menuIcon"
-                            show-word-limit
-                            placeholder="请输入图标"
-                        ></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="菜单排序">
-                        <el-input
-                            v-model="formData.menuSort"
-                            show-word-limit
-                            placeholder="请输入排序"
-                        ></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="菜单权限字符">
-                        <el-input
-                            v-model="formData.perms"
-                            show-word-limit
-                            placeholder="请输入"
-                        ></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="路由路径">
-                        <el-input
-                            v-model="formData.paths"
-                            show-word-limit
-                            placeholder="请输入"
-                        ></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="组件路径">
-                        <el-input
-                            v-model="formData.component"
-                            show-word-limit
-                            placeholder="请输入"
-                        ></el-input>
-                    </el-form-item>
-
-                    <el-form-item label="菜单状态">
-                        <el-switch
-                            v-model="formData.isDisable"
-                            :active-value="0"
-                            :inactive-value="1"
-                        />
-                    </el-form-item> -->
                 </el-form>
             </div>
         </el-card>
@@ -250,6 +173,7 @@ import { onMounted, reactive, ref } from 'vue'
 import FooterBtns from '@/components/footer-btns/index.vue'
 import type { ElForm, ElMessage } from 'element-plus'
 import { apiConfigGetMenu, apiMenuDetail, apiMenuAdd, apiMenuEdit, apiMenuDelete } from '@/api/auth'
+import SelectIcon from './select-icon/index.vue'
 
 const menuDataType = {
     CATALOG: 'M', // 目录
@@ -284,7 +208,7 @@ const formData = ref({
 
 // 获取详情
 const getMenuDetail = async (id: number) => {
-    (formData.value as {}) = await apiMenuDetail({ id })
+    ;(formData.value as {}) = await apiMenuDetail({ id })
     getFatherMenu()
 }
 

admin/src/views/permission/menu/select-icon/index.vue

@@ -0,0 +1,9 @@
+<template>
+    <div class="select-icon">
+        <div>选择图标</div>
+    </div>
+</template>
+
+<script lang="ts" setup></script>
+
+<style lang="scss" scoped></style>

admin/src/views/setting/system/cache.vue

@@ -14,49 +14,76 @@
 
         <el-card class="m-t-15" shadow="never">
             <div>
-                <div class="m-b-15">基本信息</div>
+                <div class="m-b-20 lg">基本信息</div>
 
-                <el-form :inline="true" :model="formData" label-width="110px" size="small">
-                    <el-form-item label="Redis版本">
-                        <div>{{ formData.redis_version || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="运行模式">
-                        <div>{{ formData.redis_mode || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="端口">
-                        <div>{{ formData.tcp_port || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="客户端数">
-                        <div>{{ formData.connected_clients || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="运行时间(天)">
-                        <div>{{ formData.uptime_in_days || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="使用内存">
-                        <div>{{ formData.used_memory_human || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="使用CPU">
-                        <div>{{ formData.used_cpu_user_children || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="内存配置">
-                        <div>{{ formData.maxmemory_human || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="AOF是否开启">
-                        <div>{{ formData.aof_enabled || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="RDB是否成功">
-                        <div>{{ formData.rdb_last_bgsave_status || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="Key数量">
-                        <div>{{ formData.dbSize || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="网络入口/出口">
-                        <div>
-                            {{ formData.instantaneous_input_kbps || '-' }}
-                            <span>/</span>
-                            {{ formData.instantaneous_output_kbps || '-' }}
+                <el-form :inline="true" :model="formData" size="small">
+                    <div class="flex basic-information">
+                        <div class="flex-1">
+                            <span class="m-r-40 nr">Redis版本</span>
+                            <span>{{ formData.redis_version || '-' }}</span>
                         </div>
-                    </el-form-item>
+
+                        <div class="flex-1">
+                            <span class="m-r-40 nr">运行模式</span>
+                            <span>{{ formData.redis_mode || '-' }}</span>
+                        </div>
+
+                        <div class="flex-1">
+                            <span class="m-r-40 nr">端口</span>
+                            <span>{{ formData.tcp_port || '-' }}</span>
+                        </div>
+
+                        <div class="flex-1">
+                            <span class="m-r-40 nr">客户端数</span>
+                            <span>{{ formData.connected_clients || '-' }}</span>
+                        </div>
+                    </div>
+
+                    <div class="flex basic-information">
+                        <div class="flex-1">
+                            <span class="m-r-40 nr">运行时间(天)</span>
+                            <span>{{ formData.uptime_in_days || '-' }}</span>
+                        </div>
+                        <div class="flex-1">
+                            <span class="m-r-40 nr">使用内存</span>
+                            <span>{{ formData.used_memory_human || '-' }}</span>
+                        </div>
+                        <div class="flex-1">
+                            <span class="m-r-40 nr">使用CPU</span>
+                            <span>{{ formData.used_cpu_user_children || '-' }}</span>
+                        </div>
+                        <div class="flex-1">
+                            <span class="m-r-40 nr">内存配置</span>
+                            <span>{{ formData.maxmemory_human || '-' }}</span>
+                        </div>
+                    </div>
+
+                    <div class="flex basic-information">
+                        <div class="flex-1">
+                            <span class="m-r-40 nr">AOF是否开启</span>
+                            <span>{{ formData.aof_enabled == '0' ? '开启' : '关闭' || '-' }}</span>
+                        </div>
+                        <div class="flex-1">
+                            <span class="m-r-40 nr">RDB是否成功</span>
+                            <span>
+                                {{
+                                    formData.rdb_last_bgsave_status == 'ok' ? '成功' : '失败' || '-'
+                                }}
+                            </span>
+                        </div>
+                        <div class="flex-1">
+                            <span class="m-r-40 nr">Key数量</span>
+                            <span>{{ formData.dbSize || '-' }}</span>
+                        </div>
+                        <div class="flex-1">
+                            <span class="m-r-40 nr">网络入口/出口</span>
+                            <span>
+                                {{ formData.instantaneous_input_kbps || '-' }}
+                                <span>/</span>
+                                {{ formData.instantaneous_output_kbps || '-' }}
+                            </span>
+                        </div>
+                    </div>
                 </el-form>
             </div>
         </el-card>
@@ -65,7 +92,7 @@
             <!-- 命令统计 -->
             <el-card class="m-r-15 flex-1 test" shadow="never">
                 <div>
-                    <div class="p-b-60">命令统计</div>
+                    <div class="p-b-60 lg">命令统计</div>
                     <div class="statistical-chart">
                         <v-chart class="chart" :option="statisticalData.commandChartOption" />
                     </div>
@@ -75,7 +102,7 @@
             <!-- 内存信息 -->
             <el-card class="flex-1" shadow="never">
                 <div>
-                    <div class="p-b-40">内存信息</div>
+                    <div class="p-b-40 lg">内存信息</div>
                     <div class="statistical-chart">
                         <v-chart class="chart" :option="statisticalData.memoryChartOption" />
                     </div>
@@ -223,4 +250,10 @@ onMounted(() => {
     justify-content: center;
     height: 240px;
 }
+
+.basic-information {
+    padding-bottom: 20px;
+    margin-top: 20px;
+    border-bottom: 1px solid #dfdfdf;
+}
 </style>

admin/src/views/setting/system/environment.vue

@@ -3,92 +3,88 @@
     <div class="system-environment">
         <div class="flex">
             <el-card class="flex-1 m-r-15" shadow="never">
-                <div>CPU</div>
+                <div class="lg">CPU</div>
                 <div class="m-t-15">
                     <el-form :inline="true" :model="cpuFormData" label-width="110px" size="small">
-                        <el-form-item label="核心数">
-                            <div>{{ cpuFormData.cpuNum || '-' }}</div>
-                        </el-form-item>
-                        <el-form-item label="用户使用率">
-                            <div>{{ cpuFormData.used || '-' }}%</div>
-                        </el-form-item>
-                        <el-form-item label="系统使用率">
-                            <div>{{ cpuFormData.sys || '-' }}%</div>
-                        </el-form-item>
-                        <el-form-item label="当前空闲率">
-                            <div>{{ cpuFormData.free || '-' }}%</div>
-                        </el-form-item>
+                        <div class="flex">
+                            <div class="flex-1">
+                                <div class="f-s-32 m-b-10">{{ cpuFormData.cpuNum || '-' }}</div>
+                                <div class="lighter">核心数</div>
+                            </div>
+
+                            <div class="flex-1">
+                                <div class="f-s-32 m-b-10">{{ cpuFormData.used || '-' }}%</div>
+                                <div class="lighter">用户使用率</div>
+                            </div>
+
+                            <div class="flex-1">
+                                <div class="f-s-32 m-b-10">{{ cpuFormData.sys || '-' }}%</div>
+                                <div class="lighter">系统使用率</div>
+                            </div>
+
+                            <div class="flex-1">
+                                <div class="f-s-32 m-b-10">{{ cpuFormData.free || '-' }}%</div>
+                                <div class="lighter">当前空闲率</div>
+                            </div>
+                        </div>
                     </el-form>
                 </div>
             </el-card>
 
             <el-card class="flex-1" shadow="never">
-                <div>内存</div>
+                <div class="lg">内存</div>
                 <div class="m-t-15">
                     <el-form :inline="true" :model="memFormData" label-width="110px" size="small">
-                        <el-form-item label="总内存">
-                            <div>{{ memFormData.total || '-' }}G</div>
-                        </el-form-item>
-                        <el-form-item label="已用内存">
-                            <div>{{ memFormData.used || '-' }}G</div>
-                        </el-form-item>
-                        <el-form-item label="剩余内存">
-                            <div>{{ memFormData.free || '-' }}G</div>
-                        </el-form-item>
-                        <el-form-item label="使用率">
-                            <div>{{ memFormData.usage || '-' }}%</div>
-                        </el-form-item>
+                        <div class="flex">
+                            <div class="flex-1">
+                                <div class="f-s-32 m-b-10">{{ memFormData.total || '-' }}G</div>
+                                <div class="lighter">总内存</div>
+                            </div>
+
+                            <div class="flex-1">
+                                <div class="f-s-32 m-b-10">{{ memFormData.used || '-' }}G</div>
+                                <div class="lighter">已用内存</div>
+                            </div>
+
+                            <div class="flex-1">
+                                <div class="f-s-32 m-b-10">{{ memFormData.free || '-' }}G</div>
+                                <div class="lighter">剩余内存</div>
+                            </div>
+
+                            <div class="flex-1">
+                                <div class="f-s-32 m-b-10">{{ memFormData.usage || '-' }}%</div>
+                                <div class="lighter">使用率</div>
+                            </div>
+                        </div>
                     </el-form>
                 </div>
             </el-card>
         </div>
 
         <el-card shadow="never" class="m-t-15">
-            <div>服务器信息</div>
+            <div class="lg">服务器信息</div>
             <div class="m-t-15">
-                <el-form :inline="true" :model="serverFormData" label-width="160px" size="small">
-                    <el-form-item label="服务器名称">
-                        <div>{{ serverFormData.computerName || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="服务器IP">
-                        <div>{{ serverFormData.computerIp || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="操作系统">
-                        <div>{{ serverFormData.osName || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="系统架构">
-                        <div>{{ serverFormData.osArch || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="项目路径">
-                        <div>{{ serverFormData.userDir || '-' }}</div>
-                    </el-form-item>
-                </el-form>
+                <el-table :data="info.serverFormData" size="medium">
+                    <el-table-column prop="computerName" label="服务器名称"> </el-table-column>
+                    <el-table-column prop="computerIp" label="服务器IP"> </el-table-column>
+                    <el-table-column prop="osName" label="操作系统"> </el-table-column>
+                    <el-table-column prop="osArch" label="系统架构"> </el-table-column>
+                    <el-table-column prop="userDir" label="项目路径"> </el-table-column>
+                </el-table>
             </div>
         </el-card>
 
         <el-card shadow="never" class="m-t-15">
             <div>Java虚拟机信息</div>
             <div class="m-t-15">
-                <el-form :inline="true" :model="jvmFormData" label-width="120px" size="small">
-                    <el-form-item label="Java名称">
-                        <div>{{ jvmFormData.name || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="启动时间">
-                        <div>{{ jvmFormData.startTime || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="安装路径">
-                        <div>{{ jvmFormData.home || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="运行参数">
-                        <div>{{ jvmFormData.inputArgs || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="Java版本">
-                        <div>{{ jvmFormData.version || '-' }}</div>
-                    </el-form-item>
-                    <el-form-item label="运行时长">
-                        <div>{{ jvmFormData.runTime || '-' }}</div>
-                    </el-form-item>
-                </el-form>
+                <el-table :data="info.jvmFormData" size="medium">
+                    <el-table-column prop="name" label="Java名称"> </el-table-column>
+                    <el-table-column prop="startTime" label="启动时间"> </el-table-column>
+                    <el-table-column prop="home" label="安装路径"> </el-table-column>
+                    <el-table-column prop="inputArgs" label="运行参数"> </el-table-column>
+                    <el-table-column prop="version" label="Java版本"> </el-table-column>
+                    <el-table-column prop="runTime" label="运行时长"> </el-table-column>
+                </el-table>
             </div>
         </el-card>
 
@@ -114,13 +110,13 @@ import { defineComponent, reactive, onMounted, ref } from 'vue'
 import { apiSystemInfo } from '@/api/setting'
 
 const info = reactive({
-    disk: [] // 硬盘
+    disk: [], // 硬盘
+    serverFormData: [], // 服务器信息
+    jvmFormData: [] // Java虚拟机信息
 })
 
-const cpuFormData = ref<any>({})
-const memFormData = ref<any>({})
-const serverFormData = ref<any>({})
-const jvmFormData = ref<any>({})
+const cpuFormData = ref<any>({}) // CPU
+const memFormData = ref<any>({}) // 内存
 
 const getSystemInfo = () => {
     apiSystemInfo()
@@ -128,10 +124,10 @@ const getSystemInfo = () => {
             console.log('res', res)
             cpuFormData.value = res.cpu
             memFormData.value = res.mem
-            serverFormData.value = res.sys
-            jvmFormData.value = res.jvm
 
             info.disk = res.disk
+            info.serverFormData = [res.sys]
+            info.jvmFormData = [res.jvm]
         })
         .catch((err: any) => {
             console.log('err', err)