Merge branch 'yuan' of panhui/lasuo_nft_front into dev

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/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/asset/ConsignmentSuccess.vue

@@ -17,7 +17,7 @@
                         <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

@@ -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> -->
@@ -413,16 +413,16 @@
             <!-- 赠送 -->
             <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() {
@@ -932,7 +935,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 +1370,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 +1534,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 +1974,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 +2106,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 +2133,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;