xuqiang преди 4 години
родител
ревизия
547f703998
променени са 2 файла, в които са добавени 37 реда и са изтрити 46 реда
  1. 35 44
      src/main/pc-space/src/views/user/AccountData.vue
  2. 2 2
      src/main/pc-space/src/views/user/Personal.vue

+ 35 - 44
src/main/pc-space/src/views/user/AccountData.vue

@@ -41,7 +41,7 @@
                                     <div class="name1">{{ item.nickname }}</div>
                                     <img class="name2" src="../../assets/img/renzheng_icon@3x.png" alt="" />
                                 </div>
-                                <div class="detail">暂无</div>
+                                <div class="detail">{{ item.intro || '暂无' }}</div>
                                 <div class="box3">
                                     <div class="box4">
                                         <div class="text4">
@@ -51,15 +51,7 @@
                                             已售 <span>{{ item.sales }}</span>
                                         </div>
                                     </div>
-                                    <div
-                                        class="btnFollow"
-                                        style="color: #939599"
-                                        @click.prevent="like(item)"
-                                        :class="{ prim: !item.follow }"
-                                    >
-                                        {{ item.follow ? '已关注' : '关注' }}
-                                    </div>
-                                    <!-- <div class="btnFollow">
+                                    <div class="btnFollow">
                                         <el-button
                                             style="color: #939599"
                                             plain
@@ -70,7 +62,7 @@
                                         >
                                             {{ item.follow ? '已关注' : '关注' }}
                                         </el-button>
-                                    </div> -->
+                                    </div>
                                 </div>
                             </div>
                             <!-- <div class="imgBox" v-if="item.bg">
@@ -407,21 +399,7 @@ export default {
         padding-top: 200px;
         margin: 0 auto;
     }
-    /deep/ .el-button {
-        position: absolute;
-        width: 90px;
-        height: 26px;
-        border-radius: 16px;
-        border: 1px solid #939599;
-        text-align: center;
-        font-size: 14px;
-        background: transparent;
-        color: #939599;
-        line-height: 6px;
-        cursor: pointer;
-        top: 20px;
-        right: 15px;
-    }
+
     /deep/ .el-empty__description {
         color: #ccc;
         margin: 10px 0 0 17px;
@@ -430,6 +408,21 @@ export default {
         height: 146px;
         width: 970px;
         position: relative;
+        .btn {
+            position: absolute;
+            width: 90px;
+            height: 26px;
+            border-radius: 16px;
+            border: 1px solid #939599;
+            text-align: center;
+            font-size: 14px;
+            background: transparent;
+            color: #939599;
+            line-height: 6px;
+            cursor: pointer;
+            top: 20px;
+            right: 15px;
+        }
     }
 
     .top1 {
@@ -532,25 +525,23 @@ export default {
                             }
                         }
                         .btnFollow {
-                            // background-color: transparent;
-                            border-radius: 16px;
-                            width: 76px;
-                            height: 26px;
-                            border: 1px solid #939599;
-                            text-align: center;
-                            line-height: 26px;
-                            font-size: 13px;
-                            // &.prim {
-                            //     .line(@radius: 28px);
-                            //     border: 0;
-                            //     text-align: center;
+                            .el-button {
+                                background-color: transparent;
+                                min-width: 76px;
+                                height: 28px;
 
-                            //     /deep/span {
-                            //         color: @prim;
-                            //         position: relative;
-                            //         z-index: 111;
-                            //     }
-                            // }
+                                &.prim {
+                                    .line(@radius: 28px);
+                                    border: 0;
+                                    text-align: center;
+
+                                    /deep/span {
+                                        color: @prim;
+                                        position: relative;
+                                        z-index: 1;
+                                    }
+                                }
+                            }
                         }
                     }
                 }

+ 2 - 2
src/main/pc-space/src/views/user/Personal.vue

@@ -66,7 +66,7 @@ export default {
             background: #1c1e26 !important;
             color: #ffffff !important;
             font-size: 18px !important;
-            margin-left: 24px !important;
+            margin-left: 4px !important;
         }
         .el-menu-item {
             height: 60px !important;
@@ -74,7 +74,7 @@ export default {
             margin-bottom: 10px !important;
             background: #1c1e26 !important;
             font-size: 16px;
-            padding-left: 78px !important;
+            padding-left: 56px !important;
             span {
                 color: #ffffff !important;
                 font-size: 18px !important;