diff --git a/index.html b/index.html index c531f37..626fd63 100644 --- a/index.html +++ b/index.html @@ -42,8 +42,8 @@ - - + +
diff --git a/src/assets/less/variables.less b/src/assets/less/variables.less index b624f28..1b9db87 100644 --- a/src/assets/less/variables.less +++ b/src/assets/less/variables.less @@ -1,5 +1,5 @@ @footer-height: 56rem; @header-height: 50rem; -@indicator-height: 50rem; +@indicator-height: 43rem; @padding-page: 15rem; \ No newline at end of file diff --git a/src/components/slide/Indicator.vue b/src/components/slide/Indicator.vue index d9dff17..b407a19 100644 --- a/src/components/slide/Indicator.vue +++ b/src/components/slide/Indicator.vue @@ -132,13 +132,14 @@ export default { font-weight: bold; .tab { - height: 45rem; + height: 40rem; width: 45%; display: flex; justify-content: center; align-items: center; color: gray; transition: color .3s; + font-size: 16rem; &.active { color: white; diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue index ef10745..56715c1 100644 --- a/src/pages/home/index.vue +++ b/src/pages/home/index.vue @@ -337,11 +337,12 @@ function dislike() { overflow: hidden; .sidebar { - width: 75vw; + width: 80vw; height: 100vh; overflow: auto; background: rgb(22, 22, 22); padding: 10rem; + padding-bottom: 20rem; box-sizing: border-box; & > .header { @@ -367,13 +368,13 @@ function dislike() { } .card { - margin-top: 20rem; + margin-top: 10rem; border-radius: 12rem; padding: 15rem; background: rgb(29, 29, 29); .header { - margin-bottom: 16rem; + margin-bottom: 8rem; font-size: 14rem; display: flex; color: white; @@ -383,12 +384,12 @@ function dislike() { .right { display: flex; align-items: center; - font-size: 14rem; + font-size: 12rem; gap: 4rem; color: gray; svg { - font-size: 18rem; + font-size: 16rem; } } } @@ -404,16 +405,17 @@ function dislike() { flex-direction: column; justify-content: center; align-items: center; - font-size: 16rem; + font-size: 14rem; gap: 8rem; svg { - font-size: 30rem; + font-size: 28rem; } .xcx { border-radius: 12rem; - width: 55rem; + width: 50rem; + height: 50rem; } } @@ -422,7 +424,7 @@ function dislike() { img { border-radius: 50%; - width: 55rem; + width: 50rem; } } } diff --git a/src/pages/me/Me.less b/src/pages/me/Me.less index e6d2c3e..6bc0a51 100644 --- a/src/pages/me/Me.less +++ b/src/pages/me/Me.less @@ -54,7 +54,6 @@ } .scroll { - .notice { font-size: 12rem; height: 40rem; @@ -203,7 +202,6 @@ } } } - } .float { @@ -218,100 +216,144 @@ padding: 0 15rem; background: transparent; transition: all .2s; + text-align: center; .center { + position: absolute; + left: 50%; + transform: translateX(-50%); color: white; } &.fixed { background: @main-bg; - img { + .item { background: @main-bg !important; } } + @h: 30rem; + .left { - font-size: 12rem; - height: 26rem; + font-size: 14rem; + height: @h; display: flex; - padding-right: 13rem; - padding-left: 5rem; + gap: 6rem; + padding: 0 10rem; align-items: center; border-radius: 20rem; background: rgba(82, 80, 80, 0.5); + color: white; - img { - padding: 6rem; - width: 18rem; + svg { + font-size: 16rem; } } .right { - img { - margin-left: 20rem; - border-radius: 50%; + display: flex; + + .item { + height: @h; + width: @h; + display: flex; + justify-content: center; + align-items: center; background: rgba(82, 80, 80, 0.5); - padding: 6rem; - width: 18rem; + border-radius: 50%; + margin-left: 10rem; + + svg { + color: white; + font-size: 22rem; + } + + .finger { + transform: rotate(90deg); + } } } } .desc { header { + position: relative; color: white; - height: 120rem; + height: 190rem; background-image: url('../../assets/img/header-bg.png'); - //background-image: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wCEAAkGBxAQEBAQEBAPEBAPEBAPDw8QDw8NEA8OFRIWFhURFRUYHSggGBolGxUVITEhJSkrLi4uFx8zODMtNygtLisBCgoKDg0OGBAQGC0dHR0tLS0rKy0tLS0tLS0tKy0tKy0tLSstLS0tLS0tLSstLSstLS0tKy0tLS0tLS0tLisrN//AABEIAKgBLAMBIgACEQEDEQH/xAAbAAACAwEBAQAAAAAAAAAAAAAAAwECBAUGB//EAD8QAAIBAgMFAwgIBQQDAAAAAAABAgMRBBIhBSIxQXFRYbEGEyMyUnKBkRWCkqGissHRFEJic/AkNIPhBzNT/8QAGAEBAQEBAQAAAAAAAAAAAAAAAAECAwT/xAAeEQEBAQEAAwEBAQEAAAAAAAAAARECEiExA0FRE//aAAwDAQACEQMRAD8A+QgUTJTPS4mRLpi4stF6hDETAiIRBpiAEwZcZoRaJBKCLZSbF7BYuMaXYmxewWGGqWCxewWGGqWCxewWLhpeULDLENEw1SwWLWCxcNVsRYvYLDCUmtw+KKIvivV+KFxZnPbpL6MiWRCLNEXQRYsyAaVUiLY+pwM5YiAuQyAJuRcLlbhUhci4XC6oSicpKQZ1aBaBMUTBA1aJKIXEtYJqSWWsSkBVEl7EqBUq1LVdBmQStHc1wSauiudLyhlG5QyBCspGUdlBxKEuJGUdlCw0JyhlHZSHEBOQMg3KGUaaVlIyjsoZSrrHjI7j6ozUuBt2gtx9UYsOtPiY/rpz8PQ1R0KIeloRdLaIsXZE0DSprQzM2NGSSAoVLMqwIuQwIYUXJKkgMsCQqnV5PQci/UsMii0EQuBaIASisi1MIYTEESVTXG5akgo9haUdTLNLqcS+HlZ5eT4dSMjJnTv15dTSVqsFiaEsyT58H3MvYmsYXYiw2xGUaFWJyjFEtlGhOULFq1WEFeUkra6vUXQxdOfqzTfZez+Q1fGpcSLDspVxGslWJsXyhlKMW0l6N9V4mTBRvCXU3bUXon1j4mbZmsJe+l80Zv124+DsHx4CZLUfHgFLCQMOQENGOotWa2ZqvEsCWVZeRRgVZDJZDIqCxUsBFWndd5WjWtoy1SskZJO5Or7a5mxqqYrkhKryXMWkaKWFb4k+tZOYIYmb7zVh693Z6FqdJRWiBwTeqLljFsrVEmxlmpQV4u65pk0MdGTs9GXUxtpaM15TPT7TZSa5kqYWo2LZUOdircRrOF0t2XdLxNeQy1JRtx8R1LHU7b0rNaPRkTDMhGQj+Po+3+GX7EfSFH2/wy/YSmL5BONq+bpzn7K073yXzL/SFH2/wy/Y5flBioTpqMJN72Z6NXtwWvW/wLq887XnKk3JuUndvVt6kLu0JUS2Uy9T0mx8eqscsn6RfiXb1Oi4HjqLcWpR0ad0ej2ftZSj6XRrhJJtS/Zl15++P7G3IWVMX9JUfaf2ZfsStqUPaf2ZF1jxZdtQtRl1j4mPYsbwqe8vA17Yx1GdGUYSbk3FpZZLg0YtiYmEIzUna8lbRvSxNdOZ6NxMd5Pt1LR4DayUoprquguJZTqZVJcyvIu+YJaFQpmesjQJrrgaRnZRjGLZKKshkshkaQAABmSbGKhpcfTgkTU4Mni35+8jGnZnQw87o5w/CVLO3aTmr3zsdFC6k0tWRUqZTn1qrkzVrnzzp1fGSlotEZgL0aTm7Ixuu2SR2djScou/J6HVpLVGbA0FCKj8+psjErl9afNK3AmFBNapE0noaaS0XQxp4sUaEXmVlo9DNGjFVFmimtbpq66nUow1n736CcRR313psSr4q7TwNNUZSjCKe7ZpJfzI2fRtL/5w+yhGIlfD1Ivllt0zLQ7nmzNuL4PPbMwNN003CLeaau4pv12Y9qbNUvPxhBXjShKMUv5lK+nysd/Y9L0X16n52cbau3aWHxFRZXUlkhBqO6oyWur+KLOicV4+dKUcratmV13o04LBTqXUY3srt8ku/wCRXae1ZVnpCNOKbkoxu9Xxd3+lg2ZtepQcrKMlOOWSd1p1XM1vp0x0sJsqTnDNBqOV53xSunZnV2Zs+ClVi4qSjJZc0U2k9UK2b5UULU6c4ThpGLm8rgn2vuO5g6XpcR1p/kMb/p1dmY52KwUFUoJQglKUk1lWu7zHbSwFNUarVOCahJpqKunY142l6XDe/P8AIx21afoK39ufgPJznLi7XwdNYPMoRUstLeUUnq1zOf5N4eMo1M0U7NWuk+R3NtQ/0P1KXjE5fkxHdqdY+BfL034rYimk2krLs7jG1ZnSx3r/AFf1MNZczXLPc9FNFUWZRM6OSkuIqqtB0xcuBRkYtjJFGhUUZDJZDI0gAABca/aXdVNMzAZ118YCYOzTIII0dXq5mKACEmLU4OTSXM7+BwkYR7XzZz9nxitb6s7FE1I527TqSNajw6mWmbIcupnpeYuka8Ot1dEZ5LRmrC+quhz6rfPK+FhrP3l4FcRG1SHfGQ7CetU95eAYmN6kfck/Azvt08WHH07Rku23iejhaSTXB6o4WN1g308TpbGq3i4PjB6dH/jHXzUz2jY8PRfXqfnZ8s2vUzYivLtq1PzM+r7GXovr1PzM+R4t3qVH2zm/xMcfSzISFiQbOuMIPp3kxeUMz1bpYa7/AOJHzKJ9M8ipZqF37FJfZi1+hj9PUb5mtuOh6XDe/P8AIxu1o+grf25+BOPXpcN78/yMvtf/AG9b+3PwOW/GvFyttL/Q/Uo+MTk+TS3avWPgzsba/wBh/wAdHxicbybe7V6x8Gal9VM9jaL9LFdsPBmPF1LIbtSfp6futCq0FLR/sduXPpgnWfaZcVO8ePYbJ4SN/wCb7TOTU0bXY2jblPqt33hd95vw+HjKKbvdmGejfUYsqLsLmmjSTV2S6SGU8oyEj5QRGUYeRFwv3jnFEZBhsZwADLoAABaAAAQSpNcDTR2hOPO/UygNLHYobZ9qPxR0qe2KXtHlQH0kx7XD7TpVbxg9UuDOng57q6HzvDVnCSkuXgeupY1uEWnZWRjrhudSfXbwlXeqe8vAtOr6aC7YT/Q4NLGSUpNPmr356D6eNvUhJ6WjJeBjrix0575vpvxTeSSt/lzds+MoVU2t2ScXquPFGHEYhODtpdLxNNPGK6u8ut9dOBm243Pzm/W7Y0l5r69T87PmHlBh/NYqvDkqkmvdlvL7mj3+ycbBU7OUU89Tn/W7Hg/KWrnxdeX9dl0jFL9C/nvlWP0mcxzCQA9EcEJHv/8Ax5iHKlVi/wCSUEujTa/U8Cei8kce6fnYq6vlndd11b7zH6TeW+Ll9vc7RqJVMO3olOd2+W4ym08XTlQrKM4t+bnpfXh2HDxmIzunecm3J+s1aO6cjF7QhZxi81002lov35nDn89+u3XWfx2fKPGSjhqMFly1IRzX47qi1Y8/gNpTpKWXLaTjmvxduzUVjsZGcaaV80cyafDlaxmpVNGdZxkyuXXe3Y6GNxsalWnKN+CTXY2+BqkcBys0+yzO83odJ8c+rpVU4Vdb0urO7M4eIW8+pq/HKfXQwfqRObUW8+rOlhfUj/nM51Ti+rLfhPrXhvUXVkyJwq3PiwkajFKYtjJFGKRUAAisoABzx3AABAAAFAAAMAAAIA62y8XaOV624dDklqU3Fpoalehoyu5Plx+4XtKcmopLK7Pu00Of/FTXqvja/LWxWWIctea+/Ral9E116G0Jxp5Zauzte1uOnA1YjalKbvaXvZtPkcDf0v0/6LQnFJ3S1vq1omZ8Z9b/AOnUmNrxjV0pOLzNp2g1b4tO5x8bNyqTk9czzXso3vrwXA01dHa1+dhdWhfV3i3rZ9nBeBc/xnWUB6w3f9wyGHS7+prE8mZU2+CGYCvKnUTjo2nDX+pWv87P4GtIHYXnUneD+Lq2blKelrXlLR63aM/nNVpxWut9DU5X42fVJlZUou2jVuFtVqZ8V8pWWWl+9E0eY6thssb6t31srpLryE0OfwCol6y72vE9A+BwJ+tHqvE70ufd+xZGaozi4ji+p2Wzj4j1mVmN2G9SJzanF9WdPDLcj0OZV4vqW/Gefrfg/wD1/FkSJwT3PiyJGozSpi2XkUYpFQADNVlAAMO4AAAAABoAAB6AAAUBBIGRenroalTS4a9eFzCdfZdWm0lNJtN8UiVrmbcLw9PW8svCyyqMfnZal6OCbd3kte/q3fRX5HSn5qzSjHh7KJn5t8N3otPkSV1v55Pq1KMV3P72c/ajvO6vokte4ViMRFpyvJyUrK1rWMv8U+d+7Vm+Y499WzDCbmZ1u4iVZm9c8apSKqRn86DqsaY1Z+o1SXFX63MCqsmNZr9gY35m3w7npxXO4z6PXGLv1VjFHEvklfqdLBYxNapJrs1uY79e46flJuVzpQ31f2l4nUq1471mmy1TEwSu1f4I51bFO+7ouzLFGebb/F/Tmc/KvGo9bmGvLeYxzd+JmqPVnSuMjr4V7kehzKvrPqx+HqLKrmao9X1F+JzPbZhpbnxZMpGalLd+JLNSs2ezJMo2LZFxqzle4XF3Ai+JQBYmxzdUATYiwAAWCwAAWCwAAWAugAAIoAAA00MZJaPVD8RWzJW4czn2G0arXQG1E0VTGOzFyNM4GQAWGqAABosmFypITF6cuI+lO1zOmTGYXGmVUTJlc5VzBV7ipE5irCYZFi5PUkgEi8XoWzC0wuXU8V2yLlAGr4r3C5QBpgAAMNgAAAAAAAAAAAAAAAAAAAAAAAAACYAAAoAAAAAAAAAJgAACgAAAAAAAAAAAAJgAABj/2Q=='); background-size: cover; background-position: center; background-repeat: no-repeat; box-sizing: border-box; + + .info { + position: absolute; + bottom: 10rem; + padding: 20rem; + display: flex; + align-items: center; + gap: 15rem; + + .avatar { + background: black; + padding: 2px; + border-radius: 50%; + width: 100rem; + height: 100rem; + } + + .name { + font-size: 18rem; + margin-bottom: 5rem; + } + + .number { + font-size: 12rem; + color: @second-text-color; + display: flex; + align-items: center; + + img { + width: 12rem; + margin-left: 5rem; + } + } + } } + @p: 15rem; + .detail { transform: translateY(-10rem); background: @main-bg; - padding: 0 20rem 0 20rem; - border-radius: 10rem 10rem 0 0; + padding: @p @p 0 @p; + border-radius: 14rem 14rem 0 0; .head { width: 100%; display: flex; + margin-bottom: 20rem; justify-content: space-between; align-items: center; box-sizing: border-box; - transform: translateY(-20rem); - - .head-image { - background: black; - padding: 2px; - border-radius: 50%; - width: 80rem; - height: 80rem; - } .heat { - margin-top: 10rem; - width: calc(100% - 120rem); color: @second-text-color; display: flex; + gap: 30rem; align-items: center; justify-content: space-between; .num { - margin-top: 5rem; color: white; - font-size: 16rem; + font-size: 15rem; font-weight: bold; - margin-right: 3px; } .text { - font-size: 12rem; - margin-right: 10px; + font-size: 13rem; display: flex; align-items: center; flex-direction: column; @@ -319,33 +361,25 @@ } } - } - - .description { - font-size: 12rem; - color: white; - transform: translateY(-20rem); - - .number { - color: @second-text-color; - padding-bottom: 10rem; - border-bottom: 1px solid @line-color; + .button { + position: relative; + padding: 8rem 20rem; + font-size: 15rem; display: flex; align-items: center; - - img { - width: 14rem; - margin-left: 5rem; - } + justify-content: center; + border-radius: 4rem; + background: @second-btn-color; + color: white; } - } .signature { + font-size: 13rem; color: @second-text-color; display: flex; align-items: center; - margin-bottom: 5rem; + margin-bottom: 8rem; img { height: 12rem; @@ -358,17 +392,18 @@ } .more { + margin-bottom: 10rem; color: @second-text-color; display: flex; + gap: 8rem; .item { padding: 2rem 5rem; border-radius: 2rem; background: @second-btn-color-tran; - font-size: 10rem; + font-size: 12rem; display: flex; align-items: center; - margin-right: 5rem; img { height: 10rem; @@ -377,67 +412,28 @@ } } - .my-buttons { - display: flex; - justify-content: space-between; - - .button { - position: relative; - width: 49%; - font-size: 12rem; - display: flex; - align-items: center; - justify-content: center; - border-radius: 2rem; - background: @second-btn-color; - height: 30rem; - color: white; - - .not-read { - right: 45rem; - position: absolute; - } - } - - } - .other { display: flex; - margin-bottom: 20rem; .item { + width: 20vw; margin-right: 25rem; display: flex; + flex-direction: column; + align-items: center; + color: gray; + gap: 6rem; + font-size: 12rem; - img { - margin-right: 8rem; - border-radius: 4rem; - background: @second-btn-color-tran; - padding: 8rem; - height: 22rem; - } - - .right { - display: flex; - justify-content: space-between; - flex-direction: column; - - .top { - color: white; - font-size: 14rem; - } - - .bottom { - color: @second-text-color; - font-size: 12rem; - } + svg { + color: white; + font-size: 24rem; } } } } } - .ul { font-size: 14rem; width: 100%; diff --git a/src/pages/me/Me.vue b/src/pages/me/Me.vue index a914ad5..9f6a50c 100644 --- a/src/pages/me/Me.vue +++ b/src/pages/me/Me.vue @@ -5,9 +5,12 @@ style="width: 100vw;" v-model:active-index="baseActiveIndex">
-
- - 切换账号 +
+ + 编辑资料
@@ -15,10 +18,22 @@
- - + @click="$nav('/me/request-update')"> + +
+
+ +
+
+ +
+
+ +
-
-
-
- +
+ -
-
- 获赞 - {{ formatNumber(userinfo.aweme_count) }} -
-
- 关注 - {{ formatNumber(userinfo.following_count) }} -
-
- 粉丝 - {{ formatNumber(userinfo.follower_count) }} +
+

{{ userinfo.nickname }}

+
+ 私密账号 + 抖音号：{{ userinfo.unique_id }} +
-
-

{{ userinfo.nickname }}

-
- 私密账号 - 抖音号：{{ userinfo.unique_id }} - + +
+
+
+
+ {{ formatNumber(userinfo.aweme_count) }} + 获赞 +
+
+ {{ formatNumber(userinfo.following_count) }} + 朋友 +
+
+ {{ formatNumber(userinfo.following_count) }} + 关注 +
+
+ {{ formatNumber(userinfo.follower_count) }} + 粉丝 +
-
-