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

src/main/nine-space/src/components/Post.vue

@@ -83,10 +83,10 @@ export default {
             if (this.isLogin) {
                 return resolveUrl(
                     this.$baseUrl,
-                    this.pageUrl + '?id=' + this.info.id + '&userId=' + this.$store.state.userInfo.id
+                    '9th/' + this.pageUrl + '?id=' + this.info.id + '&userId=' + this.$store.state.userInfo.id
                 );
             } else {
-                return resolveUrl(this.$baseUrl, this.pageUrl + '?id=' + this.info.id);
+                return resolveUrl(this.$baseUrl, '9th/' + this.pageUrl + '?id=' + this.info.id);
             }
         },
         banners() {

src/main/nine-space/src/components/creator/CreatorInfo.vue

@@ -20,7 +20,7 @@
 
         <div class="content">
             <div class="text1 van-ellipsis">{{ info.nickname }}</div>
-            <div class="text2 van-ellipsis--l2">
+            <div class="text2 van-multi-ellipsis--l2">
                 {{ info.intro }}
             </div>
             <div class="flex1"></div>
@@ -201,8 +201,9 @@ export default {
     .NOImg {
         position: absolute;
         width: 98px;
+        height: 104px;
         display: block;
-        left: 10px;
+        left: 11px;
         top: 14px;
     }
 }

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

@@ -134,7 +134,8 @@ export default {
                 page: this.page,
                 size: 20,
                 query: {
-                    userId: this.$store.state.userInfo.id
+                    userId: this.$store.state.userInfo.id,
+                    status: 'NORMAL,TRADING,GIFTING'
                 },
                 sort: 'createdAt,desc'
             };

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

@@ -424,7 +424,7 @@ export default {
                         return this.$http.post(`/asset/cancelConsignment?id=${this.info.id}`);
                     })
                     .then(res => {
-                        this.$message.success('取消寄售');
+                        this.$toast.success('取消寄售');
                         setTimeout(() => {
                             this.getProduct();
                         }, 1000);

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

@@ -6,8 +6,8 @@
                 <div class="userInfo-top">
                     <van-image
                         round
-                        width="78"
-                        height="78"
+                        width="79"
+                        height="79"
                         :src="info.avatar || require('../../assets/svgs/img_default_photo.svg')"
                         fit="cover"
                         @click="$router.push('/setting')"
@@ -307,9 +307,10 @@ export default {
 
     .rank-icon {
         width: 90px;
-        height: 90px;
+        display: block;
+        height: auto;
         position: absolute;
-        top: -4px;
+        top: -5px;
         left: 0px;
     }
 

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

@@ -141,7 +141,7 @@
 
         <driver />
 
-        <post ref="post" :info="info" noButton />
+        <post ref="post" pageUrl="productDetail2" :info="info" noButton />
     </div>
 </template>
 
@@ -592,8 +592,8 @@ export default {
     .share-icon {
         margin-left: 30px;
         img {
-            width: 24px;
-            height: 24px;
+            width: 18px;
+            height: 18px;
             display: inline-block;
             vertical-align: middle;
         }
@@ -624,7 +624,7 @@ export default {
 
             &:nth-child(3),
             &:nth-child(4) {
-                width: 100%;
+                width: calc(100% - 65px);
                 height: 10px;
             }
             &:nth-child(2) {
@@ -633,11 +633,11 @@ export default {
             }
             &:nth-child(3) {
                 top: -0.8px;
-                left: 5px;
+                left: 45px;
             }
             &:nth-child(4) {
                 bottom: 0.5px;
-                right: 5px;
+                right: 45px;
             }
             &:nth-child(5) {
                 bottom: 0;

src/main/pc-space/src/components/AssetInfo.vue

@@ -20,7 +20,7 @@
         </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 class="num">{{ info.sellPrice || 0 }}</div>
         </div>
         <div class="status" v-else-if="info.status === 'NORMAL'">
             {{ info.publicShow ? '仅展示' : '未展示' }}

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

@@ -81,7 +81,7 @@
                     <div class="price1" v-if="info.consignment">
                         <div class="price2">价格</div>
                         <img class="price3" src="../assets/img/icon_jiage@3x.png" alt="" />
-                        <div class="price4">{{ info.price || 0 }}</div>
+                        <div class="price4">{{ info.sellPrice || 0 }}</div>
                         <div class="price2" v-if="info.royalties">
                             含<span>{{ info.royalties }}%</span>版税
                         </div>

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

@@ -137,14 +137,15 @@ export default {
                     search: this.search,
                     query: {
                         userId: this.$store.state.userInfo.id,
-                        consignment: true
+                        status: 'TRANSFERRED'
                     }
                 };
             } else {
                 return {
                     search: this.search,
                     query: {
-                        userId: this.$store.state.userInfo.id
+                        userId: this.$store.state.userInfo.id,
+                        status: 'NORMAL,TRADING,GIFTING'
                     }
                 };
             }