diff --git a/src/assets/scss/color.scss b/src/assets/scss/color.scss index d93b99e..1077e61 100644 --- a/src/assets/scss/color.scss +++ b/src/assets/scss/color.scss @@ -1,61 +1,4 @@ $main-bg: rgb(22, 26, 37); -.c-red { - color: red; -} - -.c-white { - color: white; -} - -.c-gray { - color: gray; -} - -.c-text-notice { - color: #008000 !important; -} - -.c-black { - color: black; -} - -.c-text-gray { - color: #80808094; -} - -.bg-red { - background: red; -} - -.bg-gold { - background: gold; -} - -.bg-green { - background: green; -} - -.bg-white { - background: white; -} - -.bg-gray { - background: gray; -} - -.bg-second-gray { - background: #c1c1c1; - -} - -.red { - background: red; -} - -.gold { - background: gold; -} - -.green { - background: green; -} +$second-text-color: rgb(143, 143, 158); +$second-btn-color: rgb(58,58,70); +$line-color: rgb(37, 45, 66); diff --git a/src/components/BaseSlideItem.vue b/src/components/BaseSlideItem.vue deleted file mode 100644 index d9be9dd..0000000 --- a/src/components/BaseSlideItem.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/components/BaseSlideList.vue b/src/components/BaseSlideList.vue deleted file mode 100644 index d25e26c..0000000 --- a/src/components/BaseSlideList.vue +++ /dev/null @@ -1,201 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/components/Posters.vue b/src/components/Posters.vue index 06439a7..a5a7c72 100644 --- a/src/components/Posters.vue +++ b/src/components/Posters.vue @@ -1,6 +1,6 @@ - + diff --git a/src/components/Video.vue b/src/components/Video.vue index eceeb18..4440c9e 100644 --- a/src/components/Video.vue +++ b/src/components/Video.vue @@ -33,7 +33,8 @@ {{ video.loves }} - + + {{ video.comments }} @@ -49,7 +50,7 @@ - + @TTentau 吴三二的光年之外, 您的浏览器不支持 video 标签。 您的浏览器不支持 video 标签。 @@ -60,6 +61,27 @@ 吴三二 - 光年之外 + + + + + + + zzzzz + 2020-01-20 + + 北京 + + + + + + + + + + + { return true } + }, + isMy: { + type: Boolean, + default: () => { + return true + } } }, computed: { @@ -156,6 +184,7 @@ export default { isMove: false, mitt: inject('mitt'), currentVideoId: 'a' + Date.now(), + test: [1] } }, mounted() { @@ -169,6 +198,7 @@ export default { // this.currentTime = v.isMove ? v.e : this.currentTime v.isMove ? this.move(v.e) : this.end(v.e) }) + }, methods: { attention() { @@ -220,6 +250,7 @@ export default { }, //展示评论 showComment() { + return this.test.push(Date.now()) this.isCommenting = !this.isCommenting }, showShare() { @@ -258,15 +289,18 @@ export default { - diff --git a/src/components/home/SlideItem.vue b/src/components/home/SlideItem.vue deleted file mode 100644 index 122a158..0000000 --- a/src/components/home/SlideItem.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/components/home/SlideList.vue b/src/components/home/SlideList.vue deleted file mode 100644 index c12d372..0000000 --- a/src/components/home/SlideList.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/components/home/index.vue b/src/components/home/index.vue deleted file mode 100644 index ae74771..0000000 --- a/src/components/home/index.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - diff --git a/src/pages/home/SlideItem.vue b/src/components/slide/SlideItem.vue similarity index 100% rename from src/pages/home/SlideItem.vue rename to src/components/slide/SlideItem.vue diff --git a/src/pages/home/SlideList.vue b/src/components/slide/SlideList.vue similarity index 99% rename from src/pages/home/SlideList.vue rename to src/components/slide/SlideList.vue index 556726e..c30c665 100644 --- a/src/pages/home/SlideList.vue +++ b/src/components/slide/SlideList.vue @@ -53,6 +53,10 @@ export default { name: "BaseSlideList", props: { + canMove: { + type: Boolean, + default: () => true + }, direction: { type: String, default: () => 'row' @@ -217,6 +221,7 @@ export default { this.startTime = Date.now() }, touchMove(e) { + if (!this.canMove) return; this.moveXDistance = e.touches[0].pageX - this.startLocationX this.moveYDistance = e.touches[0].pageY - this.startLocationY @@ -400,6 +405,8 @@ export default { diff --git a/src/pages/me/VideoDetail.vue b/src/pages/me/VideoDetail.vue new file mode 100644 index 0000000..01d895c --- /dev/null +++ b/src/pages/me/VideoDetail.vue @@ -0,0 +1,162 @@ + + + + + + + + + + + + + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + 详情页 + + + + + + + + \ No newline at end of file diff --git a/src/pages/home/我的动态.vue b/src/pages/me/我的动态.vue similarity index 100% rename from src/pages/home/我的动态.vue rename to src/pages/me/我的动态.vue diff --git a/src/router/index.js b/src/router/index.js index 730855a..3bc7922 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3,12 +3,13 @@ import * as VueRouter from "vue-router"; import Index from "../pages/home/Index"; import Attention from "../pages/home/Attention"; import Message from "../pages/home/Message"; -import Me from "../pages/home/Me"; -import Me2 from "../pages/home/Me2"; +import Me from "../pages/me/Me"; +import Me2 from "../pages/me/Me2"; import Music from "../components/common/Music"; import countryChoose from "../pages/login/countryChoose"; import MyCard from "../pages/me/MyCard"; import MyCollect from "../pages/me/MyCollect"; +import VideoDetail from "../pages/me/VideoDetail"; const routes = [ // {path: '', component: Music}, @@ -22,6 +23,7 @@ const routes = [ {path: '/countryChoose', component: countryChoose}, {path: '/MyCard', component: MyCard}, {path: '/MyCollect', component: MyCollect}, + {path: '/VideoDetail', component: VideoDetail}, ] export default VueRouter.createRouter({
+ zzzzz + 2020-01-20 +
北京
详情页
+ zzzzz + 2020-01-20 +
+北京
+