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

src/iframe/buy-nft.js

@@ -3,20 +3,11 @@ import App from '@/view/iframe/buy-nft/index.vue'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 
-import "ant-design-vue/dist/antd.css"; // or 'ant-design-vue/dist/antd.less'
 import router from '@/router/buy-nft.js'
-import {Button,message,Tooltip} from "ant-design-vue";
-message.config({
-    top: `10px`,
-    duration: 3,
-    maxCount: 1,
-});
 
 const app = createApp(App);
 
-app.use(Button);
-app.use(Tooltip);
-app.use(message);
+
 app.use(router)
 app.use(ElementPlus);
 app.mount('#app');

src/view/iframe/buy-nft/buy/home.vue

@@ -219,7 +219,6 @@ onMounted(() => {
                 border-radius: 100px;
                 color: #1D9BF0;
                 min-width: 217px;
-                min-height: 50px;
                 display: flex;
                 justify-content: space-between;
                 align-items: center;
@@ -267,7 +266,6 @@ onMounted(() => {
                 color: #fff;
                 border-radius: 100px;
                 min-width: 217px;
-                min-height: 50px;
                 display: flex;
                 align-items: center;
                 font-size: 14px;

src/view/iframe/buy-nft/buy/pay.vue

@@ -37,8 +37,7 @@
                         </div>
                         <preview-balance v-if="tempCurrentCurrencyInfo.currencyCode"
                             :currencyCode="tempCurrentCurrencyInfo.currencyCode"
-                            :tokenSymbol="tempCurrentCurrencyInfo.tokenSymbol" 
-                            @updateData="updateData">
+                            :tokenSymbol="tempCurrentCurrencyInfo.tokenSymbol" @updateData="updateData">
                         </preview-balance>
                     </template>
                 </div>
@@ -154,7 +153,7 @@ const clickPlay = () => {
             ElMessage({
                 message: msg,
                 grouping: true,
-                type: 'error',
+                type: 'warning',
                 offset: -16,
                 appendTo: document.body
             })

src/view/iframe/buy-nft/index.vue

@@ -1,11 +1,10 @@
 <template>
     <div class="content">
-        <div class="background"></div>
         <router-view></router-view>
     </div>
 </template>
 <script setup>
-import { reactive,provide } from 'vue'
+import { reactive, provide } from 'vue'
 let pay_info = reactive({})
 provide('pay_info', pay_info)
 let state = reactive({
@@ -24,7 +23,11 @@ body,
     height: 100%;
     margin: 0;
     padding: 0;
+}
+
+body {
 
+    background-color: rgba(0, 0, 0, 0.5);
 }
 
 .content {
@@ -33,14 +36,5 @@ body,
     display: flex;
     align-items: center;
     justify-content: center;
-
-    .background {
-        width: 100%;
-        height: 100%;
-        background: #000000;
-        opacity: 0.7;
-        position: fixed;
-        z-index: 1;
-    }
 }
 </style>

src/view/popup/currency-detail.vue

@@ -14,11 +14,13 @@
         :src="currencyInfo.iconPath"/>
       <div class="amount">
         <div class="balance"
-             :class="{'direction-column': (currencyInfo.totalBalance.length + currencyInfo.tokenSymbol.length) > 12}">
-             
+             :class="{'direction-column': (currencyInfo.totalBalance.length + currencyInfo.tokenSymbol.length) > 15}">
           <a-tooltip :title="currencyInfo.totalBalance">
               {{ getBit(currencyInfo.totalBalance) }}
           </a-tooltip> 
+          <template v-if="currencyInfo.totalBalance.length + currencyInfo.tokenSymbol.length < 16">
+            &nbsp;&nbsp;
+          </template>
           <span class="symbol">
              {{currencyInfo.tokenSymbol}}
           </span>

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

@@ -193,6 +193,8 @@ const refreshList = () => {
     setTimeout(() => {
         iconRotate.value = false
     }, 1000)
+
+    getAccountBalance();
     if(currencyListDom.value) {
         currencyListDom.value.getCurrencyInfoList && currencyListDom.value.getCurrencyInfoList();
     }