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

src/view/components/preview-balance.vue

@@ -21,6 +21,10 @@ const props = defineProps({
     currencyCode: {
         type: String,
         default: ''
+    },
+    tokenSymbol: {
+        type: String,
+        default: ''
     }
 });
 
@@ -113,11 +117,13 @@ onMounted(() => {
             color: rgba($color: #000000, $alpha: 0.5);
             font-size: 12px;
             margin-bottom: 4px;
+            line-height: 14px;
         }
 
         .price {
             font-size: 16px;
             font-weight: bold;
+            line-height: 19px;
         }
     }
 

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

@@ -23,35 +23,35 @@
                 <template v-for="item in state.data.salePlans.splice(0, 2).reverse()">
                     <div class="buy1" @click="clickJump(item)"
                         v-if="item.itemCount == 1 && (state.data.perUserBuyLimit - state.data.userBuyCount) >= 1">
-                        <template v-if="(item.price.length + item.currencyCode.length) > 30">
+                        <template v-if="(item.price.length + item.currencyInfo.tokenSymbol.length) > 30">
                             <div class="left">Buy 1</div>
                             <div class="right">
                                 <p>{{ item.price }}</p>
-                                <p>{{ item.currencyCode }}</p>
+                                <p>{{ item.currencyInfo.tokenSymbol }}</p>
                             </div>
                         </template>
                         <template v-else>
                             <div class="left">Buy 1</div>
                             <div class="right">
                                 {{ item.price }}
-                                {{ item.currencyCode }}
+                                {{ item.currencyInfo.tokenSymbol }}
                             </div>
                         </template>
                     </div>
                     <div class="buy1 grey"
                         v-if="item.itemCount == 1 && (state.data.perUserBuyLimit - state.data.userBuyCount) <= 0">
-                        <template v-if="(item.price.length + item.currencyCode.length) > 30">
+                        <template v-if="(item.price.length + item.currencyInfo.tokenSymbol.length) > 30">
                             <div class="left">Buy 1</div>
                             <div class="right">
                                 <p>{{ item.price }}</p>
-                                <p>{{ item.currencyCode }}</p>
+                                <p>{{ item.currencyInfo.tokenSymbol }}</p>
                             </div>
                         </template>
                         <template v-else>
                             <div class="left">Buy 1</div>
                             <div class="right">
                                 {{ item.price }}
-                                {{ item.currencyCode }}
+                                {{ item.currencyInfo.tokenSymbol }}
                             </div>
                         </template>
                     </div>
@@ -61,18 +61,18 @@
                         @click="clickJump(item)">
                         <div class="left">Buy {{ item.itemCount }}</div>
 
-                        <div class="right" v-if="(item.price.length + item.currencyCode.length) > 30">
+                        <div class="right" v-if="(item.price.length + item.currencyInfo.tokenSymbol.length) > 30">
                             <div class="usdt">
                                 <p>{{ item.price }}</p>
-                                <p>{{ item.currencyCode }}</p>
+                                <p>{{ item.currencyInfo.tokenSymbol }}</p>
                             </div>
                             <div class="off">
-                                <p>{{ item.discount }} OFF</p>
+                                <p>{{ item.discount }}</p>
                             </div>
                         </div>
                         <div class="right" v-else>
-                            <div class="usdt">{{ item.price }} {{ item.currencyCode }}</div>
-                            <div class="off">{{ item.discount }} OFF</div>
+                            <div class="usdt">{{ item.price }} {{ item.currencyInfo.tokenSymbol }}</div>
+                            <div class="off">{{ item.discount }}</div>
                         </div>
                     </div>
                 </template>
@@ -144,7 +144,7 @@ onMounted(() => {
 .dialog {
     background: #fff;
     border-radius: 25px;
-    max-width: 90%;
+    max-width: 1000px;
     min-width: 800px;
     max-height: 90%;
     min-height: 90%;

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

@@ -36,7 +36,9 @@
                             <div class="font">Wait for the amount to arrive</div>
                         </div>
                         <preview-balance v-if="tempCurrentCurrencyInfo.currencyCode"
-                            :currencyCode="tempCurrentCurrencyInfo.currencyCode" @updateData="updateData">
+                            :currencyCode="tempCurrentCurrencyInfo.currencyCode"
+                            :tokenSymbol="tempCurrentCurrencyInfo.tokenSymbol" 
+                            @updateData="updateData">
                         </preview-balance>
                     </template>
                 </div>
@@ -48,35 +50,35 @@
             <div class="buy1" @click="clickPlay" v-if="state.is_btn_grey == false">
                 <btn-loading :color="'while'" v-if="state.loading.show"></btn-loading>
                 <template
-                    v-else-if="(pay_info.home.sale_plan.price.length + pay_info.home.sale_plan.currencyCode.length) > 30">
+                    v-else-if="(pay_info.home.sale_plan.price.length + pay_info.home.sale_plan.currencyInfo.tokenSymbol.length) > 30">
                     <div class="left">Pay</div>
                     <div class="right">
                         <p>{{ pay_info.home.sale_plan.price }}</p>
-                        <p>{{ pay_info.home.sale_plan.currencyCode }}</p>
+                        <p>{{ pay_info.home.sale_plan.currencyInfo.tokenSymbol }}</p>
                     </div>
                 </template>
                 <template v-else>
                     <div class="left">Pay</div>
                     <div class="right">
                         {{ pay_info.home.sale_plan.price }}
-                        {{ pay_info.home.sale_plan.currencyCode }}
+                        {{ pay_info.home.sale_plan.currencyInfo.tokenSymbol }}
                     </div>
                 </template>
             </div>
             <div class="buy1 grey" v-else>
                 <template
-                    v-if="(pay_info.home.sale_plan.price.length + pay_info.home.sale_plan.currencyCode.length) > 30">
+                    v-if="(pay_info.home.sale_plan.price.length + pay_info.home.sale_plan.currencyInfo.tokenSymbol.length) > 30">
                     <div class="left">Pay</div>
                     <div class="right">
                         <p>{{ pay_info.home.sale_plan.price }}</p>
-                        <p>{{ pay_info.home.sale_plan.currencyCode }}</p>
+                        <p>{{ pay_info.home.sale_plan.currencyInfo.tokenSymbol }}</p>
                     </div>
                 </template>
                 <template v-else>
                     <div class="left">Pay</div>
                     <div class="right">
                         {{ pay_info.home.sale_plan.price }}
-                        {{ pay_info.home.sale_plan.currencyCode }}
+                        {{ pay_info.home.sale_plan.currencyInfo.tokenSymbol }}
                     </div>
                 </template>
             </div>
@@ -201,7 +203,7 @@ onMounted(() => {
 .dialog {
     background: #fff;
     border-radius: 25px;
-    max-width: 90%;
+    max-width: 1000px;
     min-width: 800px;
     height: 90%;
     z-index: 23;