xuqiang hace 4 años
padre
commit
4c2d0f899a

BIN
src/main/pc-space/src/assets/img/888.jpg


BIN
src/main/pc-space/src/assets/img/bg-moren@3x.png


BIN
src/main/pc-space/src/assets/nav_logo@3x (1).png


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

@@ -11,13 +11,14 @@
         <el-image class="imgBox" :src="getImg(changeImgs(info.pic))" fit="cover"></el-image>
 
         <div class="introduce">{{ info.name }}</div>
-        <div class="price">
+        <div class="price" v-if="info.salable">
             <img class="img1" src="../assets/img/icon_jiage@3x.png" alt="" />
             <div class="num">{{ info.price }}</div>
             <!-- <div class="time" >
                 <div class="time1">抢购倒计时<span>1天 01:35:06</span></div>
             </div> -->
         </div>
+        <div class="init" v-else>仅展示</div>
         <div class="border"></div>
         <div class="fans">
             <div class="text">
@@ -139,6 +140,14 @@ export default {
         color: #939599;
         line-height: 20px;
     }
+    .init {
+        font-size: 18px;
+        font-weight: 400;
+        color: #939599;
+        line-height: 24px;
+        padding: 0 16px 16px;
+        margin-top: 4px;
+    }
     .price {
         display: flex;
         align-items: center;

+ 0 - 163
src/main/pc-space/src/components/GoodsInfo.vue

@@ -1,163 +0,0 @@
-<template>
-    <div>
-        <div class="box" @click="Store">
-            <div class="content" v-for="(item, index) in list" :key="index">
-                <img class="imgBox" src="../assets/img/888.jpg" alt="" />
-                <div class="introduce">{{ item.name }}</div>
-                <div class="price">
-                    <img class="img1" src="../assets/img/icon_jiage@3x.png" alt="" />
-                    <div class="num">{{ item.price }}</div>
-                    <div class="time" v-if="flagId == 1">
-                        <div class="time1">抢购倒计时<span>1天 01:35:06</span></div>
-                    </div>
-                </div>
-                <div class="border"></div>
-                <div class="fans">
-                    <div class="text">
-                        <div class="text1 name1">
-                            <img class="text2" src="../assets/img/888.jpg" alt="" />
-                            <div class="text3">铸造者</div>
-                        </div>
-                        <div class="text1" v-if="flagId !== '1'">
-                            <img class="text2" src="../assets/img/888.jpg" alt="" />
-                            <div class="text3">持有者</div>
-                        </div>
-                    </div>
-                    <div class="text">
-                        <div class="text1" v-if="flagId !== '1'">
-                            <img class="text2 text4" src="../assets/img/like.png" alt="" />
-                            <div class="text3">16</div>
-                        </div>
-                        <div class="text1" v-else>
-                            <img class="text2 text4" src="../assets/img/icon-yuyue@3x.png" alt="" />
-                            <div class="text3">预约</div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-export default {
-    data() {
-        return {
-            list: [
-                { name: '游戏《百分之一》精美皮肤-恶…', price: '320' },
-                { name: '游戏《百分之一》精美皮肤-恶…', price: '320' },
-                { name: '游戏《百分之一》精美皮肤-恶…', price: '320' },
-                { name: '游戏《百分之一》精美皮肤-恶…', price: '320' }
-            ]
-        };
-    },
-    computed: {
-        flagId() {
-            return this.$route.query.flag;
-        }
-    },
-    mounted() {},
-    methods: {
-        Store() {
-            this.$router.push('/storeDetail');
-        }
-    }
-};
-</script>
-<style lang="less" scoped>
-.box {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    .content {
-        .line();
-        width: 276px;
-        height: 416px;
-        .imgBox {
-            height: 266px;
-            width: 100%;
-            border-radius: 8px 8px 0px 0px;
-        }
-        .introduce {
-            padding: 10px 16px 6px;
-            font-size: 14px;
-            font-weight: 400;
-            color: #939599;
-            line-height: 20px;
-        }
-        .price {
-            display: flex;
-            align-items: center;
-            // justify-content: space-between;
-            padding: 0 16px 16px;
-            .img1 {
-                width: 10px;
-                height: 11px;
-                margin-top: 10px;
-            }
-            .num {
-                font-size: 30px;
-                font-family: OSP-DIN, OSP;
-                font-weight: normal;
-                color: @prim;
-                line-height: 30px;
-            }
-            .time {
-                display: flex;
-                margin-left: 24px;
-                .time1 {
-                    font-size: 14px;
-                    font-weight: 400;
-                    color: #939599;
-                    line-height: 24px;
-                }
-                span {
-                    font-size: 14px;
-                    font-weight: 400;
-                    color: @prim;
-                    line-height: 24px;
-                    margin-left: 6px;
-                }
-            }
-        }
-        .border {
-            height: 1px;
-            background: #494a4d;
-            border-radius: 1px;
-            margin: 0 16px;
-        }
-        .fans {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            padding: 19px 16px 20px;
-            .text {
-                display: flex;
-                align-items: center;
-                .text1 {
-                    display: flex;
-                    align-items: center;
-                    &.name1 {
-                        margin-right: 22px;
-                    }
-                    .text2 {
-                        width: 20px;
-                        height: 20px;
-                        border-radius: 50%;
-                        margin-right: 4px;
-                        &.text4 {
-                            width: 18px;
-                            height: 18px;
-                        }
-                    }
-                    .text3 {
-                        font-size: 14px;
-                        font-weight: 400;
-                        color: #939599;
-                        line-height: 24px;
-                    }
-                }
-            }
-        }
-    }
-}
-</style>

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

@@ -2,7 +2,7 @@
     <div class="container">
         <div class="header">
             <router-link class="logo-link" :to="{ path: '/' }">
-                <img class="logo" src="../assets/img/nav_logo@3x.png" alt=""
+                <img class="logo" src="../assets/nav_logo@3x (1).png" alt=""
             /></router-link>
 
             <div class="content">
@@ -34,7 +34,7 @@
                         </span>
                         <el-dropdown-menu slot="dropdown">
                             <el-dropdown-item command="nickname" style="word-break: keep-all"
-                                >{{ userInfo.username }}
+                                >{{ userInfo.nickname }}
                             </el-dropdown-item>
                             <div class="border"></div>
                             <el-dropdown-item

+ 2 - 1
src/main/pc-space/src/views/CastingDetail.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="detail">
-        <el-image class="bg" :src="info.bg" fit="cover"></el-image>
+        <el-image class="bg" :src="info.bg || require('../assets/defaultBg.jpg')" fit="cover"></el-image>
         <div class="detail-content center-content">
             <el-image :src="info.avatar" fit="cover" class="avatar"></el-image>
             <div class="info">
@@ -244,6 +244,7 @@ export default {
 
             &.prim {
                 .line(@radius:28px);
+                border: 0;
                 text-align: center;
                 /deep/span {
                     color: @prim;

+ 3 - 2
src/main/pc-space/src/views/CollectionDetail.vue

@@ -80,7 +80,7 @@
                     </div>
                     <div class="price1 num">
                         <div class="num1">
-                            <div class="price2 num2">数量</div>
+                            <div class="price2 num2">限购</div>
                             <span class="span">{{ info.total }}</span>
                         </div>
                         <div class="price2 num2">已售 {{ info.sale }} / 剩余 {{ info.stock }}</div>
@@ -631,7 +631,7 @@ export default {
                     margin-left: 16px;
                 }
                 .price2 {
-                    font-size: 16px;
+                    font-size: 14px;
                     font-weight: 400;
                     color: #939599;
                     line-height: 24px;
@@ -876,6 +876,7 @@ export default {
     width: 100%;
     display: block;
     height: 52px;
+    font-size: 16px;
     background: linear-gradient(135deg, @prim 0%, @warn 100%);
     border-radius: 8px;
     border-width: 0;

+ 1 - 1
src/main/pc-space/src/views/Index.vue

@@ -19,7 +19,7 @@
             >
                 <div class="footer center-content">
                     <div class="footer-l">
-                        <img class="logo" src="../assets/img/nav_logo@3x.png" alt="" />
+                        <img class="logo" src="../assets/nav_logo@3x (1).png" alt="" />
                         <div>
                             <div class="text1">加入创造者生态</div>
                             <div class="text2">让我们成为一批游戏NFT的弄潮儿</div>

+ 3 - 1
src/main/pc-space/src/views/user/AccountData.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="container">
         <el-upload class="top" :action="uploadUrl" :show-file-list="false" :before-upload="beforeAvatarUpload2">
-            <img class="top" :src="userInfo.bg || userInfo.avatar" alt="" />
+            <img class="top" :src="userInfo.bg || require('../../assets/img/bg-moren@3x.png')" alt="" />
             <i class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
         <div class="top1">
@@ -573,6 +573,8 @@ export default {
                     line-height: 26px;
                     &.text5 {
                         width: 745px;
+                        min-height: 60px;
+                        word-wrap: break-word;
                     }
                 }
             }