Merge branch 'dev_1.1.0' of https://git.yishihui.com/DeNet/de-net into dev_1.1.0

src/iframe/nft-card.js

@@ -1,5 +1,5 @@
 import { createApp } from 'vue'
-import App from '@/view/nft/card.vue'
+import App from '@/view/iframe/nft/card.vue'
 
 const app = createApp(App);
 

src/view/components/currency-list.vue

@@ -246,7 +246,7 @@ const listScroll = (e) => {
     let scrollTop = e.target.scrollTop || 0;
     if (
         listReqParams.loadMore === false &&
-        wrapperHeight + scrollTop >= listContentHeight
+        wrapperHeight + scrollTop >= (listContentHeight - 50)
     ) {
         listReqParams.loadMore = true;
         listReqParams.params.pageNum++;

src/view/popup/currency-detail.vue

@@ -233,7 +233,7 @@ onMounted(() => {
       bottom: 0;
       background-color: #fff;
       border-radius: 20px 20px 0 0;
-      overflow-y: scroll;
+      overflow-y: auto;
   }
   .selectBg {
       position: absolute;

src/view/popup/tabbar-page/wallter/popup.vue

@@ -26,6 +26,7 @@
         </div>
 
         <currency-list 
+            v-if="userInfo.accessToken"
             style="height: calc(100% - 118px);"
             ref="currencyListDom"
             :showRefresh="false"

src/view/popup/top-up/home.vue

@@ -75,7 +75,7 @@ onMounted(() => {
     bottom: 0;
     background-color: #fff;
     border-radius: 20px 20px 0 0;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 .selectBg {
     position: absolute;

src/view/popup/withdraw/home.vue

@@ -85,7 +85,7 @@ onMounted(() => {
     bottom: 0;
     background-color: #fff;
     border-radius: 20px 20px 0 0;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 .selectBg {
     position: absolute;