diff --git a/src/App.vue b/src/App.vue index 3b6d8bd..c54e516 100644 --- a/src/App.vue +++ b/src/App.vue @@ -22,9 +22,11 @@ export default { return this.transitionName = '' } const routeDeep = ['/message', '/attention', '/home', '/me', - '/editUserInfo', - '/editUserInfoItem', - '/VideoDetail', + '/edit-userinfo', + '/edit-userinfo-item', + '/video-detail', + '/add-school', + '/choose-school', ]; const toDepth = routeDeep.indexOf(to.path) const fromDepth = routeDeep.indexOf(from.path) diff --git a/src/assets/scss/color.scss b/src/assets/scss/color.scss index 4aa180b..ae19bd5 100644 --- a/src/assets/scss/color.scss +++ b/src/assets/scss/color.scss @@ -1,8 +1,9 @@ $main-bg: rgb(22, 26, 37); +$active-main-bg: rgb(31, 37, 52); $second-text-color: rgb(143, 143, 158); $second-btn-color: rgb(58, 58, 70); $line-color: rgb(37, 45, 66); $primary-btn-color: rgb(252, 47, 86); -$disable-primary-btn-color: rgba(252, 47, 86, .5); \ No newline at end of file +$disable-primary-btn-color: rgba(252, 47, 86, .5); \ No newline at end of file diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss index c7ef1b4..2b73243 100644 --- a/src/assets/scss/index.scss +++ b/src/assets/scss/index.scss @@ -12,7 +12,8 @@ html, body { width: 100%; height: 100%; - background: #2e3244; + //background: #2e3244; + background: $main-bg; font-size: 62.5%; margin: 0; padding: 0; diff --git a/src/components/BaseHeader.vue b/src/components/BaseHeader.vue index 8fec6ea..651c487 100644 --- a/src/components/BaseHeader.vue +++ b/src/components/BaseHeader.vue @@ -1,15 +1,18 @@ diff --git a/src/components/Search.vue b/src/components/Search.vue index 6120098..050a776 100644 --- a/src/components/Search.vue +++ b/src/components/Search.vue @@ -1,13 +1,39 @@ @@ -15,6 +41,7 @@ export default { @import "../assets/scss/color"; .search { + position: relative; height: 36px; background: rgb(59, 59, 71); border-radius: 2px; @@ -40,6 +67,12 @@ export default { color: $second-text-color; } } + + .close { + position: absolute; + right: 0; + width: 1rem; + } } \ No newline at end of file diff --git a/src/pages/me/Me.vue b/src/pages/me/Me.vue index 5e6513e..9b81ec1 100644 --- a/src/pages/me/Me.vue +++ b/src/pages/me/Me.vue @@ -29,7 +29,7 @@
-
+
编辑资料 85%
diff --git a/src/pages/me/School.vue b/src/pages/me/School.vue deleted file mode 100644 index 600acaf..0000000 --- a/src/pages/me/School.vue +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/me/userinfo/AddSchool.vue b/src/pages/me/userinfo/AddSchool.vue new file mode 100644 index 0000000..1542bce --- /dev/null +++ b/src/pages/me/userinfo/AddSchool.vue @@ -0,0 +1,154 @@ + + + + + \ No newline at end of file diff --git a/src/pages/me/userinfo/ChooseSchool.vue b/src/pages/me/userinfo/ChooseSchool.vue new file mode 100644 index 0000000..520b2ee --- /dev/null +++ b/src/pages/me/userinfo/ChooseSchool.vue @@ -0,0 +1,203 @@ + + + + + \ No newline at end of file diff --git a/src/pages/me/EditUserInfo.vue b/src/pages/me/userinfo/EditUserInfo.vue similarity index 80% rename from src/pages/me/EditUserInfo.vue rename to src/pages/me/userinfo/EditUserInfo.vue index fcbbc81..9621526 100644 --- a/src/pages/me/EditUserInfo.vue +++ b/src/pages/me/userinfo/EditUserInfo.vue @@ -11,37 +11,37 @@
- - + +
点击更换头像
-
+
名字
B - +
-
+
抖音号
B - +
-
+
简介
B - +
性别
B - +
@@ -54,21 +54,21 @@
生日
B - +
-
+
所在地
B - +
-
+
学校
B - +
@@ -108,7 +108,7 @@ export default {