蚂蚁链

src/components/Post.vue

@@ -141,13 +141,15 @@ export default {
         url() {
             let pageUrl = this.pageUrl;
             let id = this.info.id;
+            console.log('111ss', pageUrl, id, this.info);
             if (pageUrl === 'assetDetail') {
-                id = this.info.publicCollectionId;
+                id = this.info.collectionId;
                 pageUrl = 'productDetail';
             }
-
             if (pageUrl === 'productDetail' && !this.assignment) {
-                pageUrl = 'productDetail/' + id;
+                pageUrl = 'productDetail';
+
+                console.log('111ss', pageUrl, this.info);
             }
             if (this.isLogin && this.assignment && pageUrl === 'productDetail') {
                 return resolveUrl(
@@ -157,7 +159,7 @@ export default {
             } else if (this.isLogin) {
                 return resolveUrl(
                     this.$baseUrl,
-                    '9th/' + pageUrl + '?id=' + id + '&invitor=' + this.$store.state.userInfo.id
+                    '9th/' + pageUrl + '?collectionId=' + id + '&invitor=' + this.$store.state.userInfo.id
                 );
             } else {
                 return resolveUrl(this.$baseUrl, '9th/' + pageUrl + '?id=' + id);
@@ -183,7 +185,7 @@ export default {
         vueQrcode
     },
     methods: {
-        init() {
+        init(value) {
             this.show = true;
             if (!this.img) {
                 this.$toast.loading({

src/views/Creator.vue

@@ -25,7 +25,7 @@
                 <van-tab title="人气" name="followers,desc"></van-tab>
             </van-tabs>
         </van-sticky>
-        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getList">
+        <van-list v-model:loading="loading" :finished="finished" finished-text="- 更多藏品敬请期待 -" @load="getList">
             <template v-for="(item, index) in miners" :key="index">
                 <creator-info v-model:info="miners[index]"></creator-info>
             </template>

src/views/Discover.vue

@@ -125,7 +125,7 @@
                 v-model:loading="loading"
                 :finished="finished"
                 @load="getData"
-                :finished-text="empty ? '' : '没有更多了'"
+                :finished-text="empty ? '' : '- 更多藏品敬请期待 -'"
             >
                 <div class="current_recommendation">
                     <template v-for="(item, index) in list" :key="item.id">

src/views/DiscoverPre.vue

@@ -59,7 +59,7 @@
 
         <div class="title">本期推荐</div>
 
-        <van-list class="box-list" v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getList">
+        <van-list class="box-list" v-model:loading="loading" :finished="finished" finished-text="- 更多藏品敬请期待 -" @load="getList">
             <template v-for="(item, index) in list" :key="item.id">
                 <product-info v-model:info="list[index]"></product-info>
             </template>

src/views/Givesubmit.vue

@@ -280,12 +280,12 @@ export default {
                                     //     resolveUrl(this.$baseUrl, 'payOrder/gift/alipay?id=' + res.id)
                                     // );
                                     if (this.inWeixin) {
-                                        if (this.gas === '0') {
-                                            this.$http
-                                                .get('/payOrder/gift/alipay_wx?id=' + res.id)
-                                                .then(res => {
-                                                    this.$toast.success('转赠成功');
-                                                    this.getOrder(true);
+                                        // if (this.gas === '0') {
+                                        //     this.$http
+                                        //         .get('/payOrder/gift/alipay_wx?id=' + res.id)
+                                        //         .then(res => {
+                                        //             this.$toast.success('转赠成功');
+                                        //             this.getOrder(true);
                                                     // setTimeout(() => {
                                                     // this.$router.push({
                                                     //     path: '/orderDetail',
@@ -297,20 +297,19 @@ export default {
                                                     // document.location.replace("https://www.adcs.vip/9th/giftOrder/223639");
                                                     // this.$router.replace('/giftOrder/' + order.getId());
                                                     // }, 1000);
-                                                })
-                                                .catch(e => {
-                                                    if (e.error) {
-                                                        this.$toast(e.error);
-                                                    }
-                                                });
-                                        } else {
-                                            document.location.replace(
-                                                resolveUrl(this.$baseUrl, '/payOrder/gift/alipay_wx?id=' + res.id)
-                                            );
-                                        }
+                                        //         })
+                                        //         .catch(e => {
+                                        //             if (e.error) {
+                                        //                 this.$toast(e.error);
+                                        //             }
+                                        //         });
+                                        // } else {
+                                        //     document.location.replace(
+                                        //         resolveUrl(this.$baseUrl, '/payOrder/gift/alipay_wx?id=' + res.id)
+                                        //     );
+                                        // }
                                     } else {
                                         if (this.gas === '0') {
-                                            console.log('131313我北郊用');
                                             this.$http
                                                 .get(
                                                     `/payOrder/gift/${this.inApp ? 'alipay_app' : 'alipay_h5'}?id=${
@@ -368,42 +367,43 @@ export default {
                                                 });
                                         }
                                     }
-                                } else if (this.payType === 'WEIXIN') {
-                                    if (this.inWeixin) {
-                                        this.$toast.loading('加载中');
-                                        this.$http
-                                            .post('/payOrder/gift/weixin', {
-                                                id: res.id,
-                                                openId: localStorage.getItem('openId')
-                                            })
-                                            .then(res => {
-                                                console.log({
-                                                    ...res,
-                                                    package: res.package || res.packageValue,
-                                                    timestamp: res.timestamp || res.timeStamp
-                                                });
-                                                let _this = this;
-                                                wx.chooseWXPay({
-                                                    ...res,
-                                                    package: res.package || res.packageValue,
-                                                    timestamp: res.timeStamp,
-                                                    success(res) {
-                                                        _this.$toast.success('支付成功');
-                                                        setTimeout(() => {
-                                                            _this.$router.replace('/orders');
-                                                        }, 1000);
-                                                    },
-                                                    fail(e) {
-                                                        console.log(e);
-                                                        _this.$toast('支付失败，请稍后再试');
-                                                    }
-                                                });
-                                            });
-                                    } else {
-                                        document.location.replace(
-                                            resolveUrl(this.$baseUrl, 'payOrder/gift/weixin_h5?id=' + res.id)
-                                        );
-                                    }
+                                // } else if (this.payType === 'WEIXIN') {
+                                //     if (this.inWeixin) {
+                                //         this.$toast.loading('加载中');
+                                //         this.$http
+                                //             .post('/payOrder/gift/weixin', {
+                                //                 id: res.id,
+                                //                 openId: localStorage.getItem('openId')
+                                //             })
+                                //             .then(res => {
+                                //                 console.log({
+                                //                     ...res,
+                                //                     package: res.package || res.packageValue,
+                                //                     timestamp: res.timestamp || res.timeStamp
+                                //                 });
+                                //                 let _this = this;
+                                //                 wx.chooseWXPay({
+                                //                     ...res,
+                                //                     package: res.package || res.packageValue,
+                                //                     timestamp: res.timeStamp,
+                                //                     success(res) {
+                                //                         _this.$toast.success('支付成功');
+                                //                         setTimeout(() => {
+                                //                             _this.$router.replace('/orders');
+                                //                         }, 1000);
+                                //                     },
+                                //                     fail(e) {
+                                //                         console.log(e);
+                                //                         _this.$toast('支付失败，请稍后再试');
+                                //                     }
+                                //                 });
+                                //             });
+                                //     } else {
+                                //         document.location.replace(
+                                //             resolveUrl(this.$baseUrl, 'payOrder/gift/weixin_h5?id=' + res.id)
+                                //         );
+                                //     }
+                                // }
                                 }
                             });
                         })

src/views/Home.vue

@@ -41,12 +41,12 @@
             </swiper> -->
                 <!-- 商品列表 -->
                 <div class="collection_list" v-if="active === 0">
-                    <!-- <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getList"> -->
+                    <!-- <van-list v-model:loading="loading" :finished="finished" finished-text="- 更多藏品敬请期待 -" @load="getList"> -->
                     <!-- @load="getList" -->
                     <van-list
                         v-model:loading="loading"
                         :finished="finished"
-                        :finished-text="empty ? '' : '没有更多了'"
+                        :finished-text="empty ? '' : '- 更多藏品敬请期待 -'"
                         @load="getList"
                     >
                         <product-large
@@ -78,7 +78,7 @@
                         v-model:loading="loading"
                         :finished="finished"
                         @load="offeringNotice"
-                        :finished-text="saleList.length == 0 ? '' : '没有更多了'"
+                        :finished-text="saleList.length == 0 ? '' : '- 更多藏品敬请期待 -'"
                     >
                         <div class="collection_list_con" v-for="(item, index) in saleList" :key="index">
                             <div class="collection_list_con_month">
@@ -150,7 +150,7 @@
             ></product-large>
         </div>
         <template v-else>
-            <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getNews">
+            <van-list v-model:loading="loading" :finished="finished" finished-text="- 更多藏品敬请期待 -" @load="getNews">
                 <news-info v-for="item in news" :key="item.id" :info="item"></news-info>
             </van-list>
         </template> -->

src/views/Store.vue

@@ -85,7 +85,7 @@
                     :loading-text="' '"
                     :finished="finished"
                     @load="getAllCollections"
-                    :finished-text="empty ? '' : '没有更多了'"
+                    :finished-text="empty ? '' : '- 更多藏品敬请期待 -'"
                 >
                     <div class="data_display_fanter">
                         <template v-for="(item, index) in collections" :key="index">
@@ -107,7 +107,7 @@
                 <van-list
                     v-model:loading="loading"
                     :finished="finished"
-                    :finished-text="showList.length === 0 ? '' : '没有更多了'"
+                    :finished-text="showList.length === 0 ? '' : '- 更多藏品敬请期待 -'"
                     @load="init"
                 >
                     <div class="current_recommendation">
@@ -123,7 +123,7 @@
                         :image-size="`172`"
                     >
                         <div class="h44_tip_one">你还没有收藏的藏品</div>
-                        <div class="h44_tip">这里将展示你在拉索持有的数字藏品</div>
+                        <div class="h44_tip">这里将展示你在拉索收藏的数字藏品</div>
                     </van-empty>
                 </div>
             </div>

src/views/activity/List.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="search">
-        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getData">
+        <van-list v-model:loading="loading" :finished="finished" finished-text="- 更多藏品敬请期待 -" @load="getData">
             <template v-for="(item, index) in list" :key="index">
                 <router-link
                     :to="{

src/views/activity/List1.vue

@@ -2,7 +2,7 @@
     <div class="search">
         <div class="filter-bg" :style="{ backgroundImage: `url(${filterBg})` }"></div>
         <div class="header">铸造活动</div>
-        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getData">
+        <van-list v-model:loading="loading" :finished="finished" finished-text="- 更多藏品敬请期待 -" @load="getData">
             <template v-for="(item, index) in list" :key="index">
                 <router-link
                     :to="{

src/views/asset/Detail.vue

@@ -858,7 +858,10 @@ export default {
         },
         isBuy() {
             return this.info.stock && this.info.onShelf;
-        }
+        },
+        pageUrl() {
+            return 'assetDetail';
+        },
     },
     mounted() {
         this.getProduct(true);
@@ -1325,7 +1328,7 @@ export default {
                 .list_of_details_one_title_one {
                     display: flex;
                     justify-content: center;
-                    transform: translateY(-50px);
+                    // transform: translateY(-50px);
                     font-size: 11px;
                     font-family: PingFangSC-Regular, PingFang SC;
                     font-weight: 400;
@@ -1488,7 +1491,7 @@ export default {
             box-sizing: border-box;
             margin-top: -140px;
             position: relative;
-            z-index: 1;
+            // z-index: 1;
             .work_story_con {
                 width: 100%;
                 background: #1e222c;

src/views/asset/GiveSearch.vue

@@ -18,7 +18,7 @@
                 </template>
             </van-search>
         </van-sticky>
-        <van-list class="list" :immediate-check="false" :finished="finished" finished-text="没有更多了" @load="getData">
+        <van-list class="list" :immediate-check="false" :finished="finished" finished-text="- 更多藏品敬请期待 -" @load="getData">
             <div
                 class="search_message"
                 v-if="info.length != 0"

src/views/asset/Search.vue

@@ -23,7 +23,7 @@
             v-model:loading="loading"
             :immediate-check="false"
             :finished="finished"
-            finished-text="没有更多了"
+            finished-text="- 更多藏品敬请期待 -"
             @load="getData"
             v-if="isSearch"
         >

src/views/creator/Detail.vue

@@ -120,7 +120,7 @@
             v-model:loading="loading"
             :finished="finished"
             :immediate-check="false"
-            :finished-text="empty ||  list.length === 0? '' : '没有更多了'"
+            :finished-text="empty ||  list.length === 0? '' : '- 更多藏品敬请期待 -'"
             @load="getData"
         >
             <template v-for="(item, index) in list" :key="item.id">

src/views/creator/List.vue

@@ -27,7 +27,7 @@
                 </van-tab>
             </van-tabs>
         </van-sticky>
-        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getData">
+        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="- 更多藏品敬请期待 -" @load="getData">
             <template v-for="(item, index) in list" :key="index">
                 <creator-info v-model:info="list[index]"></creator-info>
             </template>

src/views/creator/Search.vue

@@ -22,7 +22,7 @@
             v-model:loading="loading"
             :immediate-check="false"
             :finished="finished"
-            finished-text="没有更多了"
+            finished-text="- 更多藏品敬请期待 -"
             @load="getData"
             v-if="isSearch"
         >

src/views/hall/ProductAdd.vue

@@ -12,7 +12,7 @@
             </div>
         </div>
 
-        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getData">
+        <van-list v-model:loading="loading" :finished="finished" finished-text="- 更多藏品敬请期待 -" @load="getData">
             <van-empty
                 v-if="empty"
                 description=" 你还没有藏品哦～"

src/views/order/ActivityOrders.vue

@@ -17,7 +17,7 @@
             </van-tabs>
         </van-sticky>
 
-        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getData">
+        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="- 更多藏品敬请期待 -" @load="getData">
             <order-info-act
                 @delFn="delFn"
                 v-for="(item, index) in list"

src/views/order/CouponList.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="page">
-        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getData">
+        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="- 更多藏品敬请期待 -" @load="getData">
             <template v-for="(item, index) in useList" :key="index">
                 <coupon-info
                     needChoose

src/views/order/Orders.vue

@@ -54,7 +54,7 @@
                     class="list"
                     v-model:loading="loading"
                     :finished="finished"
-                    :finished-text="empty ? '' : '没有更多了'"
+                    :finished-text="empty ? '' : '- 更多藏品敬请期待 -'"
                     @load="getData"
                 >
                     <div class="list_display">

src/views/product/Detail.vue

@@ -374,7 +374,7 @@
                             <div>{{ appointmentEndOne }}</div>
                             <div>{{ appointmentEndTwo }}</div>
                         </div>
-                        <div class="appointment_process_time_con">
+                        <div class="appointment_process_time_con appointment_process_time_cons">
                             <div>{{ purchaseQualificationOne }}</div>
                             <div>{{ purchaseQualificationTwo }}</div>
                         </div>
@@ -412,7 +412,10 @@
                     </div>
                 </div>
             </div>
-            <div class="technology_tip">蚂蚁链提供技术支持</div>
+            <div class="technology_tip">
+                <img :src="require('@assets/mayilian@3x.png')" alt="" class="technology_tip_img" />
+                <div class="technology_tip_con">提供技术支持</div>
+            </div>
         </div>
         <!-- <img src="" alt="" class="detail_content_img" />
         <div class="detail_content_one">
@@ -1492,6 +1495,9 @@ export default {
                         line-height: 16px;
                         opacity: 0.3;
                     }
+                    .appointment_process_time_cons {
+                        transform: translateX(15px);
+                    }
                 }
             }
         }
@@ -1581,14 +1587,24 @@ export default {
             }
         }
         .technology_tip {
-            font-size: 14px;
-            font-family: PingFangSC-Regular, PingFang SC;
-            font-weight: 400;
-            color: #ffffff;
-            line-height: 20px;
-            opacity: 0.5;
-            text-align: center;
+            display: flex;
+            justify-content: center;
+            align-items: center;
             margin-top: 20px;
+            .technology_tip_img {
+                width: 74px;
+                height: 30px;
+                margin-right: 9px;
+            }
+            .technology_tip_con {
+                font-size: 12px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #ffffff;
+                line-height: 18px;
+                letter-spacing: 1px;
+                opacity: 0.5;
+            } 
         }
     }
     .detail_content_con {

src/views/product/List.vue

@@ -66,7 +66,7 @@
             close-on-click-action
         />
 
-        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="getData">
+        <van-list v-model:loading="loading" :finished="finished" finished-text="- 更多藏品敬请期待 -" @load="getData">
             <template v-for="(item, index) in showList" :key="index">
                 <product-info v-model:info="list[index]" @update:info="init"></product-info>
             </template>
@@ -153,7 +153,7 @@
             style="padding-bottom: 1px"
             v-model:loading="loading"
             :finished="finished"
-            finished-text="没有更多了"
+            finished-text="- 更多藏品敬请期待 -"
             @load="getData"
         >
             <div class="selected_recommendations_list">

src/views/product/Search.vue

@@ -128,7 +128,7 @@
             v-model:loading="loading"
             :immediate-check="false"
             :finished="finished"
-            :finished-text="empty ? '' : '没有更多了'"
+            :finished-text="empty ? '' : '- 更多藏品敬请期待 -'"
             @load="getData"
             v-if="isSearch"
         >

src/views/user/Exchange.vue

@@ -34,7 +34,7 @@
                 close-on-click-action
             /> -->
         </van-sticky>
-        <van-list class="list" v-model:loading="loading" :finished="finished" :finished-text="empty ? '' : '没有更多了'" @load="getData">
+        <van-list class="list" v-model:loading="loading" :finished="finished" :finished-text="empty ? '' : '- 更多藏品敬请期待 -'" @load="getData">
             <template v-for="(item, index) in list" :key="index">
                 <div class="exchange">
                     <div class="exchange_top">