Merge branch 'master' of http://g.jimilicai.com:8000/legobackend/lego-manage-web

@@ -2,7 +2,7 @@ export default {
   // 路由国际化
   // 路由国际化
   route: {
   route: {
     Dashboard: 'Dashboard',
     Dashboard: 'Dashboard',
-    DataCenter: 'Data Center',
+    DataCenter: 'Data Center111',
     // setting
     // setting
     SystemSetting: 'System Setting',
     SystemSetting: 'System Setting',
     SystemUser: 'User Manage',
     SystemUser: 'User Manage',

 export default {
 export default {
-  // 路由国际化
-  route: {
-    Dashboard: 'Dashboard',
-    DataCenter: 'Data Center',
-    // setting
-    SystemSetting: 'System Setting',
-    SystemUser: 'User Manage',
-    SystemRole: 'Role Manage',
-    SystemMenu: 'Menu Manage',
-    SystemDict: 'Dict Manage'
-  },
   // 登录
   // 登录
   login: {
   login: {
     title: '乐高后台管理',
     title: '乐高后台管理',
@@ -122,7 +111,6 @@ export default {
     controlsEditName: '编辑',
     controlsEditName: '编辑',
     controlsDelistName: '下架',
     controlsDelistName: '下架',
     controlsReleaseName: '发布',
     controlsReleaseName: '发布',
-    controlsDelistName: '下架',
     controlsAddName: '新增问题',
     controlsAddName: '新增问题',
     placeholder: '问题名称搜索',
     placeholder: '问题名称搜索',
     // 新增
     // 新增

 <template>
 <template>
-  <!--this is a language component-->
   <el-dropdown trigger="hover" @command="handleLanguageChange">
   <el-dropdown trigger="hover" @command="handleLanguageChange">
     <div>
     <div>
       <!-- <svg-icon icon-class="language" class-name="language-icon" style="width: 36px;" /> -->
       <!-- <svg-icon icon-class="language" class-name="language-icon" style="width: 36px;" /> -->
@@ -46,4 +45,4 @@ const definition = [
 
 
 <style lang='scss' scoped>
 <style lang='scss' scoped>
 
 
-</style>
+</style>
\ No newline at end of file

@@ -2,6 +2,7 @@
   <div class="navbar">
   <div class="navbar">
     <div class="left-menu">
     <div class="left-menu">
       <logo v-if="showLogo" :collapse="false" />
       <logo v-if="showLogo" :collapse="false" />
+      <hamburger id="hamburger-container" v-if="!sidebar.hide" :is-active="appStore.sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
     </div>
     </div>
 
 
     <div class="right-menu">
     <div class="right-menu">
@@ -28,7 +29,7 @@ import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import SizeSelect from '@/components/SizeSelect'
 import HeaderSearch from '@/components/HeaderSearch'
 import HeaderSearch from '@/components/HeaderSearch'
 
 
-import Language from '@/layout/components/Language'
+import Language from '@/layout/components/language'
 import Logo from './Logo'
 import Logo from './Logo'
 import useAppStore from '@/store/modules/app'
 import useAppStore from '@/store/modules/app'
 import useUserStore from '@/store/modules/user'
 import useUserStore from '@/store/modules/user'
@@ -51,6 +52,10 @@ const definition = [
   { label: '俄文', value: 'ru_RU'},
   { label: '俄文', value: 'ru_RU'},
 ]
 ]
 
 
+function toggleSideBar() {
+  appStore.toggleSideBar(undefined, !sidebar.value.opened)
+}
+
 
 
 function handleLanguageChange(lang) {
 function handleLanguageChange(lang) {
   locale.value = lang
   locale.value = lang

@@ -71,7 +71,7 @@ import { getCodeImg } from "@/api/login";
 import Cookies from "js-cookie";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from "@/utils/jsencrypt";
 import { encrypt, decrypt } from "@/utils/jsencrypt";
 import useUserStore from '@/store/modules/user'
 import useUserStore from '@/store/modules/user'
-import Language from '@/layout/components/Language'
+import Language from '@/layout/components/language'
 
 
 const userStore = useUserStore()
 const userStore = useUserStore()
 const router = useRouter();
 const router = useRouter();

@@ -28,18 +28,14 @@ export default defineConfig(({ mode, command }) => {
       open: true,
       open: true,
       forceHttps: false,
       forceHttps: false,
       proxy: {
       proxy: {
-        // '/dev-api': {
-        //   target: 'http://legao.jimilicai.com/prod-api/',
-        //   changeOrigin: true,
-        //   secure: false,
-        //   rewrite: (p) => p.replace(/^\/dev-api/, '')
-        // },
-        // '/prod-api': {
-        //   target: 'http://localhost:8080/',
-        //   changeOrigin: true,
-        //   secure: false,
-        //   rewrite: (p) => p.replace(/^\/prod-api/, '')
-        // }
+        // https://cn.vitejs.dev/config/#server-proxy
+        '/dev-api': {
+          // target: 'http://192.168.1.7:8082/',
+          // target: 'http://470k2111t0.zicp.vip/',
+          changeOrigin: true,
+          secure: false,
+          rewrite: (p) => p.replace(/^\/dev-api/, '')
+        }
       }
       }
     },
     },
     //fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
     //fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file