From 5608db898f7221ed37a75b7f4f5b5ef9ed9575b1 Mon Sep 17 00:00:00 2001 From: Shaw <1050429181@qq.com> Date: Wed, 31 Mar 2021 09:05:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=AF=8F=E6=97=A5=E4=B8=80?= =?UTF-8?q?=E5=8F=A5=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 207 +++++++++++++++++---------------- package.json | 4 +- src/api/tip.js | 8 ++ src/asset/app.css | 21 ++++ src/main.js | 3 + src/view/Home.vue | 43 ++++--- src/view/card/CardBar.vue | 29 +++++ src/view/card/LoginWelcome.vue | 32 +++++ src/view/card/Promotion.vue | 32 +++++ src/view/card/Tip.vue | 39 +++++++ src/view/post/Index.vue | 28 +++++ 11 files changed, 328 insertions(+), 118 deletions(-) create mode 100644 src/api/tip.js create mode 100644 src/asset/app.css create mode 100644 src/view/card/CardBar.vue create mode 100644 src/view/card/LoginWelcome.vue create mode 100644 src/view/card/Promotion.vue create mode 100644 src/view/card/Tip.vue create mode 100644 src/view/post/Index.vue diff --git a/package-lock.json b/package-lock.json index dae30eb..3ce9c6c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1061,6 +1061,11 @@ "to-fast-properties": "^2.0.0" } }, + "@fortawesome/fontawesome-free": { + "version": "5.15.3", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.3.tgz", + "integrity": "sha512-rFnSUN/QOtnOAgqFRooTA3H57JLDm0QEG/jPdk+tLQNL/eWd+Aok8g3qCI+Q1xuDPWpGW/i9JySpJVsq8Q0s9w==" + }, "@hapi/address": { "version": "2.1.4", "resolved": "https://registry.npm.taobao.org/@hapi/address/download/@hapi/address-2.1.4.tgz", @@ -1715,6 +1720,16 @@ "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=", "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" + } + }, "cacache": { "version": "13.0.1", "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.1.tgz?cache=0&sync_timestamp=1616431251047&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-13.0.1.tgz", @@ -1741,6 +1756,53 @@ "unique-filename": "^1.1.1" } }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "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.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "source-map": { "version": "0.6.1", "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", @@ -1757,6 +1819,16 @@ "minipass": "^3.1.1" } }, + "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" + } + }, "terser-webpack-plugin": { "version": "2.3.8", "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.3.8.tgz", @@ -1773,6 +1845,18 @@ "terser": "^4.6.12", "webpack-sources": "^1.4.3" } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.2.0", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.2.0.tgz", + "integrity": "sha512-TitGhqSQ61RJljMmhIGvfWzJ2zk9m1Qug049Ugml6QP3t0e95o0XJjk29roNEiPKJQBEi8Ord5hFuSuELzSp8Q==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } } } }, @@ -2385,6 +2469,14 @@ "integrity": "sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk=", "dev": true }, + "axios": { + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz", + "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==", + "requires": { + "follow-redirects": "^1.10.0" + } + }, "babel-eslint": { "version": "10.1.0", "resolved": "https://registry.npm.taobao.org/babel-eslint/download/babel-eslint-10.1.0.tgz", @@ -2830,6 +2922,13 @@ "integrity": "sha512-LRSIYVNrKTPQhmNRegASkntX+ObtZ7aSSA/3cybDKXzGtPNy8g8cl2tp79Rl8/LBVH/KkRT5rmmzJ21nxz9IcQ==", "requires": { "bulma": "0.9.1" + }, + "dependencies": { + "bulma": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.1.tgz", + "integrity": "sha512-LSF69OumXg2HSKl2+rN0/OEXJy7WFEb681wtBlNS/ulJYR27J3rORHibdXZ6GVb/vyUzzYK/Arjyh56wjbFedA==" + } } }, "buffer": { @@ -2874,9 +2973,9 @@ "dev": true }, "bulma": { - "version": "0.9.1", - "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.1.tgz", - "integrity": "sha512-LSF69OumXg2HSKl2+rN0/OEXJy7WFEb681wtBlNS/ulJYR27J3rORHibdXZ6GVb/vyUzzYK/Arjyh56wjbFedA==" + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/bulma/-/bulma-0.9.2.tgz", + "integrity": "sha512-e14EF+3VSZ488yL/lJH0tR8mFWiEQVCMi/BQUMi2TGMBOk+zrDg4wryuwm/+dRSHJw0gMawp2tsW7X1JYUCE3A==" }, "bytes": { "version": "3.1.0", @@ -4591,15 +4690,13 @@ "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==", + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.0.0-rc.1.tgz", + "integrity": "sha512-lKtzKn5t+L3BSBZYkWU3VQ3UIiXBKmLW1jwj4CWr7lSPlKjyZT86hLYzJO0Lk3jUfgiFFHIcsWnFvN4+sQnhNQ==", "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" } }, @@ -5493,8 +5590,7 @@ "follow-redirects": { "version": "1.13.3", "resolved": "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.13.3.tgz?cache=0&sync_timestamp=1614437038110&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffollow-redirects%2Fdownload%2Ffollow-redirects-1.13.3.tgz", - "integrity": "sha1-5VmK1QF0wbxOhyMB6CrCzZf5Amc=", - "dev": true + "integrity": "sha1-5VmK1QF0wbxOhyMB6CrCzZf5Amc=" }, "for-in": { "version": "1.0.2", @@ -7726,11 +7822,6 @@ "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", @@ -9344,11 +9435,6 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, - "resize-observer-polyfill": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", - "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" - }, "resolve": { "version": "1.20.0", "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz", @@ -11120,87 +11206,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.1.2", - "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-16.1.2.tgz", - "integrity": "sha1-XAO2xQ0qX5g8fOuhXFDXjKKymPQ=", - "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.npm.taobao.org/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1611327117754&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz", - "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npm.taobao.org/chalk/download/chalk-4.1.0.tgz?cache=0&sync_timestamp=1604053731560&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchalk%2Fdownload%2Fchalk-4.1.0.tgz", - "integrity": "sha1-ThSHCmGNni7dl92DRf2dncMVZGo=", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz", - "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz", - "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npm.taobao.org/has-flag/download/has-flag-4.0.0.tgz", - "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz", - "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=", - "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.npm.taobao.org/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1611394043517&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz", - "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-router": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz", diff --git a/package.json b/package.json index 07b6e30..ffd8b73 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,12 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "@fortawesome/fontawesome-free": "^5.15.3", "axios": "^0.21.1", "buefy": "^0.9.4", + "bulma": "^0.9.2", "core-js": "^3.6.5", - "element-ui": "^2.15.1", + "element-ui": "^2.0.0-rc.1", "vue": "^2.6.11", "vue-router": "^3.5.1", "vuex": "^3.6.2" diff --git a/src/api/tip.js b/src/api/tip.js new file mode 100644 index 0000000..8a83600 --- /dev/null +++ b/src/api/tip.js @@ -0,0 +1,8 @@ +import request from '@/util/request' + +export function getTodayTip() { + return request({ + url: '/tip/today', + method: 'get' + }) +} \ No newline at end of file diff --git a/src/asset/app.css b/src/asset/app.css new file mode 100644 index 0000000..aae965e --- /dev/null +++ b/src/asset/app.css @@ -0,0 +1,21 @@ +* { + margin: 0; + padding: 0; +} + +body, +html { + background-color: #f6f6f6; + color: black; + width: 100%; + font-size: 14px; + letter-spacing: 0.03em; + font-family: -apple-system, BlinkMacSystemFont, Helvetica Neue, PingFang SC, + Microsoft YaHei, Source Han Sans SC, Noto Sans CJK SC, WenQuanYi Micro Hei, + sans-serif, Apple Color Emoji, Segoe UI Emoji, Noto Color Emoji, + Segoe UI Symbol, Android Emoji, EmojiSymbols; +} + +.el-card{ + margin-bottom: 16px; +} \ No newline at end of file diff --git a/src/main.js b/src/main.js index 3ac0fe9..db062ee 100644 --- a/src/main.js +++ b/src/main.js @@ -6,6 +6,9 @@ import 'buefy/dist/buefy.css' import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' +import '@/asset/app.css' +import 'bulma/css/bulma.css' +import '@fortawesome/fontawesome-free/css/all.css' import router from './router' // import store from './store' diff --git a/src/view/Home.vue b/src/view/Home.vue index c0f7fa2..f80e894 100644 --- a/src/view/Home.vue +++ b/src/view/Home.vue @@ -1,35 +1,46 @@ \ No newline at end of file diff --git a/src/view/card/LoginWelcome.vue b/src/view/card/LoginWelcome.vue new file mode 100644 index 0000000..361ca09 --- /dev/null +++ b/src/view/card/LoginWelcome.vue @@ -0,0 +1,32 @@ + + + + + \ No newline at end of file diff --git a/src/view/card/Promotion.vue b/src/view/card/Promotion.vue new file mode 100644 index 0000000..5141a30 --- /dev/null +++ b/src/view/card/Promotion.vue @@ -0,0 +1,32 @@ + + + + + \ No newline at end of file diff --git a/src/view/card/Tip.vue b/src/view/card/Tip.vue new file mode 100644 index 0000000..00a003f --- /dev/null +++ b/src/view/card/Tip.vue @@ -0,0 +1,39 @@ + + + + + \ No newline at end of file diff --git a/src/view/post/Index.vue b/src/view/post/Index.vue new file mode 100644 index 0000000..91ac795 --- /dev/null +++ b/src/view/post/Index.vue @@ -0,0 +1,28 @@ + + + + + \ No newline at end of file -- Gitee