diff --git a/package-lock.json b/package-lock.json index 4a6a3cd..10f4fec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,9 @@ "name": "love-nav-vue", "version": "0.1.0", "dependencies": { + "@popperjs/core": "^2.11.8", "axios": "^1.6.2", + "bootstrap": "^5.3.2", "core-js": "^3.8.3", "echarts": "^5.4.3", "element-ui": "^2.15.14", @@ -2042,6 +2044,11 @@ "integrity": "sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==", "dev": true }, + "node_modules/@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmmirror.com/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==" + }, "node_modules/@sideway/address": { "version": "4.1.4", "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.4.tgz", @@ -3716,6 +3723,14 @@ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", "dev": true }, + "node_modules/bootstrap": { + "version": "5.3.2", + "resolved": "https://registry.npmmirror.com/bootstrap/-/bootstrap-5.3.2.tgz", + "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==", + "peerDependencies": { + "@popperjs/core": "^2.11.8" + } + }, "node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -12620,6 +12635,11 @@ "integrity": "sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==", "dev": true }, + "@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmmirror.com/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==" + }, "@sideway/address": { "version": "4.1.4", "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.4.tgz", @@ -14029,6 +14049,12 @@ "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", "dev": true }, + "bootstrap": { + "version": "5.3.2", + "resolved": "https://registry.npmmirror.com/bootstrap/-/bootstrap-5.3.2.tgz", + "integrity": "sha512-D32nmNWiQHo94BKHLmOrdjlL05q1c8oxbtBphQFb9Z5to6eGRDCm0QgeaZ4zFBHzfg2++rqa2JkqCcxDy0sH0g==", + "requires": {} + }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmmirror.com/brace-expansion/-/brace-expansion-1.1.11.tgz", diff --git a/package.json b/package.json index ba56db8..3a02042 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,9 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "@popperjs/core": "^2.11.8", "axios": "^1.6.2", + "bootstrap": "^5.3.2", "core-js": "^3.8.3", "echarts": "^5.4.3", "element-ui": "^2.15.14", diff --git a/src/assets/css/home-style.css b/src/assets/css/home-style.css index a758f6e..7585d5e 100644 --- a/src/assets/css/home-style.css +++ b/src/assets/css/home-style.css @@ -875,12 +875,22 @@ body.light-mode .video-bg:before { } } -::-webkit-scrollbar { - width: 6px; - border-radius: 10px; -} - +/*::-webkit-scrollbar {*/ +/* width: 6px;*/ +/* height: 0px;*/ +/* border-radius: 10px;*/ +/*}*/ ::-webkit-scrollbar-thumb { background: var(--scrollbar-bg); border-radius: 10px; } +*::-webkit-scrollbar { + display: none; +} +* { + scrollbar-width: none; +} +* { + -ms-overflow-style: none; +} + diff --git a/src/components/home/HomeHeader.vue b/src/components/home/HomeHeader.vue index f96c6a2..c930da8 100644 --- a/src/components/home/HomeHeader.vue +++ b/src/components/home/HomeHeader.vue @@ -2,10 +2,13 @@
- ALL - HotNews - Discover - Market + + + + ALL + HotNews + Discover + Market
@@ -13,46 +16,198 @@
3 - +
- + - +
- + + + + + 登录 + + + + + + + + + + + + + + + +
+ + 记住我 + + +
+ + + + + + + 注册 + + + + + + + + + + + + + + + + + + + + + + + + + + 获取验证码 + ({{sendTime}}s) + + + + + + +
diff --git a/src/components/login/LoginDialog.vue b/src/components/login/LoginDialog.vue deleted file mode 100644 index c4403cf..0000000 --- a/src/components/login/LoginDialog.vue +++ /dev/null @@ -1,45 +0,0 @@ - - - \ No newline at end of file diff --git a/src/main.js b/src/main.js index 3163822..e12fc48 100644 --- a/src/main.js +++ b/src/main.js @@ -14,6 +14,8 @@ window.$ = $; import * as echarts from 'echarts';//引入echarts Vue.prototype.$echarts = echarts //引入组件 +import 'bootstrap' +import 'bootstrap/dist/css/bootstrap.min.css' Vue.config.productionTip = false Vue.use(ElementUI); diff --git a/src/router/index.js b/src/router/index.js index 7b74506..7298af3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,7 +2,7 @@ import Vue from 'vue' import VueRouter from 'vue-router' import index from '../views/Index.vue' import home from "@/components/home/HomePage.vue"; -import hotNews from "@/components/hotNews/HotNews.vue"; +import news from "@/components/hotNews/HotNews.vue"; import navDetail from "@/components/detail/NavDetail.vue"; import notFound from "@/components/notFound/NotFound.vue"; import settings from "@/views/Settings.vue"; @@ -30,9 +30,9 @@ const routes = [ component: home }, { - path: '/hotNews', - name: 'hotNews', - component: hotNews + path: '/news', + name: 'news', + component: news },{ path: '/navDetail', name: 'navDetail', diff --git a/vue.config.js b/vue.config.js index 6c2de53..a4af45f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,6 +1,7 @@ const { defineConfig } = require('@vue/cli-service') module.exports = defineConfig({ transpileDependencies: true, + lintOnSave:false,//关闭语法检查 devServer: { client: { overlay: false // 编译错误时，取消全屏覆盖