Merge branch 'master' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/asset/Detail.vue

@@ -107,7 +107,11 @@
 
         <div class="goods">
             <van-collapse v-model="activeNames">
-                <van-collapse-item name="1" class="goods-info" v-if="info.minterId !== info.ownerId">
+                <van-collapse-item
+                    name="1"
+                    class="goods-info"
+                    v-if="info.type !== 'PICTURE' || info.minterId !== info.ownerId"
+                >
                     <template #title>
                         <div class="page-title"><img src="@assets/fenxiang-icon.png" alt="" />用户信息</div>
                     </template>

src/views/product/Detail.vue

@@ -40,6 +40,39 @@
             <div class="info-title">
                 <product-title :isSmall="info.name && info.name.length > 16">{{ info.name }}</product-title>
             </div>
+            <div class="types" v-if="info.type === 'PICTURE'">
+                <div class="product-type">个人作品</div>
+            </div>
+            <div class="userInfo-status" v-if="info.type === 'PICTURE' && info.minterId === info.ownerId">
+                <van-cell
+                    class="creator"
+                    :to="{
+                        path: '/creatorDetail',
+                        query: {
+                            id: info.minterId
+                        }
+                    }"
+                    :border="false"
+                >
+                    <template #icon>
+                        <van-image
+                            width="40"
+                            height="40"
+                            class="user-img"
+                            :src="info.minterAvatar || require('@assets/svgs/img_default_photo.svg')"
+                            fit="cover"
+                            radius="100"
+                        />
+                    </template>
+                    <template #title>
+                        <div class="text1 van-ellipsis">{{ info.minter }}</div>
+                        <div class="text2">铸造者</div>
+                    </template>
+                </van-cell>
+                <div class="userInfo-status-text">
+                    {{ info.publicShow ? '公开展示' : '未展示' }}
+                </div>
+            </div>
             <!-- <div class="name" v-if="info.salable && startTime">
                 <div class="name1">首发抢购倒计时</div>
                 <div class="name2">{{ startTime }}</div>
@@ -99,7 +132,7 @@
                         </div>
                     </div>
                 </van-collapse-item>
-                <van-collapse-item name="1" class="goods-info">
+                <van-collapse-item name="1" class="goods-info" v-if="info.minterId !== info.ownerId">
                     <template #title>
                         <div class="page-title">
                             <img src="@assets/fenxiang-icon.png" alt="" />
@@ -454,7 +487,7 @@
             </div>
         </div>
 
-        <div class="btn van-safe-area-bottom" v-else>
+        <div class="btn van-safe-area-bottom" v-else-if="info.type !== 'PICTURE' || info.minterId !== info.ownerId">
             <div class="status-text">仅展示</div>
         </div>
 
@@ -1893,4 +1926,34 @@ export default {
         margin-left: 12px;
     }
 }
+.types {
+    .flex();
+    justify-content: center;
+    margin-top: 5px;
+}
+.product-type {
+    font-size: 12px;
+    color: #3ab200;
+    line-height: 22px;
+    padding: 0 5px;
+    background: #27272b;
+    border-radius: 4px;
+}
+.userInfo-status {
+    .flex();
+    background: #1c1c1c;
+    border-radius: 12px;
+    margin-top: 12px;
+    .creator {
+        padding: 16px;
+    }
+    .userInfo-status-text {
+        font-size: 14px;
+        font-weight: bold;
+        color: #43ce00;
+        line-height: 24px;
+        flex-shrink: 0;
+        padding-right: 16px;
+    }
+}
 </style>

src/views/product/SearchCorpse.vue

@@ -175,7 +175,11 @@
             <template v-for="(item, index) in list" :key="index">
                 <product-info dark v-model:info="list[index]" @update:info="init"></product-info>
             </template>
-            <van-empty v-if="empty" description="什么都没有搜到哦~" :image="require('@assets/kong_png_wusousuo.png')" />
+            <van-empty
+                v-if="empty"
+                description="什么都没有搜到哦~"
+                :image="require('@assets/empty_img_asset_dark.png')"
+            />
         </van-list>
     </div>
 </template>
@@ -246,7 +250,7 @@ export default {
             banners: [],
             classification: '',
             displayInformation: {},
-            rarityLabel: "",
+            rarityLabel: ''
         };
     },
     // watch: {
@@ -315,11 +319,11 @@ export default {
             this.$http
                 .get('/rarityLabel/label/' + search)
                 .then(res => {
-                    this.selectOptions = Object.values(res)
-                    if(Object.values(res).length > 0){
+                    this.selectOptions = Object.values(res);
+                    if (Object.values(res).length > 0) {
                         this.classification = true;
-                        this.rarityLabel = Object.values(res)[0].value
-                    }else{
+                        this.rarityLabel = Object.values(res)[0].value;
+                    } else {
                         this.classification = false;
                     }
                     this.getData(true);
@@ -418,10 +422,10 @@ export default {
                 this.getData(true);
             });
         },
-        changeTabOne(info){
-            this.rarityLabel = info.title
+        changeTabOne(info) {
+            this.rarityLabel = info.title;
             this.getData(true);
-            console.log("fdf",info)
+            console.log('fdf', info);
         },
         beforeData() {
             let sort = this.sort + ',' + this.sortDes;
@@ -979,4 +983,4 @@ export default {
     margin-right: 0px !important;
     // flex-grow: 1 !important;
 }
-</style>
+</style>

src/views/product/Tasks.vue

@@ -16,7 +16,7 @@
         <!-- <van-image class="bg" width="100%" :src="registerBg" fit="scale-down" /> -->
         <img class="bg" :src="registerBg" alt="" />
         <div class="box" v-if="!isMine">
-            <div class="title">帮好友助力获得白名单权限</div>
+            <div class="title">新用户注册实名领取空投</div>
             <van-form ref="form">
                 <van-field
                     type="tel"