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

+ 4 - 11
src/main/pc-space/src/components/AssetInfo.vue

@@ -11,13 +11,6 @@
         <el-image class="imgBox" :src="getImg(changeImgs(info.pic))" fit="cover"></el-image>
 
         <div class="introduce">{{ info.name }}</div>
-        <!-- <div class="price" v-if="info.consignment">
-            <img class="img1" src="../assets/img/icon_jiage@3x.png" alt="" />
-            <div class="num">{{ info.price }}</div>
-        </div>
-        <div class="status" v-else-if="info.status === 'NORMAL' && !info.consignment">
-            {{ info.publicShow ? '仅展示' : '未展示' }}
-        </div> -->
         <div class="price" v-if="info.consignment">
             <img class="img1" src="../assets/img/icon_jiage@3x.png" alt="" />
             <div class="num">{{ info.sellPrice || 0 }}</div>
@@ -33,13 +26,13 @@
             <div class="text">
                 <div class="text1 name1">
                     <img class="text2" :src="info.minterAvatar" alt="" />
-                    <!-- <div class="text3">{{ info.minter }}</div> -->
-                    <div class="text3">铸造者</div>
+                    <div class="text3">{{ info.minter }}</div>
+                    <!-- <div class="text3">铸造者</div> -->
                 </div>
                 <div class="text1" v-if="info.ownerId">
                     <img class="text2" :src="info.ownerAvatar" alt="" />
-                    <div class="text3">持有者</div>
-                    <!-- <div class="text3">{{ info.owner }}</div> -->
+                    <!-- <div class="text3">持有者</div> -->
+                    <div class="text3">{{ info.owner }}</div>
                 </div>
             </div>
             <div class="text">

+ 10 - 6
src/main/pc-space/src/components/CollectionInfo.vue

@@ -18,13 +18,13 @@
             <div class="text">
                 <div class="text1 name1">
                     <img class="text2" :src="info.minterAvatar" alt="" />
-                    <div class="text3">铸造者</div>
-                    <!-- <div class="text3">{{ info.minter }}</div> -->
+                    <!-- <div class="text3">铸造者</div> -->
+                    <div class="text3">{{ info.minter }}</div>
                 </div>
                 <div class="text1" v-if="info.ownerId">
                     <img class="text2" :src="info.ownerAvatar" alt="" />
-                    <!-- <div class="text3">{{ info.owner }}</div> -->
-                    <div class="text3">持有者</div>
+                    <div class="text3">{{ info.owner }}</div>
+                    <!-- <div class="text3">持有者</div> -->
                 </div>
             </div>
             <div class="text">
@@ -157,20 +157,24 @@ export default {
     .con {
         display: flex;
         align-items: center;
+        justify-content: space-between;
+
         .border {
             width: 100%;
             height: 1px;
-            background: #2b2e3e;
+            background: #494a4d;
             border-radius: 1px;
             margin: 10px 16px;
         }
         .price2 {
-            width: 70%;
             font-size: 12px;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
             color: #939599;
             line-height: 22px;
+            width: 220px;
+            text-align: right;
+            margin-right: 16px;
         }
     }
     .init {

+ 13 - 12
src/main/pc-space/src/components/PageHeader.vue

@@ -7,12 +7,7 @@
         </div>
         <div class="content">
             <el-tabs v-model="activeName" class="menus" @tab-click="change">
-                <el-tab-pane
-                    v-for="(item, index) in menus"
-                    :key="index"
-                    :label="item.label"
-                    :name="item.value"
-                ></el-tab-pane>
+                <el-tab-pane v-for="item in menus" :key="item.id" :label="item.label" :name="item.value"></el-tab-pane>
             </el-tabs>
             <div class="btn-list" v-if="isLogin">
                 <el-dropdown @command="onCommand" style="margin-left: 20px">
@@ -64,27 +59,33 @@ export default {
             menus: [
                 {
                     label: '铸造者',
-                    value: '/casting'
+                    value: '/casting',
+                    id: 1
                 },
                 {
                     label: '收藏探索',
-                    value: '/collection'
+                    value: '/collection',
+                    id: 2
                 },
                 {
                     label: '数字盲盒',
-                    value: '/collection?type=BLIND_BOX'
+                    value: '/collection?type=BLIND_BOX',
+                    id: 3
                 },
                 {
                     label: '铸造商店',
-                    value: 'wait'
+                    value: 'wait',
+                    id: 4
                 },
                 {
                     label: '我的藏品',
-                    value: '/my'
+                    value: '/my',
+                    id: 5
                 },
                 {
                     label: '了解更多',
-                    value: 'wait'
+                    value: 'wait',
+                    id: 6
                 }
             ]
         };

+ 16 - 19
src/main/pc-space/src/views/user/AccountData.vue

@@ -4,8 +4,8 @@
             <el-upload :action="uploadUrl" :show-file-list="false" :before-upload="beforeAvatarUpload2">
                 <img class="top" :src="userInfo.bg || require('../../assets/img/bg-moren@3x.png')" alt="" />
                 <i class="el-icon-plus avatar-uploader-icon"></i>
+                <el-button class="btn" size="small" type="primary">更换背景</el-button>
             </el-upload>
-            <div class="btn">更换背景</div>
         </div>
         <div class="top1">
             <div class="title">
@@ -210,10 +210,6 @@ export default {
         }, 1000);
     },
     methods: {
-        aFn() {
-            this.beforeAvatarUpload2();
-            console.log(222);
-        },
         add() {
             this.$http
                 .post(
@@ -401,6 +397,21 @@ export default {
         padding-top: 200px;
         margin: 0 auto;
     }
+    /deep/ .el-button {
+        position: absolute;
+        width: 90px;
+        height: 26px;
+        border-radius: 16px;
+        border: 1px solid #939599;
+        text-align: center;
+        font-size: 14px;
+        background: transparent;
+        color: #939599;
+        line-height: 6px;
+        cursor: pointer;
+        top: 20px;
+        right: 15px;
+    }
     /deep/ .el-empty__description {
         color: #ccc;
         margin: 10px 0 0 17px;
@@ -409,20 +420,6 @@ export default {
         height: 146px;
         width: 970px;
         position: relative;
-        .btn {
-            position: absolute;
-            width: 90px;
-            height: 26px;
-            border-radius: 16px;
-            border: 1px solid #939599;
-            text-align: center;
-            font-size: 14px;
-            color: #939599;
-            line-height: 26px;
-            cursor: pointer;
-            top: 20px;
-            right: 15px;
-        }
     }
 
     .top1 {