diff --git a/package-lock.json b/package-lock.json index 4cb7761..9a8b6fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9938,6 +9938,19 @@ "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", "dev": true }, + "is-dom-node": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-dom-node/-/is-dom-node-1.0.4.tgz", + "integrity": "sha512-NEnTHKCeyGJTL0cKdzATF8SWzyTMYf5CbNKWBvsXvyMxZG32g+a09qkeCbrfQNLTD85CbPeHb4YjIJCjyzF0yA==" + }, + "is-dom-node-list": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-dom-node-list/-/is-dom-node-list-1.2.1.tgz", + "integrity": "sha512-P1H071iT5TGG8pAHslhrLDo/tQLYc8tGuWABVqhGU4l2mm7aDNb9cx2myQ2AujEQO6B2cAujcW4a0/+6UfXInw==", + "requires": { + "is-dom-node": "^1.0.4" + } + }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", @@ -11151,6 +11164,11 @@ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, + "miniraf": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/miniraf/-/miniraf-1.0.0.tgz", + "integrity": "sha512-XpvhtJYzVrpXe+JoAthrT9E40NIrSDDMcdHEYL2M+lR/OCas0nadetcBBq/MWYqlgV5aDWVQ3mfAqd+fG6Y/EQ==" + }, "mississippi": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", @@ -14281,6 +14299,11 @@ "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", "dev": true }, + "rematrix": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/rematrix/-/rematrix-0.3.0.tgz", + "integrity": "sha512-xB/9ZvJIKaDgXX0qkvV9/pLD8zK23A6TVV6F8Vhsl+SrxbBeVYutz5uszxgC6Rt3RP9LZiH8OXaYjr+x6WXWmQ==" + }, "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", @@ -14747,6 +14770,16 @@ "ajv-keywords": "^3.5.2" } }, + "scrollreveal": { + "version": "4.0.9", + "resolved": "https://registry.npmjs.org/scrollreveal/-/scrollreveal-4.0.9.tgz", + "integrity": "sha512-fefGvzVS8YbXbDK1+T0kvy2yqxaiBJZeGUhPeqajf+7sGqtX4xikbKGAlzQuPCpswAMswx94ZwhDjXKnRIqW1w==", + "requires": { + "miniraf": "1.0.0", + "rematrix": "0.3.0", + "tealight": "0.3.6" + } + }, "scss-tokenizer": { "version": "0.2.3", "resolved": "https://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz", @@ -16003,6 +16036,15 @@ } } }, + "tealight": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/tealight/-/tealight-0.3.6.tgz", + "integrity": "sha512-Dys3N8jFBThD9pNVpPCyUiu6DfWcTBdqWQJIvnAuVaFkGEdrPBJ43070vVbn6sTlLvn2IQK2zFW4FrVIrTo8eQ==", + "requires": { + "is-dom-node": "^1.0.4", + "is-dom-node-list": "^1.2.1" + } + }, "temp-dir": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", diff --git a/package.json b/package.json index dc4c8ee..92de33a 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "mavon-editor": "^2.9.1", "node-sass": "^4.14.1", "pinyin-pro": "^3.15.1", + "scrollreveal": "^4.0.9", "vue": "^2.6.14", "vue-animate-number": "^0.4.2", "vue-cropperjs": "^3.0.0", diff --git a/src/assets/images/occupationlab.png b/src/assets/images/occupationlab.png index 5b4d7f3..7cc6585 100644 Binary files a/src/assets/images/occupationlab.png and b/src/assets/images/occupationlab.png differ diff --git a/src/components/occuQrcode/index.vue b/src/components/occuQrcode/index.vue new file mode 100644 index 0000000..6cea0da --- /dev/null +++ b/src/components/occuQrcode/index.vue @@ -0,0 +1,75 @@ + + + + \ No newline at end of file diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index 344f16c..656e990 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -32,6 +32,8 @@
+ @@ -41,30 +43,16 @@ :isHome.sync="isHome" @updateModelType="updateType">
- - -
- -
-
+