Merge branch 'yuan' of panhui/lasuo_nft_front into master

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/order/OrderInfo.vue

@@ -20,7 +20,7 @@
                     <div class="product_details_title">{{info.name}}</div>
                     <div class="product_details_collection">
                         <div class="product_details_collection_title">限量</div>
-                        <div class="product_details_collection_value">{{info.total || '888'}}份</div>
+                        <div class="product_details_collection_value">{{info.total}}份</div>
                     </div>
                     <div class="product_details_price"><span class="product_details_price_symbol">￥</span>{{info.price}}</div>
                 </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/Givesubmit.vue

@@ -6,7 +6,7 @@
                 <div class="gift_confirmation_top_two_text1">¥</div>
                 <div class="gift_confirmation_top_two_text2">{{ gas }}</div>
             </div>
-            <div class="gift_confirmation_top_three">
+            <div class="gift_confirmation_top_three" @click="$router.go(-2)">
                 <div class="gift_confirmation_top_three_text1">{{ info.name }}</div>
                 <div class="gift_confirmation_top_three_text2">赠品详情</div>
                 <img :src="require('@assets/more@3x.png')" alt="" class="gift_confirmation_top_three_img" />
@@ -233,8 +233,10 @@ export default {
                         })
                         .then(() => {
                             if (res.status === 'CANCELLED') {
+                                this.$router.push({ path: '/assetDetail', query: { id: this.info.id, collectionStatus: res.status} })
                                 this.$router.go(-2);
                             } else {
+                                this.$router.push({ path: '/assetDetail', query: { id: this.info.id, collectionStatus: res.status} })
                                 this.$router.go(-2);
                             }
                             // on close
@@ -247,6 +249,7 @@ export default {
             });
         },
         submit() {
+            // this.$router.push({ path: '/assetDetail', query: { id: this.info.id, collectionStatus: 'CANCELLED'} })
             if (this.orderId) {
                 return;
             }

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,11 +13,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.sellPrice }}
                     </div>
                 </div>
                 <img :src="require('@assets/dibuwenli.png')" alt="" class="bottom_texture" />

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>
@@ -179,7 +179,7 @@
                                 <div class="hold_privileges_list_con_right">
                                     <div v-if="item.price">
                                         <div class="hold_privileges_list_con_text1">¥{{ item.price }}</div>
-                                        <div class="hold_privileges_list_con_text2">{{ item.operation }}</div>
+                                        <div class="hold_privileges_list_con_text2 hold_privileges_list_con_text2_con">{{ item.operation }}</div>
                                     </div>
                                     <div class="hold_privileges_list_con_text3" v-else>{{ item.operation }}</div>
                                     <!-- <div class="hold_privileges_list_con_text1">仅展示</div> -->
@@ -406,23 +406,23 @@
                     <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>
             <!-- 赠送 -->
             <div class="gift_collection">
                 <div class="gift_collection_one">
-                    <img :src="giftStatus ? giftSuccess : giftFailed" alt="" class="gift_collection_one_img" />
-                    <div class="gift_collection_one_title">{{ giftStatus ? '赠送成功' : '赠送失败' }}</div>
+                    <img :src="collectionStatus === 'CANCELLED' ? giftSuccess : giftFailed" alt="" class="gift_collection_one_img" />
+                    <div class="gift_collection_one_title">{{ collectionStatus === 'CANCELLED' ? '赠送成功' : '赠送失败' }}</div>
                 </div>
                 <div class="gift_collection_two">
-                    {{ giftStatus ? '我们会在24小时内，短信通知您的好友' : '很遗憾！赠送失败' }}
+                    {{ collectionStatus === 'CANCELLED' ? '我们会在24小时内，短信通知您的好友' : '很遗憾！赠送失败' }}
                 </div>
                 <div class="gift_collection_three">
                     <div class="gift_collection_three_left" @click="$router.push('/store')">返回</div>
                     <div class="gift_collection_three_right" @click="againGive">
-                        {{ giftStatus ? '完成' : '重新转赠' }}
+                        {{ collectionStatus === 'CANCELLED' ? '完成' : '重新转赠' }}
                     </div>
                 </div>
             </div>
@@ -781,9 +781,9 @@ export default {
             publicDisplay: require('@assets/publicDisplay@3x.png'),
             privateDisplay: require('@assets/privateDisplay@3x.png'),
             giftCollection: false,
-            giftStatus: true,
             giftSuccess: require('@assets/zengsongchenggong@3x.png'),
-            giftFailed: require('@assets/zengsongshibai@3x.png')
+            giftFailed: require('@assets/zengsongshibai@3x.png'),
+            collectionStatus: ""
         };
     },
     computed: {
@@ -806,6 +806,9 @@ export default {
         setTimeout(() => {
             this.record();
         }, 1000);
+        if(this.$route.query.collectionStatus){
+            this.collectionStatus = this.$route.query.collectionStatus
+        } 
     },
     methods: {
         share() {
@@ -861,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,
@@ -932,7 +936,7 @@ export default {
                 });
         },
         againGive() {
-            if (this.giftStatus === true) {
+            if (this.collectionStatus === 'CANCELLED') {
                 this.$router.push('/store');
             } else {
                 this.$router.push('/giveSearch?id=' + this.info.id);
@@ -1367,6 +1371,8 @@ export default {
             padding: 0px 15px;
             box-sizing: border-box;
             margin-top: -140px;
+            position: relative;
+            z-index: 1;
             .work_story_con {
                 width: 100%;
                 background: #1e222c;
@@ -1529,6 +1535,9 @@ export default {
                         line-height: 18px;
                         opacity: 0.3;
                     }
+                    .hold_privileges_list_con_text2_con{
+                        text-align: right;
+                    }
                     .hold_privileges_list_con_text3 {
                         font-size: 14px;
                         font-family: PingFangSC-Regular, PingFang SC;
@@ -1966,6 +1975,7 @@ export default {
         box-shadow: inset 0px 1px 0px 0px #292d36;
         position: fixed;
         bottom: 0;
+        z-index: 99;
         // justify-content: space-between;
         font-size: 16px;
         font-family: PingFangSC-Medium, PingFang SC;
@@ -2097,6 +2107,7 @@ export default {
         box-shadow: inset 0px 1px 0px 0px #292d36;
         position: fixed;
         bottom: 0;
+        z-index: 99;
         display: flex;
         .purchase_transaction_button_one_con {
             width: 50%;
@@ -2123,6 +2134,7 @@ export default {
         box-shadow: inset 0px 1px 0px 0px #292d36;
         position: fixed;
         bottom: 0;
+        z-index: 99;
         .purchase_transaction_button_two_con {
             padding: 17px 14px 17px 24px;
             box-sizing: border-box;

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>