[bug] fix、文案

src/logic/twitter.js

@@ -406,7 +406,7 @@ function _createBtnDom(port) {
 
     const deBtn3 = document.createElement('img');
     deBtn3.id = 'de-btn3'
-    deBtn3.src = require("@/assets/img/icon-slider-de-net-btn.png");
+    deBtn3.src = require("@/assets/logo/128.png");
     deBtn3.style.cssText = 'width:52px;height: 52px;margin-top:20px;cursor: pointer;';
 
     deBtn.addEventListener('click', () => {

src/view/components/currency-list.vue

@@ -19,7 +19,7 @@
                         <div class="item-title">
                             <img class="icon"
                                 :src="item.type == 1 ? require('../../assets/svg/icon-currency-category-01.svg') : require('../../assets/svg/icon-currency-category-02.svg')" />
-                            {{ item.type == 1 ? 'Legal Tender' : 'Token' }}
+                            {{ item.type == 1 ? 'Cash' : 'Crypto' }}
                         </div>
                         <div class="item-detail" v-for="(data, idx) in item.data" :key="idx"
                             @click="selectCurrency(data)">
@@ -76,6 +76,10 @@ const props = defineProps({
     page: {
         type: String,
         default: '',
+    },
+    filterEmptyBalance: {
+        type: Boolean,
+        default: false
     }
 })
 let keywords = ref('');
@@ -164,7 +168,7 @@ const getCurrencyInfoList = () => {
             pageNum: listReqParams.params.pageNum,
             pageSize: listReqParams.params.pageSize,
             filterFiatCurrency: props.page == 'top-up',
-            filterEmptyBalance: props.page != 'top-up'
+            filterEmptyBalance: props.filterEmptyBalance
         }
     };
     getCurrencyInfo(params).then(res => {

src/view/components/follow-input.vue

@@ -14,7 +14,8 @@
                     @keydown="onKeydown(item, index)"
                     @keyup="onKeyup(item, index)"
                     @blur="onblur(item, index)"
-                    @focus="onfocus(item, index)"/>
+                    @focus="onfocus(item, index)"
+                    @mouseenter="iptMouseenter"/>
 
             <template v-if="currentIptIndex == index && userList.length">
                 <div class="user-list-wrapper">
@@ -197,6 +198,14 @@ const handleMouseEn = () => {
 const handleMouseLe = () => {
     isActiveAddBtn.value = false;
 }
+const iptMouseenter = (e) => {
+    rectClick(e);
+}
+
+function rectClick(event) {
+    //获取相对于当前所指向对象的位置坐标
+    console.log(event,'x:' + event.clientX + "  y:" +  event.clientY);
+}
 
 const getTwitterUsers = (query, cb) => {
     searchTwitterUser({

src/view/components/give-dialog.vue

@@ -35,7 +35,7 @@
                         <div class="option">
                             <div class="item" @click="goTransactionsList()">
                                 <img :src="require('@/assets/svg/icon-menu.svg')">
-                                <span>Transactions</span>
+                                <span>Transaction History</span>
                             </div>
                         </div>
                     </div>
@@ -89,7 +89,7 @@
                                             :src="currentCurrencyInfo.iconPath"
                                         />
                                         <div class="text">
-                                            {{currentCurrencyInfo.currencyCode == 'USD' ? 'USD' : currentCurrencyInfo.tokenSymbol || 'Select a Reward'}}
+                                            {{currentCurrencyInfo.currencyCode == 'USD' ? 'USD' : currentCurrencyInfo.tokenSymbol || 'Select a reward'}}
                                         </div>
                                         <img
                                             class="arrow"
@@ -218,13 +218,13 @@
                             <!-- 提示 -->
                             <ul class="tips-wrapper">
                                 <li class="row">
-                                    Rewards can only be claimed after the target user completes all tasks you set.
+                                    Rewards can only be claimed after the target user completes all tasks you set. 
                                 </li>
                                 <li class="row">
-                                    Each user can only receive a reward once per task
+                                    Each user can only receive a reward once per task.
                                 </li>
                                 <li class="row">
-                                    The reward will expire in 7 days once issued. Please promote it as much as possible within this period. After experiment, remaining rewards will be returned to your DeNet Wallet.
+                                    The reward will expire in 7 days once issued. Please promote it as much as possible within this period. After the experiment, the remaining rewards will be returned to your DeNet Wallet.
                                 </li>
                             </ul>
 
@@ -315,7 +315,7 @@ let publishRes = reactive({});
 
 let currentComData = {
     default: {
-        title: "Giveaways",
+        title: "Giveaway",
     },
     preview: {
         title: "Preview",
@@ -407,7 +407,7 @@ let formList = reactive([
         checked: true,
     },
     {
-        label: "Like tweet",
+        label: "Like Tweet",
         icon: require("../../assets/svg/icon-like.svg"),
         nodeType: "div",
         type: 2,
@@ -426,12 +426,12 @@ watch(
     () => props.dialogVisible,
     (newVal) => {
         console.log("watch", newVal);
+        visible.value = newVal;
         if (newVal) {
             setTimeout(() => {
                 setDialogHeight();
             }, 300);
         }
-        visible.value = newVal;
     }
 );
 
@@ -450,14 +450,16 @@ const close = () => {
 /**
  * 设置弹窗高度
  */
-const setDialogHeight = () => {
+const setDialogHeight = (resize = false) => {
     let clientHeight = window.innerHeight;
     let gapSafe = 40;
 
     if (dialogHeight.value > clientHeight - gapSafe) {
         dialogHeight.value = clientHeight - gapSafe;
     } else {
-        dialogHeight.value = 680;
+        if(resize) {
+            dialogHeight.value = 680;
+        }
     }
 };
 
@@ -503,8 +505,8 @@ const selectCurrency = (params) => {
     if(params.currencyCode != "USD" && params.balance < params.minAmount) {
         let tokenSymbol = params.currencyCode == 'USD' ? 'USD' : params.tokenSymbol;
         messageBoxBlock({
-            title: `Deposit ${tokenSymbol}`,
-            content: `${tokenSymbol} available balance is ${params.balance}`,
+            title: `Whether to deposit ${tokenSymbol}`,
+            content: `Insufficient ${tokenSymbol} balance`,
         });
     } else {
         currentCurrencyInfo.value = params;
@@ -587,6 +589,7 @@ const topUpDone = () => {
     asyncIng.value = false;
     showCurrencyPop.value = false;
     showComType.value = 'default';
+    calcDomZoom();
     asyncTokenRechRecord((res) => {
         if(res.code == 0 && res.data && res.data.length) {
             let currencyInfo = res.data[0];
@@ -930,21 +933,21 @@ const setIsEmptyTxt = () => {
 const onIptSetErrorTxt = (params) => {
     depositGuide.value = false;
     if(!currentCurrencyInfo.value.currencyCode) {
-        iptErrMsgTxt.value = "Please select a currency"
+        iptErrMsgTxt.value = "Select a reward"
     } else if (!baseFormData.amountValue || baseFormData.amountValue == '0') {
-        iptErrMsgTxt.value = "Please enter the ‘reward’ amount";
+        iptErrMsgTxt.value = "Enter an amount";
     } else if (!baseFormData.totalCount || baseFormData.totalCount == '0') {
-            iptErrMsgTxt.value = "Please enter the ‘winners’ amount";
+            iptErrMsgTxt.value = "Enter the number of winners";
     } else if(+baseFormData.amountValue < +currentCurrencyInfo.value.balance) {
         let res = calcIptValue();
         if (!res.flag) {
-            iptErrMsgTxt.value = `Please enter at least ${baseFormData.amountValue} ${currentCurrencyInfo.value.tokenSymbol} for ${res.count} winners`;
+            iptErrMsgTxt.value = `${baseFormData.amountValue} ${currentCurrencyInfo.value.tokenSymbol} Can send up to ${res.count} winners`;
         } else {
             iptErrMsgTxt.value = "";
         }
     } else if(currentCurrencyInfo.value.currencyCode != 'USD') {
         depositGuide.value = true;
-        iptErrMsgTxt.value = `Insufficient ${currentCurrencyInfo.value.tokenSymbol} balance, please recharge`;
+        iptErrMsgTxt.value = `Insufficient ${currentCurrencyInfo.value.tokenSymbol} balance, please deposit`;
     } 
 }
 
@@ -992,7 +995,7 @@ onMounted(() => {
         }
     };
     window.onresize = throttle(function () {
-        setDialogHeight()
+        setDialogHeight(true)
     }, 300)
 });
 </script>

src/view/components/message-box.vue

@@ -4,8 +4,8 @@
             <div class="title">{{title}}</div>
             <div class="desc">{{content}}</div>
             <div class="btn-wrapper">
-                <div class="btn cancel" @click="cancel">Cancel</div>
-                <div class="btn confirm" @click="confirm">Confirm</div>
+                <div class="btn cancel" @click="cancel">Not yet</div>
+                <div class="btn confirm" @click="confirm">Deposit</div>
             </div>
         </div>
     </div>

src/view/components/options-transactions.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="com-wrapper">
+    <div class="com-wrapper" ref="listWrapper"  @scroll="listScroll">
         <!-- <div class="com-nav-bar">
             <img
                 :src="require('@/assets/svg/icon-bar-arrow-left.svg')"
@@ -8,11 +8,11 @@
             />
             Transactions
         </div> -->
-        <div class="list-wrapper" ref="listWrapper" @scroll="listScroll">
+        <div class="list-wrapper" ref="listContent">
             <template v-if="!dataList.length">
                 <img class="icon-empty" :src="require('@/assets/svg/icon-empty-list.svg')" />
             </template>
-            <div ref="listContent">
+            <div>
                 <div class="cell" v-for="(item, index) in dataList" :key="index">
                     <div class="img-wrapper">
                         <!-- 收入- 任务红包领取 -->
@@ -198,7 +198,7 @@ const listScroll = (e) => {
     let scrollTop = e.target.scrollTop || 0;
     if (
         listReqParams.loadMore === false &&
-        wrapperHeight + scrollTop >= listContentHeight
+        wrapperHeight + scrollTop >= listContentHeight - 30
     ) {
         listReqParams.loadMore = true;
         listReqParams.params.pageNum++;
@@ -210,6 +210,7 @@ const listScroll = (e) => {
 <style lang="scss" scoped>
 .com-wrapper {
     height: 100%;
+    overflow-y: auto;
 
     .com-nav-bar {
         padding: 14px;
@@ -229,8 +230,7 @@ const listScroll = (e) => {
     .list-wrapper {
         width: 100%;
         // height: calc(100% - 51px);
-        height: 100%;
-        overflow-y: auto;
+        // height: 100%;
         position: relative;
 
         .icon-empty {

src/view/components/top-up.vue

@@ -5,7 +5,7 @@
             <div class="top">
                 <div class="item">
                     <div class="label">
-                        Token
+                        Crypto
                     </div>
                     <div class="content">
                         <img
@@ -16,14 +16,14 @@
                 </div>
                 <div class="item">
                     <div class="label">
-                        Network
+                        Deposit network
                     </div>
                     <div class="content">
                         <img
                             class="icon"
                             :src="require('@/assets/svg/icon-BNB.svg')"
                         />
-                        BNB Chain
+                        BNB Smart Chain (BEP20)
                     </div>
                 </div>
             </div>
@@ -34,7 +34,7 @@
             </div>
             <div class="tips-box">
                 <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.
+                Make sure you also selected BNB Smart Chain (BEP20) as the network on the platform where you are withdrawing funds for this deposit. Otherwise, you'll lose your assets.
             </div>
         </div>
         <div class="btn-done" @click="doneHandle">

src/view/popup/withdraw/home.vue

@@ -2,7 +2,7 @@
     <!-- 公共组件 -->
     <div class="info">
         <v-head :title="'Withdraw'" :show_more="true" :back_url="'/'"></v-head>
-        <currency-list style="height: calc(100% - 48px);" @selectCurrency="selectCurrency" ></currency-list>
+        <currency-list style="height: calc(100% - 48px);" :filterEmptyBalance="true" @selectCurrency="selectCurrency" ></currency-list>
     </div>
 
 </template>