!212 后台管理主页面优化

Merge pull request !212 from 熊志伟123123/5.0.0

src/main/webapp/WEB-INF/manager/main.ftl

@@ -9,9 +9,9 @@
   <meta name="format-detection" content="telephone=no"/>
   <meta name="app-mobile-web-app-capable" content="yes"/>
   <meta name="app-mobile-web-app-status-bar-style" content="black-translucent"/>
-  <script src="https://cdn.jsdelivr.net/npm/vue"></script>
+  <script src="${base}/static/plugins/vue/2.6.9/vue.min.js"></script>
   <!--通用图标-->
-  <link rel="stylesheet" href="http://cdn.mingsoft.net/iconfont/iconfont.css" />
+  <link rel="stylesheet" href="${base}/static/ms-admin/5.0.0/iconfont/iconfont.css" />
   <script src="${base}/static/plugins/element-ui/2.12.0/index.js"></script>
   <link rel="stylesheet" href="${base}/static/plugins/element-ui/2.12.0/index.css" />
   <!--网络请求框架-->
@@ -55,7 +55,7 @@
               <div  class="class-12" >
                 <!--图片开始-->
                 <img
-                        src="http://desginer.mingsoft.net/upload/71/images/1578362848002.png"
+                        src="${base}/static/ms-admin/5.0.0/images/1578362848002.png"
                         class="class-13" />
                 <!--图片结束-->
               </div>
@@ -67,7 +67,7 @@
               <div  class="class-16" >
                 <!--图片开始-->
                 <img
-                        src="http://desginer.mingsoft.net/upload/71/images/1578363219309.png"
+                        src="${base}/static/ms-admin/5.0.0/images/1578363219309.png"
                         class="class-17" />
                 <!--图片结束-->
               </div>
@@ -79,7 +79,7 @@
               <div  class="class-20" >
                 <!--图片开始-->
                 <img
-                        src="http://desginer.mingsoft.net/upload/71/images/1578363549912.png"
+                        src="${base}/static/ms-admin/5.0.0/images/1578363549912.png"
                         class="class-21" />
                 <!--图片结束-->
               </div>
@@ -91,7 +91,7 @@
               <div  class="class-24" >
                 <!--图片开始-->
                 <img
-                        src="http://desginer.mingsoft.net/upload/71/images/1578363754088.png"
+                        src="${base}/static/ms-admin/5.0.0/images/1578363754088.png"
                         class="class-25" />
                 <!--图片结束-->
               </div>
@@ -103,7 +103,7 @@
               <div  class="class-28" >
                 <!--图片开始-->
                 <img
-                        src="http://desginer.mingsoft.net/upload/71/images/1578364450652.png"
+                        src="${base}/static/ms-admin/5.0.0/images/1578364450652.png"
                         class="class-29" />
                 <!--图片结束-->
               </div>
@@ -115,7 +115,7 @@
               <div  class="class-32" >
                 <!--图片开始-->
                 <img
-                        src="http://desginer.mingsoft.net/upload/71/images/1578363880431.png"
+                        src="${base}/static/ms-admin/5.0.0/images/1578363880431.png"
                         class="class-33" />
                 <!--图片结束-->
               </div>
@@ -127,7 +127,7 @@
               <div  class="class-36" >
                 <!--图片开始-->
                 <img
-                        src="http://desginer.mingsoft.net/upload/71/images/1578363998984.png"
+                        src="${base}/static/ms-admin/5.0.0/images/1578363998984.png"
                         class="class-37" />
                 <!--图片结束-->
               </div>
@@ -139,7 +139,7 @@
               <div  class="class-40" >
                 <!--图片开始-->
                 <img
-                        src="http://desginer.mingsoft.net/upload/71/images/1578364095317.png"
+                        src="${base}/static/ms-admin/5.0.0/images/1578364095317.png"
                         class="class-41" />
                 <!--图片结束-->
               </div>
@@ -234,7 +234,7 @@
           <div  class="class-66" >
             <!--图片开始-->
             <img
-                    src="http://desginer.mingsoft.net/upload/71/images/1577687056305.png"
+                    src="${base}/static/ms-admin/5.0.0/images/1577687056305.png"
                     class="class-67" />
             <!--图片结束-->
           </div>
@@ -251,7 +251,7 @@
           <div  class="class-72" >
             <!--图片开始-->
             <img
-                    src="http://desginer.mingsoft.net/upload/71/images/1577687056305.png"
+                    src="${base}/static/ms-admin/5.0.0/images/1577687056305.png"
                     class="class-73" />
             <!--图片结束-->
           </div>
@@ -268,7 +268,7 @@
           <div  class="class-78" >
             <!--图片开始-->
             <img
-                    src="http://desginer.mingsoft.net/upload/71/images/1577687056305.png"
+                    src="${base}/static/ms-admin/5.0.0/images/1577687056305.png"
                     class="class-79" />
             <!--图片结束-->
           </div>
@@ -285,7 +285,7 @@
           <div  class="class-84" >
             <!--图片开始-->
             <img
-                    src="http://desginer.mingsoft.net/upload/71/images/1577687056305.png"
+                    src="${base}/static/ms-admin/5.0.0/images/1577687056305.png"
                     class="class-85" />
             <!--图片结束-->
           </div>
@@ -385,7 +385,7 @@
               <div  class="class-126" >
                 <!--图片开始-->
                 <img
-                        src="http://desginer.mingsoft.net/upload/71/images/1577687023678.png"
+                        src="${base}/static/ms-admin/5.0.0/images/1577687023678.png"
                         class="class-127" />
                 <!--图片结束-->
               </div>
@@ -402,7 +402,7 @@
               <div  class="class-132" >
                 <!--图片开始-->
                 <img
-                        src="http://desginer.mingsoft.net/upload/71/images/1577687056305.png"
+                        src="${base}/static/ms-admin/5.0.0/images/1577687056305.png"
                         class="class-133" />
                 <!--图片结束-->
               </div>
@@ -504,7 +504,6 @@
         axios.create({
           withCredentials: true
         }).get("https://ms.mingsoft.net/cms/content/list.do?contentCategoryId=202").then(function (res){
-          console.log(res.data.data.rows[0]);
           that.msNewsLast = res.data.data.rows[0].contentTitle.toString();
           that.msNewsPath = 'https://ms.mingsoft.net/html/1/203/202/'+res.data.data.rows[0].id+'.html'
         })
@@ -1079,7 +1078,7 @@
   .class-44
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1578104008987.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1578104008987.png);
     outline:none;
     outline-offset:-1px;
     background-size:cover;
@@ -1121,7 +1120,7 @@
   .class-47
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1578367666376.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1578367666376.png);
     outline:none;
     outline-offset:-1px;
     background-size:cover;
@@ -1163,7 +1162,7 @@
   .class-50
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1578366770290.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1578366770290.png);
     outline:none;
     outline-offset:-1px;
     background-size:cover;
@@ -1205,7 +1204,7 @@
   .class-53
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1578368816112.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1578368816112.png);
     outline:none;
     outline-offset:-1px;
     background-size:cover;
@@ -1291,7 +1290,7 @@
   .class-59
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1577257489392.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1577257489392.png);
     outline:none;
     outline-offset:-1px;
     background-size:contain;
@@ -1337,7 +1336,7 @@
   .class-62
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1577151868190.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1577151868190.png);
     outline:none;
     outline-offset:-1px;
     height:40px;
@@ -1753,7 +1752,7 @@
   .class-96
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1578031206821.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1578031206821.png);
     outline:none;
     outline-offset:-1px;
     background-size:contain;
@@ -1797,7 +1796,7 @@
   .class-99
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1578031321635.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1578031321635.png);
     outline:none;
     outline-offset:-1px;
     background-size:contain;
@@ -1841,7 +1840,7 @@
   .class-102
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1578031484700.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1578031484700.png);
     outline:none;
     outline-offset:-1px;
     background-size:contain;
@@ -1885,7 +1884,7 @@
   .class-105
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1578031264207.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1578031264207.png);
     outline:none;
     outline-offset:-1px;
     background-size:contain;
@@ -1929,7 +1928,7 @@
   .class-108
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1578031682848.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1578031682848.png);
     outline:none;
     outline-offset:-1px;
     background-size:contain;
@@ -1973,7 +1972,7 @@
   .class-111
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1578031639173.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1578031639173.png);
     outline:none;
     outline-offset:-1px;
     background-size:contain;
@@ -2017,7 +2016,7 @@
   .class-114
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1578031215338.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1578031215338.png);
     outline:none;
     outline-offset:-1px;
     background-size:contain;
@@ -2061,7 +2060,7 @@
   .class-117
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1578031228196.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1578031228196.png);
     outline:none;
     outline-offset:-1px;
     background-size:contain;
@@ -2105,7 +2104,7 @@
   .class-120
   {
     color:#333333;
-    background-image:url(http://desginer.mingsoft.net/upload/71/images/1578031234719.png);
+    background-image:url(${base}/static/ms-admin/5.0.0/images/1578031234719.png);
     outline:none;
     outline-offset:-1px;
     background-size:contain;

src/main/webapp/static/ms-admin/5.0.0/iconfont/iconfont.json

@@ -47,6 +47,13 @@
       "unicode": "e6c2",
       "unicode_decimal": 59074
     },
+    {
+      "icon_id": "174849",
+      "name": "特色服务icon",
+      "font_class": "tesefuwuicon",
+      "unicode": "e7a2",
+      "unicode_decimal": 59298
+    },
     {
       "icon_id": "247483",
       "name": "书",
@@ -278,6 +285,13 @@
       "unicode": "e66e",
       "unicode_decimal": 58990
     },
+    {
+      "icon_id": "964611",
+      "name": "关注",
+      "font_class": "guanzhu2",
+      "unicode": "e78a",
+      "unicode_decimal": 59274
+    },
     {
       "icon_id": "968135",
       "name": "高德地图",
@@ -383,6 +397,13 @@
       "unicode": "e65b",
       "unicode_decimal": 58971
     },
+    {
+      "icon_id": "1176578",
+      "name": "h5",
+      "font_class": "h5",
+      "unicode": "e794",
+      "unicode_decimal": 59284
+    },
     {
       "icon_id": "1186712",
       "name": "电信",
@@ -474,6 +495,13 @@
       "unicode": "e77f",
       "unicode_decimal": 59263
     },
+    {
+      "icon_id": "1462043",
+      "name": "积分",
+      "font_class": "icon_jifen",
+      "unicode": "e78e",
+      "unicode_decimal": 59278
+    },
     {
       "icon_id": "1463161",
       "name": "徽章",
@@ -481,6 +509,13 @@
       "unicode": "e654",
       "unicode_decimal": 58964
     },
+    {
+      "icon_id": "1473859",
+      "name": "货币",
+      "font_class": "huobi",
+      "unicode": "e797",
+      "unicode_decimal": 59287
+    },
     {
       "icon_id": "1478478",
       "name": "火",
@@ -593,6 +628,13 @@
       "unicode": "e63d",
       "unicode_decimal": 58941
     },
+    {
+      "icon_id": "1849136",
+      "name": "已评价",
+      "font_class": "yipingjia",
+      "unicode": "e788",
+      "unicode_decimal": 59272
+    },
     {
       "icon_id": "1899969",
       "name": "评论",
@@ -614,6 +656,13 @@
       "unicode": "e6c1",
       "unicode_decimal": 59073
     },
+    {
+      "icon_id": "2000760",
+      "name": "已过期",
+      "font_class": "yiguoqi",
+      "unicode": "e78d",
+      "unicode_decimal": 59277
+    },
     {
       "icon_id": "2042475",
       "name": "颜色",
@@ -698,6 +747,20 @@
       "unicode": "e6aa",
       "unicode_decimal": 59050
     },
+    {
+      "icon_id": "2228997",
+      "name": "打折",
+      "font_class": "dazhe",
+      "unicode": "e79e",
+      "unicode_decimal": 59294
+    },
+    {
+      "icon_id": "2245822",
+      "name": "红包",
+      "font_class": "hongbao",
+      "unicode": "e787",
+      "unicode_decimal": 59271
+    },
     {
       "icon_id": "2268695",
       "name": "微博",
@@ -712,6 +775,13 @@
       "unicode": "e612",
       "unicode_decimal": 58898
     },
+    {
+      "icon_id": "2310636",
+      "name": "APP",
+      "font_class": "APP",
+      "unicode": "e9e0",
+      "unicode_decimal": 59872
+    },
     {
       "icon_id": "2364639",
       "name": "钻石",
@@ -810,6 +880,13 @@
       "unicode": "e989",
       "unicode_decimal": 59785
     },
+    {
+      "icon_id": "2634141",
+      "name": "红包",
+      "font_class": "hongbao2",
+      "unicode": "e78b",
+      "unicode_decimal": 59275
+    },
     {
       "icon_id": "2649048",
       "name": "气泡",
@@ -1041,6 +1118,13 @@
       "unicode": "e615",
       "unicode_decimal": 58901
     },
+    {
+      "icon_id": "3512889",
+      "name": "地址",
+      "font_class": "dizhi",
+      "unicode": "e79f",
+      "unicode_decimal": 59295
+    },
     {
       "icon_id": "3555825",
       "name": "加",
@@ -1181,6 +1265,13 @@
       "unicode": "e6a5",
       "unicode_decimal": 59045
     },
+    {
+      "icon_id": "4239837",
+      "name": "满减优惠",
+      "font_class": "manjianyouhui",
+      "unicode": "e791",
+      "unicode_decimal": 59281
+    },
     {
       "icon_id": "4247306",
       "name": "积分",
@@ -1314,6 +1405,13 @@
       "unicode": "e6e1",
       "unicode_decimal": 59105
     },
+    {
+      "icon_id": "4480718",
+      "name": "网页",
+      "font_class": "wangye",
+      "unicode": "e7a0",
+      "unicode_decimal": 59296
+    },
     {
       "icon_id": "4549366",
       "name": "水滴",
@@ -1496,6 +1594,20 @@
       "unicode": "e917",
       "unicode_decimal": 59671
     },
+    {
+      "icon_id": "5296173",
+      "name": "承诺函",
+      "font_class": "chengnuohan",
+      "unicode": "e8f9",
+      "unicode_decimal": 59641
+    },
+    {
+      "icon_id": "5296174",
+      "name": "正品行货",
+      "font_class": "zhengpinhanghuo",
+      "unicode": "e8fa",
+      "unicode_decimal": 59642
+    },
     {
       "icon_id": "5309436",
       "name": "电源",
@@ -1622,6 +1734,13 @@
       "unicode": "e72f",
       "unicode_decimal": 59183
     },
+    {
+      "icon_id": "5940347",
+      "name": "支付",
+      "font_class": "zhifu1",
+      "unicode": "e79b",
+      "unicode_decimal": 59291
+    },
     {
       "icon_id": "5959484",
       "name": "更多",
@@ -1678,6 +1797,13 @@
       "unicode": "e617",
       "unicode_decimal": 58903
     },
+    {
+      "icon_id": "6240414",
+      "name": "无评论",
+      "font_class": "wupinglun",
+      "unicode": "e78c",
+      "unicode_decimal": 59276
+    },
     {
       "icon_id": "6249971",
       "name": "项目",
@@ -1909,6 +2035,13 @@
       "unicode": "e61a",
       "unicode_decimal": 58906
     },
+    {
+      "icon_id": "7210650",
+      "name": "已使用",
+      "font_class": "yishiyong",
+      "unicode": "e78f",
+      "unicode_decimal": 59279
+    },
     {
       "icon_id": "7284398",
       "name": "星星",
@@ -2028,6 +2161,13 @@
       "unicode": "ebf4",
       "unicode_decimal": 60404
     },
+    {
+      "icon_id": "7731245",
+      "name": "优惠券",
+      "font_class": "youhuiquan1",
+      "unicode": "e79a",
+      "unicode_decimal": 59290
+    },
     {
       "icon_id": "7782114",
       "name": "裁剪",
@@ -2196,6 +2336,13 @@
       "unicode": "e666",
       "unicode_decimal": 58982
     },
+    {
+      "icon_id": "8221696",
+      "name": "运费查询",
+      "font_class": "yunfeichaxun",
+      "unicode": "e79c",
+      "unicode_decimal": 59292
+    },
     {
       "icon_id": "8231464",
       "name": "大头针",
@@ -2252,6 +2399,13 @@
       "unicode": "e602",
       "unicode_decimal": 58882
     },
+    {
+      "icon_id": "8654775",
+      "name": "电脑",
+      "font_class": "computer_icon",
+      "unicode": "e792",
+      "unicode_decimal": 59282
+    },
     {
       "icon_id": "8661369",
       "name": "电信",
@@ -2406,6 +2560,13 @@
       "unicode": "e67e",
       "unicode_decimal": 59006
     },
+    {
+      "icon_id": "9180278",
+      "name": "券",
+      "font_class": "quan",
+      "unicode": "e793",
+      "unicode_decimal": 59283
+    },
     {
       "icon_id": "9210505",
       "name": "加载",
@@ -2448,6 +2609,13 @@
       "unicode": "e737",
       "unicode_decimal": 59191
     },
+    {
+      "icon_id": "9323616",
+      "name": "核销",
+      "font_class": "hexiao",
+      "unicode": "e798",
+      "unicode_decimal": 59288
+    },
     {
       "icon_id": "9392420",
       "name": "支付倒计时",
@@ -2546,6 +2714,13 @@
       "unicode": "e82f",
       "unicode_decimal": 59439
     },
+    {
+      "icon_id": "9739958",
+      "name": "9-劳联保险@三合一",
+      "font_class": "-laolianbaoxiansanheyi",
+      "unicode": "e7a3",
+      "unicode_decimal": 59299
+    },
     {
       "icon_id": "9742421",
       "name": "清空",
@@ -2658,6 +2833,13 @@
       "unicode": "e77d",
       "unicode_decimal": 59261
     },
+    {
+      "icon_id": "10074308",
+      "name": "规格参数",
+      "font_class": "guigecanshu",
+      "unicode": "e799",
+      "unicode_decimal": 59289
+    },
     {
       "icon_id": "10100018",
       "name": "收 藏-产品详情",
@@ -2749,6 +2931,13 @@
       "unicode": "e745",
       "unicode_decimal": 59205
     },
+    {
+      "icon_id": "10408240",
+      "name": "APP",
+      "font_class": "APP1",
+      "unicode": "e795",
+      "unicode_decimal": 59285
+    },
     {
       "icon_id": "10445236",
       "name": "自定义",
@@ -2798,6 +2987,13 @@
       "unicode": "e738",
       "unicode_decimal": 59192
     },
+    {
+      "icon_id": "10833932",
+      "name": "商户管理",
+      "font_class": "shanghuguanli",
+      "unicode": "e79d",
+      "unicode_decimal": 59293
+    },
     {
       "icon_id": "11043027",
       "name": "多行文本",
@@ -2924,6 +3120,13 @@
       "unicode": "e6fc",
       "unicode_decimal": 59132
     },
+    {
+      "icon_id": "11132530",
+      "name": "微信",
+      "font_class": "weixin3",
+      "unicode": "e796",
+      "unicode_decimal": 59286
+    },
     {
       "icon_id": "11448884",
       "name": "文件夹",
@@ -2951,6 +3154,20 @@
       "font_class": "youhuijuan",
       "unicode": "e6f4",
       "unicode_decimal": 59124
+    },
+    {
+      "icon_id": "12135968",
+      "name": "暂无优惠券",
+      "font_class": "zanwuyouhuiquan",
+      "unicode": "e789",
+      "unicode_decimal": 59273
+    },
+    {
+      "icon_id": "12321692",
+      "name": "分享",
+      "font_class": "fenxiang-copy",
+      "unicode": "eee3",
+      "unicode_decimal": 61155
     }
   ]
 }