Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

src/main/nine-space/src/views/asset/Detail.vue

@@ -186,10 +186,9 @@
             </div>
         </div>
         <!-- <div > -->
-        <div class="goods">
+        <!-- <div class="goods">
             <div style="padding-left: 16px" class="page-title">交易历史</div>
             <div class="content" v-for="item in list" :key="item.id">
-                <!-- <img class="img" :src="list.avatar" alt="" /> -->
                 <div class="init">
                     <div style="width: 100%">
                         <div class="text1">{{ item.fromUser || '保密' }}</div>
@@ -200,7 +199,26 @@
                     </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="" /> -->
+                        <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>
+                <div v-else style="display: flex; justify-content: center; margin-top: 10px">暂无购买记录</div>
+            </van-collapse-item>
+        </van-collapse>
         <!-- </div> -->
 
         <driver />
@@ -605,6 +623,22 @@ export default {
 .detail {
     padding-bottom: 100px;
 }
+/deep/ .van-collapse-item__content {
+    background: #181818 !important;
+    padding: 0 !important;
+}
+.activeName {
+    /deep/ .van-cell__title {
+        font-size: @font2;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: bold;
+        color: #ffffff;
+        line-height: 24px;
+    }
+    /deep/ .van-cell {
+        padding: 0 16px;
+    }
+}
 .conName {
     font-size: @font2;
     font-weight: 400;

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

@@ -201,11 +201,25 @@
 
         <!-- <driver /> -->
 
-        <!-- <van-collapse v-model="activeName" accordion>
-      <van-collapse-item title="交易记录" name="1">
-        <van-cell title="单元格" value="内容"> </van-cell>
-      </van-collapse-item>
-    </van-collapse> -->
+        <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="" /> -->
+                        <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>
+                <div v-else style="display: flex; justify-content: center; margin-top: 10px">暂无购买记录</div>
+            </van-collapse-item>
+        </van-collapse>
 
         <driver />
 
@@ -242,7 +256,8 @@ export default {
             btn: null,
             blindBoxItems: [],
             init: [],
-            init2: null
+            init2: null,
+            list: []
         };
     },
     computed: {
@@ -298,7 +313,22 @@ export default {
             this.$http
                 .get('/collection/get/' + this.$route.query.id)
                 .then(res => {
+                    console.log(res);
                     this.info = res;
+                    if (res.assetId) {
+                        this.$http.get('/asset/get/' + res.assetId).then(res => {
+                            console.log(res);
+                            this.$http
+                                .get('/asset/tokenHistory', {
+                                    tokenId: res.tokenId,
+                                    assetId: res.collectionId
+                                })
+                                .then(res => {
+                                    console.log(res);
+                                    this.list = res;
+                                });
+                        });
+                    }
                     if (res.privileges) {
                         this.init2 = res.privileges.find(item => {
                             return item.name === '悄悄话';
@@ -507,7 +537,22 @@ export default {
         }
     }
 }
-
+/deep/ .van-collapse-item__content {
+    background: #181818 !important;
+    padding: 0 !important;
+}
+.activeName {
+    /deep/ .van-cell__title {
+        font-size: @font2;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: bold;
+        color: #ffffff;
+        line-height: 24px;
+    }
+    /deep/ .van-cell {
+        padding: 0 16px;
+    }
+}
 /deep/.creator {
     align-items: center;
     padding: 24px 16px 24px;
@@ -649,7 +694,7 @@ span {
     }
 }
 .goods {
-    padding: 30px 16px 20px;
+    padding: 30px 16px 0px;
 
     .page-title {
         font-size: @font2;
@@ -661,7 +706,50 @@ span {
         }
     }
 }
-
+.content {
+    padding: 0px 16px;
+    display: flex;
+    align-items: center;
+    width: 343px;
+    height: 68px;
+    border-radius: 12px;
+    .img {
+        width: 40px;
+        height: 40px;
+        border-radius: 50%;
+        margin-right: 10px;
+    }
+    .init {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        width: 100%;
+        .text1 {
+            font-size: 14px;
+            font-weight: bold;
+            color: #ffffff;
+            line-height: 24px;
+        }
+        .text2 {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            width: 100%;
+            .text3 {
+                font-size: 14px;
+                font-weight: 400;
+                color: @text3;
+                line-height: 24px;
+            }
+            .text4 {
+                font-size: 14px;
+                font-weight: 400;
+                color: @text3;
+                line-height: 24px;
+            }
+        }
+    }
+}
 .specific-list {
     padding: 10px 0 0;
     display: flex;

src/main/pc-space/src/views/CollectionDetail.vue

@@ -193,6 +193,20 @@
                         <div v-html="info.detail"></div>
                     </div>
                 </el-collapse-item>
+                <!-- v-if="tableData.length != 0" -->
+                <div v-if="tableData.length != 0">
+                    <el-collapse-item name="3">
+                        <template slot="title">
+                            <img class="imgs" src="../assets/info_icon_jiaoyijilu.png" alt="" />
+                            <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>
+                    </el-collapse-item>
+                </div>
             </el-collapse>
         </div>
         <div class="nft" v-if="relateds.length > 0">
@@ -301,6 +315,20 @@ export default {
                     this.loading = false;
                     this.getTime(res.startTime);
                     this.getRelated(res.ownerId);
+                    if (res.assetId) {
+                        this.$http.get('/asset/get/' + res.assetId).then(res => {
+                            console.log(res);
+                            this.$http
+                                .get('/asset/tokenHistory', {
+                                    tokenId: res.tokenId,
+                                    assetId: res.collectionId
+                                })
+                                .then(res => {
+                                    console.log(res);
+                                    this.tableData = res;
+                                });
+                        });
+                    }
                     if (res.privileges) {
                         this.init2 = res.privileges.find(item => {
                             return item.name === '悄悄话';
@@ -771,6 +799,16 @@ export default {
         }
     }
     .content {
+        /deep/ .el-table__row {
+            color: #ffffff;
+        }
+        /deep/ .el-table td,
+        .el-table th.is-leaf {
+            border-bottom: 1px solid #2b2e3e;
+        }
+        /deep/ .el-table th.is-leaf {
+            border-bottom: 1px solid #2b2e3e;
+        }
         .info {
             display: flex;
             align-items: center;