xuqiang 4 years ago
parent
commit
5cea2b39b5

+ 16 - 23
src/main/nine-space/src/views/asset/Detail.vue

@@ -185,31 +185,18 @@
                 }}</van-button>
             </div>
         </div>
-        <!-- <div > -->
-        <!-- <div class="goods">
-            <div style="padding-left: 16px" class="page-title">交易历史</div>
-            <div class="content" v-for="item in list" :key="item.id">
-                <div class="init">
-                    <div style="width: 100%">
-                        <div class="text1">{{ item.fromUser || '保密' }}</div>
-                        <div class="text2">
-                            <div class="text3">{{ item.operation }}{{ item.price }}</div>
-                            <div class="text4">{{ item.createdAt }}</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div> -->
         <van-collapse v-model="activeName" accordion>
             <van-collapse-item class="activeName" title="交易记录" name="1">
                 <div v-if="list.length > 0">
                     <div class="content" v-for="item in list" :key="item.id">
-                        <!-- <img class="img" :src="list.avatar" alt="" /> -->
+                        <img v-if="list.minterAvatar" class="img" :src="list.minterAvatar" alt="" />
                         <div class="init">
                             <div style="width: 100%">
                                 <div class="text1">{{ item.fromUser || '保密' }}</div>
                                 <div class="text2">
-                                    <div class="text3">{{ item.operation }}{{ item.price }}</div>
+                                    <div class="text3">
+                                        {{ item.operation }}<span v-if="item.price">{{ item.price }}</span>
+                                    </div>
                                     <div class="text4">{{ item.createdAt }}</div>
                                 </div>
                             </div>
@@ -221,7 +208,7 @@
         </van-collapse>
         <!-- </div> -->
 
-        <driver />
+        <!-- <driver /> -->
         <!-- 其他三个 -->
         <van-popup v-model:show="show">
             <div class="title2">
@@ -635,7 +622,13 @@ export default {
     background: #181818 !important;
     padding: 0 !important;
 }
+/deep/ .van-collapse {
+    border: 0 !important;
+}
 .activeName {
+    /deep/ .van-collapse {
+        border: 0 !important;
+    }
     /deep/ .van-cell__title {
         font-size: @font2;
         font-family: PingFangSC-Medium, PingFang SC;
@@ -662,8 +655,8 @@ export default {
     height: 68px;
     border-radius: 12px;
     .img {
-        width: 40px;
-        height: 40px;
+        width: 32px;
+        height: 32px;
         border-radius: 50%;
         margin-right: 10px;
     }
@@ -673,7 +666,7 @@ export default {
         justify-content: space-between;
         width: 100%;
         .text1 {
-            font-size: 14px;
+            font-size: @font1;
             font-weight: bold;
             color: #ffffff;
             line-height: 24px;
@@ -684,13 +677,13 @@ export default {
             justify-content: space-between;
             width: 100%;
             .text3 {
-                font-size: 14px;
+                font-size: @font1;
                 font-weight: 400;
                 color: @text3;
                 line-height: 24px;
             }
             .text4 {
-                font-size: 14px;
+                font-size: @font1;
                 font-weight: 400;
                 color: @text3;
                 line-height: 24px;

+ 7 - 7
src/main/nine-space/src/views/product/Detail.vue

@@ -205,7 +205,7 @@
             <van-collapse-item class="activeName" title="交易记录" name="1">
                 <div v-if="list.length > 0">
                     <div class="content" v-for="item in list" :key="item.id">
-                        <!-- <img class="img" :src="list.avatar" alt="" /> -->
+                        <img v-if="list.minterAvatar" class="img" :src="list.minterAvatar" alt="" />
                         <div class="init">
                             <div style="width: 100%">
                                 <div class="text1">{{ item.fromUser || '保密' }}</div>
@@ -221,7 +221,7 @@
             </van-collapse-item>
         </van-collapse>
 
-        <driver />
+        <!-- <driver /> -->
 
         <post ref="post" :info="info" noButton />
     </div>
@@ -714,8 +714,8 @@ span {
     height: 68px;
     border-radius: 12px;
     .img {
-        width: 40px;
-        height: 40px;
+        width: 32px;
+        height: 32px;
         border-radius: 50%;
         margin-right: 10px;
     }
@@ -725,7 +725,7 @@ span {
         justify-content: space-between;
         width: 100%;
         .text1 {
-            font-size: 14px;
+            font-size: @font1;
             font-weight: bold;
             color: #ffffff;
             line-height: 24px;
@@ -736,13 +736,13 @@ span {
             justify-content: space-between;
             width: 100%;
             .text3 {
-                font-size: 14px;
+                font-size: @font1;
                 font-weight: 400;
                 color: @text3;
                 line-height: 24px;
             }
             .text4 {
-                font-size: 14px;
+                font-size: @font1;
                 font-weight: 400;
                 color: @text3;
                 line-height: 24px;

+ 3 - 0
src/main/pc-space/src/views/AssetDetail.vue

@@ -1307,6 +1307,9 @@ export default {
         /deep/ .el-table th.is-leaf {
             border-bottom: 1px solid #2b2e3e;
         }
+        /deep/ .el-collapse-item__content {
+            padding-bottom: 1px !important;
+        }
         .info {
             display: flex;
             align-items: center;

+ 3 - 0
src/main/pc-space/src/views/CollectionDetail.vue

@@ -814,6 +814,9 @@ export default {
         /deep/ .el-table th.is-leaf {
             border-bottom: 1px solid #2b2e3e;
         }
+        /deep/ .el-collapse-item__content {
+            padding-bottom: 1px !important;
+        }
         .info {
             display: flex;
             align-items: center;

+ 3 - 1
src/main/pc-space/src/views/Index.vue

@@ -19,7 +19,9 @@
             >
                 <div class="footer center-content">
                     <div class="footer-l">
-                        <img class="logo" src="../assets/nav_logo@3x (1).png" alt="" />
+                        <router-link class="logo-link" :to="{ path: '/' }">
+                            <img class="logo" src="../assets/nav_logo@3x (1).png" alt="" />
+                        </router-link>
                         <div>
                             <div class="text1">加入创造者生态</div>
                             <div class="text2">让我们成为一批游戏NFT的弄潮儿</div>