From e83f773b80cde453136949e49900164a8f425c78 Mon Sep 17 00:00:00 2001 From: zyronon Date: Tue, 17 Aug 2021 01:38:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96me=E9=A1=B5=E9=9D=A2=E5=92=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0login=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 1 + src/assets/scss/custom.scss | 42 +- src/assets/scss/index.scss | 11 - src/config/index.js | 6 +- src/pages/login/Login.vue | 115 +++ src/pages/me/Me2.vue | 269 +++++-- src/pages/me/Me3.vue | 860 +++++++++++++++------ src/pages/me/userinfo/EditUserInfoItem.vue | 2 +- src/router/index.js | 2 + src/store/index.js | 10 +- 10 files changed, 990 insertions(+), 328 deletions(-) create mode 100644 src/pages/login/Login.vue diff --git a/src/App.vue b/src/App.vue index e0f8099..c99c251 100644 --- a/src/App.vue +++ b/src/App.vue @@ -69,6 +69,7 @@ export default { '/me/right-menu/minor-protection/detail-setting', '/me/right-menu/minor-protection/trigger-time', '/me/right-menu/setting', + '/login', '/service-protocol', diff --git a/src/assets/scss/custom.scss b/src/assets/scss/custom.scss index c44fa22..685e327 100644 --- a/src/assets/scss/custom.scss +++ b/src/assets/scss/custom.scss @@ -29,11 +29,12 @@ background: $main-bg; } } + &.no-padding { - padding:0; + padding: 0; } - &.border{ + &.border { border-bottom: 1px solid $line-color; } @@ -83,6 +84,22 @@ } } + &.no-active { + &:active { + &.primary { + background: $primary-btn-color; + } + + &.dark { + background: $second-btn-color; + } + + &.white { + background: white; + } + } + } + &.dark { background: $second-btn-color; @@ -90,4 +107,25 @@ background: $second-btn-color-tran; } } + + &.white { + background: white; + color: black; + border: 1px solid gainsboro; + } +} + +p { + padding: 0; + margin: 0; +} + +.line { + height: 1px; + background: $line-color; + width: 100%; +} + +.link { + color: rgb(18, 100, 149); } \ No newline at end of file diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss index b1a4da6..82b1664 100644 --- a/src/assets/scss/index.scss +++ b/src/assets/scss/index.scss @@ -18,14 +18,3 @@ html, body { margin: 0; padding: 0; } - -p { - padding: 0; - margin: 0; -} - -.line { - height: 1px; - background: $line-color; - width: 100%; -} \ No newline at end of file diff --git a/src/config/index.js b/src/config/index.js index 63bac23..561787d 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -1,4 +1,6 @@ export default { - baseUrl: 'http://192.168.0.105//index.php/v1', - filePreview:'http://192.168.0.105//static/uploads/' + // baseUrl: 'http://192.168.0.105//index.php/v1', + // filePreview:'http://192.168.0.105/static/uploads/', + baseUrl: 'http://192.168.10.164//index.php/v1', + filePreview:'http://192.168.10.164/static/uploads/' } \ No newline at end of file diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue new file mode 100644 index 0000000..94ab1ab --- /dev/null +++ b/src/pages/login/Login.vue @@ -0,0 +1,115 @@ + + + + diff --git a/src/pages/me/Me2.vue b/src/pages/me/Me2.vue index 75555fb..64c90f7 100644 --- a/src/pages/me/Me2.vue +++ b/src/pages/me/Me2.vue @@ -38,7 +38,7 @@
编辑资料 - 85% +
@@ -53,8 +53,29 @@ 抖音号：605128307
-
- 填写个性签名更容易获得别人关注哦 +
+ + {{ userinfo.desc }} +
+
+
+ + + {{ filterAge(userinfo.birthday) }}岁 +
+
+ {{ userinfo.location }} +
+
+ {{ userinfo.school.name }} +
8获赞
@@ -62,6 +83,22 @@
8粉丝
+
+
+ +
+
抖音商城
+
发现超值好物
+
+
+
+ +
+
我的音乐
+
已收藏20首
+
+
+