Merge branch 'dev' of http://git.echepei.com/zhujiawei/Warehouse_management_ui into dev

src/layout/components/Sidebar/Logo.vue

@@ -31,6 +31,7 @@
 <script>
 import logoImg from "@/assets/logo/logo.png";
 import overseas from "@/assets/logo/hwc.png";
+import overseasZjxd from "@/assets/logo/zjxd.png";
 import variables from "@/assets/styles/variables.scss";
 import Cookies from "js-cookie";
 import testLogo from "@/assets/logo/testLogo.png";
@@ -66,6 +67,8 @@ export default {
       this.logo = testLogo;
     }else if (Cookies.get("test") == 2) {
       this.logo = overseas
+    }else if (Cookies.get("test") == 3) {
+      this.logo = overseasZjxd
     }
   },
 };

src/views/login.vue

@@ -110,8 +110,9 @@ export default {
     this.getCode();
     this.getCookie();
     const host = document.domain;
-    // this.test = host.includes('dh');
-    if (host.includes('dh')){
+    if (host.includes('zjxd')){
+      Cookies.set('test', 3);
+    }else if (host.includes('dh')){
       Cookies.set('test', 0);
     }else if (host.includes('hwc')){
       Cookies.set('test', 2);