diff --git a/src/App.vue b/src/App.vue index 4ef23f8..3d38c6e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -58,6 +58,7 @@ export default { '/video-detail', '/scan', '/face-to-face', + '/chat', '', ]; const toDepth = routeDeep.indexOf(to.path) diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index 37e7d17..3063082 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -1 +1,2 @@ -$footer-height: 60px; \ No newline at end of file +$footer-height: 6rem; +$header-height: 6rem; \ No newline at end of file diff --git a/src/components/FromBottomDialog.vue b/src/components/FromBottomDialog.vue index cd054b7..50c32c3 100644 --- a/src/components/FromBottomDialog.vue +++ b/src/components/FromBottomDialog.vue @@ -98,6 +98,8 @@ export default { done() }, 200) }, + afterEnter() { + }, beforeLeave(el) { this.$setCss(el, 'transition-duration', `200ms`) this.$setCss(el, 'transform', `translate3d(0,0,0)`) @@ -106,6 +108,10 @@ export default { this.$setCss(el, 'transform', `translate3d(0,${this.height},0)`) setTimeout(done, 200) }, + afterLeave() { + }, + + hide(val = false) { this.$emit('update:modelValue', val) }, diff --git a/src/pages/message/Chat.vue b/src/pages/message/Chat.vue new file mode 100644 index 0000000..28a617a --- /dev/null +++ b/src/pages/message/Chat.vue @@ -0,0 +1,317 @@ + + + + diff --git a/src/pages/home/Message.vue b/src/pages/message/Message.vue similarity index 99% rename from src/pages/home/Message.vue rename to src/pages/message/Message.vue index 9dbb51c..4763773 100644 --- a/src/pages/home/Message.vue +++ b/src/pages/message/Message.vue @@ -10,7 +10,7 @@
@@ -719,7 +719,7 @@ export default { } .badge { - font-size: 1rem; + font-size: 1.2rem; display: block; color: black; padding: 1px 6px; diff --git a/src/router/index.js b/src/router/index.js index 4f52344..6165d15 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,7 +2,7 @@ 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 Message from "../pages/message/Message"; import Me from "../pages/me/Me"; import Music from "../components/common/Music"; import countryChoose from "../pages/login/countryChoose"; @@ -27,6 +27,7 @@ import ServiceProtocol from "../pages/other/ServiceProtocol"; import AddressList from "../pages/people/AddressList"; import Scan from "../pages/people/Scan"; import FaceToFace from "../pages/people/FaceToFace"; +import Chat from "../pages/message/Chat"; const routes = [ // {path: '', component: Music}, @@ -58,6 +59,7 @@ const routes = [ {path: '/address-list', component: AddressList}, {path: '/scan', component: Scan}, {path: '/face-to-face', component: FaceToFace}, + {path: '/chat', component: Chat}, ] export default VueRouter.createRouter({ diff --git a/src/utils/enums.js b/src/utils/enums.js index c92d650..66a39f7 100644 --- a/src/utils/enums.js +++ b/src/utils/enums.js @@ -4,4 +4,5 @@ export default { SCHOOL: 1, ME: 2, } -} \ No newline at end of file +} +