From 03c52acd80bdb63c797a1179e83b33ef0025584c Mon Sep 17 00:00:00 2001 From: zyronon Date: Sun, 25 Jul 2021 17:39:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8A=E5=A4=A9=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 3 + src/assets/scss/color.scss | 6 +- src/components/{ => dialog}/ConfirmDialog.vue | 0 .../{ => dialog}/FromBottomDialog.vue | 24 +++- src/components/{ => dialog}/SelectDialog.vue | 0 src/main.js | 2 + src/pages/me/Me.vue | 19 +-- src/pages/me/MyCard.vue | 53 ++++---- src/pages/me/VideoDetail.vue | 4 +- src/pages/me/rightMenu/LookHistory.vue | 72 +++++++++++ src/pages/me/userinfo/AddSchool.vue | 2 +- src/pages/me/userinfo/EditUserInfo.vue | 2 + src/pages/me/userinfo/EditUserInfoItem.vue | 7 +- src/pages/message/ChatDetail.vue | 66 ++++++++-- src/pages/message/Message.vue | 4 +- src/pages/message/SetRemark.vue | 121 ++++++++++++++++++ src/pages/people/FindAcquaintance.vue | 50 +++++--- src/router/index.js | 4 + src/utils/global-methods.js | 4 +- 19 files changed, 360 insertions(+), 83 deletions(-) rename src/components/{ => dialog}/ConfirmDialog.vue (100%) rename src/components/{ => dialog}/FromBottomDialog.vue (92%) rename src/components/{ => dialog}/SelectDialog.vue (100%) create mode 100644 src/pages/me/rightMenu/LookHistory.vue create mode 100644 src/pages/message/SetRemark.vue diff --git a/src/App.vue b/src/App.vue index 8a5d3de..b2c7110 100644 --- a/src/App.vue +++ b/src/App.vue @@ -56,10 +56,13 @@ export default { '/service-protocol', '/address-list', '/video-detail', + '/my-card', '/scan', '/face-to-face', '/chat', '/chat-detail', + '/set-remark', + '/me/right-menu/look-history', '', ]; const toDepth = routeDeep.indexOf(to.path) diff --git a/src/assets/scss/color.scss b/src/assets/scss/color.scss index ee52f34..d61e186 100644 --- a/src/assets/scss/color.scss +++ b/src/assets/scss/color.scss @@ -7,4 +7,8 @@ $line-color: rgb(37, 45, 66); $primary-btn-color: rgb(252, 47, 86); -$disable-primary-btn-color: rgba(252, 47, 86, .5); \ No newline at end of file +$disable-primary-btn-color: rgba(252, 47, 86, .5); + +.second-text-color { + color: $second-text-color; +} \ No newline at end of file diff --git a/src/components/ConfirmDialog.vue b/src/components/dialog/ConfirmDialog.vue similarity index 100% rename from src/components/ConfirmDialog.vue rename to src/components/dialog/ConfirmDialog.vue diff --git a/src/components/FromBottomDialog.vue b/src/components/dialog/FromBottomDialog.vue similarity index 92% rename from src/components/FromBottomDialog.vue rename to src/components/dialog/FromBottomDialog.vue index 50c32c3..03d4107 100644 --- a/src/components/FromBottomDialog.vue +++ b/src/components/dialog/FromBottomDialog.vue @@ -9,15 +9,16 @@ @after-leave="afterLeave" :css="false" > -
-
+
@@ -39,14 +40,18 @@ export default { // default: 'light' // default: 'white' }, + maskMode:{ + type: String, + default: 'dark' + }, height: { type: String, default: '70vh' }, - useMask: { + showHengGang: { type: Boolean, default: true - } + }, }, watch: { modelValue(newVal) { @@ -61,7 +66,7 @@ export default { document.body.style.position = 'static' document.documentElement.scrollTop = this.scroll } - this.$store.commit('setMaskDialog', {state: newVal, mode: this.mode}) + this.$store.commit('setMaskDialog', {state: newVal, mode: this.maskMode}) }, maskDialog(newVal) { if (!newVal) { @@ -95,6 +100,7 @@ export default { }, 0) setTimeout(() => { this.$setCss(el, 'transition-duration', `0ms`) + this.$setCss(el, 'transform', `none`) done() }, 200) }, @@ -151,7 +157,7 @@ export default { diff --git a/src/pages/me/userinfo/AddSchool.vue b/src/pages/me/userinfo/AddSchool.vue index 8e3c5d1..45e00ca 100644 --- a/src/pages/me/userinfo/AddSchool.vue +++ b/src/pages/me/userinfo/AddSchool.vue @@ -56,7 +56,7 @@ import {mapState} from 'vuex' import enums from '../../../utils/enums' import {inject} from "vue"; import MobileSelect from "mobile-select"; -import ConfirmDialog from "../../../components/ConfirmDialog"; +import ConfirmDialog from "../../../components/dialog/ConfirmDialog"; import Loading from "../../../components/Loading"; //TODO 年份选择器没做 diff --git a/src/pages/me/userinfo/EditUserInfo.vue b/src/pages/me/userinfo/EditUserInfo.vue index 59a50d5..2c136ca 100644 --- a/src/pages/me/userinfo/EditUserInfo.vue +++ b/src/pages/me/userinfo/EditUserInfo.vue @@ -155,6 +155,8 @@ export default { right: 0; bottom: 0; top: 0; + overflow: auto; + font-size: 1.4rem; } .title { diff --git a/src/pages/me/userinfo/EditUserInfoItem.vue b/src/pages/me/userinfo/EditUserInfoItem.vue index f75811b..3a39501 100644 --- a/src/pages/me/userinfo/EditUserInfoItem.vue +++ b/src/pages/me/userinfo/EditUserInfoItem.vue @@ -18,7 +18,8 @@
我的名字
- +
{{ localUserinfo.name.length }}/20
@@ -26,7 +27,9 @@
我的抖音号
- +
最多16个字，只允许包含字母、数字、下划线和点，30天内仅能修改一次
diff --git a/src/pages/message/ChatDetail.vue b/src/pages/message/ChatDetail.vue index 8ae26d7..10e6347 100644 --- a/src/pages/message/ChatDetail.vue +++ b/src/pages/message/ChatDetail.vue @@ -22,19 +22,20 @@ -
+
设备备注
+
举报
-
+
拉黑
@@ -42,30 +43,48 @@
+ +
+
+ 拉黑后，对方将无法搜索到你，也不能再给你发私信 +
+
确认拉黑
+
不让 TA 看
+
+
取消
+
+
+ + \ No newline at end of file diff --git a/src/pages/people/FindAcquaintance.vue b/src/pages/people/FindAcquaintance.vue index 466c2ee..6243aa1 100644 --- a/src/pages/people/FindAcquaintance.vue +++ b/src/pages/people/FindAcquaintance.vue @@ -53,10 +53,6 @@ - - - -
@@ -77,7 +73,7 @@ -
+
站外好友口令
@@ -94,6 +90,28 @@
+ +
+
+ 站外好友口令 +
+
+ 扫一扫加好友 +
+
+ 面对面加好友 +
+
+
+ 取消 +
+
+ +