Просмотр исходного кода

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

panhui 4 лет назад
Родитель
Сommit
1e33da520a

BIN
src/main/pc-space/src/assets/detail/icon-dingjia@3x.png


BIN
src/main/pc-space/src/assets/detail/icon-leixing@3x.png


BIN
src/main/pc-space/src/assets/detail/icon-qiaoqiaohua@3x.png


BIN
src/main/pc-space/src/assets/detail/icon-tequan@3x.png


BIN
src/main/pc-space/src/assets/detail/icon-texing@3x.png


+ 1 - 0
src/main/pc-space/src/styles/common.less

@@ -16,6 +16,7 @@
 @red: #fd4d49;
 @menuFont: 16px;
 @menuFont1: 12px;
+@menuFont2: 14px;
 .flex1 {
     flex-grow: 1;
 }

+ 263 - 173
src/main/pc-space/src/views/AssetDetail.vue

@@ -15,9 +15,9 @@
                         </video>
                         <el-image
                             v-else
-                            :src="getImg(item.url, '', 800)"
+                            :src="getImg(item.url, '', 1800)"
                             :preview-src-list="bannerList"
-                            style="width: 460px; height: 460px"
+                            style="width: 100%; height: 520px"
                             fit="scale-down"
                         />
                     </swiper-slide>
@@ -26,8 +26,8 @@
                     <img class="works1" src="../assets/img/icon-quanyibaohu@3x.png" alt="" />
                     <div class="works2">该作品已在保存至区块链并进行权益保护</div>
                 </div>
-                <div class="content2">
-                    <el-collapse v-model="activeNames1" :accordion="false">
+                <div class="content">
+                    <el-collapse v-model="activeNames" :accordion="false">
                         <el-collapse-item name="1" v-if="info.tokenId">
                             <template slot="title">
                                 <img class="imgs" src="../assets/icon-lianshangxinxi.png" alt="" />
@@ -74,8 +74,27 @@
                         <img class="name4" src="../assets/img/icon_inter@3x (4).png" alt="" />
                     </div>
                 </div>
+                <div class="content topcontent">
+                    <el-collapse v-model="activeNames" :accordion="false">
+                        <el-collapse-item name="4">
+                            <template slot="title">
+                                <img class="imgs" src="../assets/icon-miaoshu.png" alt="" />
+                                <span>作品描述</span>
+                            </template>
+                            <div class="info5">
+                                <div v-html="info.detail"></div>
+                            </div>
+                        </el-collapse-item>
+                    </el-collapse>
+                </div>
                 <div class="time">
-                    <div class="time1">卖家定价</div>
+                    <div class="time-icon">
+                        <img class="time-img" src="../assets/detail/icon-dingjia@3x.png" alt="" />
+                        <div class="time1">卖家定价</div>
+                    </div>
+                    <!-- <div class="time2" v-if="info.isAppointment">
+                        首发抢购倒计时<span>{{ startTime }}</span>
+                    </div> -->
                 </div>
                 <div class="price">
                     <div class="price1" v-if="info.consignment">
@@ -118,96 +137,113 @@
                         >
                     </div>
                 </div>
-                <div class="init">
-                    <div class="name">类型</div>
-                    <div class="name name1">悄悄话<span>(灰色表示已使用)</span></div>
-                    <div class="name name2">持有特权<span>(灰色表示已使用)</span></div>
-                </div>
-                <div class="init1">
-                    <div class="name">{{ info.category || '铸造者未设置' }}</div>
-                    <div class="bor"></div>
-                    <div class="box" v-if="init2 != ''">
-                        <div
-                            v-if="init2"
-                            @mouseenter="isShowPopover(init2.name, true)"
-                            @mouseleave="isShowPopover(init2.name, false)"
-                            style="position: relative; width: 24px; margin-left: 16px"
-                        >
-                            <img @click="Whisper" v-if="init2.opened" class="img" :src="init2.icon[2]" alt="" />
-                            <img @click="Whisper" v-else class="img" :src="init2.icon[0]" alt="" />
-                            <div class="hoverTips1" v-if="popoverStatus[init2.name]">
-                                <p>{{ init2.description }}</p>
-                            </div>
-                        </div>
-                        <div class="del" v-else>铸造者未设置</div>
-                    </div>
-                    <div class="bor"></div>
-                    <div class="iconBox" v-if="init.length > 0">
-                        <div v-for="(item, index) in init" :key="index">
-                            <div
-                                style="position: relative"
-                                @mouseenter="isShowPopover(item.name, true)"
-                                @mouseleave="isShowPopover(item.name, false)"
-                            >
-                                <div v-if="item.icon[2]">
-                                    <!-- 只能点一次 -->
-                                    <div v-if="item.once" @click="privilegeFn2(item)">
-                                        <img v-if="item.opened" class="img2" :src="item.icon[2]" alt="" />
-                                    </div>
-                                    <!-- 多次点 -->
-                                    <div v-else @click="privilegeFn(item)">
-                                        <img v-if="item.opened" class="img2" :src="item.icon[2]" alt="" />
-                                    </div>
-                                    <div @click="privilegeFn(item)">
-                                        <img v-if="!item.opened" class="img2" :src="item.icon[3]" alt="" />
+                <div class="content">
+                    <el-collapse v-model="activeNames" :accordion="false">
+                        <el-collapse-item name="5">
+                            <template slot="title">
+                                <img class="imgs" src="../assets/detail/icon-leixing@3x.png" alt="" />
+                                <span>类型</span>
+                                <img
+                                    style="margin-left: 47px"
+                                    class="imgs"
+                                    src="../assets/detail/icon-qiaoqiaohua@3x.png"
+                                    alt=""
+                                />
+                                <span>悄悄话<span class="span-detail">(灰色表示已使用)</span></span>
+                                <img
+                                    style="margin-left: 37px"
+                                    class="imgs"
+                                    src="../assets/detail/icon-tequan@3x.png"
+                                    alt=""
+                                />
+                                <span>持有特权<span class="span-detail">(灰色表示已使用)</span></span>
+                            </template>
+                            <div class="init1">
+                                <div class="name-store" v-if="info.category">{{ info.category }}</div>
+                                <div class="Notset" v-else>铸造者未设置</div>
+                                <div class="bor"></div>
+                                <div class="box" v-if="init2 != ''">
+                                    <div
+                                        v-if="init2"
+                                        @mouseenter="isShowPopover(init2.name, true)"
+                                        @mouseleave="isShowPopover(init2.name, false)"
+                                        style="position: relative; width: 24px; margin-left: 16px"
+                                    >
+                                        <img
+                                            @click="Whisper"
+                                            v-if="init2.opened"
+                                            class="img"
+                                            :src="init2.icon[2]"
+                                            alt=""
+                                        />
+                                        <img @click="Whisper" v-else class="img" :src="init2.icon[0]" alt="" />
+                                        <div class="hoverTips1" v-if="popoverStatus[init2.name]">
+                                            <p>{{ init2.description }}</p>
+                                        </div>
                                     </div>
+                                    <div class="del" v-else>铸造者未设置</div>
                                 </div>
-                                <!-- 新加特权 -->
-                                <div @click="privilegeFn2(item)" v-else>
-                                    <img class="img2" :src="item.icon[0]" alt="" />
-                                </div>
-                                <div class="hoverTips" v-if="popoverStatus[item.name]">
-                                    <div class="span">{{ item.name }}</div>
-                                    <p>{{ item.description }}</p>
+                                <div class="bor"></div>
+                                <div class="iconBox" v-if="init.length > 0">
+                                    <div v-for="(item, index) in init" :key="index">
+                                        <div
+                                            style="position: relative"
+                                            @mouseenter="isShowPopover(item.name, true)"
+                                            @mouseleave="isShowPopover(item.name, false)"
+                                        >
+                                            <div v-if="item.icon[2]">
+                                                <!-- 只能点一次 -->
+                                                <div v-if="item.once" @click="privilegeFn2(item)">
+                                                    <img v-if="item.opened" class="img2" :src="item.icon[2]" alt="" />
+                                                </div>
+                                                <!-- 多次点 -->
+                                                <div v-else @click="privilegeFn(item)">
+                                                    <img v-if="item.opened" class="img2" :src="item.icon[2]" alt="" />
+                                                </div>
+                                                <div @click="privilegeFn(item)">
+                                                    <img v-if="!item.opened" class="img2" :src="item.icon[3]" alt="" />
+                                                </div>
+                                            </div>
+                                            <!-- 新加特权 -->
+                                            <div @click="privilegeFn2(item)" v-else>
+                                                <img class="img2" :src="item.icon[0]" alt="" />
+                                            </div>
+                                            <div class="hoverTips" v-if="popoverStatus[item.name]">
+                                                <div class="span">{{ item.name }}</div>
+                                                <p>{{ item.description }}</p>
+                                            </div>
+                                        </div>
+                                    </div>
                                 </div>
+                                <div class="del" v-else>铸造者未设置</div>
                             </div>
-                        </div>
-                    </div>
-                    <div class="del" v-else>铸造者未设置</div>
+                        </el-collapse-item>
+                    </el-collapse>
                 </div>
-                <div style="margin-top: 30px">
-                    <div class="time">
-                        <div class="time1">商品特性</div>
-                    </div>
-                    <div class="card">
-                        <div class="storeCard" 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 class="content">
+                    <el-collapse v-model="activeNames" :accordion="false">
+                        <el-collapse-item name="4">
+                            <template slot="title">
+                                <img class="imgs" src="../assets/detail/icon-texing@3x.png" alt="" />
+                                <span>商品特性</span>
+                            </template>
+                            <div class="card">
+                                <div class="storeCard" 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 class="del" v-else>铸造者未设置</div>
-                    </div>
+                        </el-collapse-item>
+                    </el-collapse>
                 </div>
             </div>
         </div>
 
         <div class="content" v-loading="loading">
             <el-collapse v-model="activeNames" :accordion="false">
-                <el-collapse-item name="2">
-                    <template slot="title">
-                        <img class="imgs" src="../assets/icon-miaoshu.png" alt="" />
-                        <span>作品描述</span>
-                    </template>
-                    <div class="info4">
-                        <swiper class="boxs" :options="boxOptions">
-                            <swiper-slide v-for="(item, index) in boxs" :key="index">
-                                <el-image :src="item" :preview-src-list="boxs" fit="scale-down" />
-                            </swiper-slide>
-                        </swiper>
-                        <div v-html="info.detail"></div>
-                    </div>
-                </el-collapse-item>
                 <div v-if="tableData.length != 0">
                     <el-collapse-item name="3">
                         <template slot="title">
@@ -359,8 +395,7 @@ export default {
             info: {},
             blindBoxItems: [],
             swiperOptions: {},
-            activeNames: ['2', '3'],
-            activeNames1: ['1'],
+            activeNames: ['1', '2', '3', '4', '5', '6', '7', '8'],
             relateds: [],
             boxOptions: { slidesPerView: 4, spaceBetween: 24, autoplay: true },
             loading: true,
@@ -897,15 +932,16 @@ export default {
     background: #1a1a1a;
     .top {
         display: flex;
-
+        justify-content: space-between;
         .top-left {
             width: 460px;
             flex-shrink: 0;
         }
 
         .top-info {
-            flex-grow: 1;
-            margin-left: 30px;
+            width: 650px;
+            // flex-grow: 1;
+            // margin-left: 30px;
         }
         .init {
             background: #1c1e26;
@@ -948,27 +984,42 @@ export default {
             line-height: 24px;
             padding-left: 22px;
         }
+        .Notset {
+            font-size: 14px;
+            max-width: 100px;
+            font-weight: 400;
+            color: #939599;
+            line-height: 24px;
+            padding: 0 16px;
+        }
         .init1 {
             display: flex;
             align-items: center;
-            height: 102px;
+            height: 64px;
             background: #1f2230;
             border-radius: 0px 0px 8px 8px;
-            .name {
+            .name-store {
                 font-size: 14px;
-                width: 123px;
                 font-weight: 400;
                 color: #ffffff;
+                min-width: 100px;
                 line-height: 24px;
                 padding-left: 16px;
-                margin-right: 0;
             }
             .bor {
                 width: 1px;
-                height: 62px;
+                height: 16px;
                 background: #2b2e3e;
                 border-radius: 1px;
             }
+            .box {
+                width: 225px;
+                .img {
+                    width: 24px;
+                    height: 24px;
+                    cursor: pointer;
+                }
+            }
             .box {
                 width: 218px;
             }
@@ -1053,10 +1104,10 @@ export default {
         .works {
             display: flex;
             align-items: center;
-            height: 68px;
+            height: 44px;
             background: #1c1e26;
             border-radius: 8px;
-            margin-top: 30px;
+            margin-top: 20px;
             .works1 {
                 width: 24px;
                 height: 24px;
@@ -1068,7 +1119,7 @@ export default {
                 color: #ffffff;
             }
         }
-        .content2 {
+        .content {
             .info {
                 display: flex;
                 align-items: center;
@@ -1120,7 +1171,6 @@ export default {
         }
         .title {
             display: flex;
-            margin-top: 10px;
             padding-right: 100px;
             position: relative;
             .title1 {
@@ -1192,21 +1242,35 @@ export default {
                 margin-left: 16px;
             }
         }
+        .time-icon {
+            display: flex;
+            .time-img {
+                width: 24px;
+                height: 24px;
+                margin-right: 10px;
+            }
+            .time1 {
+                font-size: @menuFont;
+                font-weight: bold;
+                color: #ffffff;
+                line-height: 24px;
+            }
+        }
         .time {
             display: flex;
             align-items: center;
             justify-content: space-between;
             background: #1c1e26;
             border-radius: 8px 8px 0px 0px;
-            // width: 678px;
-            height: 56px;
+            height: 44px;
             padding: 0 16px;
-            .time1 {
-                font-size: 18px;
-                font-weight: bold;
-                color: #ffffff;
-                line-height: 24px;
-            }
+            margin-top: 20px;
+            // .time1 {
+            //     font-size: @menuFont2;
+            //     font-weight: 400;
+            //     color: #939599;
+            //     line-height: 24px;
+            // }
             .time2 {
                 font-size: 16px;
                 font-weight: 400;
@@ -1214,7 +1278,7 @@ export default {
                 line-height: 24px;
             }
             span {
-                font-size: 16px;
+                font-size: @menuFont2;
                 font-weight: 400;
                 color: @prim;
                 line-height: 24px;
@@ -1283,10 +1347,10 @@ export default {
             }
         }
         .card {
-            height: 112px;
+            height: 66px;
             border-radius: 0px 0px 8px 8px;
             background: #1f2230;
-            padding: 0 60px;
+            padding: 0 30px;
             display: flex;
             align-items: center;
             // justify-content: space-between;
@@ -1295,26 +1359,33 @@ export default {
                 width: 100%;
                 flex-wrap: wrap;
                 .box1 {
-                    width: 120px;
-                    height: 62px;
+                    width: 94px;
+                    height: 46px;
                     text-align: center;
-                    margin-left: 20px;
                     .line();
                     .box2 {
-                        font-size: 14px;
+                        font-size: @menuFont1;
                         font-weight: 400;
                         color: #939599;
-                        line-height: 24px;
-                        margin-top: 5px;
+                        line-height: 22px;
                     }
                     .box3 {
-                        font-size: 14px;
+                        font-size: @menuFont1;
                         font-weight: 400;
                         color: #ffffff;
-                        line-height: 24px;
+                        line-height: 22px;
                     }
                 }
             }
+
+            &.init3 {
+                height: 59px;
+                padding-left: 16px;
+                font-size: 22px;
+                font-weight: 400;
+                color: #939599;
+                line-height: 36px;
+            }
         }
     }
 
@@ -1379,6 +1450,14 @@ export default {
             color: #fff;
             padding: 16px;
         }
+        .info5 {
+            padding: 10px 16px;
+            font-size: 14px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #939599;
+            line-height: 24px;
+        }
     }
     .nft {
         display: flex;
@@ -1421,15 +1500,11 @@ export default {
     }
 }
 .mySwiper {
-    width: 462px;
+    width: 520px;
     display: inline-block;
     .line();
     /deep/.el-image {
         display: block;
-        width: 458px !important;
-        height: 458px !important;
-        border-radius: 8px !important;
-        margin-left: 1px;
         img {
             display: block;
         }
@@ -1462,67 +1537,34 @@ export default {
 }
 
 /deep/.content {
-    margin-top: 30px;
+    margin-top: 20px;
+    &.topcontent {
+        margin-top: 0;
+    }
     .el-collapse-item__wrap {
-        // border-bottom: 1px solid #494a4d;
+        border-radius: 0 0 8px 8px !important;
         border-bottom-width: 0;
     }
     .el-collapse {
         border-width: 0;
     }
-
-    .el-collapse-item__header {
-        background-color: #1c1e26;
-        padding-left: 16px;
-        height: 68px;
-        border-bottom-width: 0;
-        img {
-            width: 24px;
-            height: 24px;
-            margin-right: 10px;
-        }
-        font-size: 16px;
-        color: #ffffff;
-        line-height: 24px;
-    }
-    .el-collapse-item__content {
-        background-color: #1f2230;
-    }
-    .el-table {
-        background-color: transparent;
-        padding: 0 16px;
-        tr {
-            background-color: transparent;
-        }
-        th {
-            background-color: transparent;
-        }
-        &::before {
-            content: none;
-        }
-    }
-
-    .el-collapse-item {
-        &:last-child {
-            .el-collapse-item__wrap {
-                border-width: 0;
-            }
-        }
-    }
-}
-/deep/.content2 {
-    margin-top: 30px;
-    .el-collapse-item__wrap {
-        border-bottom-width: 0;
+    p {
+        max-height: 130px;
+        overflow-y: auto;
     }
-    .el-collapse {
-        border-width: 0;
+    .span-detail {
+        font-size: 12px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #939599;
+        line-height: 22px;
     }
-
     .el-collapse-item__header {
         background-color: #1c1e26;
+        border-radius: 8px 8px 0 0 !important;
         padding-left: 16px;
-        height: 68px;
+        height: 44px;
+        font-weight: bold;
         border-bottom-width: 0;
         img {
             width: 24px;
@@ -1535,7 +1577,6 @@ export default {
     }
     .el-collapse-item__content {
         background-color: #1f2230;
-        height: 100px !important;
     }
     .el-table {
         background-color: transparent;
@@ -1559,6 +1600,55 @@ export default {
         }
     }
 }
+// /deep/.content2 {
+//     margin-top: 30px;
+//     .el-collapse-item__wrap {
+//         border-bottom-width: 0;
+//     }
+//     .el-collapse {
+//         border-width: 0;
+//     }
+
+//     .el-collapse-item__header {
+//         background-color: #1c1e26;
+//         padding-left: 16px;
+//         height: 68px;
+//         border-bottom-width: 0;
+//         img {
+//             width: 24px;
+//             height: 24px;
+//             margin-right: 10px;
+//         }
+//         font-size: 16px;
+//         color: #ffffff;
+//         line-height: 24px;
+//     }
+//     .el-collapse-item__content {
+//         background-color: #1f2230;
+//         height: 100px !important;
+//     }
+//     .el-table {
+//         background-color: transparent;
+//         padding: 0 16px;
+//         tr {
+//             background-color: transparent;
+//         }
+//         th {
+//             background-color: transparent;
+//         }
+//         &::before {
+//             content: none;
+//         }
+//     }
+
+//     .el-collapse-item {
+//         &:last-child {
+//             .el-collapse-item__wrap {
+//                 border-width: 0;
+//             }
+//         }
+//     }
+// }
 .list {
     margin: -16px;
 
@@ -1568,7 +1658,7 @@ export default {
 }
 
 .status {
-    font-size: 26px;
+    font-size: 22px;
     color: #fdfb60;
     line-height: 36px;
     padding: 20px 0 16px;

+ 148 - 121
src/main/pc-space/src/views/CollectionDetail.vue

@@ -65,7 +65,7 @@
                 </div>
                 <div class="content topcontent">
                     <el-collapse v-model="activeNames" :accordion="false">
-                        <el-collapse-item name="2">
+                        <el-collapse-item name="1">
                             <template slot="title">
                                 <img class="imgs" src="../assets/icon-miaoshu.png" alt="" />
                                 <span>作品描述</span>
@@ -78,14 +78,20 @@
                 </div>
 
                 <div class="time" v-if="info.salable">
-                    <div class="time1">卖家定价</div>
+                    <div class="time-icon">
+                        <img class="time-img" src="../assets/detail/icon-dingjia@3x.png" alt="" />
+                        <div class="time1">卖家定价</div>
+                    </div>
                     <div class="time2" v-if="info.isAppointment">
                         首发抢购倒计时<span>{{ startTime }}</span>
                     </div>
                 </div>
                 <div style="margin-bottom: 30px" v-if="info.salable == false">
                     <div class="time">
-                        <div class="time1">卖家特定</div>
+                        <div class="time-icon">
+                            <img class="time-img" src="../assets/detail/icon-tequan@3x.png" alt="" />
+                            <div class="time1">卖家定价</div>
+                        </div>
                     </div>
                     <div class="card init3">仅展示</div>
                 </div>
@@ -118,63 +124,87 @@
                         <div class="price2 num2">已售 {{ info.sale }} / 剩余 {{ info.stock }}</div>
                     </div>
                 </div>
-                <div class="init">
-                    <div class="type">类型</div>
-                    <div class="type type1">悄悄话<span>(灰色表示已使用)</span></div>
-                    <div class="type type2">持有特权<span>(灰色表示已使用)</span></div>
-                </div>
-                <div class="init1">
-                    <div class="name" v-if="info.category">{{ info.category }}</div>
-                    <div class="Notset" v-else>铸造者未设置</div>
-                    <div class="bor"></div>
-                    <div class="box" v-if="init2 != ''">
-                        <div
-                            v-if="init2"
-                            @mouseenter="isShowPopover(init2.name, true)"
-                            @mouseleave="isShowPopover(init2.name, false)"
-                            style="position: relative; width: 24px; margin-left: 16px"
-                        >
-                            <img v-if="init2.opened" class="img" :src="init2.icon[2]" alt="" />
-                            <img v-else class="img" :src="init2.icon[0]" alt="" />
-                            <div class="hoverTips1" v-if="popoverStatus[init2.name]">
-                                <p>{{ init2.description }}</p>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="del" v-else>铸造者未设置</div>
-                    <div class="bor"></div>
-                    <div class="iconBox" v-if="init.length > 0">
-                        <div v-for="(item, index) in init" :key="index">
-                            <div
-                                style="position: relative"
-                                @mouseenter="isShowPopover(item.name, true)"
-                                @mouseleave="isShowPopover(item.name, false)"
-                            >
-                                <img v-if="item.opened" class="img2" :src="item.icon[2]" alt="" />
-                                <img v-if="!item.opened" class="img2" :src="item.icon[3]" alt="" />
-                                <div class="hoverTips" v-if="popoverStatus[item.name]">
-                                    <div class="span">{{ item.name }}</div>
-                                    <p>{{ item.description }}</p>
+                <div class="content">
+                    <el-collapse v-model="activeNames" :accordion="false">
+                        <el-collapse-item name="5">
+                            <template slot="title">
+                                <img class="imgs" src="../assets/detail/icon-leixing@3x.png" alt="" />
+                                <span>类型</span>
+                                <img
+                                    style="margin-left: 47px"
+                                    class="imgs"
+                                    src="../assets/detail/icon-qiaoqiaohua@3x.png"
+                                    alt=""
+                                />
+                                <span>悄悄话<span class="span-detail">(灰色表示已使用)</span></span>
+                                <img
+                                    style="margin-left: 37px"
+                                    class="imgs"
+                                    src="../assets/detail/icon-tequan@3x.png"
+                                    alt=""
+                                />
+                                <span>持有特权<span class="span-detail">(灰色表示已使用)</span></span>
+                            </template>
+                            <div class="init1">
+                                <div class="name-store" v-if="info.category">{{ info.category }}</div>
+                                <div class="Notset" v-else>铸造者未设置</div>
+                                <div class="bor"></div>
+                                <div class="box" v-if="init2 != ''">
+                                    <div
+                                        v-if="init2"
+                                        @mouseenter="isShowPopover(init2.name, true)"
+                                        @mouseleave="isShowPopover(init2.name, false)"
+                                        style="position: relative; width: 24px; margin-left: 16px"
+                                    >
+                                        <img v-if="init2.opened" class="img" :src="init2.icon[2]" alt="" />
+                                        <img v-else class="img" :src="init2.icon[0]" alt="" />
+                                        <div class="hoverTips1" v-if="popoverStatus[init2.name]">
+                                            <p>{{ init2.description }}</p>
+                                        </div>
+                                    </div>
                                 </div>
+                                <div class="del" v-else>铸造者未设置</div>
+                                <div class="bor"></div>
+                                <div class="iconBox" v-if="init.length > 0">
+                                    <div v-for="(item, index) in init" :key="index">
+                                        <div
+                                            style="position: relative"
+                                            @mouseenter="isShowPopover(item.name, true)"
+                                            @mouseleave="isShowPopover(item.name, false)"
+                                        >
+                                            <img v-if="item.opened" class="img2" :src="item.icon[2]" alt="" />
+                                            <img v-if="!item.opened" class="img2" :src="item.icon[3]" alt="" />
+                                            <div class="hoverTips" v-if="popoverStatus[item.name]">
+                                                <div class="span">{{ item.name }}</div>
+                                                <p>{{ item.description }}</p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div v-else class="del">铸造者未设置</div>
                             </div>
-                        </div>
-                    </div>
-                    <div v-else class="del">铸造者未设置</div>
+                        </el-collapse-item>
+                    </el-collapse>
                 </div>
 
-                <div>
-                    <div class="time">
-                        <div class="time1">商品特性</div>
-                    </div>
-                    <div class="card">
-                        <div class="storeCard" 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 class="content">
+                    <el-collapse v-model="activeNames" :accordion="false">
+                        <el-collapse-item name="4">
+                            <template slot="title">
+                                <img class="imgs" src="../assets/detail/icon-texing@3x.png" alt="" />
+                                <span>商品特性</span>
+                            </template>
+                            <div class="card">
+                                <div class="storeCard" 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 class="del" v-else>铸造者未设置</div>
-                    </div>
+                        </el-collapse-item>
+                    </el-collapse>
                 </div>
             </div>
         </div>
@@ -192,7 +222,7 @@
                     </div>
                 </el-collapse-item>
 
-                <el-collapse-item name="2">
+                <el-collapse-item name="2" v-if="boxs.length !== 0">
                     <template slot="title">
                         <img class="imgs" src="../assets/icon-miaoshu.png" alt="" />
                         <span>盲盒信息</span>
@@ -206,7 +236,6 @@
                         <!-- <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">
@@ -214,24 +243,31 @@
                             <span>交易历史</span>
                         </template>
                         <el-table :data="tableData" stripe style="width: 100%; background: #1c1e26">
-                            <el-table-column prop="fromUser" label="用户" width="455">
+                            <el-table-column prop="fromUser" label="卖方" width="355">
                                 <template slot-scope="scope">
-                                    <div style="color: #fdfb60; font-size: 16px">
+                                    <div style="color: #fdfb60; font-size: 14px">
                                         {{ scope.row.fromUser }}
                                     </div>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="operation" label="操作" width="505">
+                            <el-table-column prop="operation" label="操作" width="305">
                                 <template slot-scope="scope">
-                                    <div style="font-size: 16px">
+                                    <div style="font-size: 14px">
                                         {{ scope.row.operation }}
                                         <span v-if="scope.row.price">{{ scope.row.price }}</span>
                                     </div>
                                 </template>
                             </el-table-column>
+                            <el-table-column prop="operation" label="持有方" width="305">
+                                <template slot-scope="scope">
+                                    <div style="font-size: 14px">
+                                        {{ scope.row.owner }}
+                                    </div>
+                                </template>
+                            </el-table-column>
                             <el-table-column prop="createdAt" label="时间">
                                 <template slot-scope="scope">
-                                    <div style="font-size: 16px">
+                                    <div style="font-size: 14px">
                                         {{ scope.row.createdAt }}
                                     </div>
                                 </template>
@@ -293,7 +329,7 @@ export default {
             info: {},
             blindBoxItems: [],
             swiperOptions: {},
-            activeNames: ['2', '3'],
+            activeNames: ['1', '2', '3', '4', '5'],
             relateds: [],
             boxOptions: { slidesPerView: 4, spaceBetween: 24, autoplay: true },
             loading: true,
@@ -472,10 +508,11 @@ export default {
         .works {
             display: flex;
             align-items: center;
-            height: 68px;
+            height: 44px;
             background: #1c1e26;
             border-radius: 8px;
-            margin-top: 30px;
+            width: 500px;
+            margin-top: 20px;
             .works1 {
                 width: 24px;
                 height: 24px;
@@ -561,6 +598,20 @@ export default {
                 margin-left: 16px;
             }
         }
+        .time-icon {
+            display: flex;
+            .time-img {
+                width: 24px;
+                height: 24px;
+                margin-right: 10px;
+            }
+            .time1 {
+                font-size: @menuFont;
+                font-weight: bold;
+                color: #ffffff;
+                line-height: 24px;
+            }
+        }
         .time {
             display: flex;
             align-items: center;
@@ -570,20 +621,15 @@ export default {
             height: 44px;
             padding: 0 16px;
             margin-top: 20px;
-            .time1 {
-                font-size: 16px;
-                font-weight: bold;
-                color: #ffffff;
-                line-height: 24px;
-            }
+
             .time2 {
-                font-size: 16px;
+                font-size: @menuFont2;
                 font-weight: 400;
                 color: #939599;
                 line-height: 24px;
             }
             span {
-                font-size: 16px;
+                font-size: @menuFont2;
                 font-weight: 400;
                 color: @prim;
                 line-height: 24px;
@@ -621,8 +667,7 @@ export default {
                     font-weight: 400;
                     color: #939599;
                     line-height: 24px;
-                    // padding-top: 12px;
-                    margin-top: 16px;
+                    margin-top: 13px;
                     &.num2 {
                         padding-top: 0;
                     }
@@ -655,42 +700,9 @@ export default {
                 border-radius: 8px;
             }
         }
-        .init {
-            background: #1c1e26;
-            border-radius: 8px 8px 0px 0px;
-            display: flex;
-            height: 44px;
-            align-items: center;
-            .type {
-                font-size: @menuFont;
-                font-weight: bold;
-                color: #ffffff;
-                line-height: 28px;
-                margin: 0 !important;
-                padding-left: 16px;
-                width: 130px;
-                &.type1 {
-                    width: 220px;
-                }
-                &.type2 {
-                    width: 313px;
-                }
-            }
-            span {
-                font-size: 14px;
-                font-weight: 400;
-                color: #939599;
-                line-height: 24px;
-            }
-            .img {
-                width: 24px;
-                height: 24px;
-                cursor: pointer;
-            }
-        }
         .del {
             font-size: 14px;
-            width: 220px;
+            width: 210px;
             font-weight: 400;
             color: #939599;
             line-height: 24px;
@@ -704,20 +716,19 @@ export default {
             border-radius: 0px 0px 8px 8px;
             .Notset {
                 font-size: 14px;
-                width: 128px;
+                max-width: 100px;
                 font-weight: 400;
                 color: #939599;
                 line-height: 24px;
-                padding-left: 16px;
+                padding: 0 16px;
             }
-            .name {
-                width: 128px;
+            .name-store {
                 font-size: 14px;
                 font-weight: 400;
                 color: #ffffff;
+                min-width: 100px;
                 line-height: 24px;
                 padding-left: 16px;
-                margin-right: 0;
             }
             .bor {
                 width: 1px;
@@ -726,7 +737,7 @@ export default {
                 border-radius: 1px;
             }
             .box {
-                width: 235px;
+                width: 225px;
                 .img {
                     width: 24px;
                     height: 24px;
@@ -749,6 +760,7 @@ export default {
                 width: 188px;
                 background: #fff;
                 border-radius: 4px;
+                z-index: 9999;
                 top: 40px;
                 left: 30px;
                 .span {
@@ -773,6 +785,7 @@ export default {
                 border-bottom: 10px solid #fff;
                 content: '';
                 display: block;
+                z-index: 999;
                 position: absolute;
                 left: 12px; //给小三角定位,更具实际需求调整
                 top: -10px; //给小三角定位,更具实际需求调整
@@ -837,12 +850,12 @@ export default {
             }
 
             &.init3 {
-                height: 79px;
+                height: 70px;
                 padding-left: 16px;
-                font-size: 26px;
+                font-size: 20px;
                 font-weight: 400;
                 color: #939599;
-                line-height: 36px;
+                line-height: 30px;
             }
         }
     }
@@ -910,7 +923,7 @@ export default {
             padding: 16px;
         }
         .info5 {
-            padding: 16px;
+            padding: 10px 16px;
             font-size: 14px;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
@@ -979,6 +992,7 @@ export default {
     border-radius: 8px;
     border-width: 0;
     color: #000;
+    font-size: 20px;
     &:hover {
         background: linear-gradient(135deg, darken(@prim, 10%), darken(@warn, 10%));
     }
@@ -995,17 +1009,20 @@ export default {
         margin-top: 0;
     }
     .el-collapse-item__wrap {
-        // border-bottom: 1px solid #494a4d;
         border-bottom-width: 0;
+        border-radius: 0 0 8px 8px !important;
     }
     .el-collapse {
         border-width: 0;
+        // border-radius: 8px !important;
     }
 
     .el-collapse-item__header {
         background-color: #1c1e26;
+        border-radius: 8px 8px 0 0 !important;
         padding-left: 16px;
         height: 44px;
+        font-weight: bold;
         border-bottom-width: 0;
         img {
             width: 24px;
@@ -1016,6 +1033,13 @@ export default {
         color: #ffffff;
         line-height: 24px;
     }
+    .span-detail {
+        font-size: 12px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #939599;
+        line-height: 22px;
+    }
     .el-collapse-item__content {
         background-color: #1f2230;
     }
@@ -1032,7 +1056,10 @@ export default {
             content: none;
         }
     }
-
+    p {
+        max-height: 130px;
+        overflow-y: auto;
+    }
     .el-collapse-item {
         &:last-child {
             .el-collapse-item__wrap {