merge

.gitignore

@@ -22,7 +22,7 @@
 # mockStatic
 
 /.idea
-config/base.config.json
+/config/base.config.json
 
 /src/services/index.ts
 .vscode

config/base.config.json

-{"userRegister":{"useType":{"memberType":[{"id":1,"typeName":"企业会员"},{"id":3,"typeName":"渠道企业会员"},{"id":4,"typeName":"渠道个人会员"},{"id":2,"typeName":"个人会员"}],"businessType":[{"id":1,"typeName":"采购"},{"id":2,"typeName":"商品销售"},{"id":3,"typeName":"加工服务"},{"id":4,"typeName":"物流服务"},{"id":5,"typeName":"金融服务"},{"id":6,"typeName":"保险服务"},{"id":22,"typeName":"别删"},{"id":23,"typeName":"测试"},{"id":24,"typeName":"供应"},{"id":26,"typeName":"业务"},{"id":27,"typeName":"test"},{"id":28,"typeName":"123"},{"id":29,"typeName":"21321"}]}},"global":{"logo":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/logo.png","countryList":[{"name":"简体中文-ZH","key":"zh-CN","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/china.png"},{"name":"English-EN","key":"en-US","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/us.png"},{"name":"日本語-JP","key":"jp","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/japen.png"},{"name":"한국어-KO","key":"ko","icon":"http://lingxi-frontend-test.oss-cn-hangzhou.aliyuncs.com/images/koren.png"}],"menuList":[{"code":"/memberCenter/commodityAbility","children":[{"code":"/mem"}]},{"code":"/memberCenter/commodityAbility/classAndProperty/class"}]}}

src/pages/lxMall/components/MainNav/index.less

@@ -9,21 +9,20 @@
   background-color: #FFF;
 
 
-
   &_container {
     .common_page_container();
     height: 40px;
+    display: flex;
 
     &>.nav {
       padding: 0;
       margin: 0;
       position: relative;
-      float: left;
       margin-left: 20px;
+      display: flex;
 
       .nav_item {
         list-style: none;
-        display: inline-block;
         height: 40px;
         line-height: 40px;
         padding: 0 20px;

src/pages/lxMall/components/mainNav/index.less

@@ -9,21 +9,20 @@
   background-color: #FFF;
 
 
-
   &_container {
     .common_page_container();
     height: 40px;
+    display: flex;
 
     &>.nav {
       padding: 0;
       margin: 0;
       position: relative;
-      float: left;
       margin-left: 20px;
+      display: flex;
 
       .nav_item {
         list-style: none;
-        display: inline-block;
         height: 40px;
         line-height: 40px;
         padding: 0 20px;

src/theme/science/styles/category.less

@@ -5,7 +5,6 @@
 
   .category_type {
     position: relative;
-    float: left;
     width: 190px;
     height: 40px;
     background-color: var(--mall_main_color);