Merge branch 'master' of http://49.232.99.129:3000/admin/jurong_circle_agent_backstage

src/layout/Layout.vue

@@ -21,6 +21,7 @@
         </el-menu-item>
 
         <el-menu-item index="/dashboard_directly" v-if="userType === 'agent_directly'">
+        <!-- <el-menu-item index="/dashboard_directly"> -->
           <el-icon><Odometer /></el-icon>
           <template #title>仪表盘（直营代理）</template>
         </el-menu-item>

src/utils/config.js

@@ -2,8 +2,8 @@
 const config = {
   development: {
     baseURL: 'https://minio.zrbjr.com',
-    uploadURL: 'http://192.168.1.43:3002/api/upload',
-    apiURL: 'http://192.168.1.43:3002/api'
+    uploadURL: 'http://192.168.0.11:3002/api/upload',
+    apiURL: 'http://192.168.0.11:3002/api'
   },
   production: {
     baseURL: 'https://minio.zrbjr.com',

vite.config.js

@@ -4,43 +4,42 @@ import {resolve} from 'path'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-    base: '/admin',
-    // base: '/',
-    plugins: [vue()],
-    resolve: {
-        alias: {
-            '@': resolve(__dirname, 'src')
-        }
-    },
-    server: {
-        port: 5174,
-        host: '0.0.0.0',
-        proxy: {
-            '/api': {
-                target: 'http://127.0.0.1:3002',
-                changeOrigin: true
-            },
-            '/admin': {
-              target: 'http://localhost:3000',
-              changeOrigin: true
-            },
-            '/uploads': {
-                target: 'http://127.0.0.1:3002',
-                changeOrigin: true
-            }
-        }
-    },
-    build: {
-        outDir: 'dist',
-        assetsDir: 'assets',
-        rollupOptions: {
-            output: {
-                manualChunks: {
-                    vendor: ['vue', 'vue-router', 'pinia'],
-                    elementPlus: ['element-plus'],
-                    charts: ['echarts', 'vue-echarts']
-                }
-            }
-        }
+  // base: '/admin',
+  base: '/',
+  plugins: [vue()],
+  resolve: {
+    alias: {
+      '@': resolve(__dirname, 'src')
     }
+  },
+  server: {
+    port: 5174,
+    proxy: {
+      '/api': {
+        target: 'http://192.168.1.43:3002',
+        changeOrigin: true
+      },
+      // '/admin': {
+      //   target: 'http://localhost:3000',
+      //   changeOrigin: true
+      // },
+      '/uploads': {
+        target: 'http://192.168.1.43:3002',
+        changeOrigin: true
+      }
+    }
+  },
+  build: {
+    outDir: 'dist',
+    assetsDir: 'assets',
+    rollupOptions: {
+      output: {
+        manualChunks: {
+          vendor: ['vue', 'vue-router', 'pinia'],
+          elementPlus: ['element-plus'],
+          charts: ['echarts', 'vue-echarts']
+        }
+      }
+    }
+  }
 })