Merge branch 'master' of http://git.zthymaoyi.com/zyw/cloudNew

unimall-admin/config/prod.env.js

@@ -1,6 +1,6 @@
 module.exports = {
 	NODE_ENV: '"production"',
   	ENV_CONFIG: '"prod"',
-    HOST: '"http://8.209.114.119:8189"',
-    BASE_API: '"http://8.209.114.119:8189/m.api"'
+    HOST: '"https://api.mitopowder.online"',
+    BASE_API: '"https://api.mitopowder.online/m.api"'
 }

unimall-admin/src/router/route.json

@@ -43,58 +43,6 @@
         "name": "sysManage",
         "alwaysShow": true
     },
-    {
-        "redirect": "noredirect",
-        "name": "sysTools",
-        "path": "/tools",
-        "meta": {
-            "icon": "tools",
-            "title": "系统工具"
-        },
-        "alwaysShow": true,
-        "children": [{
-                "path": "api",
-                "name": "api",
-                "page": "/tools/api/api",
-                "meta": {
-                    "title": "API文档",
-                    "icon": "api",
-                    "noCache": true,
-                    "perms": [
-                        "tools:api:list"
-                    ]
-                }
-            },
-            {
-                "path": "gen",
-                "name": "gen",
-                "page": "/tools/gen",
-                "meta": {
-                    "title": "代码生成",
-                    "icon": "gen",
-                    "noCache": true,
-                    "perms": [
-                        "tools:gen:list",
-                        "tools:gen:create",
-                        "tools:gen:delete",
-                        "tools:gen:update"
-                    ]
-                }
-            },
-            {
-                "path": "gen/edit/:tableId(\\d+)",
-                "hidden": true,
-                "meta": {
-                    "noCache": true,
-                    "perms": [],
-                    "title": "配置项修改"
-                },
-                "name": "genEdit",
-                "page": "/tools/gen/editTable"
-            }
-
-        ]
-    },
     {
         "redirect": "noredirect",
         "name": "articleManagement",

unimall-admin/src/views/articleManagement/add.vue

@@ -60,7 +60,7 @@
       </el-radio-group>
       <el-radio-group style="margin-left:10px;" v-model="form.articleClassify">
         <el-radio-button label="文章"></el-radio-button>
-        <el-radio-button label="电子书"></el-radio-button>
+        <el-radio-button label="百科"></el-radio-button>
       </el-radio-group>
     </div>
     

unimall-admin/src/views/articleManagement/index.vue

@@ -31,8 +31,8 @@
         >新增文章</el-button>
       </el-col>
     </el-row>
-    <el-row style="margin-top:20px;">
-      <el-col :span="4">
+    <el-row style="margin-top:20px;display: flex;overflow-x: auto;">
+      <el-col :span="7" style="min-width:450px">
         <el-tree :default-expanded-keys="[-1]" node-key="id" :data="data" :props="defaultProps" @node-click="handleNodeClick">
           <span  class="custom-tree-node" slot-scope="{ node, data }">
             <span>{{ node.label }}</span>