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

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

@@ -218,9 +218,28 @@
                             <span>交易历史</span>
                         </template>
                         <el-table :data="tableData" stripe style="width: 100%; background: #1c1e26">
-                            <el-table-column prop="fromUser" label="用户" width="555"> </el-table-column>
-                            <el-table-column prop="operation" label="操作" width="455"> </el-table-column>
-                            <el-table-column prop="createdAt" label="时间"> </el-table-column>
+                            <el-table-column prop="fromUser" label="用户" width="455">
+                                <template slot-scope="scope">
+                                    <div style="color: #fdfb60; font-size: 16px">
+                                        {{ scope.row.fromUser }}
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="operation" label="操作" width="505">
+                                <template slot-scope="scope">
+                                    <div style="font-size: 16px">
+                                        {{ scope.row.operation }}
+                                        <span v-if="scope.row.price">{{ scope.row.price }}</span>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="createdAt" label="时间">
+                                <template slot-scope="scope">
+                                    <div style="font-size: 16px">
+                                        {{ scope.row.createdAt }}
+                                    </div>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </el-collapse-item>
                 </div>

+ 39 - 17
src/main/pc-space/src/views/CollectionDetail.vue

@@ -131,7 +131,7 @@
                         </div>
                         <div class="del" v-else>铸造者未设置</div>
                     </div>
-
+                    <!-- <div class="del">铸造者未设置</div> -->
                     <div class="bor"></div>
                     <!-- <div v-if="init"> -->
                     <div class="iconBox" v-if="init.length > 0">
@@ -150,18 +150,21 @@
                             </div>
                         </div>
                     </div>
-                    <div class="del" v-else>铸造者未设置</div>
+                    <div class="del">铸造者未设置</div>
                     <!-- </div> -->
                 </div>
-                <div v-if="properties.length > 0">
+                <div>
                     <div class="time">
                         <div class="time1">商品特性</div>
                     </div>
                     <div class="card">
-                        <div class="box1" v-for="(item, index) in properties" :key="index">
-                            <div class="box2">{{ item.name }}</div>
-                            <div class="box3">{{ item.value }}</div>
+                        <div v-if="properties.length != 0">
+                            <div class="box1" v-for="(item, index) in properties" :key="index">
+                                <div class="box2">{{ item.name }}</div>
+                                <div class="box3">{{ item.value }}</div>
+                            </div>
                         </div>
+                        <div class="del" v-else>铸造者未设置</div>
                     </div>
                 </div>
             </div>
@@ -202,9 +205,28 @@
                             <span>交易历史</span>
                         </template>
                         <el-table :data="tableData" stripe style="width: 100%; background: #1c1e26">
-                            <el-table-column prop="fromUser" label="用户" width="555"> </el-table-column>
-                            <el-table-column prop="operation" label="操作" width="455"> </el-table-column>
-                            <el-table-column prop="createdAt" label="时间"> </el-table-column>
+                            <el-table-column prop="fromUser" label="用户" width="455">
+                                <template slot-scope="scope">
+                                    <div style="color: #fdfb60; font-size: 16px">
+                                        {{ scope.row.fromUser }}
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="operation" label="操作" width="505">
+                                <template slot-scope="scope">
+                                    <div style="font-size: 16px">
+                                        {{ scope.row.operation }}
+                                        <span v-if="scope.row.price">{{ scope.row.price }}</span>
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="createdAt" label="时间">
+                                <template slot-scope="scope">
+                                    <div style="font-size: 16px">
+                                        {{ scope.row.createdAt }}
+                                    </div>
+                                </template>
+                            </el-table-column>
                         </el-table>
                     </el-collapse-item>
                 </div>
@@ -656,6 +678,14 @@ export default {
                 cursor: pointer;
             }
         }
+        .del {
+            font-size: 14px;
+            width: 220px;
+            font-weight: 400;
+            color: #939599;
+            line-height: 24px;
+            padding-left: 16px;
+        }
         .init1 {
             display: flex;
             align-items: center;
@@ -694,14 +724,6 @@ export default {
                     cursor: pointer;
                 }
             }
-            .del {
-                font-size: 14px;
-                width: 220px;
-                font-weight: 400;
-                color: #939599;
-                line-height: 24px;
-                padding-left: 16px;
-            }
             .iconBox {
                 margin-left: -22px;
                 display: flex;