Merge branch 'yuan' of panhui/lasuo_nft_front into dev

src/components/asset/assetInfo.vue

@@ -23,11 +23,11 @@
         <div class="data_display_con_title">{{ info.name }}</div>
         <div class="blockchain">
             <img :src="require('@assets/blockchain@3x.png')" alt="" class="blockchain_img" />
-            <div class="blockchain_title">ac10781#03506/10000</div>
+            <div class="blockchain_title">{{info.numericCode}}</div>
         </div>
         <div class="data_display_con_collection">
             <div class="data_display_con_collection_title">{{info.minter}}</div>
-            <img :src="require('@assets/3d@3x.png')" alt="" class="shop_title_img" />
+            <img :src="!!info.model3d ? require('@assets/3d@3x.png') : require('@assets/tupian@3x.png')" alt="" class="shop_title_img" />
         </div>
         <img :src="require('@assets/dibuwenli.png')" alt="" class="bottom_texture">
     </div>

src/components/product/productLarge.vue

@@ -24,10 +24,10 @@
             <van-image width="100%" height="345px" :radius="30" :src="getImg(changeImgs(info.pic))" fit="cover" />
             <div class="shop_title">
                 <div>{{ info.name }}</div>
-                <img :src="require('@assets/3d@3x.png')" alt="" class="shop_title_img" />
+                <img :src="!!info.model3d ? require('@assets/3d@3x.png') : require('@assets/tupian@3x.png')" alt="" class="shop_title_img" />
             </div>
             <div class="shop_number">
-                <div class="shop_number_con">清乾隆</div>
+                <div class="shop_number_con">{{info.collectionCategory}}</div>
                 <div class="limit">限量</div>
                 <div class="number_of_copies">{{ info.total }}份</div>
                 <div class="collection" v-if="info.category != ''">{{ info.category }}</div>

src/views/Store.vue

@@ -181,6 +181,11 @@ export default {
             this.init();
         },
         init() {
+            if (!this.isLogin) {
+                this.empty = true;
+                this.loading = false;
+                return Promise.resolve();
+            }
             this.$toast.loading({
                 message: '加载中...',
                 forbidClick: true

src/views/Submit.vue

@@ -2,7 +2,7 @@
     <div class="page">
         <!-- <TopNavigation/> -->
         <div class="gift_confirmation_top">
-            <div class="gift_confirmation_top_one">支付剩余时间 12:30</div>
+            <!-- <div class="gift_confirmation_top_one">支付剩余时间 12:30</div> -->
             <div class="gift_confirmation_top_two">
                 <div class="gift_confirmation_top_two_text1">¥</div>
                 <div class="gift_confirmation_top_two_text2">{{ info.price }}</div>

src/views/asset/Consignment.vue

@@ -5,11 +5,11 @@
             <div class="consignment_top_title">
                 <div class="consignment_top_title_one">{{ info.name }}</div>
                 <div class="consignment_top_title_two">
-                    <div class="consignment_top_title_two_text1">清乾隆</div>
+                    <div class="consignment_top_title_two_text1">{{info.collectionCategory}}</div>
                     <div class="consignment_top_title_two_text2">{{ info.category }}</div>
                 </div>
                 <div class="consignment_top_title_three">
-                    <span class="consignment_top_title_three_text1">¥</span>{{ info.price || '100' }}
+                    <span class="consignment_top_title_three_text1">¥</span>{{ info.price || '0' }}
                 </div>
             </div>
             <img :src="require('@assets/dibuwenli.png')" alt="" class="bottom_texture">

src/views/asset/ConsignmentSuccess.vue

@@ -13,7 +13,7 @@
                 <div class="consignment_top_title">
                     <div class="consignment_top_title_one">{{ info.name }}</div>
                     <div class="consignment_top_title_two">
-                        <div class="consignment_top_title_two_text1">清乾隆</div>
+                        <div class="consignment_top_title_two_text1">{{info.collectionCategory}}</div>
                         <div class="consignment_top_title_two_text2">{{ info.category }}</div>
                     </div>
                     <div class="consignment_top_title_three">

src/views/asset/Detail.vue

@@ -63,10 +63,10 @@
                     <div class="list_of_details_one_title_con">{{ info.name }}</div>
                     <div class="list_of_details_one_text" v-if="!info.consignment">
                         <img :src="require('@assets/blockchain@3x.png')" alt="" class="list_of_details_one_text_img" />
-                        <div class="list_of_details_one_text_con">ac10781#03506/10000</div>
+                        <div class="list_of_details_one_text_con">{{info.numericCode}}</div>
                     </div>
                     <div class="list_of_details_one_title_one" v-else>
-                        <div class="list_of_details_one_title_one_text1">清乾隆</div>
+                        <div class="list_of_details_one_title_one_text1">{{info.collectionCategory}}</div>
                         <div class="list_of_details_one_title_one_text2">{{ info.category }}</div>
                     </div>
                 </div>
@@ -92,7 +92,7 @@
                     />
                     <div class="collection_holder_publisher_title">
                         <div class="collection_holder_publisher_title_one">{{ userInfo.nickname }}</div>
-                        <div class="collection_holder_publisher_title_two">作品06</div>
+                        <div class="collection_holder_publisher_title_two">{{info.collectionWorks}}</div>
                     </div>
                 </div>
             </div>
@@ -106,7 +106,7 @@
                     </div>
                     <div class="work_story_creator">
                         <div class="work_story_creator_left">发行方</div>
-                        <div class="work_story_creator_right">苏州合适设计营造股份有限公司</div>
+                        <div class="work_story_creator_right">{{info.issuer}}</div>
                     </div>
                 </div>
             </div>
@@ -114,7 +114,7 @@
             <div class="hold_privileges">
                 <div class="hold_privileges_con">
                     <div class="hold_privileges_title">
-                        持有特权<span class="hold_privileges_tip">灰色表示已使用</span>
+                        持有特权<span class="hold_privileges_tip" v-if="privileges.length != 0">灰色表示已使用</span>
                     </div>
                     <div class="hold_privileges_name" v-if="privileges.length == 0">创作者暂时未设置</div>
                     <div class="hold_privileged_information" v-else>
@@ -153,7 +153,7 @@
                     <div class="hold_privileges_title">作品特效</div>
                     <div class="hold_privileges_name" v-if="properties.length == 0">创作者暂时未设置</div>
                     <div class="digital_equity_card" v-else>
-                        <div class="digital_equity_card_con" v-for="(item, index) in properties" :key="index">
+                        <div class="digital_equity_card_con" v-for="(item, index) in properties" :key="index" @click="Whisper">
                             <span class="digital_equity_card_con_one">{{ item.name }}</span>
                             <span class="digital_equity_card_con_two">{{ item.value }}</span>
                         </div>
@@ -406,7 +406,7 @@
                     <div class="list_of_details_one_title_con">{{ info.name }}</div>
                     <div class="list_of_details_one_text">
                         <img :src="require('@assets/blockchain@3x.png')" alt="" class="list_of_details_one_text_img" />
-                        <div class="list_of_details_one_text_con">ac10781#03506/10000</div>
+                        <div class="list_of_details_one_text_con">{{info.numericCode}}</div>
                     </div>
                 </div>
             </div>
@@ -864,23 +864,24 @@ export default {
             }
         },
         openedFn() {
-            this.show2 = false;
-            this.show3 = true;
-            if (!this.init2.once) {
+            console.log("14313131",this.init2)
+            // this.show2 = false;
+            // this.show3 = true;
+            // if (!this.init2.once) {
                 // this.show2 = false;
-                this.$http
-                    .post('/asset/usePrivilege', {
-                        assetId: this.info.id,
-                        privilegeId: this.init2.id
-                    })
-                    .then(res => {
-                        console.log(res);
-                    });
-            }
+            //     this.$http
+            //         .post('/asset/usePrivilege', {
+            //             assetId: this.info.id,
+            //             privilegeId: this.init2.id
+            //         })
+            //         .then(res => {
+            //             console.log(res);
+            //         });
+            // }
         },
         Whisper() {
             if (!this.init2.once || (this.init2.once && !this.init2.opened)) {
-                this.show2 = true;
+                // this.show2 = true;
                 this.$http
                     .post('/asset/usePrivilege', {
                         assetId: this.info.id,

src/views/order/Detail.vue

@@ -15,7 +15,7 @@
                 <div class="order_information_title_one">{{info.name}}</div>
                 <div class="order_information_title_two">
                     <img :src="require('@/assets/blockchain@3x.png')" alt="" class="order_information_title_two_img">
-                    <div class="order_information_title_two_title">ac10781#03506/10000</div>
+                    <div class="order_information_title_two_title">{{info.numericCode}}</div>
                 </div>
                 <!-- <div class="order_information_title_two">{{info.category}}</div> -->
                 <div class="order_information_title_number">{{info.minter}}</div>

src/views/product/Detail.vue

@@ -310,7 +310,7 @@
                     <img :src="require('@assets/maisui.png')" alt="" class="list_of_details_one_title_img" />
                     <div class="list_of_details_one_title_con">{{ info.name }}</div>
                     <div class="limited_label">
-                        <div class="limited_label_title">清乾隆</div>
+                        <div class="limited_label_title">{{ info.collectionCategory }}</div>
                         <div class="limited_label_number">限量</div>
                         <div class="limited_label_total">{{ info.total }}份</div>
                         <div class="limited_label_category">{{ info.category }}</div>
@@ -336,7 +336,7 @@
                         />
                         <div class="author_details">
                             <div class="author_details_one">{{ info.minter }}</div>
-                            <div class="author_details_two">作品06</div>
+                            <div class="author_details_two">{{ info.collectionWorks }}</div>
                         </div>
                     </div>
                     <div class="collection_author_right" @click="follow">{{ info.follow ? '已关注' : '关注' }}</div>
@@ -382,7 +382,7 @@
                     </div>
                     <div class="work_story_creator">
                         <div class="work_story_creator_left">发行方</div>
-                        <div class="work_story_creator_right">苏州合适设计营造股份有限公司</div>
+                        <div class="work_story_creator_right">{{info.issuer}}</div>
                     </div>
                 </div>
             </div>
@@ -390,7 +390,7 @@
                 <div class="purchase_instructions_con">
                     <div class="purchase_instructions_title">购买须知</div>
                     <div class="purchase_instructions_text">
-                        这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案这是文案
+                       {{info.purchaseInstructions}}
                     </div>
                 </div>
             </div>
@@ -578,7 +578,7 @@
             </div>
         </div> -->
         <!-- 仅展示 -->
-        <div class="show_only" v-else @click="buyNow">
+        <div class="show_only" v-else>
             <div class="show_only_con">仅展示</div>
         </div>
     </div>