[bug] fix

src/logic/twitter.js

@@ -138,7 +138,7 @@ export function addPinedPop() {
     img.src = require("@/assets/img/img-pined-guide.png");
 
     let contentDom = document.createElement('div');
-    contentDom.innerHTML = "<div style='font-weight: 500;font-size: 18px;margin-top: 20px;margin-bottom: 20px'>📌 Pin an Extension is more convenient to open😄</div><div style='display: flex; align-items: center; justify-content: space-between;'><div style='display: flex; align-items: center; font-size: 14px; color: #899099; cursor: pointer;' id='de-remind'><input id='de-check' type='checkbox'/> Don't remind</div><div class='de-pin-skip' style='font-weight: 500; font-size: 16px; color: #389AFF;cursor: pointer;'>Skip</div></div>"
+    contentDom.innerHTML = "<div style='font-weight: 500;font-size: 18px;margin-top: 20px;margin-bottom: 20px'>📌 Pin an Extension is more convenient to open😄</div><div style='display: flex; align-items: center; justify-content: space-between;'><div style='display: flex; align-items: center; font-size: 14px; color: #899099; cursor: pointer;' id='de-remind'><input id='de-check' type='checkbox'/> Don't remind</div><div class='de-pin-skip' style='font-weight: 500; font-size: 16px; color: #1D9BF0;cursor: pointer;'>Skip</div></div>"
 
     let arrow = document.createElement('div');
     arrow.style.cssText = 'position: absolute;height: 15px;width: 15px;top: -8px;right: 80px;border-left: 0.5px solid rgb(145, 145, 145);border-top: 0.5px solid rgb(145, 145, 145);background: rgb(255, 255, 255);transform: rotate(45deg);';

src/view/components/custom-card-cover.vue

@@ -110,6 +110,9 @@ const open = () => {
                 font-size: 60px;
                 line-height: 76px;
                 color: #ffffff;
+                display: inline-block;
+                max-width: 260px;
+                word-break: break-all;
             }
         }
 

src/view/components/follow-input.vue

@@ -250,7 +250,7 @@ const onUserMouseLeave = (params, index) => {
             border: 1px solid #ECECEC;
             box-sizing: border-box;
             border-radius: 100px;
-            color: #389AFF;
+            color: #1D9BF0;
             font-weight: 500;
             font-size: 15px;
             padding: 4px 12px;
@@ -276,7 +276,7 @@ const onUserMouseLeave = (params, index) => {
                 max-width: 128px;
             }
             .at-user-input {
-                color: #389AFF;
+                color: #1D9BF0;
                 border: none;
                 outline: none;
             }

src/view/components/give-dialog.vue

@@ -230,7 +230,7 @@
 
                             <div class="submit-btn-wrapper">
                                 <div class="submit-btn"
-                                    :class="{ 'disabled-submit': iptErrMsgTxt != '' }"
+                                    :class="{ 'disabled-submit': iptErrMsgTxt != '' && !depositGuide }"
                                     @click="confirm">
                                     <img
                                         class="icon-loading"
@@ -355,6 +355,8 @@ let postId = ref('');
 
 let asyncIng = ref(false);
 
+let depositGuide = ref(false);
+
 let messageBoxData = ref({
     title: "",
     content: "",
@@ -481,6 +483,10 @@ const getPayAmount = async (amountValue) => {
 };
 
 const confirm = () => {
+    if(depositGuide.value) { //余额不够去充值
+        goTopUp();
+        return;
+    }
     if (submitIng.value || iptErrMsgTxt.value) {
         return;
     }
@@ -493,11 +499,12 @@ const confirm = () => {
 
 const selectCurrency = (params) => {
     tempCurrentCurrencyInfo.value = params;
+    depositGuide.value = false;
     if(params.currencyCode != "USD" && params.balance < params.minAmount) {
         let tokenSymbol = params.currencyCode == 'USD' ? 'USD' : params.tokenSymbol;
         messageBoxBlock({
-            title: `是否要充值 ${tokenSymbol}`,
-            content: `${tokenSymbol} 可用余额为${params.balance}，是否要去充值？`,
+            title: `Deposit ${tokenSymbol}`,
+            content: `${tokenSymbol} available balance is ${params.balance}`,
         });
     } else {
         currentCurrencyInfo.value = params;
@@ -576,6 +583,7 @@ const goTopUp = () => {
 const topUpDone = () => {
     currentCurrencyInfo.value = tempCurrentCurrencyInfo.value;
     asyncIng.value = true;
+    depositGuide.value = false;
     asyncTokenRechRecord((res) => {
         asyncIng.value = false;
         showCurrencyPop.value = false;
@@ -783,6 +791,14 @@ const onAmountInput = () => {
     if(val == '00') {
         val = '0'
     }
+    if(val.indexOf('.') > -1){ //校验 例：00.12 => 0.12
+        let arr = val.split('.');
+        if(arr[0].startsWith('0')) {
+            let num = +arr[0];
+            val = num + '.' + arr[1];
+        }
+    }
+
     baseFormData.amountValue = val;
     setInputErrorMsg({from: 'amount', type:'input'});
 
@@ -903,6 +919,7 @@ const setIsEmptyTxt = () => {
  * 输入时 检测设置错误信息
  */
 const onIptSetErrorTxt = (params) => {
+    depositGuide.value = false;
     if(!currentCurrencyInfo.value.currencyCode) {
         iptErrMsgTxt.value = "Please select a currency"
     } else if (!baseFormData.amountValue || baseFormData.amountValue == '0') {
@@ -917,6 +934,7 @@ const onIptSetErrorTxt = (params) => {
             iptErrMsgTxt.value = "";
         }
     } else if(currentCurrencyInfo.value.currencyCode != 'USD') {
+        depositGuide.value = true;
         iptErrMsgTxt.value = `Insufficient ${currentCurrencyInfo.value.tokenSymbol} balance, please recharge`;
     } 
 }
@@ -1242,6 +1260,7 @@ onMounted(() => {
                                 font-size: 12px;
                                 color: #ff9839;
                                 cursor: pointer;
+                                margin-left: 8px;
                             }
 
                             .icon-refresh-rotate {
@@ -1305,7 +1324,7 @@ onMounted(() => {
                             .currency-select {
                                 max-width: 136px;
                                 cursor: pointer;
-                                background: #389AFF;
+                                background: #1D9BF0;
                                 margin-left: 6px;
                                 padding: 6px 10px;
                                 border-radius: 12px;
@@ -1419,7 +1438,7 @@ onMounted(() => {
                     }
 
                     .more {
-                        color: #389aff;
+                        color: #1D9BF0;
                         font-size: 13px;
                         padding-left: 4px;
                         cursor: pointer;
@@ -1439,7 +1458,6 @@ onMounted(() => {
                         width: 100%;
                         height: 46px;
                         text-align: center;
-                        line-height: 46px;
                         background: #4a99e9;
                         border-radius: 100px;
                         color: #fff;

src/view/components/message-box.vue

@@ -89,7 +89,7 @@ const confirm = () => {
                 text-align: center;
                 line-height: 46px;
                 border-radius: 100px;
-                border: 1px solid #389AFF;
+                border: 1px solid #1D9BF0;
                 box-sizing: border-box;
                 font-weight: 600;
                 font-size: 16px;
@@ -97,10 +97,10 @@ const confirm = () => {
             }
 
             .cancel {
-                color: #389AFF;
+                color: #1D9BF0;
             }
             .confirm {
-                background: #389AFF;
+                background: #1D9BF0;
                 color: #fff;
             }
         }

src/view/components/option-login.vue

@@ -44,7 +44,7 @@ const login = () => {
         }
     }
     .login-btn {
-        background: #389AFF;
+        background: #1D9BF0;
         border-radius: 100px;
         padding: 18px 60px;
         box-sizing: border-box;

src/view/components/option-withdraw.vue

@@ -351,7 +351,7 @@ const setWithdrawIptStatus = (amount) => {
                     .withdrawal-all-btn {
                         font-weight: 500;
                         font-size: 13px;
-                        color: #389aff;
+                        color: #1D9BF0;
                         padding-right: 10px;
                         cursor: pointer;
                     }
@@ -420,7 +420,7 @@ const setWithdrawIptStatus = (amount) => {
         text-align: center;
         line-height: 60px;
         border-radius: 100px;
-        background: #389aff;
+        background: #1D9BF0;
         font-weight: 600;
         font-size: 18px;
         color: #fff;

src/view/components/options-transactions.vue

@@ -83,42 +83,50 @@
                                 <template v-if="item.bizType == -1">
                                     <!-- 提现状态（0：已申请，1：支付中，2：提现成功，3：提现失败） -->
                                     <template v-if="item.bizData.withdrawStatus == 0 || item.bizData.withdrawStatus == 1">
-                                        <div class="balance">
-                                            -{{ item.trxAmountValue || 0 }}
-                                            <span>{{ item.trxAmountCurrencyInfo.currencyName }}</span>
-                                            <img :src="item.trxAmountCurrencyInfo.iconPath" alt="">
-                                        </div>
-                                        <div class="desc">
-                                            in progress
+                                        <div>
+                                            <div class="balance">
+                                                <span class="amount">
+                                                    -{{ item.trxAmountValue || 0 }}
+                                                </span>
+                                                <span class="name">{{ item.trxAmountCurrencyInfo.tokenSymbol }}</span>
+                                                <img :src="item.trxAmountCurrencyInfo.iconPath" alt="">
+                                            </div>
+                                            <div class="desc">
+                                                in progress
+                                            </div>
                                         </div>
                                     </template>
                                     <template v-else-if="item.bizData.withdrawStatus == 2">
                                         <div class="balance">
-                                            -{{ item.trxAmountValue || 0 }}
-                                            <span>{{ item.trxAmountCurrencyInfo.currencyName }}</span>
+                                            <span class="amount">-{{ item.trxAmountValue || 0 }}</span>
+                                            <span class="name">{{ item.trxAmountCurrencyInfo.tokenSymbol }}</span>
                                             <img :src="item.trxAmountCurrencyInfo.iconPath" alt="">
                                         </div>
                                     </template>
                                     <template v-else-if="item.bizData.withdrawStatus == 3">
-                                        <div class="balance">
-                                            -{{ item.trxAmountValue || 0 }}
-                                            <span>{{ item.trxAmountCurrencyInfo.currencyName }}</span>
-                                            <img :src="item.trxAmountCurrencyInfo.iconPath" alt="">
-                                        </div>
-                                        <div class="desc">
-                                            Withdrawal failed
+                                        <div>
+                                            <div class="balance">
+                                                <span class="amount">-{{ item.trxAmountValue || 0 }}</span>
+                                                <span class="name">{{ item.trxAmountCurrencyInfo.tokenSymbol }}</span>
+                                                <img :src="item.trxAmountCurrencyInfo.iconPath" alt="">
+                                            </div>
+                                            <div class="desc">
+                                                Withdrawal failed
+                                            </div>
                                         </div>
                                     </template>
                                     <template v-else>
-                                        -{{ item.trxAmountValue || 0 }}
-                                        <span>{{ item.trxAmountCurrencyInfo.currencyName }}</span>
+                                        <span class="amount">-{{ item.trxAmountValue || 0 }}</span>
+                                        <span class="name">{{ item.trxAmountCurrencyInfo.tokenSymbol }}</span>
                                         <img :src="item.trxAmountCurrencyInfo.iconPath" alt="">
                                     </template>
                                 </template>
                                 <!-- 收入 -->
                                 <template v-else>
-                                    <template v-if="item.bizType == -2">-</template>{{ item.trxAmountValue || 0 }}
-                                    <span>{{ item.trxAmountCurrencyInfo.currencyName }}</span>
+                                    <span class="amount">
+                                        <template v-if="item.bizType == -2">-</template>{{ item.trxAmountValue || 0 }}
+                                    </span>
+                                    <span class="name">{{ item.trxAmountCurrencyInfo.tokenSymbol }}</span>
                                     <img :src="item.trxAmountCurrencyInfo.iconPath" alt="">
                                 </template>
                             </div>
@@ -236,7 +244,7 @@ const listScroll = (e) => {
             display: flex;
             justify-content: space-between;
             align-items: center;
-            height: 66px;
+            min-height: 66px;
             box-sizing: border-box;
             padding-left: 20px;
 
@@ -266,7 +274,7 @@ const listScroll = (e) => {
                 align-items: center;
                 border-bottom: 1px solid #d1d1d1;
                 box-sizing: border-box;
-                padding-right: 12px;
+                padding: 10px 12px 10px 0;
 
                 .left {
                     .nickname {
@@ -292,7 +300,14 @@ const listScroll = (e) => {
                         display: flex;
                         align-items: center;
 
-                        span {
+                        .amount {
+                            max-width: 110px;
+                            display: inline-block;
+                            word-break: break-all;
+                            text-align: right;
+                        }
+
+                        .name {
                             margin-left: 3px;
                             color: #E29A2E;
                         }
@@ -306,9 +321,16 @@ const listScroll = (e) => {
                         .balance {
                             text-align: right;
                             margin-bottom: 4px;
+                            display: flex;
+                            align-items: center;
                         }
 
-                        .desc {}
+                        .desc {
+                            text-align: right;
+                            font-weight: 400;
+                            font-size: 12px;
+                            color: #797979;
+                        }
                     }
 
                     .icon {

src/view/components/paypal-button.vue

@@ -159,7 +159,7 @@ onMounted(() => {
         .row {
             font-weight: 600;
             font-size: 16px;
-            color: #389AFF;
+            color: #1D9BF0;
             display: flex;
             align-items: center;
             margin-bottom: 6px;
@@ -191,7 +191,7 @@ onMounted(() => {
         .token-pay {
             width: 100%;
             height: 100%;
-            background: #389AFF;
+            background: #1D9BF0;
             border-radius: 10000px;
             display: flex;
             align-items: center;

src/view/components/preview-card.vue

@@ -302,6 +302,7 @@ onMounted(() => {
                         font-weight: 800;
                         font-size: 16px;
                         color: #ffffff;
+                        margin-bottom: -8px;
                     }
                     .center {
                         padding: 12px 0;
@@ -323,6 +324,7 @@ onMounted(() => {
                         font-weight: 800;
                         font-size: 13px;
                         color: #ffffff;
+                        margin-top: -8px;
                     }
                 }
                 .card-cover {

src/view/components/top-up.vue

@@ -33,10 +33,8 @@
                 <div class="copy-btn" :data-clipboard-text="tokenRechargeAddress">copy</div>
             </div>
             <div class="tips-box">
-                <div>TIPS</div>
-                <div>1、请通过客户端或在线钱包将您需要充值的相应币种数目发送到该地址。</div> 
-                <div>2、发送完成后，系统会自动在此交易获得 相应数量确认后将该笔虚拟币充值到您在本站的账户，相应数量的确认需要大约 0.5 到 1 小时时间，请耐心等待</div>
-                <div>3、同一个地址可多次充值，不影响到账。最小充值金额 0.0001。</div>
+                <img :src="require('@/assets/svg/icon-top-up-tips-warning.svg')" >
+                Make sure you also selected BNB Smart Chain (BEP20) as the Network on the platform where you are withdrawing funds for this deposiit. Otherwise, you'll lose your assets.
             </div>
         </div>
         <a-button class="btn-done" 
@@ -149,9 +147,9 @@ onMounted(() => {
         .top {
             width: 100%;
             display: flex;
+            justify-content: space-between;
 
             .item {
-                margin-right: 24px;
                 width: 48%;
 
                 .label {
@@ -207,10 +205,10 @@ onMounted(() => {
                 height: 40px;
                 width: 160px;
                 border-radius: 1000px;
-                border: 1px solid #389AFF;
+                border: 1px solid #1D9BF0;
                 font-weight: 600;
                 font-size: 16px;
-                color: #389AFF;
+                color: #1D9BF0;
                 text-align: center;
                 line-height: 40px;
                 cursor: pointer;
@@ -218,15 +216,15 @@ onMounted(() => {
         }
         .tips-box {
             margin-top: 18px;
-            font-weight: 400;
-            font-size: 13px;
-            div{
-                line-height: 20px;
-            }
+            font-size: 14px;
+            border-radius: 8px;
+            background: #FCF5E5;
+            padding: 12px 10px;
+            box-sizing: border-box;
         }
     }
     .btn-done {
-        background: #389AFF;
+        background: #1D9BF0;
         width: 100%;
         height: 46px;
         text-align: center;

src/view/popup/components/state-page.vue

@@ -75,7 +75,7 @@ function clickBtn() {
             height: 46px;
             line-height: 46px;
             text-align: center;
-            background: #389AFF;
+            background: #1D9BF0;
             border-radius: 1000px;
             font-weight: 600;
             font-size: 18px;

src/view/popup/popup.vue

@@ -515,9 +515,9 @@ body {
 
             .top-up-btn {
                 cursor: pointer;
-                border: 1px solid #389AFF;
+                border: 1px solid #1D9BF0;
                 color: #fff;
-                background: #389AFF;
+                background: #1D9BF0;
                 border-radius: 100px;
                 width: 110px;
                 height: 38px;
@@ -528,7 +528,7 @@ body {
 
             .withdraw-btn {
                 background: rgba(56, 154, 255, 0.01);
-                border: 1px solid #389AFF;
+                border: 1px solid #1D9BF0;
                 box-sizing: border-box;
                 width: 110px;
                 font-size: 15px;
@@ -536,7 +536,7 @@ body {
                 text-align: center;
                 line-height: 36px;
                 border-radius: 100px;
-                color: #389AFF;
+                color: #1D9BF0;
                 display: inline-block;
                 cursor: pointer;
             }
@@ -683,8 +683,8 @@ body {
                                     line-height: 24px;
                                     text-align: center;
                                     border-radius: 100px;
-                                    border: 1px solid #389aff;
-                                    color: #389aff;
+                                    border: 1px solid #1D9BF0;
+                                    color: #1D9BF0;
                                     font-weight: 500;
                                     font-size: 14px;
                                     cursor: pointer;

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

@@ -242,9 +242,9 @@ onMounted(() => {
                 line-height: 38px;
                 text-align: center;
                 font-size: 16px;
-                color: #389AFF;
+                color: #1D9BF0;
 
-                border: 1px solid #389AFF;
+                border: 1px solid #1D9BF0;
                 border-radius: 100px;
 
             }
@@ -282,7 +282,7 @@ onMounted(() => {
             height: 46px;
             text-align: center;
             border-radius: 100px;
-            background: #389aff;
+            background: #1D9BF0;
             font-weight: 600;
             font-size: 18px;
             color: #fff;

src/view/popup/withdraw/confirm.vue

@@ -252,7 +252,7 @@ const clickEnter = () => {
 
             .agreement {
                 text-decoration: underline;
-                color: #389AFF;
+                color: #1D9BF0;
             }
         }
 
@@ -274,7 +274,7 @@ const clickEnter = () => {
             }
 
             .enter {
-                background: #389AFF;
+                background: #1D9BF0;
             }
         }
     }

src/view/popup/withdraw/info.vue

@@ -292,7 +292,7 @@ const clickWithdrawalAll = () => {
 
         span {
           display: block;
-          color: #389AFF;
+          color: #1D9BF0;
           font-size: 13px;
           cursor: pointer;
           margin-right: 16px;
@@ -367,7 +367,7 @@ const clickWithdrawalAll = () => {
       }
 
       .enter {
-        background: #389AFF;
+        background: #1D9BF0;
       }
     }
   }

src/view/red-packet.vue

@@ -780,9 +780,9 @@ body {
       line-height: 46px;
       text-align: center;
       border-radius: 100px;
-      border: 1px solid #389AFF;
+      border: 1px solid #1D9BF0;
       background: rgba(196, 196, 196, 0.01);
-      color: #389AFF;
+      color: #1D9BF0;
       font-size: 16px;
       font-weight: 500;
       cursor: pointer;
@@ -1167,7 +1167,7 @@ body {
               span {
                 margin-left: 8px;
                 margin-right: 2px;
-                color: #389aff;
+                color: #1D9BF0;
                 opacity: 1;
               }
 
@@ -1199,7 +1199,7 @@ body {
           border-radius: 500px;
           text-align: center;
           letter-spacing: 0.3px;
-          color: #389aff;
+          color: #1D9BF0;
           cursor: pointer;
         }
       }
@@ -1279,7 +1279,7 @@ body {
       }
 
       .btn {
-        background: #389AFF;
+        background: #1D9BF0;
         border-radius: 100px;
         color: #fff;
         width: 258px;