diff --git a/package-lock.json b/package-lock.json index 76e9c4a..a283737 100755 --- a/package-lock.json +++ b/package-lock.json @@ -3897,6 +3897,15 @@ } } }, + "dom7": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/dom7/-/dom7-2.1.2.tgz", + "integrity": "sha512-cGwWtpu7KY3JnbREGqG4EGC/u+1hyLfWVMqrqRjmwiO8d5i4B+0imLZAQ/cJbiXnjbs0pdIUzcUyeI9BbnyKNg==", + "dev": true, + "requires": { + "ssr-window": "^1.0.1" + } + }, "domain-browser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", @@ -5169,14 +5178,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5191,20 +5198,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -5321,8 +5325,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -5334,7 +5337,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5349,7 +5351,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5357,14 +5358,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -5383,7 +5382,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5464,8 +5462,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5477,7 +5474,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -5599,7 +5595,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -11292,6 +11287,12 @@ "tweetnacl": "~0.14.0" } }, + "ssr-window": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-1.0.1.tgz", + "integrity": "sha512-dgFqB+f00LJTEgb6UXhx0h+SrG50LJvti2yMKMqAgzfUmUXZrLSv2fjULF7AWGwK25EXu8+smLR3jYsJQChPsg==", + "dev": true + }, "ssri": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", @@ -11537,6 +11538,16 @@ "util.promisify": "~1.0.0" } }, + "swiper": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-4.4.1.tgz", + "integrity": "sha512-SONgpB1mFh++eFiUDOCggwW2ZzsWMEf3+SEROcQ+qXPYUnyD423l3uDsk+0jdo/a4pXeOJmH0oN3XK5maMqQyQ==", + "dev": true, + "requires": { + "dom7": "^2.1.2", + "ssr-window": "^1.0.1" + } + }, "table": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", @@ -12228,6 +12239,16 @@ "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.17.tgz", "integrity": "sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ==" }, + "vue-awesome-swiper": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/vue-awesome-swiper/-/vue-awesome-swiper-3.1.3.tgz", + "integrity": "sha512-E7suzkyApO8vNZbgdEnjSmnpsmQZyRvSVXJ7sey3XYwKPOkLhH3+GnHroBw+5PZIQXvWBwdCeQsPG1xQ1r1Rhg==", + "dev": true, + "requires": { + "object-assign": "^4.1.1", + "swiper": "^4.0.7" + } + }, "vue-eslint-parser": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz", diff --git a/package.json b/package.json index 3016015..53bba66 100755 --- a/package.json +++ b/package.json @@ -5,7 +5,8 @@ "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build", - "lint": "vue-cli-service lint" + "lint": "vue-cli-service lint", + "push": "git add ./ & git commit -m 'dubug' & git push origin master" }, "dependencies": { "vue": "^2.5.17", @@ -17,7 +18,8 @@ "@vue/cli-service": "^3.0.3", "vue-template-compiler": "^2.5.17", "node-sass": "^4.9.3", - "sass-loader": "^7.1.0" + "sass-loader": "^7.1.0", + "vue-awesome-swiper": "^3.1.3" }, "eslintConfig": { "root": true, diff --git a/public/index.html b/public/index.html index 8f0a4fc..4d8150b 100755 --- a/public/index.html +++ b/public/index.html @@ -12,7 +12,10 @@ 抖音 diff --git a/src/assets/img/poster/src1-bg.png b/src/assets/img/poster/src1-bg.png new file mode 100644 index 0000000..a72f2d7 Binary files /dev/null and b/src/assets/img/poster/src1-bg.png differ diff --git a/src/components/attention/Attention.vue b/src/components/attention/Attention.vue index 4d4488e..7d89517 100755 --- a/src/components/attention/Attention.vue +++ b/src/components/attention/Attention.vue @@ -3,7 +3,7 @@
- + TTentau
@@ -17,53 +17,53 @@
- + 吴三二 - 光年之外 - - + +
- + 东方明珠
- - + + 555
- + 555
- + 555
- + 555
- +
@ttentau
其实我也不知道评论点什么啊啊啊看吧看吧看吧
- - + + 3453
11小时前
-
@@ -80,8 +80,21 @@ return { items:[ {},{},{} - ] + ], + height:0, + width:0, + footerHeight:0 } + }, + created() { + self = this; + this.height = document.body.clientHeight; + this.width = document.body.clientWidth; + }, + mounted() { + let footer = this.$refs.footer.$el; + this.footerUserHeight = footer.offsetHeight; + } } diff --git a/src/components/common/Footer.vue b/src/components/common/Footer.vue index c19c52c..2011d80 100755 --- a/src/components/common/Footer.vue +++ b/src/components/common/Footer.vue @@ -2,7 +2,7 @@
首页
关注
-
+
消息
我
@@ -34,7 +34,7 @@ this.$router.push('/message'); break; case 5: - this.$router.push('/me'); + this.$router.push('/user'); break; } } @@ -48,7 +48,7 @@ border-top: 1px solid #7b7878; position: fixed; z-index: 2; - bottom: 0; + top: 600px; width: 100%; background: #020202b3; color: white; diff --git a/src/components/home/Comment.vue b/src/components/home/Comment.vue index 3bdb7ac..259ebb7 100755 --- a/src/components/home/Comment.vue +++ b/src/components/home/Comment.vue @@ -1,14 +1,14 @@ @@ -101,14 +101,21 @@ }, data() { return { - height: 0, - width: 0, - videos: [{},{},{},{}] + videos: [{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{}], + height:0, + width:0, + footerHeight:0 } }, created() { - this.height = window.screen.height; - this.width = window.screen.width; + self = this; + this.height = document.body.clientHeight; + this.width = document.body.clientWidth; + }, + mounted() { + let footer = this.$refs.footer.$el; + this.footerUserHeight = footer.offsetHeight; + } } diff --git a/src/components/user/Other.vue b/src/components/user/Other.vue index 7f4acc4..a4dea1c 100644 --- a/src/components/user/Other.vue +++ b/src/components/user/Other.vue @@ -1,13 +1,264 @@ - diff --git a/src/main.js b/src/main.js index dc8ae50..f0dcd49 100755 --- a/src/main.js +++ b/src/main.js @@ -4,11 +4,13 @@ import VueRouter from 'vue-router' import Home from './components/home/Home.vue' import Attention from './components/attention/Attention.vue' import Message from './components/message/Message.vue' -import Me from './components/me/Me.vue' - -Vue.config.productionTip = false +import Me from './components/user/Me.vue' +// import VueAwesomeSwiper from 'vue-awesome-swiper' +// import 'swiper/dist/css/swiper.css' +Vue.config.productionTip = false; +// Vue.use(VueAwesomeSwiper, /* { default global options } */) Vue.use(VueRouter); const router = new VueRouter({ @@ -18,7 +20,7 @@ const router = new VueRouter({ {path: '/home', component: Home}, {path: '/attention', component: Attention}, {path: '/message', component: Message}, - {path: '/me', component: Me}, + {path: '/user', component: Me}, ] }); new Vue({