diff --git a/package.json b/package.json index 7b60b2a..5230ba9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "my-vue-app", "version": "0.0.0", "scripts": { - "dev": "vite", + "dev": "vite --host", "build": "vite build", "serve": "vite preview" }, diff --git a/src/App.vue b/src/App.vue index 1468a6a..56685d7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -63,6 +63,9 @@ export default { '/message/live-notice', '/message/money-notice', '/message/notice-setting', + '/message/chat', + '/message/chat/detail', + '/message/chat/red-packet-detail', '/me/country-choose', '/me/edit-userinfo', @@ -85,8 +88,6 @@ export default { '/me/my-card', '/scan', '/face-to-face', - '/message/chat', - '/message/chat-detail', '/set-remark', '/me/right-menu/look-history', diff --git a/src/assets/img/icon/message/d-k.webp b/src/assets/img/icon/message/d-k.webp deleted file mode 100644 index 517ed13..0000000 Binary files a/src/assets/img/icon/message/d-k.webp and /dev/null differ diff --git a/src/assets/img/icon/message/g51.webp b/src/assets/img/icon/message/g51.webp deleted file mode 100644 index 66e8c93..0000000 Binary files a/src/assets/img/icon/message/g51.webp and /dev/null differ diff --git a/src/assets/img/icon/message/g52.webp b/src/assets/img/icon/message/g52.webp deleted file mode 100644 index ba3f415..0000000 Binary files a/src/assets/img/icon/message/g52.webp and /dev/null differ diff --git a/src/assets/img/icon/message/g7+.webp b/src/assets/img/icon/message/g7+.webp deleted file mode 100644 index 34e80e1..0000000 Binary files a/src/assets/img/icon/message/g7+.webp and /dev/null differ diff --git a/src/assets/img/icon/message/g7-.webp b/src/assets/img/icon/message/g7-.webp deleted file mode 100644 index 533ba68..0000000 Binary files a/src/assets/img/icon/message/g7-.webp and /dev/null differ diff --git a/src/assets/img/icon/message/g7b.webp b/src/assets/img/icon/message/g7b.webp deleted file mode 100644 index ef89607..0000000 Binary files a/src/assets/img/icon/message/g7b.webp and /dev/null differ diff --git a/src/assets/img/icon/message/g7c.webp b/src/assets/img/icon/message/g7c.webp deleted file mode 100644 index 7a94acb..0000000 Binary files a/src/assets/img/icon/message/g7c.webp and /dev/null differ diff --git a/src/assets/img/icon/message/g7d.webp b/src/assets/img/icon/message/g7d.webp deleted file mode 100644 index f0ab2f3..0000000 Binary files a/src/assets/img/icon/message/g7d.webp and /dev/null differ diff --git a/src/assets/img/icon/message/h4p.webp b/src/assets/img/icon/message/h4p.webp deleted file mode 100644 index bba3909..0000000 Binary files a/src/assets/img/icon/message/h4p.webp and /dev/null differ diff --git a/src/assets/img/icon/message/h4x.webp b/src/assets/img/icon/message/h4x.webp deleted file mode 100644 index 75acc8d..0000000 Binary files a/src/assets/img/icon/message/h4x.webp and /dev/null differ diff --git a/src/assets/img/icon/message/hme.webp b/src/assets/img/icon/message/hme.webp deleted file mode 100644 index 65800b6..0000000 Binary files a/src/assets/img/icon/message/hme.webp and /dev/null differ diff --git a/src/pages/message/Chat.vue b/src/pages/message/Chat.vue index 44e4f6c..32920ac 100644 --- a/src/pages/message/Chat.vue +++ b/src/pages/message/Chat.vue @@ -1,78 +1,172 @@ + + + \ No newline at end of file diff --git a/src/pages/message/RedPacketDetail.vue b/src/pages/message/RedPacketDetail.vue new file mode 100644 index 0000000..762e422 --- /dev/null +++ b/src/pages/message/RedPacketDetail.vue @@ -0,0 +1,104 @@ + + + + diff --git a/src/pages/message/components/ChatMessage.vue b/src/pages/message/components/ChatMessage.vue index 6d4a645..be1cfcd 100644 --- a/src/pages/message/components/ChatMessage.vue +++ b/src/pages/message/components/ChatMessage.vue @@ -6,8 +6,8 @@ {{ message.time }} @@ -206,7 +206,7 @@ export default { } .red_packet { - border-radius: .3rem; + border-radius: 1rem; @not-received: rgb(253, 92, 72); @received: rgba(253, 92, 72, .8); width: 60vw; @@ -226,7 +226,8 @@ export default { border-bottom: 1px solid rgb(253, 124, 81); img { - height: 4rem; + border-radius: .3rem; + height: 3.8rem; margin-right: 1rem; } @@ -241,6 +242,7 @@ export default { } .bottom { + font-size: 1.2rem; padding: .5rem 1rem 1rem 1rem; } } @@ -393,7 +395,6 @@ export default { background: @chat-bg-color; } - .loves { margin-top: 1rem; diff --git a/src/pages/Test.vue b/src/pages/test/Test.vue similarity index 74% rename from src/pages/Test.vue rename to src/pages/test/Test.vue index 4bf7d92..e76654c 100644 --- a/src/pages/Test.vue +++ b/src/pages/test/Test.vue @@ -5,9 +5,9 @@ diff --git a/src/router/index.js b/src/router/index.js index ef995f8..e2e6ce6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -41,18 +41,18 @@ import PasswordLogin from "../pages/login/PasswordLogin"; import VerificationCode from "../pages/login/VerificationCode"; import RetrievePassword from "../pages/login/RetrievePassword"; import Help from "../pages/login/Help"; -import Test from "../pages/Test"; -import Test2 from "../pages/Test2"; -import Test3 from "../pages/Test3"; +import Test from "../pages/test/Test"; +import Test2 from "../pages/test/Test2"; +import Test3 from "../pages/test/Test3"; import Share2Friend from "../pages/message/Share2Friend"; import JoinedGroupChat from "../pages/message/JoinedGroupChat"; import Report from "../pages/home/Report"; import SubmitReport from "../pages/home/SubmitReport"; import RequestUpdate from "../pages/me/RequestUpdate"; -import Test4 from "../pages/Test4"; +import Test4 from "../pages/test/Test4"; import Search from "../pages/home/SearchPage"; import LivePage from "../pages/home/LivePage"; -import Test5 from "../pages/Test5"; +import Test5 from "../pages/test/Test5"; import MusicCollect from "../pages/me/collect/MusicCollect"; import VideoCollect from "../pages/me/collect/VideoCollect"; import MyMusic from "../pages/me/MyMusic"; @@ -68,6 +68,8 @@ import TaskNotice from "../pages/message/notice/TaskNotice"; import LiveNotice from "../pages/message/notice/LiveNotice"; import MoneyNotice from "../pages/message/notice/MoneyNotice"; import MoreSearch from "../pages/message/MoreSearch"; +import Test6 from "../pages/test/Test6"; +import RedPacketDetail from "../pages/message/RedPacketDetail"; const routes = [ // {path: '', component: Music}, @@ -78,6 +80,7 @@ const routes = [ {path: '/test3', component: Test3}, {path: '/test4', component: Test4}, {path: '/test5', component: Test5}, + {path: '/test6', component: Test6}, {path: '/home', component: Index}, {path: '/home/submit-report', component: SubmitReport}, {path: '/home/music', component: Music}, @@ -95,8 +98,6 @@ const routes = [ {path: '/message/more-search', component: MoreSearch}, {path: '/message/share-to-friend', component: Share2Friend}, {path: '/message/joined-group-chat', component: JoinedGroupChat}, - {path: '/message/chat', component: Chat}, - {path: '/message/chat-detail', component: ChatDetail}, {path: '/message/fans', component: Fans}, {path: '/message/all', component: AllMessage}, {path: '/message/visitors', component: Visitors}, @@ -106,6 +107,9 @@ const routes = [ {path: '/message/live-notice', component: LiveNotice}, {path: '/message/money-notice', component: MoneyNotice}, {path: '/message/notice-setting', component: NoticeSetting}, + {path: '/message/chat', component: Chat}, + {path: '/message/chat/detail', component: ChatDetail}, + {path: '/message/chat/red-packet-detail', component: RedPacketDetail}, {path: '/people/find-acquaintance', component: FindAcquaintance}, diff --git a/src/utils/mixin.js b/src/utils/mixin.js index 4fdc3c5..c1b4b51 100644 --- a/src/utils/mixin.js +++ b/src/utils/mixin.js @@ -71,7 +71,7 @@ export default { if (pressTimer === null) { pressTimer = setTimeout(() => { // 执行函数 - handler(); + handler(e); }, 300) } } @@ -85,6 +85,9 @@ export default { } // 运行函数 const handler = (e) => { + // e.stopImmediatePropagation() + e.stopPropagation() + e.preventDefault() // 执行传递给指令的方法 binding.value(e) };