diff --git a/src/App.vue b/src/App.vue index 8f29e31..8c87b77 100644 --- a/src/App.vue +++ b/src/App.vue @@ -14,6 +14,7 @@ export default { min-height: 100vh; position: relative; } + #app { height: 100%; width: 100%; @@ -62,5 +63,14 @@ export default { } +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.3s ease; +} + +.fade-enter-from, +.fade-leave-to { + opacity: 0; +} diff --git a/src/assets/scss/color.scss b/src/assets/scss/color.scss index 9ea6c52..4aa180b 100644 --- a/src/assets/scss/color.scss +++ b/src/assets/scss/color.scss @@ -4,4 +4,5 @@ $second-btn-color: rgb(58, 58, 70); $line-color: rgb(37, 45, 66); -$primary-btn-color: rgb(252, 47, 86); \ No newline at end of file +$primary-btn-color: rgb(252, 47, 86); +$disable-primary-btn-color: rgba(252, 47, 86, .5); \ No newline at end of file diff --git a/src/components/BaseHeader.vue b/src/components/BaseHeader.vue index 50b6a8c..8fec6ea 100644 --- a/src/components/BaseHeader.vue +++ b/src/components/BaseHeader.vue @@ -1,67 +1,61 @@ diff --git a/src/pages/me/EditUserInfo.vue b/src/pages/me/EditUserInfo.vue new file mode 100644 index 0000000..9e81c0f --- /dev/null +++ b/src/pages/me/EditUserInfo.vue @@ -0,0 +1,214 @@ + + + + + \ No newline at end of file diff --git a/src/pages/me/EditUserInfoItem.vue b/src/pages/me/EditUserInfoItem.vue new file mode 100644 index 0000000..83f52f1 --- /dev/null +++ b/src/pages/me/EditUserInfoItem.vue @@ -0,0 +1,138 @@ + + + + + \ No newline at end of file diff --git a/src/pages/me/Me.vue b/src/pages/me/Me.vue index d5444e5..882c4ef 100644 --- a/src/pages/me/Me.vue +++ b/src/pages/me/Me.vue @@ -29,7 +29,7 @@
-
+
编辑资料 85%
diff --git a/src/pages/me/Me2.vue b/src/pages/me/Me2.vue deleted file mode 100644 index 1424da5..0000000 --- a/src/pages/me/Me2.vue +++ /dev/null @@ -1,964 +0,0 @@ - - - - diff --git a/src/pages/me/VideoDetail.vue b/src/pages/me/VideoDetail.vue index 9f5b82a..d103f8c 100644 --- a/src/pages/me/VideoDetail.vue +++ b/src/pages/me/VideoDetail.vue @@ -8,13 +8,13 @@
- + >
diff --git a/src/router/index.js b/src/router/index.js index ade1838..acc0ff8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4,13 +4,14 @@ import Index from "../pages/home/Index"; import Attention from "../pages/home/Attention"; import Message from "../pages/home/Message"; import Me from "../pages/me/Me"; -import Me2 from "../pages/me/Me2"; import Music from "../components/common/Music"; import countryChoose from "../pages/login/countryChoose"; import MyCard from "../pages/me/MyCard"; import MyCollect from "../pages/me/MyCollect"; import VideoDetail from "../pages/me/VideoDetail"; import Index2 from "../pages/home/Index2"; +import EditUserInfo from "../pages/me/EditUserInfo"; +import EditUserInfoItem from "../pages/me/EditUserInfoItem"; const routes = [ // {path: '', component: Music}, @@ -20,7 +21,8 @@ const routes = [ {path: '/attention', component: Attention}, {path: '/message', component: Message}, {path: '/me', component: Me}, - {path: '/me2', component: Me2}, + {path: '/editUserInfo', component: EditUserInfo}, + {path: '/editUserInfoItem', component: EditUserInfoItem}, {path: '/music', component: Music}, {path: '/countryChoose', component: countryChoose}, {path: '/MyCard', component: MyCard},