From 0cad52bd992e9f487788082b7832f52fa97c9d83 Mon Sep 17 00:00:00 2001 From: clay <209192278@qq.com> Date: Sun, 9 Oct 2022 23:23:42 +0800 Subject: [PATCH] =?UTF-8?q?dengjie=20commit=20:=20header=E5=8C=BA=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- package-lock.json | 183 +++++++++++++++++++--------------- src/assets/header/enz.png | Bin 0 -> 439 bytes src/assets/header/enz@2x.png | Bin 0 -> 705 bytes src/assets/header/enzl.png | Bin 0 -> 443 bytes src/assets/header/enzl@2x.png | Bin 0 -> 720 bytes src/views/header/index.vue | 35 ++++--- 7 files changed, 126 insertions(+), 94 deletions(-) create mode 100644 src/assets/header/enz.png create mode 100644 src/assets/header/enz@2x.png create mode 100644 src/assets/header/enzl.png create mode 100644 src/assets/header/enzl@2x.png diff --git a/.env.development b/.env.development index c61afa9..9d17ba1 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ ENV = 'development' # EBTS/开发环境 #VUE_APP_BASE_API = '/dev-api' -VUE_APP_BASE_API = 'http://192.168.101.5:8085/dev-api' +VUE_APP_BASE_API = 'http://localhost:8085/dev-api' #VUE_APP_BASE_API = 'http://sist.swjtu.edu.cn/dev-api' SITE_TYPE = 'NEd5n92EMIpyyBslaNqsRgE' #VUE_APP_BASE_API = 'http://sistapi.hchyun.cn/dev-api' diff --git a/package-lock.json b/package-lock.json index 584d2fc..4b48e1a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1786,12 +1786,50 @@ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, "big.js": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", "dev": true }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, "css-select": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz", @@ -1845,6 +1883,13 @@ "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", "dev": true }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, "html-webpack-plugin": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz", @@ -1928,6 +1973,16 @@ "ansi-regex": "^2.0.0" } }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, "util.promisify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz", @@ -1937,6 +1992,53 @@ "define-properties": "^1.1.2", "object.getownpropertydescriptors": "^2.0.3" } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.8.3", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", + "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + }, + "dependencies": { + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true, + "optional": true + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true, + "optional": true + }, + "json5": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz", + "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", + "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + } + } } } }, @@ -12262,87 +12364,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.8.3", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.8.3.tgz", - "integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-router": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz", diff --git a/src/assets/header/enz.png b/src/assets/header/enz.png new file mode 100644 index 0000000000000000000000000000000000000000..9d4aa3dff835e9428efd4c15e3af266f7a666767 GIT binary patch literal 439 zcmV;o0Z9IdP)Px$aY;l$R9HvtmcL5GKoG{~TlG%R!oun*139o0G?fv-H?gv_7sTdle1mI!6G6DE zf`uR`7Z9!ywF!uzcaV`)tNgiaToVE}DfgS%{pPnbOE3syrUrk|27Ondi5|5#F=%r$ zLePeu&J}_}(3XI0{`~deaKtB?+HMyYw)85Q;z1Zs^v1rcT4FGdKoIa!p7y!M?^b@tGXedy2|oK-!+A<$J|dz{r3UX_cr|*9`^0MOyGUK}>}Q61jM$kdb$s9;GP#A) zJy^7<{45j^D$<2u5uqZz@dU3&yseAa@8YJY7!&>9r`Y7sGBIMX46UqKAt(fG3E1XK h56%xk+e)j<{{nFH@g^m<(`5hv002ovPDHLkV1n%l$3Or8 literal 0 HcmV?d00001 diff --git a/src/assets/header/enz@2x.png b/src/assets/header/enz@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..e2bd23215f4161b9903d9d978e38dd77ea23211e GIT binary patch literal 705 zcmeAS@N?(olHy`uVBq!ia0vp^0YDtW!3HEn8#e3)QjEnx?oJHr&dI!FU|_2Dba4!+ zhVDbj^0eyrmB&nMBR|`J-~0V^rT+U=&m3N@L+g_o4H7oS%Gxl#DUDjF zTe|ns;zyDjJ`|fLDBjUXb71abO1i^qvOq)O*j-XMHLs+1m_GQX#fQZQR`6I;r-r?GgS-rDjTP=3)h_Q|7jp zf6!K1HR(<2%ua@H_8;x|e=dAE_k3hN-^Yx-!q%2Er$jO@(}*=nKCqfoB3^03+)eLU z<~7Y(ovzHse8cA?V}$Zfqgiv;23tG|T`zk+NWp8q%P;1A3Of=H9CEj0mJ2`5%VJO_ z{W#d->8nz!(Hc*dM==nN3=Ju9|gf9vO05Aq)Z4SQLBf5#U4BabJW zYt_8nmTaDS^OC&qy}D=3s}AkGXclGuF|F3JZds0TdYY2?B}?m)vTY&(H`DyCHCRSH zKO=RaVNrubIWw;YS4W{a66fRU3kRMnJbV3^=g-S+kC#@Q={>ewZo|dJf7!bw16)iO zFuF1tzGIUL5D|EsM;gbBS7Tjy?&E*%(jOPwGs(;4WInUF;0jEW44$rjF6*2UngEgn BDP{lw literal 0 HcmV?d00001 diff --git a/src/assets/header/enzl.png b/src/assets/header/enzl.png new file mode 100644 index 0000000000000000000000000000000000000000..61f83205b697a251ca040945aede9abc08f7bb02 GIT binary patch literal 443 zcmV;s0Yv_ZP)Px$bxA})R9HvtmcL2^K@i5j5f!~?XPR`^*$Mg_f_K5*DpvM_*u=&+2wM39-U>c| zFCZ3Hc0wAFE40ZeMl-TUu(&_Dy{vZxGFR@*?0);(`GzCM3m7x}kro&!pJq{`)+PdN zUPcJo(9^X-Pzc%*u&tlJ9&C8Qv8Faq{<$r^N?h!C!I$1RQvR|C%q7sdSjvkzVRH}@ zY=({8`pd(iDc#a0S>L_g_*oo=rUzu^5x1hC{bI7m)B+j!B;YyYkj?ShQ!>V2mq071 zLm+_1Ncmey5tB^fc)>k@9T7P0K_NKRp#F0)QJ+RQNg09oO0N;qK{7U4K$n=^x_Z!L zN@VBM;$p@tK)sX#;?sDI=`17G0nn zn><13L0z<|{45j^DvAriB0@#+*(c~gp_6k3gLLke z2aG;TCI}?oImmM3KErP5&4D|<&nvvk(?03X^K)m+)6<_{O4yondExvNM&X1_cPlq= zM?B$uJZ)FpOTUjSGb--0&fvJ-$r;eFgh4W#nbm`9LZK-s9Qhw?*EauI&AfHg^xO0Ynho0>Ew@V^kS|ML&62TUYuY^BR);0; zT(WxqsNR{*I%CIF;e_2*SqcsJu1nOmILpQDKg(etw5B|!f$7ic1NApMUr0*a^r&r7 zKDe%iP3jxtZ;4H74$nVic;#N_7M^X=Gpc!xhp5Icac1zEzw%Ppx{^5)SXm_&m7MgM z%J5ZJCX%g|+r8;)-~ISoEB|Zs%`2(5Z_z*dwbfto^s;}3iEn<+cE5M1`J7?i-F-jb zefWCk`-J3UXTCgjwR+Z4l^)DEGx=BwtHk23?U9UJ6GRjqXDwjxWHegGhQzV^!5ed@ zhVjOSqouz*H(so8jVoUHv5{TpYu5jRNlYq%tl+?1-G~&@L~~M^C%ulnz2o0v-pbeY ZjOWg+Rce=X$pR)(22WQ%mvv4FO#mRWIjjHx literal 0 HcmV?d00001 diff --git a/src/views/header/index.vue b/src/views/header/index.vue index d62bfc3..00f6bde 100644 --- a/src/views/header/index.vue +++ b/src/views/header/index.vue @@ -8,8 +8,8 @@
-
-
+
+
@@ -59,10 +59,12 @@ -
-
-
-
+
+
+
+
+
+
@@ -84,7 +86,11 @@ export default { pc: document.documentElement.clientWidth > 992, menuData: [], link_color:'#C5DCFE', - logo:true + login_blue:true, + en_logo_blue:false, + en_login_white:false, + ch_logo_blue:true, + ch_logo_white:false } }, mounted() { @@ -95,19 +101,22 @@ export default { window.onscroll = ()=>{ // 获取滚动距离 let top = document.documentElement.scrollTop || document.body.scrollTop; - if (top !== 0) { Head.style = "position: fixed;top: 0;background-color: #fff;" header_bgc.style= "position: fixed;top: 0;background-color: #fff;box-shadow: 0px 1px 3px 0px rgba(8,57,122,0.18);" this.link_color='#0A51AE' - this.logo=false - // link_text.style="color:#fff;" - // link_text.addClass('active') + this.login_blue=false + this.ch_logo_blue=false + this.ch_logo_white=true + // this.en_login_white=false }else if(top === 0){ Head.style = "position: static;" header_bgc.style= "position: static;background: linear-gradient(180deg, #0A51AE 0%, rgba(25,84,167,0.9) 56%, rgba(21,82,167,0.7) 69%, rgba(16,80,168,0.4) 85%, rgba(11,81,173,0) 100%);" this.link_color='#C5DCFE' - this.logo=true + this.login_blue=true + this.ch_logo_blue=true + this.ch_logo_white=false + // this.en_login_white=true } } const that = this @@ -134,12 +143,14 @@ export default { }, menuCut(menu) { console.log(menu) + // this.ch_logo_blue=false this.$router.push("/pc/" + menu.encodeId + "?type=" + menu.type + "&lang=" + sessionStorage.getItem("lang")); }, switchLang() { let lang = '' if (this.$i18n.locale === 'en') { lang = 'cn' + } else { lang = 'en' }