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

src/logic/twitter.js

@@ -99,11 +99,11 @@ export function showGiveDialogHandler(userInfo) {
 }
 
 export function showIframeHandler() {
-    dom.iframe.style.display = 'block';
+    document.getElementById('iframe-content').style.display = 'block';
 }
 
 export function hideIframeHandler() {
-    dom.iframe.style.display = 'none';
+    document.getElementById('iframe-content').style.display = 'none';
 }
 
 /**
@@ -195,7 +195,7 @@ function _getSliderTwitterBtn() {
  */
 function _addDeNetBtn() {
     setTimeout(() => {
-        addSliderNavDeBtn(window.innerWidth < 1270);
+        addSliderNavDeBtn(window.innerWidth < 1273);
         let innerDeIcon = document.getElementById('de-btn1');
         if (!innerDeIcon) {
             let dialogScheduleBtn = _getScheduleDom(false);
@@ -398,7 +398,7 @@ function addSliderNavDeBtn(isSmall = false) {
 function onWindowResize() {
     window.onresize = throttle(function () {
         try {
-            if (window.innerWidth < 1270) {
+            if (window.innerWidth < 1273) {
                 let bigBtn = document.querySelector('#de-btn');
                 bigBtn && bigBtn.remove();
                 setTimeout(() => {

src/view/components/follow-input.vue

@@ -224,7 +224,7 @@ const onUserMouseLeave = (params, index) => {
         width: 100%;
         display: flex;
         flex-wrap: wrap;
-        padding: 0px 0 14px 18px;
+        padding: 0px 0 10px 18px;
         box-sizing: border-box;
 
         .icon-add{
@@ -247,7 +247,7 @@ const onUserMouseLeave = (params, index) => {
             position: relative;
             margin-right: 10px;
             background-color: #fff;
-            margin-top: 14px;
+            margin-top: 10px;
 
             .icon-del {
                 width: 18px;

src/view/components/give-dialog.vue

@@ -27,9 +27,16 @@
                 <div class="right">
                     <template v-if="!showPreview">
                         <div class="form-wrapper">
-                            <div class="error-msg">
+                            <div class="error-msg" v-if="iptErrMsgTxt">
                                 {{iptErrMsgTxt}}
                             </div>
+                            <img class="img-mode" src="../../assets/img/img-mode.png">
+                            <div class="form-base-title">
+                                Reward
+                                <div class="msg">
+                                    Recommend quantity 100～10000
+                                </div>
+                            </div>
                             <div class="form-base">
                                 <div class="item">
                                     <div class="label">
@@ -61,7 +68,7 @@
                                 </div>
                             </div>
                             <div class="form-label">
-                                Requirement
+                                Tasks
                             </div>
                             <div class="form-require">
                                 <div
@@ -153,7 +160,7 @@ let paypalHtml = ref('');
 
 let publishRes = reactive({})
 
-let visible = ref(false);
+let visible = ref(true);
 let showPreview = ref(false);
 let openAntiBot = ref(false);
 let dialogHeight = ref(680);
@@ -446,7 +453,7 @@ const onUsdBlur = () => {
 }
 
 const onCountBlur = () => {
-    if(!baseFormData.amountValue) {
+    if(!baseFormData.totalCount) {
         iptErrMsgTxt.value = 'Please enter the number of giveaways in Quantity input box.';
     } else {
         setIptAmountErrorMsg((res) => {
@@ -607,11 +614,39 @@ onMounted(() => {
                     overflow-y: scroll;
                     box-sizing: border-box;
 
+                    .img-mode {
+                        width: 600px;
+                        margin-left: -20px;
+                    }
+
                     .error-msg {
+                        width: 100%;
                         font-size: 12px;
-                        color: #FF0000;
+                        background: #FF0000;
+                        opacity: 0.8;
+                        font-weight: 500;
+                        font-size: 13px;
+                        color: #fff;
                         margin-bottom: 8px;
-                        height: 16px;
+                        position: absolute;
+                        left: 0px;
+                        top: 0px;
+                        padding: 7px 12px;
+                        box-sizing: border-box;
+                    }
+
+                    .form-base-title {
+                        color: rgba(0, 0, 0, 0.4);
+                        margin-bottom: 10px;
+                        font-size: 13px;
+                        display: flex;
+                        align-items: center;
+                        justify-content: space-between;
+                        .msg {
+                            font-weight: 500;
+                            font-size: 12px;
+                            color: #E58A00;
+                        }
                     }
 
                     .form-base {
@@ -621,7 +656,7 @@ onMounted(() => {
 
                         .item {
                             width: 270px;
-                            height: 60px;
+                            height: 50px;
                             box-sizing: border-box;
                             border-radius: 15px;
                             display: flex;
@@ -649,8 +684,7 @@ onMounted(() => {
                         color: rgba(0, 0, 0, 0.4);
                         margin-top: 23px;
                         margin-bottom: 10px;
-                        font-weight: 500;
-                        font-size: 15px;
+                        font-size: 13px;
                     }
 
                     .form-require {
@@ -660,7 +694,7 @@ onMounted(() => {
                         box-shadow: 0px 3px 27px 0px #0000001A;
 
                         .form-item {
-                            min-height: 60px;
+                            min-height: 50px;
                             display: flex;
                             align-items: center;
                             justify-content: space-between;
@@ -680,7 +714,7 @@ onMounted(() => {
 
                             .control {
                                 width: 100%;
-                                min-height: 60px;
+                                min-height: 50px;
                                 margin-left: 18px;
                                 padding: 4px 0;
                                 box-sizing: border-box;
@@ -691,7 +725,7 @@ onMounted(() => {
 
                 .anti-bot-wrapper {
                     width: 100%;
-                    height: 60px;
+                    height: 50px;
                     display: flex;
                     align-items: center;
                     justify-content: space-between;

src/view/components/option-withdraw.vue

@@ -135,7 +135,6 @@ const props = defineProps({
         type: Object,
         default: () => {
             return {
-                withdrawUSDPaypalFee: 0,
                 withdrawUSDPreMinAmount: 100,
                 withdrawUSDSwitch: "",
                 withdrawUSDPaypalFeeDesc: ''
@@ -183,14 +182,8 @@ const withdrawalAll = () => {
     console.log(canWithdrawBalance.value)
     requestWithdrawParams.value.amountValue =
             canWithdrawBalance.value / 100;
-    if (!(canWithdrawBalance.value &&
-        canWithdrawBalance.value >
-            props.walletWithdrawConfig.withdrawUSDPaypalFee)
-    ) {
-        showWithdrawError.value = true;
-    } else {
-        showWithdrawError.value = false;
-    }
+    setWithdrawIptStatus(canWithdrawBalance.value);
+    withdrawCalcAmount();
 };
 
 const withdrawCalcAmount = () => {
@@ -237,9 +230,6 @@ const withdraw = () => {
         // })
         return;
     }
-    if(params.amountValue <= props.walletWithdrawConfig.withdrawUSDPaypalFee) {
-        return;
-    }
     withdrawIng.value = true;
     withdrawRequest({
         params,
@@ -367,12 +357,14 @@ const setWithdrawIptStatus = (amount) => {
                 .input-wrapper {
                     display: flex;
                     align-items: center;
+                    justify-content: space-between;
                     border: 1px solid #e8e8e8;
                     border-radius: 8px;
                     .withdrawal-all-btn {
                         font-weight: 500;
                         font-size: 13px;
                         color: #389aff;
+                        padding-right: 10px;
                         cursor: pointer;
                     }
                 }

src/view/popup.vue

@@ -115,7 +115,7 @@
                                         <!-- 发出的红包显示 -->
                                         <div class="desc" v-if="item.type == 2">
                                             <!-- 未发送-->
-                                            <template v-if="!item.postTaskLuckdrop.srcPublishStatus">
+                                            <template v-if="item.postTaskLuckdrop.reSendAvailable">
                                                 Unpublished
                                             </template>
                                             <!-- 进行中 -->
@@ -145,7 +145,7 @@
                                             </template>
                                             <!-- 红包未发出显示 -->
                                             <div
-                                                v-if="!item.postTaskLuckdrop.srcPublishStatus"
+                                                v-if="item.postTaskLuckdrop.reSendAvailable"
                                                 class="send-btn"
                                                 @click.stop="sendTwitter(item)"
                                             >
@@ -158,7 +158,7 @@
                                         v-if="
                                             !(
                                                 item.type == 2 &&
-                                                !item.postTaskLuckdrop.srcPublishStatus
+                                                item.postTaskLuckdrop.reSendAvailable
                                             )
                                         "
                                         class="icon"