From c870398a502131261eba9c4e25dc4b53a6b617e8 Mon Sep 17 00:00:00 2001 From: zyronon Date: Sat, 18 Sep 2021 17:57:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/custom.less | 3 +- src/assets/scss/variables.less | 4 +- src/components/Search.vue | 10 +- src/components/dialog/FromBottomDialog.vue | 1 - src/components/dialog/SimpleConfirmDialog.vue | 23 +- src/components/slide/SlideRowList.vue | 1 + src/config/index.js | 8 +- src/pages/home/Attention.vue | 4 +- src/pages/home/Index2.vue | 13 +- src/pages/home/Music.vue | 31 +- src/pages/home/Search.vue | 344 ++++++++++++++++++ src/pages/home/components/ShareToFriend.vue | 4 +- src/pages/me/Uploader.vue | 5 +- src/router/index.js | 2 + src/utils/global-methods.js | 18 +- 15 files changed, 437 insertions(+), 34 deletions(-) create mode 100644 src/pages/home/Search.vue 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 @@ - diff --git a/src/components/slide/SlideRowList.vue b/src/components/slide/SlideRowList.vue index f6f8d2a..b22a22e 100644 --- a/src/components/slide/SlideRowList.vue +++ b/src/components/slide/SlideRowList.vue @@ -18,6 +18,7 @@ diff --git a/src/config/index.js b/src/config/index.js index 930589f..2ed0b0f 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -1,8 +1,8 @@ export default { - baseUrl: 'http://192.168.0.103/index.php/v1', - filePreview:'http://192.168.0.103/static/uploads/', - // baseUrl: 'http://192.168.10.164/index.php/v1', - // filePreview:'http://192.168.10.164/static/uploads/' + // baseUrl: 'http://192.168.0.103/index.php/v1', + // filePreview:'http://192.168.0.103/static/uploads/', + baseUrl: 'http://192.168.10.164/index.php/v1', + filePreview:'http://192.168.10.164/static/uploads/' // baseUrl: 'http://localhost/index.php/v1', // filePreview:'http://localhost/static/uploads/' } \ No newline at end of file diff --git a/src/pages/home/Attention.vue b/src/pages/home/Attention.vue index 4900aa9..9eab665 100644 --- a/src/pages/home/Attention.vue +++ b/src/pages/home/Attention.vue @@ -62,7 +62,7 @@