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

src/logic/content/twitter.js

@@ -600,7 +600,7 @@ function _createBtnDom() {
 
 function createTweetToolbarDenet() {
     let src = require("@/assets/img/icon-gift-pack.png");
-    const smallDeBtnStyle = 'width:20px;height: 20px;cursor: pointer;padding: 0px 8px';
+    const smallDeBtnStyle = 'width:20px;height: 20px;cursor: pointer;margin: 0px 8px';
 
     const deBtn1 = document.createElement('img');
     deBtn1.id = 'de-btn1';
@@ -623,7 +623,7 @@ function createTweetToolbarDenet() {
 
 function createTweetToolbarToolBox() {
     let src = require("@/assets/img/icon-tool-box-01.png");
-    const smallDeBtnStyle = 'width:20px;height: 20px;cursor: pointer;padding: 0px 8px';
+    const smallDeBtnStyle = 'width:20px;height: 20px;cursor: pointer;margin: 0px 8px';
 
     const deToolBoxBtn = document.createElement('img');
     deToolBoxBtn.id = 'de-tool-box-btn-01';

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

@@ -80,7 +80,10 @@
             </div>
 
             <div class="treasure-row-2">
-                Your Gain Up to $ <div class="amount">{{data.upGainAmountUsdValue || 0}}</div>
+                Your Gain Up to $
+                <component-zoom :width="160" :txt="data.upGainAmountUsdValue || 0">
+                  <div class="amount">{{data.upGainAmountUsdValue || 0}}</div>
+                </component-zoom>
             </div>
 
             <div class="treasure-row-3" :style="{'visibility': data.currencyCode? 'visible' : 'hidden'}">

src/view/iframe/publish/give-dialog.vue

@@ -1466,6 +1466,8 @@ const calcUsd2TokenEstimate = (params) => {
  */
 const calcFansUnitAmount = () => {
     if(!baseFormData.totalCount || !baseFormData.amountValue) {
+        treasureFormData.upGainAmountUsdValue = ''
+        treasureFormData.fansUnitAmount = '';
         return;
     }
 
@@ -1563,7 +1565,7 @@ const onCountInput = () => {
     if (val == 0) {
         val = "";
     }
-    val = val.replace(/^\D*(\d*(?:\.\d{0,18})?).*$/g, '$1');
+    val = val.replace(/[^\d]/g, "");
 
     if(val > maxCount) {
         val = maxCount
@@ -1689,7 +1691,7 @@ const checkTreasureAmountRange = (isInTemplate) => {
 
             const isAvgForbidden = treasureFormData.fansUnitAmount !== '' && currentLuckDropConfig?.minAvgUsdAmount ? treasureFormData.fansUnitAmount < minAmount || treasureFormData.fansUnitAmount < currentLuckDropConfig?.minAvgUsdAmount : false;
 
-            forbiddenText = isAmountForbidden || isAvgForbidden ? txt : '';
+            forbiddenText = isAmountForbidden && isAvgForbidden ? txt : '';
         }
     }
     return forbiddenText;

src/view/popup/tabbar-page/message/index.vue

@@ -386,13 +386,13 @@ const clickListItem = (params) => {
   }
   let twitterUrl = "https://twitter.com/";
   let nickName = "";
-  if (params.type == 1 || params.type == 3) {
-    nickName = params.userInfo.nickName;
-  } else if (params.type == 2) {
+  if (params.type == 2) {
     nickName = userInfo.value.nickName;
+  } else {
+    nickName = params.userInfo.nickName;
   }
-  let url = twitterUrl + nickName + "/status/" + params.srcContentId;
 
+  let url = twitterUrl + nickName + "/status/" + params.srcContentId;
   chrome.tabs.create({
     url,
   });
@@ -467,7 +467,7 @@ const terminaHandler = (params, index) => {
     modalTitle.value = `Early termination of Giveaway?`
     modalContent.value = `The remaining amount will be returned to your wallet within 1 day.`
   }
-  
+
   modalVisible.value = true;
 };
 
@@ -852,4 +852,4 @@ onBeforeUnmount(() => {
     }
   }
 }
-</style>
+</style>