Merge branch 'yuan' of panhui/lasuo_nft_front into master

src/components/CollectionList.vue

@@ -16,7 +16,7 @@
                 </div>
                 <div v-else class="showOnly">仅展示</div>
             </div>
-            <div class="information_display_con">
+            <div class="information_display_con" v-if="!isSolded">
                 <span>{{ Math.max(Math.min(info.sale, info.total), 0) }}</span
                 >&nbsp;/&nbsp;<span>{{ info.total }}</span>
             </div>
@@ -49,9 +49,9 @@
 </template>
 
 <script>
-// import product from '../../mixins/product';
+import product from '../mixins/product';
 export default {
-    // mixins: [product],
+    mixins: [product],
     props: {
         info: {
             type: Object,

src/views/creator/Detail.vue

@@ -213,7 +213,8 @@ export default {
                         minterId: this.info.id || this.$route.query.id,
                         del: false,
                         source: this.sourceType,
-                        onShelf: true
+                        onShelf: true,
+                        scanCode: false
                     },
                     sort: 'soldOut;' + (this.sort || 'id,desc')
                 };
@@ -224,7 +225,8 @@ export default {
                         salable: this.salable,
                         ownerId: this.info.id || this.$route.query.id,
                         del: false,
-                        source: this.sourceType
+                        source: this.sourceType,
+                        scanCode: false
                     },
                     sort: 'soldOut;' + (this.sort || 'id,desc')
                 };

src/views/user/Exchange.vue

@@ -302,7 +302,7 @@ export default {
                         margin-left: 12px;
                         padding-top: 18px;
                         .exchange_top_con_content_assetName {
-                            width: calc(100% + 70px);
+                            // width: calc(100% - 35px);
                             font-size: 14px;
                             font-family: PingFangSC-Regular, PingFang SC;
                             font-weight: 400;