From f0cbfffb5d93175dcbffebf640c78716933906bd Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Sun, 18 Jul 2021 22:17:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Indicator.vue |  1 +
 src/components/Video.vue     |  1 +
 src/pages/home/Index2.vue    |  7 ++--
 src/pages/me/Me.vue          | 72 +++++++++++++++++++-----------------
 4 files changed, 45 insertions(+), 36 deletions(-)

diff --git a/src/components/Indicator.vue b/src/components/Indicator.vue
index a248ba1..3a2848e 100644
--- a/src/components/Indicator.vue
+++ b/src/components/Indicator.vue
@@ -99,6 +99,7 @@ export default {
 @import "../assets/scss/index";
 
 .indicator-ctn {
+  font-size: 1.4rem;
   width: 100%;
   height: 6rem;
   top: 0;
diff --git a/src/components/Video.vue b/src/components/Video.vue
index 4766f12..e0729a1 100644
--- a/src/components/Video.vue
+++ b/src/components/Video.vue
@@ -328,6 +328,7 @@ export default {
 .bg-video {
   position: relative;
   background: black;
+  font-size: 1.4rem;
 
   video {
     width: 100%;
diff --git a/src/pages/home/Index2.vue b/src/pages/home/Index2.vue
index 34ef7c6..9eb1bb9 100644
--- a/src/pages/home/Index2.vue
+++ b/src/pages/home/Index2.vue
@@ -104,7 +104,7 @@
         <Footer v-bind:init-tab="1"/>
       </SlideItem>
       <SlideItem style="font-size: 40px;overflow:auto;">
-        <div>
+        <div v-if="false">
           <p>详情页</p>
           <p>详情页</p>
           <p>详情页</p>
@@ -146,6 +146,7 @@
           <p>详情页</p>
           <p>详情页</p>
         </div>
+        <Me></Me>
       </SlideItem>
     </SlideRowList>
     <Comment v-model:is-commenting="isCommenting"/>
@@ -170,10 +171,10 @@ import Comment from "../../components/Comment";
 import Share from "../../components/Share";
 import SlideColumnList from "../../components/slide/SlideColumnList";
 import SlideRowList from "../../components/slide/SlideRowList";
-
+import Me from '../me/Me'
 export default {
   name: "HomeIndex",
-  components: {SlideColumnList, SlideRowList, Video1, Comment, Share,},
+  components: {SlideColumnList, SlideRowList, Video1, Comment, Share,Me},
   data() {
     return {
       videos1: [
diff --git a/src/pages/me/Me.vue b/src/pages/me/Me.vue
index 598d55d..f1f2d2d 100644
--- a/src/pages/me/Me.vue
+++ b/src/pages/me/Me.vue
@@ -94,57 +94,57 @@
       </SlideItem>
       <SlideItem style="min-width: 70vw; overflow:auto;">
         <transition name="fade">
-          <ul v-if="!isMoreFunction">
-            <li @click="$nav('MyCard')">
+          <div class="ul" v-if="!isMoreFunction">
+            <div class="li" @click="$nav('MyCard')">
               <img src="../../assets/img/icon/card-gray.png" alt="">
               <span>我的订单</span>
-            </li>
-            <li @click="$nav('MyCard')">
+            </div>
+            <div class="li" @click="$nav('MyCard')">
               <img src="../../assets/img/icon/wallet-gray.png" alt="">
               <span>钱包</span>
-            </li>
+            </div>
             <div class="line"></div>
 
-            <li @click="$nav('MyCard')">
+            <div class="li" @click="$nav('MyCard')">
               <img src="../../assets/img/icon/card-gray.png" alt="">
               <span>我的收藏</span>
-            </li>
-            <li @click="$nav('MyCard')">
+            </div>
+            <div class="li" @click="$nav('MyCard')">
               <img src="../../assets/img/icon/card-gray.png" alt="">
               <span>观看历史</span>
-            </li>
-            <li @click="$nav('MyCard')">
+            </div>
+            <div class="li" @click="$nav('MyCard')">
               <img src="../../assets/img/icon/card-gray.png" alt="">
               <span>我的动态</span>
-            </li>
-            <li @click="$nav('MyCard')">
+            </div>
+            <div class="li" @click="$nav('MyCard')">
               <img src="../../assets/img/icon/card-gray.png" alt="">
               <span>创作者服务中心</span>
-            </li>
+            </div>
 
             <div class="line"></div>
 
-            <li @click="$nav('MyCard')">
+            <div class="li" @click="$nav('MyCard')">
               <img src="../../assets/img/icon/link-gray.png" alt="">
               <span>小程序</span>
-            </li>
-            <li @click="$nav('MyCard')">
+            </div>
+            <div class="li" @click="$nav('MyCard')">
               <img src="../../assets/img/icon/card-gray.png" alt="">
               <span>抖音公益</span>
-            </li>
-            <li @click="$nav('MyCard')">
+            </div>
+            <div class="li" @click="$nav('MyCard')">
               <img src="../../assets/img/icon/umbrella-gray.png" alt="">
               <span>未成年保护工具</span>
-            </li>
-            <li @click="$nav('MyCard')">
+            </div>
+            <div class="li" @click="$nav('MyCard')">
               <img src="../../assets/img/icon/card-gray.png" alt="">
               <span>我的客服</span>
-            </li>
-            <li @click="$nav('MyCard')">
+            </div>
+            <div class="li" @click="$nav('MyCard')">
               <img src="../../assets/img/icon/setting-gray.png" alt="">
               <span>设置</span>
-            </li>
-          </ul>
+            </div>
+          </div>
           <div v-else class="more-function">
             <div class="title">生活服务</div>
             <div class="functions">
@@ -427,6 +427,7 @@ export default {
       }
 
       .description {
+        font-size: 1.2rem;
         color: white;
         transform: translateY(-20px);
 
@@ -465,10 +466,12 @@ export default {
     }
   }
 
-  ul {
+  .ul {
+    font-size: 1.2rem;
     width: 100%;
     height: 100%;
-    overflow: auto;
+    overflow-y: auto;
+    overflow-x: hidden;
     padding: 0;
     margin: 0;
     position: absolute;
@@ -482,13 +485,15 @@ export default {
       margin: 5px 20px;
     }
 
-    li {
+    .li {
+      box-sizing: border-box;
       background: $main-bg;
-      padding: 10px 20px;
+      width: 100%;
+      padding: 1rem 2rem;
       list-style: none;
       display: flex;
       align-items: center;
-      line-height: 40px;
+      line-height: 4rem;
 
       &:nth-last-child(1) {
         margin-bottom: 90px;
@@ -543,6 +548,7 @@ export default {
   }
 
   .button-ctn {
+    font-size: 1.4rem;
     z-index: 99999;
     width: 70vw;
     position: absolute;
@@ -551,10 +557,10 @@ export default {
 
     .button {
       box-sizing: border-box;
-      width: calc(70vw - 40px);
-      background: #686464;
-      margin: 20px;
-      height: 50px;
+      width: calc(100% - 4rem);
+      background: $second-btn-color;
+      margin: 2rem;
+      height: 4.5rem;
       border-radius: 3px;
       display: flex;
       align-items: center;