

diff --git a/src/assets/scss/custom.less b/src/assets/scss/custom.less
index 9084f10..8f08b01 100644
--- a/src/assets/scss/custom.less
+++ b/src/assets/scss/custom.less
@@ -1,4 +1,5 @@
@import "color";
+@import "variables";
.op0 {
opacity: 0;
@@ -18,7 +19,7 @@
}
.row {
- padding: 0 1.5rem;
+ padding: 0 @padding-page;
display: flex;
justify-content: space-between;
align-items: center;
diff --git a/src/assets/scss/variables.less b/src/assets/scss/variables.less
index 35ca1d5..5f403a5 100644
--- a/src/assets/scss/variables.less
+++ b/src/assets/scss/variables.less
@@ -1,2 +1,4 @@
@footer-height: 6rem;
-@header-height: 6rem;
\ No newline at end of file
+@header-height: 6rem;
+
+@padding-page: 1.5rem;
\ No newline at end of file
diff --git a/src/components/Search.vue b/src/components/Search.vue
index 0419c92..ace2c8c 100644
--- a/src/components/Search.vue
+++ b/src/components/Search.vue
@@ -92,7 +92,7 @@ export default {
}
.notice {
- margin-left: 2rem;
+ margin-left: 1.5rem;
font-size: 1.6rem;
}
@@ -107,9 +107,9 @@ export default {
align-items: center;
.search-icon {
- height: 2rem;
- width: 2rem;
- margin-left: 1rem;
+ height: 2.2rem;
+ width: 2.2rem;
+ margin-left: .7rem;
}
input {
@@ -119,7 +119,7 @@ export default {
width: 100%;
outline: none;
border: none;
- padding: 0 0 0 1rem;
+ padding: 0 0 0 .7rem;
background: transparent;
&::-webkit-input-placeholder {
diff --git a/src/components/dialog/FromBottomDialog.vue b/src/components/dialog/FromBottomDialog.vue
index 405a8b7..c493a6e 100644
--- a/src/components/dialog/FromBottomDialog.vue
+++ b/src/components/dialog/FromBottomDialog.vue
@@ -25,7 +25,6 @@
{{ localAuthor.nickname }}
@@ -382,7 +381,7 @@ export default { bus.on('baseSlide-end', () => this.canScroll = true) }, methods: { - cancelFollow(){ + cancelFollow() { this.localAuthor.is_follow = false }, changeIndicatorIndex(index) { diff --git a/src/router/index.js b/src/router/index.js index e3ced4f..895fb8e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -50,6 +50,7 @@ import Report from "../pages/home/Report"; import SubmitReport from "../pages/home/SubmitReport"; import RequestUpdate from "../pages/me/RequestUpdate"; import Test4 from "../pages/Test4"; +import Search from "../pages/home/Search"; const routes = [ // {path: '', component: Music}, @@ -64,6 +65,7 @@ const routes = [ {path: '/home/music', component: Music}, {path: '/home/music-rank-list', component: MusicRankList}, {path: '/home/report', component: Report}, + {path: '/home/search', component: Search}, {path: '/attention', component: Attention}, diff --git a/src/utils/global-methods.js b/src/utils/global-methods.js index 011b3b1..c8aaa13 100644 --- a/src/utils/global-methods.js +++ b/src/utils/global-methods.js @@ -45,7 +45,11 @@ export default { document.body.append(parent) app.mount(parent) }, - $showSimpleConfirmDialog(title, okCb, cancelCb) { + $showSimpleConfirmDialog(title, okCb, cancelCb, okText, cancelText,) { + if (!cancelCb) { + cancelCb = () => { + } + } let remove = () => { let parent = document.querySelector('.dialog-ctn') parent.classList.replace('fade-in', 'fade-out') @@ -63,7 +67,13 @@ export default { } const app = Vue.createApp({ render() { - return