From 028ed7e86e73ab01004f95fc85a572083f16cd0b Mon Sep 17 00:00:00 2001 From: rose <1942951600@qq.com> Date: Thu, 13 May 2021 23:31:31 +0800 Subject: [PATCH] 4 --- package-lock.json | 71 +++++++++++++++++++++-- package.json | 2 + src/App.vue | 4 +- src/components/FooterPage/FooterPage.vue | 4 +- src/components/PlatformList/Fruit.vue | 2 +- src/main.js | 5 ++ src/views/Activity/ActDetails.vue | 15 +++-- src/views/Activity/Activity.vue | 4 +- src/views/Challenge/Children/Notice.vue | 6 +- src/views/Challenge/Children/Release.vue | 4 +- src/views/FirstPage/FirstPage.vue | 27 +++++++-- src/views/ItInformation/ItInformation.vue | 8 +-- 12 files changed, 116 insertions(+), 36 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7b47050..a9ec497 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2783,6 +2783,35 @@ "schema-utils": "^2.6.5" } }, + "babel-plugin-component": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/babel-plugin-component/-/babel-plugin-component-1.1.1.tgz", + "integrity": "sha512-WUw887kJf2GH80Ng/ZMctKZ511iamHNqPhd9uKo14yzisvV7Wt1EckIrb8oq/uCz3B3PpAW7Xfl7AkTLDYT6ag==", + "requires": { + "@babel/helper-module-imports": "7.0.0-beta.35" + }, + "dependencies": { + "@babel/helper-module-imports": { + "version": "7.0.0-beta.35", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0-beta.35.tgz", + "integrity": "sha512-vaC1KyIZSuyWb3Lj277fX0pxivyHwuDU4xZsofqgYAbkDxNieMg2vuhzP5AgMweMY7fCQUMTi+BgPqTLjkxXFg==", + "requires": { + "@babel/types": "7.0.0-beta.35", + "lodash": "^4.2.0" + } + }, + "@babel/types": { + "version": "7.0.0-beta.35", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.35.tgz", + "integrity": "sha512-y9XT11CozHDgjWcTdxmhSj13rJVXpa5ZXwjjOiTedjaM0ba5ItqdS02t31EhPl7HtOWxsZkYCCUNrSfrOisA6w==", + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.2.0", + "to-fast-properties": "^2.0.0" + } + } + } + }, "babel-plugin-dynamic-import-node": { "version": "2.3.3", "resolved": "https://registry.npm.taobao.org/babel-plugin-dynamic-import-node/download/babel-plugin-dynamic-import-node-2.3.3.tgz", @@ -4753,8 +4782,7 @@ "deepmerge": { "version": "1.5.2", "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz?cache=0&sync_timestamp=1593463429320&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdeepmerge%2Fdownload%2Fdeepmerge-1.5.2.tgz", - "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=", - "dev": true + "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=" }, "default-gateway": { "version": "5.0.5", @@ -5250,6 +5278,29 @@ "integrity": "sha1-x+2YUSx/823cv+2eVOY1UzXDUlc=", "dev": true }, + "element-ui": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.1.tgz", + "integrity": "sha512-TqlScAKGH97XndSScUDeEHIzL1x7yg7DvQdKPEOUdiDcyIz3y3FJJBlpHYaJT96FOn1xpIcUZb+I2FJeU9EcrQ==", + "requires": { + "async-validator": "~1.8.1", + "babel-helper-vue-jsx-merge-props": "^2.0.0", + "deepmerge": "^1.2.0", + "normalize-wheel": "^1.0.1", + "resize-observer-polyfill": "^1.5.0", + "throttle-debounce": "^1.0.1" + }, + "dependencies": { + "async-validator": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz", + "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==", + "requires": { + "babel-runtime": "6.x" + } + } + } + }, "elliptic": { "version": "6.5.3", "resolved": "https://registry.npm.taobao.org/elliptic/download/elliptic-6.5.3.tgz?cache=0&sync_timestamp=1592492775532&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felliptic%2Fdownload%2Felliptic-6.5.3.tgz", @@ -5645,8 +5696,7 @@ "esutils": { "version": "2.0.3", "resolved": "https://registry.npm.taobao.org/esutils/download/esutils-2.0.3.tgz", - "integrity": "sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=", - "dev": true + "integrity": "sha1-dNLrTeC42hKTcRkQ1Qd1ubcQ72Q=" }, "etag": { "version": "1.8.1", @@ -8660,6 +8710,11 @@ "integrity": "sha1-suHE3E98bVd0PfczpPWXjRhlBVk=", "dev": true }, + "normalize-wheel": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", + "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" + }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz?cache=0&sync_timestamp=1577052941951&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnpm-run-path%2Fdownload%2Fnpm-run-path-2.0.2.tgz", @@ -12026,6 +12081,11 @@ "neo-async": "^2.6.0" } }, + "throttle-debounce": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz", + "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==" + }, "through": { "version": "2.3.8", "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz", @@ -12086,8 +12146,7 @@ "to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" }, "to-object-path": { "version": "0.3.0", diff --git a/package.json b/package.json index f44ffc0..7a9f903 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,11 @@ }, "dependencies": { "ant-design-vue": "^1.2.4", + "babel-plugin-component": "^1.1.1", "compression-webpack-plugin": "^6.1.1", "core-js": "^3.6.5", "echarts": "^4.9.0", + "element-ui": "^2.15.1", "moment": "^2.29.1", "quill": "^1.3.7", "register-service-worker": "^1.7.1", diff --git a/src/App.vue b/src/App.vue index 97e20c8..113cf0f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,7 +2,7 @@
- + @@ -58,7 +58,7 @@ body, } body { background: #f5f5f5 !important; - padding-top: 70px; + /* padding-top: 70px; */ } body::-webkit-scrollbar { width: 0; diff --git a/src/components/FooterPage/FooterPage.vue b/src/components/FooterPage/FooterPage.vue index c48e21e..c8f1547 100644 --- a/src/components/FooterPage/FooterPage.vue +++ b/src/components/FooterPage/FooterPage.vue @@ -28,8 +28,8 @@ 行业政策 省级政策
-
-
我要入驻
+
+
我要入驻
人才招聘
diff --git a/src/components/PlatformList/Fruit.vue b/src/components/PlatformList/Fruit.vue index fc2c209..702cb94 100644 --- a/src/components/PlatformList/Fruit.vue +++ b/src/components/PlatformList/Fruit.vue @@ -137,6 +137,6 @@ export default { right: 10px; text-align: right; margin-bottom: 0 !important; - margin-top: 40px; + margin-top: 0.3rem; } diff --git a/src/main.js b/src/main.js index 86f4bbf..3c0a410 100644 --- a/src/main.js +++ b/src/main.js @@ -13,6 +13,9 @@ import VueDOMPurifyHTML from 'vue-dompurify-html'; import moment from 'moment'; //导入文件 import echarts from 'echarts'; import BaiduMap from 'vue-baidu-map'; +import { Carousel,CarouselItem } from 'element-ui' +import 'element-ui/lib/theme-chalk/index.css'; + Vue.prototype.$moment = moment; //赋值使用 Vue.prototype.$echarts = echarts; @@ -20,6 +23,8 @@ Vue.prototype.$echarts = echarts; Vue.config.productionTip = false; Vue.use(VueDOMPurifyHTML); +Vue.use(Carousel) +Vue.use(CarouselItem) Vue.use(BaiduMap, { /* Visit http://lbsyun.baidu.com/apiconsole/key for details about app key. */ diff --git a/src/views/Activity/ActDetails.vue b/src/views/Activity/ActDetails.vue index 1e458d9..4b83bb6 100644 --- a/src/views/Activity/ActDetails.vue +++ b/src/views/Activity/ActDetails.vue @@ -108,19 +108,18 @@ export default { diff --git a/src/views/ItInformation/ItInformation.vue b/src/views/ItInformation/ItInformation.vue index 9af9450..a7d9a1f 100644 --- a/src/views/ItInformation/ItInformation.vue +++ b/src/views/ItInformation/ItInformation.vue @@ -110,14 +110,14 @@ export default { overflow: hidden; background: #fff; box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); - margin-top: 24px; - padding: 10px 25px; + margin-top: 0.5rem; + padding: 10px 10px; } } .item-title { - margin-bottom: 10px; - font-size: 24px; + // margin-bottom: 0.5rem; + font-size: 20px; color: rgba(0, 0, 0, 0.65); font-family: Microsoft YaHei; font-weight: bold;