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

src/main/nine-space/src/components/asset/assetInfo.vue

@@ -15,8 +15,8 @@
             <div class="name van-ellipsis">
                 {{ info.name }}
             </div>
-            <div class="price" v-if="info.status === 'ON_SALE'">
-                <i class="font_family icon-icon_jiage"></i>{{ info.price }}
+            <div class="price" v-if="info.consignment">
+                <i class="font_family icon-icon_jiage"></i>{{ info.sellPrice || 0 }}
             </div>
             <div class="status" v-else-if="info.status === 'NORMAL'">
                 {{ info.publicShow ? '仅展示' : '未展示' }}

src/main/nine-space/src/mixins/asset.js

@@ -7,20 +7,20 @@ export default {
                     value: 'NORMAL'
                 },
                 {
-                    label: '出售中',
-                    value: 'ON_SALE'
+                    label: '转让中',
+                    value: 'TRADING'
                 },
                 {
-                    label: '盲盒中',
-                    value: 'IN_BLIND_BOX'
+                    label: '已转让',
+                    value: 'TRANSFERRED'
                 },
                 {
-                    label: '转让中',
-                    value: 'TRANSFERRING'
+                    label: '转赠中',
+                    value: 'GIFTING'
                 },
                 {
-                    label: '已转让',
-                    value: 'TRANSFERRED'
+                    label: '已转赠',
+                    value: 'GIFTED'
                 }
             ]
         };

src/main/nine-space/src/styles/app.less

@@ -121,3 +121,8 @@ input:-webkit-autofill {
     height: 50px;
     padding-bottom: env(safe-area-inset-bottom);
 }
+
+.van-empty__image {
+    width: 235px;
+    height: 170px;
+}

src/main/nine-space/src/views/Store.vue

@@ -50,7 +50,11 @@
                 <asset-info :info="item"></asset-info>
             </template>
 
-            <van-empty v-if="empty" description="您还没有任何藏品哦~" />
+            <van-empty
+                v-if="empty"
+                description="你还有没有藏品哦～"
+                :image="require('../assets/kong_png_maichude.png')"
+            />
         </van-list>
         <van-action-sheet
             ref="action"
@@ -137,12 +141,13 @@ export default {
             if (this.type === 'NORMAL') {
                 form.query = {
                     ...form.query,
-                    publicShow: true
+                    publicShow: true,
+                    consignment: false
                 };
             }
             if (this.type === 'ON_SALE') {
                 form.query = {
-                    userId: this.$store.state.userInfo.id,
+                    ...form.query,
                     consignment: true
                 };
             }

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

@@ -24,8 +24,8 @@
 
         <div class="info">
             <div class="price-line">
-                <template v-if="info.status === 'ON_SALE'">
-                    <div class="price"><i class="font_family icon-icon_jiage"></i>{{ info.price }}</div>
+                <template v-if="info.consignment">
+                    <div class="price"><i class="font_family icon-icon_jiage"></i>{{ info.sellPrice || 0 }}</div>
                     <div class="sub" v-if="info.royalties">
                         含 <span>{{ info.royalties }}%</span> 版税
                     </div>
@@ -147,7 +147,7 @@
                 <van-button type="primary" block round @click="buy">立即购买</van-button>
             </div>
         </div> -->
-        <div class="btn van-safe-area-bottom" ref="btn">
+        <div class="btn van-safe-area-bottom" ref="btn" v-if="info.status === 'NORMAL'">
             <div class="btns1">
                 <div @click="Add">
                     <img
@@ -264,7 +264,11 @@
             </van-popup>
         </div>
 
-        <post :info="info" pageUrl="assetDetail" />
+        <post
+            :info="info"
+            :noButton="info.status !== 'NORMAL' || (!info.publicShow && !info.consignment)"
+            pageUrl="assetDetail"
+        />
     </div>
 </template>
 

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

@@ -26,7 +26,11 @@
                 <asset-info :info="item"></asset-info>
             </template>
 
-            <van-empty v-if="empty" description="您还没有任何藏品哦~" />
+            <van-empty
+                v-if="empty"
+                description="什么都没有搜到哦~"
+                :image="require('../../assets/kong_png_wusousuo.png')"
+            />
         </van-list>
     </div>
 </template>

src/main/nine-space/src/views/creator/Search.vue

@@ -24,7 +24,11 @@
             <template v-for="(item, index) in list" :key="index">
                 <creator-info v-model:info="list[index]"></creator-info>
             </template>
-            <van-empty v-if="empty" description="没有任何收藏者哦~" />
+            <van-empty
+                v-if="empty"
+                description="什么都没有搜到哦~"
+                :image="require('../../assets/kong_png_wusousuo.png')"
+            />
         </van-list>
     </div>
 </template>

src/main/nine-space/src/views/order/Orders.vue

@@ -22,7 +22,11 @@
 
         <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
             <order-info @delFn="delFn" v-for="item in list" :key="item.id" :info="item"></order-info>
-            <van-empty v-if="empty" description="还没有订单哦~" />
+            <van-empty
+                v-if="empty"
+                description="你还没有订单哦~"
+                :image="require('../../assets/kong_png_wudingdan.png')"
+            />
         </van-list>
     </div>
 </template>

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

@@ -24,7 +24,11 @@
             <template v-for="(item, index) in list" :key="index">
                 <product-info v-model:info="list[index]" @update:info="init"></product-info>
             </template>
-            <van-empty v-if="empty" description="没有任何藏品哦~" />
+            <van-empty
+                v-if="empty"
+                description="什么都没有搜到哦~"
+                :image="require('../../assets/kong_png_wusousuo.png')"
+            />
         </van-list>
     </div>
 </template>

src/main/nine-space/src/views/user/Followers.vue

@@ -9,7 +9,11 @@
             <template v-for="(item, index) in list" :key="index">
                 <creator-info isFollow v-model:info="list[index]"></creator-info>
             </template>
-            <van-empty v-if="empty" description="还没有任何粉丝关注你哦~" />
+            <van-empty
+                v-if="empty"
+                description="你还有没有粉丝哦~"
+                :image="require('../../assets/kong_png_fensi.png')"
+            />
         </div>
     </div>
 </template>

src/main/nine-space/src/views/user/Follows.vue

@@ -9,7 +9,11 @@
             <template v-for="(item, index) in list" :key="index">
                 <creator-info v-model:info="list[index]" @update:info="init"></creator-info>
             </template>
-            <van-empty v-if="empty" description="你还没有任何关注哦~" />
+            <van-empty
+                v-if="empty"
+                description="你还没有关注别人哦～"
+                :image="require('../../assets/kong_png_gaunzhu.png')"
+            />
         </div>
     </div>
 </template>

src/main/nine-space/src/views/user/Likes.vue

@@ -17,7 +17,11 @@
             <template v-for="(item, index) in showList" :key="index">
                 <product-info v-model:info="list[item.index]" @update:info="init"></product-info>
             </template>
-            <van-empty v-if="showList.length === 0" description="你还没有赞过任何藏品哦~" />
+            <van-empty
+                v-if="showList.length === 0"
+                description="你还有没有点赞哦~"
+                :image="require('../../assets/kong_png_dianzan.png')"
+            />
         </div>
     </div>
 </template>

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

@@ -4,9 +4,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':