Merge remote-tracking branch 'origin/lc_branch' into van_branch

package.json

@@ -11,6 +11,7 @@
     "ant-design-vue": "^1.7.6",
     "core-js": "^3.6.5",
     "element-ui": "^2.15.3",
+    "less-loader": "7",
     "mapbox-gl": "1.13.1",
     "vue": "^2.6.11",
     "vue-router": "^3.2.0",
@@ -28,7 +29,6 @@
     "eslint-plugin-prettier": "^3.3.1",
     "eslint-plugin-vue": "^6.2.2",
     "less": "^3.0.4",
-    "less-loader": "^5.0.0",
     "prettier": "^2.2.1",
     "vue-template-compiler": "^2.6.11"
   },

src/App.vue

 <template>
   <div id="app">
-      <keep-alive>
-        <router-view />
-      </keep-alive>
+    <keep-alive>
+      <router-view />
+    </keep-alive>
   </div>
 </template>
 
 <script>
-
 export default {
   data() {
-    return {
-    };
+    return {};
   },
 };
 </script>
 
 <style lang="less">
-@import url("./assets/css/cssreset.css");
-@import url("./assets/css/public.less");
 html,
 body {
   margin: 0;

src/assets/css/public.less → src/assets/css/index.less

-@import url("../fonts/font.css");
+@import url(./cssreset.css);
 @font-color: #fff;
 @linear-color: linear-gradient(to right,
     rgba(0, 100, 200, 0.4),