yuany 3 år sedan
förälder
incheckning
9a0d7458f8

+ 1 - 1
src/views/Creator.vue

@@ -25,7 +25,7 @@
                 <van-tab title="人气" name="followers,desc"></van-tab>
                 <van-tab title="人气" name="followers,desc"></van-tab>
             </van-tabs>
             </van-tabs>
         </van-sticky>
         </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">
             <template v-for="(item, index) in miners" :key="index">
                 <creator-info v-model:info="miners[index]"></creator-info>
                 <creator-info v-model:info="miners[index]"></creator-info>
             </template>
             </template>

+ 2 - 2
src/views/Discover.vue

@@ -125,7 +125,7 @@
                 v-model:loading="loading"
                 v-model:loading="loading"
                 :finished="finished"
                 :finished="finished"
                 @load="getData"
                 @load="getData"
-                :finished-text="empty ? '' : '没有更多'"
+                :finished-text="empty ? '' : '没有更多'"
             >
             >
                 <div class="current_recommendation">
                 <div class="current_recommendation">
                     <template v-for="(item, index) in list" :key="item.id">
                     <template v-for="(item, index) in list" :key="item.id">
@@ -761,7 +761,7 @@ export default {
         margin-bottom: 50px;
         margin-bottom: 50px;
     }
     }
     .content_list {
     .content_list {
-        margin-bottom: 40px;
+        margin-bottom: 80px;
     }
     }
 }
 }
 // .commodity_display {
 // .commodity_display {

+ 1 - 1
src/views/DiscoverPre.vue

@@ -59,7 +59,7 @@
 
 
         <div class="title">本期推荐</div>
         <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">
             <template v-for="(item, index) in list" :key="item.id">
                 <product-info v-model:info="list[index]"></product-info>
                 <product-info v-model:info="list[index]"></product-info>
             </template>
             </template>

+ 1 - 1
src/views/Givesubmit.vue

@@ -310,7 +310,7 @@ export default {
                                         }
                                         }
                                     } else {
                                     } else {
                                         if (this.gas === '0') {
                                         if (this.gas === '0') {
-                                            console.log('131313');
+                                            console.log('131313我北郊用');
                                             this.$http
                                             this.$http
                                                 .get(
                                                 .get(
                                                     `/payOrder/gift/${this.inApp ? 'alipay_app' : 'alipay_h5'}?id=${
                                                     `/payOrder/gift/${this.inApp ? 'alipay_app' : 'alipay_h5'}?id=${

+ 6 - 5
src/views/Home.vue

@@ -15,6 +15,7 @@
                         <van-image
                         <van-image
                             width="100%"
                             width="100%"
                             height="calc(41vw - 13px)"
                             height="calc(41vw - 13px)"
+                            radius = '18'
                             :src="getImg(item.pic)"
                             :src="getImg(item.pic)"
                             fit="cover"
                             fit="cover"
                             @click="goNext(item)"
                             @click="goNext(item)"
@@ -40,12 +41,12 @@
             </swiper> -->
             </swiper> -->
                 <!-- 商品列表 -->
                 <!-- 商品列表 -->
                 <div class="collection_list" v-if="active === 0">
                 <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" -->
                     <!-- @load="getList" -->
                     <van-list
                     <van-list
                         v-model:loading="loading"
                         v-model:loading="loading"
                         :finished="finished"
                         :finished="finished"
-                        :finished-text="empty ? '' : '没有更多'"
+                        :finished-text="empty ? '' : '没有更多'"
                         @load="getList"
                         @load="getList"
                     >
                     >
                         <product-large
                         <product-large
@@ -77,7 +78,7 @@
                         v-model:loading="loading"
                         v-model:loading="loading"
                         :finished="finished"
                         :finished="finished"
                         @load="offeringNotice"
                         @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" v-for="(item, index) in saleList" :key="index">
                             <div class="collection_list_con_month">
                             <div class="collection_list_con_month">
@@ -149,7 +150,7 @@
             ></product-large>
             ></product-large>
         </div>
         </div>
         <template v-else>
         <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>
                 <news-info v-for="item in news" :key="item.id" :info="item"></news-info>
             </van-list>
             </van-list>
         </template> -->
         </template> -->
@@ -574,7 +575,7 @@ export default {
             }
             }
         }
         }
         .collection_list {
         .collection_list {
-            margin-bottom: 50px;
+            margin-bottom: 80px;
             .advance_notice_sale {
             .advance_notice_sale {
                 padding-top: 8px;
                 padding-top: 8px;
                 box-sizing: border-box;
                 box-sizing: border-box;

+ 1 - 1
src/views/Mine.vue

@@ -514,7 +514,7 @@ export default {
 }
 }
 .display_list {
 .display_list {
     width: 100%;
     width: 100%;
-    padding-bottom: 50px;
+    margin-bottom: 80px;
     box-sizing: border-box;
     box-sizing: border-box;
     .display_list_con {
     .display_list_con {
         height: 60px;
         height: 60px;

+ 4 - 4
src/views/Store.vue

@@ -85,7 +85,7 @@
                     :loading-text="' '"
                     :loading-text="' '"
                     :finished="finished"
                     :finished="finished"
                     @load="getAllCollections"
                     @load="getAllCollections"
-                    :finished-text="empty ? '' : '没有更多'"
+                    :finished-text="empty ? '' : '没有更多'"
                 >
                 >
                     <div class="data_display_fanter">
                     <div class="data_display_fanter">
                         <template v-for="(item, index) in collections" :key="index">
                         <template v-for="(item, index) in collections" :key="index">
@@ -107,7 +107,7 @@
                 <van-list
                 <van-list
                     v-model:loading="loading"
                     v-model:loading="loading"
                     :finished="finished"
                     :finished="finished"
-                    :finished-text="showList.length === 0 ? '' : '没有更多'"
+                    :finished-text="showList.length === 0 ? '' : '没有更多'"
                     @load="init"
                     @load="init"
                 >
                 >
                     <div class="current_recommendation">
                     <div class="current_recommendation">
@@ -427,7 +427,7 @@ export default {
         box-sizing: border-box;
         box-sizing: border-box;
         // background: #0F0F27;
         // background: #0F0F27;
         min-height: calc(100vh - 100px);
         min-height: calc(100vh - 100px);
-        margin-bottom: 50px;
+        margin-bottom: 80px;
         .data_display_fanter {
         .data_display_fanter {
             width: 100%;
             width: 100%;
             display: flex;
             display: flex;
@@ -438,7 +438,7 @@ export default {
     .data_display_one {
     .data_display_one {
         // padding: 0px 16px 16px;
         // padding: 0px 16px 16px;
         // box-sizing: border-box;
         // box-sizing: border-box;
-        margin-bottom: 50px;
+        margin-bottom: 80px;
         .current_recommendation {
         .current_recommendation {
             width: 100%;
             width: 100%;
             display: flex;
             display: flex;

+ 1 - 1
src/views/activity/List.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
     <div class="search">
     <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">
             <template v-for="(item, index) in list" :key="index">
                 <router-link
                 <router-link
                     :to="{
                     :to="{

+ 1 - 1
src/views/activity/List1.vue

@@ -2,7 +2,7 @@
     <div class="search">
     <div class="search">
         <div class="filter-bg" :style="{ backgroundImage: `url(${filterBg})` }"></div>
         <div class="filter-bg" :style="{ backgroundImage: `url(${filterBg})` }"></div>
         <div class="header">铸造活动</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">
             <template v-for="(item, index) in list" :key="index">
                 <router-link
                 <router-link
                     :to="{
                     :to="{

+ 21 - 11
src/views/asset/Detail.vue

@@ -355,6 +355,14 @@
                         {{ info.publicShow ? '公开展示' : '私密展示' }}
                         {{ info.publicShow ? '公开展示' : '私密展示' }}
                     </div>
                     </div>
                 </div>
                 </div>
+                <div class="purchase_transaction_button_two_con_certificate" @click="share">
+                    <img
+                        :src="require('@assets/fengxiang@3x.png')"
+                        alt=""
+                        class="purchase_transaction_button_two_con_img"
+                    />
+                    <div class="purchase_transaction_button_two_con_text">分享</div>
+                </div>
                 <!-- <div class="purchase_transaction_button_two_con_certificate" @click="wait">
                 <!-- <div class="purchase_transaction_button_two_con_certificate" @click="wait">
                     <img
                     <img
                         :src="require('@assets/zhengshu@3x.png')"
                         :src="require('@assets/zhengshu@3x.png')"
@@ -363,21 +371,21 @@
                     />
                     />
                     <div class="purchase_transaction_button_two_con_text">证书</div>
                     <div class="purchase_transaction_button_two_con_text">证书</div>
                 </div> -->
                 </div> -->
-                <van-icon name="ellipsis" size="20" @click="moreDisplay" />
+                <!-- <van-icon name="ellipsis" size="20" @click="moreDisplay" />
                 <div class="purchase_transaction_button_two_con_more_display" v-if="moreDisplayOne === true">
                 <div class="purchase_transaction_button_two_con_more_display" v-if="moreDisplayOne === true">
                     <img
                     <img
                         :src="require('@assets/xingzhuanglianhe@3x.png')"
                         :src="require('@assets/xingzhuanglianhe@3x.png')"
                         alt=""
                         alt=""
                         class="purchase_transaction_button_two_con_more_display_img"
                         class="purchase_transaction_button_two_con_more_display_img"
                     />
                     />
-                    <!-- <div class="purchase_transaction_button_two_con_more_display_con" @click="Consignment">
+                    <div class="purchase_transaction_button_two_con_more_display_con" @click="Consignment">
                         <img
                         <img
                             :src="require('@assets/guashou@3x.png')"
                             :src="require('@assets/guashou@3x.png')"
                             alt=""
                             alt=""
                             class="purchase_transaction_button_two_con_more_display_con_img"
                             class="purchase_transaction_button_two_con_more_display_con_img"
                         />
                         />
                         <div class="purchase_transaction_button_two_con_more_display_con_title">挂售</div>
                         <div class="purchase_transaction_button_two_con_more_display_con_title">挂售</div>
-                    </div> -->
+                    </div>
                     <div class="purchase_transaction_button_two_con_more_display_con" @click="share">
                     <div class="purchase_transaction_button_two_con_more_display_con" @click="share">
                         <img
                         <img
                             :src="require('@assets/fengxiang@3x.png')"
                             :src="require('@assets/fengxiang@3x.png')"
@@ -386,7 +394,7 @@
                         />
                         />
                         <div class="purchase_transaction_button_two_con_more_display_con_title">分享</div>
                         <div class="purchase_transaction_button_two_con_more_display_con_title">分享</div>
                     </div>
                     </div>
-                </div>
+                </div> -->
             </div>
             </div>
         </div>
         </div>
         <post ref="post" :info="info" noButton :pageUrl="pageUrl" />
         <post ref="post" :info="info" noButton :pageUrl="pageUrl" />
@@ -2247,9 +2255,11 @@ export default {
         bottom: 0;
         bottom: 0;
         z-index: 99;
         z-index: 99;
         .purchase_transaction_button_two_con {
         .purchase_transaction_button_two_con {
-            padding: 17px 14px 17px 24px;
+            // padding: 17px 14px 17px 24px;
+            padding: 17px 24px;
             box-sizing: border-box;
             box-sizing: border-box;
             display: flex;
             display: flex;
+            justify-content: space-between;
             // justify-content: center;
             // justify-content: center;
             font-size: 12px;
             font-size: 12px;
             font-family: PingFangSC-Medium, PingFang SC;
             font-family: PingFangSC-Medium, PingFang SC;
@@ -2302,18 +2312,18 @@ export default {
             }
             }
             .purchase_transaction_button_two_con_give {
             .purchase_transaction_button_two_con_give {
                 display: flex;
                 display: flex;
-                margin-right: 36px;
-                flex-grow: 1;
+                // margin-right: 36px;
+                // flex-grow: 1;
             }
             }
             .purchase_transaction_button_two_con_exhibition {
             .purchase_transaction_button_two_con_exhibition {
                 display: flex;
                 display: flex;
-                margin-right: 36px;
-                flex-grow: 1;
+                // margin-right: 36px;
+                // flex-grow: 1;
             }
             }
             .purchase_transaction_button_two_con_certificate {
             .purchase_transaction_button_two_con_certificate {
                 display: flex;
                 display: flex;
-                margin-right: 38px;
-                flex-grow: 1;
+                // margin-right: 38px;
+                // flex-grow: 1;
             }
             }
             .purchase_transaction_button_two_con_img {
             .purchase_transaction_button_two_con_img {
                 width: 32px;
                 width: 32px;

+ 1 - 1
src/views/asset/GiveSearch.vue

@@ -18,7 +18,7 @@
                 </template>
                 </template>
             </van-search>
             </van-search>
         </van-sticky>
         </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
             <div
                 class="search_message"
                 class="search_message"
                 v-if="info.length != 0"
                 v-if="info.length != 0"

+ 1 - 1
src/views/asset/Search.vue

@@ -23,7 +23,7 @@
             v-model:loading="loading"
             v-model:loading="loading"
             :immediate-check="false"
             :immediate-check="false"
             :finished="finished"
             :finished="finished"
-            finished-text="没有更多"
+            finished-text="没有更多"
             @load="getData"
             @load="getData"
             v-if="isSearch"
             v-if="isSearch"
         >
         >

+ 1 - 1
src/views/creator/Detail.vue

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

+ 4 - 1
src/views/creator/List.vue

@@ -27,7 +27,7 @@
                 </van-tab>
                 </van-tab>
             </van-tabs>
             </van-tabs>
         </van-sticky>
         </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">
             <template v-for="(item, index) in list" :key="index">
                 <creator-info v-model:info="list[index]"></creator-info>
                 <creator-info v-model:info="list[index]"></creator-info>
             </template>
             </template>
@@ -181,4 +181,7 @@ export default {
 .van-tabs {
 .van-tabs {
     background-color: @bg;
     background-color: @bg;
 }
 }
+.list{
+    margin-bottom: 80px;
+}
 </style>
 </style>

+ 1 - 1
src/views/creator/Search.vue

@@ -22,7 +22,7 @@
             v-model:loading="loading"
             v-model:loading="loading"
             :immediate-check="false"
             :immediate-check="false"
             :finished="finished"
             :finished="finished"
-            finished-text="没有更多"
+            finished-text="没有更多"
             @load="getData"
             @load="getData"
             v-if="isSearch"
             v-if="isSearch"
         >
         >

+ 1 - 1
src/views/hall/ProductAdd.vue

@@ -12,7 +12,7 @@
             </div>
             </div>
         </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
             <van-empty
                 v-if="empty"
                 v-if="empty"
                 description=" 你还没有藏品哦~"
                 description=" 你还没有藏品哦~"

+ 1 - 1
src/views/order/ActivityOrders.vue

@@ -17,7 +17,7 @@
             </van-tabs>
             </van-tabs>
         </van-sticky>
         </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
             <order-info-act
                 @delFn="delFn"
                 @delFn="delFn"
                 v-for="(item, index) in list"
                 v-for="(item, index) in list"

+ 1 - 1
src/views/order/CouponList.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
     <div class="page">
     <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">
             <template v-for="(item, index) in useList" :key="index">
                 <coupon-info
                 <coupon-info
                     needChoose
                     needChoose

+ 4 - 1
src/views/order/Orders.vue

@@ -54,7 +54,7 @@
                     class="list"
                     class="list"
                     v-model:loading="loading"
                     v-model:loading="loading"
                     :finished="finished"
                     :finished="finished"
-                    :finished-text="empty ? '' : '没有更多'"
+                    :finished-text="empty ? '' : '没有更多'"
                     @load="getData"
                     @load="getData"
                 >
                 >
                     <div class="list_display">
                     <div class="list_display">
@@ -290,6 +290,9 @@ export default {
 /deep/ .van-tabs {
 /deep/ .van-tabs {
     background-color: #15152d;
     background-color: #15152d;
 }
 }
+.list{
+    margin-bottom: 80px;
+}
 .top {
 .top {
     display: flex;
     display: flex;
     padding: 10px 16px;
     padding: 10px 16px;

+ 2 - 2
src/views/product/List.vue

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

+ 4 - 1
src/views/product/Search.vue

@@ -128,7 +128,7 @@
             v-model:loading="loading"
             v-model:loading="loading"
             :immediate-check="false"
             :immediate-check="false"
             :finished="finished"
             :finished="finished"
-            :finished-text="empty ? '' : '没有更多'"
+            :finished-text="empty ? '' : '没有更多'"
             @load="getData"
             @load="getData"
             v-if="isSearch"
             v-if="isSearch"
         >
         >
@@ -416,6 +416,9 @@ export default {
     padding-top: 8px;
     padding-top: 8px;
     box-sizing: border-box;
     box-sizing: border-box;
 }
 }
+.list{
+    margin-bottom: 80px;
+}
 .hot-content {
 .hot-content {
     padding: 20px 0 6px 16px;
     padding: 20px 0 6px 16px;
     box-sizing: border-box;
     box-sizing: border-box;

+ 1 - 1
src/views/user/BanksAdd.vue

@@ -7,7 +7,7 @@
                 name="银行卡"
                 name="银行卡"
                 label="银行卡"
                 label="银行卡"
                 :maxlength="23"
                 :maxlength="23"
-                placeholder="点击输本人银行卡号"
+                placeholder="点击输本人银行卡号"
                 :formatter="bankFormatter"
                 :formatter="bankFormatter"
                 v-model="form.bankNo"
                 v-model="form.bankNo"
                 clearable
                 clearable

+ 4 - 1
src/views/user/Exchange.vue

@@ -34,7 +34,7 @@
                 close-on-click-action
                 close-on-click-action
             /> -->
             /> -->
         </van-sticky>
         </van-sticky>
-        <van-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">
             <template v-for="(item, index) in list" :key="index">
                 <div class="exchange">
                 <div class="exchange">
                     <div class="exchange_top">
                     <div class="exchange_top">
@@ -414,6 +414,9 @@ export default {
 /deep/ .van-empty {
 /deep/ .van-empty {
     padding-top: 83px;
     padding-top: 83px;
 }
 }
+.list{
+    margin-bottom: 80px;
+}
 .empty_two {
 .empty_two {
     font-size: 14px;
     font-size: 14px;
     font-family: PingFangSC-Regular, PingFang SC;
     font-family: PingFangSC-Regular, PingFang SC;