xuqiang 4 лет назад
Родитель
Сommit
f134bdb5be

+ 2 - 2
src/main/pc-space/src/components/AssetInfo.vue

@@ -135,10 +135,10 @@ export default {
         .img1 {
             width: 10px;
             height: 11px;
-            margin-top: 8px;
+            margin-top: 4px;
         }
         .num {
-            font-size: 30px;
+            font-size: 26px;
             font-family: OSP-DIN, OSP;
             font-weight: normal;
             color: @prim;

+ 2 - 2
src/main/pc-space/src/components/CollectionInfo.vue

@@ -193,10 +193,10 @@ export default {
         .img1 {
             width: 10px;
             height: 11px;
-            margin-top: 8px;
+            margin-top: 4px;
         }
         .num {
-            font-size: 30px;
+            font-size: 26px;
             font-family: OSP-DIN, OSP;
             font-weight: normal;
             color: @prim;

+ 10 - 8
src/main/pc-space/src/views/AssetDetail.vue

@@ -322,9 +322,12 @@
                                 </template>
                             </el-table-column>
                             <el-table-column prop="nickname" label="持有方" width="305">
-                                <div style="color: #fdfb60; font-size: 14px">
-                                    {{ userInfo.nickname }}
-                                </div>
+                                <!-- toUser -->
+                                <template slot-scope="scope">
+                                    <div style="color: #fdfb60; font-size: 14px">
+                                        {{ scope.row.toUser }}
+                                    </div>
+                                </template>
                             </el-table-column>
                             <el-table-column prop="createdAt" label="时间">
                                 <template slot-scope="scope">
@@ -1191,7 +1194,7 @@ export default {
             width: 520px;
             background: #1c1e26;
             border-radius: 8px;
-            margin: 30px 0;
+            margin: 20px 0;
             .works1 {
                 width: 24px;
                 height: 24px;
@@ -1281,7 +1284,7 @@ export default {
         }
         .title {
             display: flex;
-            padding-right: 100px;
+            justify-content: space-between;
             position: relative;
             .title1 {
                 font-size: 26px;
@@ -1291,8 +1294,7 @@ export default {
             }
             .text {
                 position: absolute;
-                right: 24px;
-                top: -10px;
+                right: 0;
                 display: flex;
                 .text1 {
                     text-align: center;
@@ -1307,7 +1309,7 @@ export default {
                         display: block;
                     }
                     .text2 {
-                        font-size: 16px;
+                        font-size: @menuFont2;
                         font-weight: 400;
                         color: #949699;
                         line-height: 24px;

+ 23 - 19
src/main/pc-space/src/views/CollectionDetail.vue

@@ -26,14 +26,14 @@
                     <img class="works1" src="../assets/img/icon-quanyibaohu@3x.png" alt="" />
                     <div class="works2">该作品已在保存至区块链并进行权益保护</div>
                 </div>
-                <div class="content">
+                <div class="content" v-if="info.tokenId">
                     <el-collapse v-model="activeNames" :accordion="false">
                         <el-collapse-item name="6">
                             <template slot="title">
                                 <img class="imgs" src="../assets/icon-lianshangxinxi.png" alt="" />
                                 <span>链上信息</span>
                             </template>
-                            <div class="info-hash" v-if="info.tokenId">
+                            <div class="info-hash">
                                 <div class="hash-con">
                                     <div class="text1">Hash地址</div>
                                     <div class="hash-right">
@@ -65,9 +65,9 @@
                                     </div>
                                 </div>
                             </div>
-                            <div style="padding-left: 0" v-else class="info5">
+                            <!-- <div style="padding-left: 0" v-else class="info5">
                                 <div class="del">铸造者未设置链上信息</div>
-                            </div>
+                            </div> -->
                         </el-collapse-item>
                     </el-collapse>
                 </div>
@@ -299,9 +299,11 @@
                                 </template>
                             </el-table-column>
                             <el-table-column prop="nickname" label="持有方" width="305">
-                                <div style="color: #fdfb60; font-size: 14px">
-                                    {{ userInfo.nickname }}
-                                </div>
+                                <template slot-scope="scope">
+                                    <div style="color: #fdfb60; font-size: 14px">
+                                        {{ scope.row.toUser }}
+                                    </div>
+                                </template>
                             </el-table-column>
                             <el-table-column prop="createdAt" label="时间">
                                 <template slot-scope="scope">
@@ -571,7 +573,7 @@ export default {
             height: 44px;
             background: #1c1e26;
             border-radius: 8px;
-            margin: 30px 0;
+            margin: 20px 0;
             .works1 {
                 width: 24px;
                 height: 24px;
@@ -585,9 +587,10 @@ export default {
         }
         .title {
             display: flex;
+            justify-content: space-between;
             // margin-top: 10px;
-            padding-right: 100px;
-            position: relative;
+            // padding-right: 100px;
+            // position: relative;
             .title1 {
                 font-size: 26px;
                 font-weight: bold;
@@ -595,10 +598,10 @@ export default {
                 .ellipsis();
             }
             .text {
-                position: absolute;
-                right: 24px;
-                top: -10px;
-                display: flex;
+                // position: absolute;
+                // right: 24px;
+                // top: -10px;
+                // display: flex;
                 .text1 {
                     text-align: center;
                     margin-left: 26px;
@@ -612,7 +615,7 @@ export default {
                         display: block;
                     }
                     .text2 {
-                        font-size: 16px;
+                        font-size: @menuFont2;
                         font-weight: 400;
                         color: #949699;
                         line-height: 24px;
@@ -910,13 +913,14 @@ export default {
                         font-size: @menuFont1;
                         font-weight: 400;
                         color: #939599;
-                        line-height: 22px;
+                        line-height: 17px;
+                        margin-top: 5px;
                     }
                     .box3 {
                         font-size: @menuFont1;
                         font-weight: 400;
                         color: #ffffff;
-                        line-height: 22px;
+                        line-height: 17px;
                     }
                 }
             }
@@ -1096,14 +1100,14 @@ export default {
 .buy {
     // width: 100%;
     width: 280px;
-    height: 50px;
+    height: 48px;
     display: block;
     font-size: 16px;
     background: linear-gradient(135deg, @prim 0%, @warn 100%);
     border-radius: 8px;
     border-width: 0;
     color: #000;
-    font-size: 20px;
+    font-weight: bold;
     &:hover {
         background: linear-gradient(135deg, darken(@prim, 10%), darken(@warn, 10%));
     }