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

src/main/nine-space/src/components/product/productLarge.vue

@@ -28,10 +28,11 @@
                     <span>{{ info.minter }}</span>
                 </div>
                 <div class="flex1"></div>
-                <div class="price">
+                <div class="price" v-if="info.salable">
                     <img src="../../assets/icon_jiage.png" alt="" />
                     <span> {{ info.price }}</span>
                 </div>
+                <diV v-else class="status">仅展示</diV>
             </div>
         </div>
 
@@ -213,4 +214,9 @@ export default {
         left: 0;
     }
 }
+
+.status {
+    font-size: @font2;
+    color: #fff;
+}
 </style>

src/main/nine-space/src/plugins/http.js

@@ -5,9 +5,9 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        // baseUrl = 'https://nfttest.9space.vip/';
+        baseUrl = 'https://nfttest.9space.vip/';
         // baseUrl = 'http://192.168.50.190:8080';
-        baseUrl = 'http://localhost:8080';
+        // baseUrl = 'http://localhost:8080';
         // baseUrl = 'http://192.168.50.190:8080';
         break;
     case 'test':

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

@@ -150,6 +150,14 @@
                         </van-cell>
                     </div>
                 </van-collapse-item>
+
+                <van-collapse-item name="4" class="goods-info">
+                    <template #title>
+                        <div class="page-title"><img src="../../assets/icon-miaoshu.png" alt="" />作品描述</div>
+                    </template>
+                    <div v-if="info.detail" class="page-text page-detail" v-html="info.detail"></div>
+                    <div v-else class="textName">铸造者未设置</div>
+                </van-collapse-item>
                 <van-collapse-item name="002" class="goods-info">
                     <template #title>
                         <div class="page-title"><img src="../../assets/icon-lianshangxinxi.png" alt="" />类型</div>
@@ -190,8 +198,18 @@
                     </template>
                     <div class="prive" v-if="init.length > 0">
                         <div class="prive1" v-for="(item, index) in init" :key="index">
-                            <img class="img" :src="item.icon[0]" alt="" />
-                            <div class="prive2">{{ item.name }}</div>
+                            <img v-if="!item.opened" class="img" :src="item.icon[0]" alt="" />
+                            <div v-if="item.icon[2]">
+                                <img v-if="item.opened" class="img" :src="item.icon[2]" alt="" />
+                            </div>
+                            <!-- <img class="img" v-else :src="item.icon[0]" alt="" /> -->
+
+                            <div v-if="item.once" @click="privilegeFn2(item)" class="prive2">
+                                {{ item.name }}
+                            </div>
+                            <div v-else @click="privilegeFn(item)" class="prive2">
+                                {{ item.name }}
+                            </div>
                         </div>
                     </div>
                     <div v-if="init.length === 0" class="tips">铸造者未设置</div>
@@ -210,13 +228,6 @@
                     </div>
                     <div v-else class="textName">铸造者未设置</div>
                 </van-collapse-item>
-                <van-collapse-item name="4" class="goods-info">
-                    <template #title>
-                        <div class="page-title"><img src="../../assets/icon-miaoshu.png" alt="" />作品描述</div>
-                    </template>
-                    <div v-if="info.detail" class="page-text page-detail" v-html="info.detail"></div>
-                    <div v-else class="textName">铸造者未设置</div>
-                </van-collapse-item>
                 <van-collapse-item name="2" class="goods-info">
                     <template #title>
                         <div class="page-title">
@@ -248,7 +259,7 @@
                             </div>
                         </div>
                     </div>
-                    <div v-else style="display: flex; justify-content: center; margin-top: 10px">暂无购买记录</div>
+                    <div v-else style="display: flex; justify-content: center">暂无购买记录</div>
                 </van-collapse-item>
             </van-collapse>
 
@@ -402,7 +413,7 @@ export default {
     mixins: [asset, product],
     data() {
         return {
-            activeNames: [],
+            activeNames: ['01', '4'],
             info: {},
             liked: false,
             show2: false,
@@ -814,7 +825,7 @@ export default {
         font-weight: bold;
         color: #ffffff;
         line-height: 28px;
-        margin-top: 12px;
+        // margin-top: 12px;
     }
 
     .info-bottom {
@@ -1043,14 +1054,14 @@ export default {
     color: #939599;
     line-height: 24px;
     // padding-top: 10px;
-    padding: 10px 0 0 16px;
+    // padding: 10px 0 0 16px;
 }
 .goods {
     // padding: 20px 16px;
     .top1 {
         display: flex;
         align-items: center;
-        margin-top: 12px;
+        // margin-top: 12px;
         .text1 {
             font-size: @font2;
             font-weight: bold;
@@ -1128,11 +1139,12 @@ export default {
     align-items: center;
     width: 100%;
     flex-wrap: wrap;
+    margin-top: -12px;
     .prive1 {
         display: flex;
         align-items: center;
         justify-content: center;
-        margin: 16px 16px 0 0;
+        margin: 12px 16px 0 0;
         width: 94px;
         height: 32px;
         color: #000;
@@ -1219,7 +1231,7 @@ export default {
     font-size: @font2;
     color: #ffffff;
     line-height: 28px;
-    margin-top: 10px;
+    // margin-top: 10px;
     // p {
     //     font-size: @font2;
     //     color: #ffffff;
@@ -1278,7 +1290,7 @@ export default {
 
 .user {
     display: flex;
-    padding-top: 12px;
+    // padding-top: 12px;
     .creator {
         width: 50%;
     }
@@ -1286,6 +1298,9 @@ export default {
     .user-img {
         flex-shrink: 0;
     }
+    .van-cell {
+        padding: 0;
+    }
 
     /deep/.van-cell__title {
         margin-left: 10px;
@@ -1443,7 +1458,7 @@ export default {
     }
 }
 .goods {
-    padding: 0 16px 0px;
+    // padding: 0 16px 0px;
 
     .page-title {
         font-size: @font2;
@@ -1463,11 +1478,11 @@ export default {
     }
 }
 .goods-info {
-    padding: 0 0 30px;
+    // padding: 0 0 30px;
 }
 /deep/.goods-info {
     .van-cell {
-        padding: 0 0;
+        // padding: 0 0;
         &::after {
             content: none;
         }
@@ -1499,7 +1514,12 @@ export default {
 
 .tips {
     font-size: @font2;
-    margin-top: 12px;
+    // margin-top: 12px;
     color: @text3;
 }
+
+/deep/.van-collapse-item__content {
+    padding: 12px 16px !important;
+    background-color: #131313 !important;
+}
 </style>

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

@@ -133,6 +133,25 @@
                         </van-cell>
                     </div>
                 </van-collapse-item>
+
+                <van-collapse-item name="4" class="goods-info">
+                    <template #title>
+                        <div class="page-title"><img src="../../assets/icon-miaoshu.png" alt="" />作品描述</div>
+                    </template>
+                    <swiper v-if="boxs.length > 0" :slidesPerView="'auto'" :spaceBetween="20" class="detail-swiper">
+                        <swiper-slide v-for="(item, index) in boxs" :key="index">
+                            <van-image
+                                width="100%"
+                                height="170"
+                                :src="getImg(item, '', 1000)"
+                                fit="cover"
+                                radius="12"
+                                @click="preview(index, boxs)"
+                            />
+                        </swiper-slide>
+                    </swiper>
+                    <div v-if="info.detail" class="page-text page-detail" v-html="info.detail"></div>
+                </van-collapse-item>
                 <van-collapse-item name="002" class="goods-info top1">
                     <template #title>
                         <div class="page-title"><img src="../../assets/icon-lianshangxinxi.png" alt="" /> 类型</div>
@@ -193,24 +212,6 @@
                     <div v-else class="textName">铸造者未设置</div>
                 </van-collapse-item>
 
-                <van-collapse-item name="4" class="goods-info">
-                    <template #title>
-                        <div class="page-title"><img src="../../assets/icon-miaoshu.png" alt="" />作品描述</div>
-                    </template>
-                    <swiper v-if="boxs.length > 0" :slidesPerView="'auto'" :spaceBetween="20" class="detail-swiper">
-                        <swiper-slide v-for="(item, index) in boxs" :key="index">
-                            <van-image
-                                width="100%"
-                                height="170"
-                                :src="getImg(item, '', 1000)"
-                                fit="cover"
-                                radius="12"
-                                @click="preview(index, boxs)"
-                            />
-                        </swiper-slide>
-                    </swiper>
-                    <div v-if="info.detail" class="page-text page-detail" v-html="info.detail"></div>
-                </van-collapse-item>
                 <van-collapse-item name="2" class="goods-info">
                     <template #title>
                         <div class="page-title">
@@ -242,7 +243,7 @@
                             </div>
                         </div>
                     </div>
-                    <div v-else style="display: flex; justify-content: center; margin-top: 10px">暂无购买记录</div>
+                    <div v-else class="textName">暂无购买记录</div>
                 </van-collapse-item>
             </van-collapse>
         </div>
@@ -272,7 +273,7 @@
         </div>
 
         <div class="btn van-safe-area-bottom" v-if="!info.salable">
-            <div class="btns status-text">仅展示</div>
+            <div class="status-text">仅展示</div>
         </div>
 
         <!-- <driver /> -->
@@ -314,7 +315,7 @@ export default {
             init: [],
             init2: null,
             list: [],
-            activeNames: []
+            activeNames: ['01', '4']
         };
     },
     computed: {
@@ -463,11 +464,12 @@ export default {
     display: flex;
     align-items: center;
     flex-wrap: wrap;
+    margin-bottom: -12px;
     .prive1 {
         display: flex;
         align-items: center;
         justify-content: center;
-        margin: 16px 16px 0 0;
+        margin: 0 16px 12px 0;
         width: 94px;
         height: 32px;
         color: #000;
@@ -535,7 +537,7 @@ export default {
     .price-line {
         display: flex;
         justify-content: center;
-        margin-top: 12px;
+        // margin-top: 12px;
         .sub {
             flex-grow: 1;
             margin-left: 5px;
@@ -761,7 +763,7 @@ export default {
     }
 }
 .goods {
-    padding: 20px 16px 0px;
+    // padding: 20px 16px 0px;
 
     .page-title {
         font-size: @font2;
@@ -781,6 +783,7 @@ export default {
         span {
             color: @text3;
             font-size: @font1;
+            font-weight: normal;
         }
     }
 }
@@ -807,7 +810,7 @@ export default {
     height: 30px;
     align-items: center;
     justify-content: center;
-    margin-top: 12px;
+    // margin-top: 12px;
     .img {
         width: 18px;
         height: 18px;
@@ -837,7 +840,7 @@ export default {
     }
 }
 .specific-list {
-    padding: 10px 0 0;
+    // padding: 10px 0 0;
     display: flex;
     align-items: center;
     overflow-x: auto;
@@ -847,7 +850,7 @@ export default {
     font-weight: 400;
     color: #939599;
     line-height: 24px;
-    padding-top: 10px;
+    // padding-top: 10px;
 }
 .specific-item {
     // width: 94px;
@@ -897,7 +900,7 @@ export default {
     font-size: @font2;
     color: #ffffff;
     line-height: 28px;
-    margin-top: 10px;
+    // margin-top: 10px;
 }
 .btn-list {
     display: flex;
@@ -922,7 +925,7 @@ export default {
     }
 }
 .goods-info {
-    padding: 0 0 30px;
+    // padding: 0 0 30px;
 }
 .detail-swiper {
     height: 170px;
@@ -1101,7 +1104,7 @@ export default {
 
 /deep/.goods-info {
     .van-cell {
-        padding: 0 0;
+        // padding: 0 0;
         &::after {
             content: none;
         }
@@ -1116,7 +1119,7 @@ export default {
 }
 
 .user {
-    padding: 12px 0 0;
+    // padding: 12px 0 0;
     display: flex;
     .creator {
         width: 50%;
@@ -1125,6 +1128,9 @@ export default {
     .user-img {
         flex-shrink: 0;
     }
+    /deep/.van-cell {
+        padding: 0;
+    }
 
     /deep/.van-cell__title {
         margin-left: 10px;
@@ -1176,7 +1182,7 @@ export default {
     line-height: 30px;
     text-align: center;
     position: relative;
-    margin-top: 12px;
+    // margin-top: 12px;
     &::after {
         content: '';
         background-color: @bg;
@@ -1193,4 +1199,8 @@ export default {
         z-index: 1;
     }
 }
+/deep/.van-collapse-item__content {
+    padding: 12px 16px !important;
+    background-color: #131313 !important;
+}
 </style>

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

@@ -3,9 +3,8 @@
         <div class="topBox1">
             <img class="topBox" src="../assets/矩形@3x (1).png" alt="" />
             <div class="header center-content">
-                <router-link class="logo-link" :to="{ path: '/' }">
-                    <img class="logo" src="../assets/nav_logo@3x (1).png" alt=""
-                /></router-link>
+                <!-- <router-link class="logo-link" :to="{ path: '/' }"> -->
+                <img class="logo" src="../assets/nav_logo@3x (1).png" alt="" />
                 <div class="content">
                     <el-tabs v-model="activeName" class="menus" @tab-click="change">
                         <el-tab-pane
@@ -18,7 +17,7 @@
                     <div class="btn-list" v-if="isLogin">
                         <el-dropdown @command="onCommand" style="margin-left: 20px">
                             <span class="el-dropdown-link">
-                                <img class="img" :src="avatarBox" />
+                                <img style="margin-top: 8px" class="img" :src="avatarBox" />
                             </span>
                             <el-dropdown-menu slot="dropdown">
                                 <el-dropdown-item command="nickname" style="word-break: keep-all"
@@ -234,13 +233,13 @@ export default {
             this.Login();
         });
         this.getActive();
-        // if (this.userInfo.authStatus) {
-        //     if (this.userInfo.authStatus !== 'NOT_AUTH') {
-        //         setTimeout(() => {
-        //             this.add();
-        //         }, 1000);
-        //     }
-        // }
+        if (this.isLogin) {
+            if (this.userInfo.authStatus !== 'NOT_AUTH') {
+                setTimeout(() => {
+                    this.add();
+                }, 1000);
+            }
+        }
 
         this.getCreators();
         this.getProduct().then(res => {
@@ -277,7 +276,6 @@ export default {
                 this.banners = res.content.filter(item => {
                     return item.name === '首页大图';
                 });
-                console.log(this.banners);
             });
     },
     methods: {
@@ -515,7 +513,7 @@ export default {
     text-align: center;
 }
 /deep/.menus {
-    padding: 15px 25px 19px;
+    padding: 22px 25px 0px;
     .el-tabs__item {
         padding: 0 25px;
         color: #ffffff;
@@ -551,23 +549,15 @@ export default {
     }
 }
 .container {
-    .topBox1 {
-        // position: relative;
-        // width: 1300px;
-        width: 100%;
-        // text-align: center;
-        margin: 0 auto;
-    }
     .header {
         background: transparent;
-        z-index: 88;
+        z-index: 188;
         position: absolute;
         top: 0;
         left: 0;
         right: 0;
         margin: 0 auto;
         width: 1300px;
-        // margin-top: -16px;
         display: flex;
         align-items: center;
         justify-content: space-between;
@@ -625,14 +615,14 @@ export default {
 
             .login {
                 width: 80px;
-                height: 26px;
+                height: 28px;
                 line-height: 0px;
+                margin-top: 7px;
                 border-radius: 4px;
                 font-size: 14px;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;
                 color: #ffffff;
-                margin-top: -22px;
                 background: transparent;
                 border: 1px solid #ffffff;
             }