diff --git a/src/App.vue b/src/App.vue index 92c6ac6..1d55ca7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,9 +4,9 @@ - - - + + + @@ -46,6 +46,8 @@ export default { const routeDeep = [ '/message', '/attention', '/home', '/me', '/publish', + '/home/report', + '/home/submit-report', '/message/share-to-friend', '/message/joined-group-chat', '/country-choose', diff --git a/src/assets/img/icon/components/video/hqx.webp b/src/assets/img/icon/components/video/hqx.webp deleted file mode 100644 index 8626a2f..0000000 Binary files a/src/assets/img/icon/components/video/hqx.webp and /dev/null differ diff --git a/src/assets/scss/custom.less b/src/assets/scss/custom.less index c36b400..03b9a11 100644 --- a/src/assets/scss/custom.less +++ b/src/assets/scss/custom.less @@ -6,6 +6,7 @@ .global-notice { position: fixed; + z-index: 999; color: white; background: black; left: 50%; @@ -21,7 +22,7 @@ display: flex; justify-content: space-between; align-items: center; - height: 5rem; + min-height: 5rem; font-size: 1.4rem; &.no-active { diff --git a/src/components/AutoInput.vue b/src/components/AutoInput.vue index a0e8d47..f6b2adb 100644 --- a/src/components/AutoInput.vue +++ b/src/components/AutoInput.vue @@ -36,6 +36,7 @@ export default { diff --git a/src/components/Mask.vue b/src/components/Mask.vue index 1c88afc..a050473 100644 --- a/src/components/Mask.vue +++ b/src/components/Mask.vue @@ -34,6 +34,10 @@ export default { background: transparent; } + &.lightgray { + background: rgba(0, 0, 0, 0.15); + } + &.white { background: transparent; } diff --git a/src/components/Share.vue b/src/components/Share.vue index b6fd5a2..e9cf865 100644 --- a/src/components/Share.vue +++ b/src/components/Share.vue @@ -1,70 +1,77 @@ + + diff --git a/src/pages/home/SubmitReport.vue b/src/pages/home/SubmitReport.vue new file mode 100644 index 0000000..a15a8bd --- /dev/null +++ b/src/pages/home/SubmitReport.vue @@ -0,0 +1,192 @@ + + + + diff --git a/src/pages/home/components/Duoshan.vue b/src/pages/home/components/Duoshan.vue new file mode 100644 index 0000000..a0ab050 --- /dev/null +++ b/src/pages/home/components/Duoshan.vue @@ -0,0 +1,97 @@ + + + + diff --git a/src/pages/home/components/PlayFeedback.vue b/src/pages/home/components/PlayFeedback.vue new file mode 100644 index 0000000..dbbed9a --- /dev/null +++ b/src/pages/home/components/PlayFeedback.vue @@ -0,0 +1,210 @@ + + + + diff --git a/src/pages/home/components/ShareTo.vue b/src/pages/home/components/ShareTo.vue new file mode 100644 index 0000000..29dc6af --- /dev/null +++ b/src/pages/home/components/ShareTo.vue @@ -0,0 +1,311 @@ + + + + diff --git a/src/pages/me/userinfo/ChooseLocation.vue b/src/pages/me/userinfo/ChooseLocation.vue index 97b19b7..445518b 100644 --- a/src/pages/me/userinfo/ChooseLocation.vue +++ b/src/pages/me/userinfo/ChooseLocation.vue @@ -23,7 +23,7 @@
中国
- +
@@ -1234,34 +1234,6 @@ export default { margin-right: .2rem; } } - - .row { - padding: 0 1.5rem; - display: flex; - justify-content: space-between; - align-items: center; - height: 5rem; - font-size: 1.4rem; - transition: all .1s; - background: @main-bg; - - .right { - display: flex; - justify-content: space-between; - align-items: center; - color: @second-text-color; - - img { - margin-left: 1rem; - width: 15px; - } - } - - &:active { - background: @active-main-bg; - color: @second-text-color; - } - } } } diff --git a/src/pages/me/userinfo/ChooseProvince.vue b/src/pages/me/userinfo/ChooseProvince.vue index 7dc5051..10f3952 100644 --- a/src/pages/me/userinfo/ChooseProvince.vue +++ b/src/pages/me/userinfo/ChooseProvince.vue @@ -10,7 +10,7 @@
{{ item }}
- +
@@ -63,34 +63,6 @@ export default { } } - - .row { - padding: 0 1.5rem; - display: flex; - justify-content: space-between; - align-items: center; - height: 5rem; - font-size: 1.4rem; - transition: all .1s; - background: @main-bg; - - .right { - display: flex; - justify-content: space-between; - align-items: center; - color: @second-text-color; - - img { - margin-left: 1rem; - width: 15px; - } - } - - &:active { - background: @active-main-bg; - color: @second-text-color; - } - } } } diff --git a/src/pages/me/userinfo/EditUserInfo.vue b/src/pages/me/userinfo/EditUserInfo.vue index d71a5bc..7e6e6e8 100644 --- a/src/pages/me/userinfo/EditUserInfo.vue +++ b/src/pages/me/userinfo/EditUserInfo.vue @@ -20,28 +20,28 @@
名字
{{ isEmpty(userinfo.name) }} - +
抖音号
{{ isEmpty(userinfo.account) }} - +
简介
{{ isEmpty(userinfo.desc) }} - +
性别
{{ isEmpty(userinfo.sex) }} - +
@@ -49,21 +49,21 @@
{{ isEmpty(userinfo.birthday) }}
- +
所在地
{{ isEmpty(userinfo.location) }} - +
学校
{{ isEmpty(userinfo.school.name) }} - +
diff --git a/src/pages/message/Message.vue b/src/pages/message/Message.vue index e890ffa..a038539 100644 --- a/src/pages/message/Message.vue +++ b/src/pages/message/Message.vue @@ -239,6 +239,9 @@ export default {