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

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

@@ -11,7 +11,14 @@
         <el-image class="imgBox" :src="getImg(changeImgs(info.pic))" fit="cover"></el-image>
 
         <div class="introduce">{{ info.name }}</div>
-        <div class="price" v-if="info.status === 'ON_SALE'">
+        <!-- <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>
+        <div class="status" v-else-if="info.status === 'NORMAL' && !info.consignment">
+            {{ info.publicShow ? '仅展示' : '未展示' }}
+        </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>

src/main/pc-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/pc-space/src/views/AssetDetail.vue

@@ -78,10 +78,10 @@
                     <div class="time1">卖家定价</div>
                 </div>
                 <div class="price">
-                    <div class="price1" v-if="info.salable">
+                    <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 }}</div>
+                        <div class="price4">{{ info.price || 0 }}</div>
                         <div class="price2" v-if="info.royalties">
                             含<span>{{ info.royalties }}%</span>版税
                         </div>
@@ -101,7 +101,7 @@
                         <div class="price2 num2">已售 {{ info.sale }} / 剩余 {{ info.stock }}</div>
                     </div>
 
-                    <div class="btn-content">
+                    <div class="btn-content" v-if="info.status !== 'GIFTING' && info.status !== 'GIFTED'">
                         <div class="btn-list">
                             <div class="btn-item" @click="changeShow">
                                 <i class="font_family icon-icon-gongkaizhanshi"></i>

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

@@ -184,14 +184,16 @@ export default {
                     search: this.search,
                     query: {
                         type: this.type,
-                        canResale: this.canResale
+                        canResale: this.canResale,
+                        onShelf: true
                     }
                 };
             } else {
                 return {
                     search: this.search,
                     query: {
-                        type: this.type
+                        type: this.type,
+                        onShelf: true
                     }
                 };
             }

src/main/pc-space/src/views/user/AccountData.vue

@@ -1,9 +1,12 @@
 <template>
     <div class="container">
-        <el-upload class="top" :action="uploadUrl" :show-file-list="false" :before-upload="beforeAvatarUpload2">
-            <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="top">
+            <el-upload :action="uploadUrl" :show-file-list="false" :before-upload="beforeAvatarUpload2">
+                <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="btn" @click="aFn">更换背景</div>
+        </div>
         <div class="top1">
             <div class="title">
                 <div class="text">
@@ -206,6 +209,10 @@ export default {
         }, 1000);
     },
     methods: {
+        aFn() {
+            this.beforeAvatarUpload2();
+            console.log(222);
+        },
         add() {
             this.$http
                 .post(
@@ -400,6 +407,21 @@ export default {
     .top {
         height: 146px;
         width: 970px;
+        position: relative;
+        .btn {
+            position: absolute;
+            width: 90px;
+            height: 26px;
+            border-radius: 16px;
+            border: 1px solid #939599;
+            text-align: center;
+            font-size: 14px;
+            color: #939599;
+            line-height: 26px;
+            cursor: pointer;
+            top: 20px;
+            right: 15px;
+        }
     }
 
     .top1 {

src/main/pc-space/src/views/user/Personal.vue

@@ -3,6 +3,7 @@
         <div class="title">个人中心</div>
         <div class="content">
             <el-menu
+                :default-openeds="openeds"
                 default-active="/accountdata"
                 router
                 class="el-menu-vertical-demo"
@@ -28,12 +29,12 @@
                     <el-menu-item index="/transactionordes">交易记录</el-menu-item>
                     <el-menu-item index="/ordervalue">价值证明</el-menu-item>
                 </el-submenu>
-                <el-submenu index="3">
+                <!-- <el-submenu index="3">
                     <template slot="title">
                         <img class="icon" src="../../assets/user/gongxu_icon_xuqiuxinxi@3x.png" alt="" />
                         <span>铸造信息</span>
                     </template>
-                </el-submenu>
+                </el-submenu> -->
             </el-menu>
             <div class="main">
                 <router-view />
@@ -44,7 +45,10 @@
 <script>
 export default {
     data() {
-        return {};
+        return {
+            openeds: ['2'],
+            uniqueOpened: false
+        };
     },
     methods: {}
 };