diff --git a/src/App.vue b/src/App.vue index f4ef6a4..3927a5e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -65,6 +65,9 @@ export default { '/chat-detail', '/set-remark', '/me/right-menu/look-history', + '/me/right-menu/minor-protection/index', + '/me/right-menu/minor-protection/detail-setting', + '/me/right-menu/minor-protection/trigger-time', '', ]; const toDepth = routeDeep.indexOf(to.path) diff --git a/src/assets/scss/custom.scss b/src/assets/scss/custom.scss index bfb111f..bd4edb2 100644 --- a/src/assets/scss/custom.scss +++ b/src/assets/scss/custom.scss @@ -1,14 +1,86 @@ -.op0{ - opacity: 0; +@import "color"; + +.op0 { + opacity: 0; } + .global-notice { - position: fixed; + position: fixed; + color: white; + background: black; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + padding: .7rem 1rem; + border-radius: 1px; + font-size: 1.4rem; +} + +.row { + padding: 0 1.5rem; + display: flex; + justify-content: space-between; + align-items: center; + height: 5rem; + font-size: 1.4rem; + + &.no-active { + &:active { + background: $main-bg; + } + } + + &:active { + background: $active-main-bg; + } + + .left { + display: flex; + justify-content: space-between; + align-items: center; color: white; - background: black; - left: 50%; - top: 50%; - transform: translate(-50%, -50%); - padding: .7rem 1rem; - border-radius: 1px; - font-size: 1.4rem; + + img { + margin-right: 1rem; + width: 1.5rem; + } + } + + .right { + display: flex; + justify-content: space-between; + align-items: center; + color: $second-text-color; + + img { + margin-left: 1rem; + width: 1.5rem; + } + } +} + +.button { + color: white; + height: 4rem; + line-height: 4rem; + text-align: center; + border-radius: .3rem; + //width: 100%; + font-size: 1.4rem; + + &.primary { + background: $primary-btn-color; + + &:active { + background: $disable-primary-btn-color; + } + } + + &.dark { + background: $second-btn-color; + + &:active { + background: $second-btn-color-tran; + } + } } \ No newline at end of file diff --git a/src/components/dialog/ConfirmDialog.vue b/src/components/dialog/ConfirmDialog.vue index 42dd472..824ea3e 100644 --- a/src/components/dialog/ConfirmDialog.vue +++ b/src/components/dialog/ConfirmDialog.vue @@ -75,7 +75,7 @@ export default { .subtitle { margin-top: 1rem; color: $second-text-color; - font-size: 1.2rem; + font-size: 1.3rem; } } diff --git a/src/main.js b/src/main.js index 4252b8f..ae3ebe6 100644 --- a/src/main.js +++ b/src/main.js @@ -38,6 +38,16 @@ app.component('Video1', Video) app.component('Footer', Footer) app.component('Mask', Mask) app.component('NoMore', NoMore) +app.component('back', { + data(){ + return{ + src:require('./assets/img/icon/back.png') + } + }, + render() { + return + }, +}) app.mixin(mixin) app.use(router) app.use(store) diff --git a/src/pages/me/Me.vue b/src/pages/me/Me.vue index 3939a20..47c09c5 100644 --- a/src/pages/me/Me.vue +++ b/src/pages/me/Me.vue @@ -113,7 +113,7 @@ 我的二维码 -
+
创作者服务中心
@@ -128,7 +128,7 @@ 抖音公益
-
+
未成年保护工具
diff --git a/src/pages/me/rightMenu/LookHistory.vue b/src/pages/me/rightMenu/LookHistory.vue index cbf9b94..cbb192b 100644 --- a/src/pages/me/rightMenu/LookHistory.vue +++ b/src/pages/me/rightMenu/LookHistory.vue @@ -4,7 +4,7 @@ -