Merge branch 'dev_220318_test' into test

src/entry/content.js

@@ -26,6 +26,7 @@ chrome.storage.onChanged.addListener(changes => {
     if (changes.executeScript) {
         let item = JSON.parse(changes.executeScript.newValue)
         if (item.executeScript) {
+            location.reload()
             init()
             console.log('yeeee')
         }

src/logic/twitter.js

@@ -196,9 +196,11 @@ function _getSliderTwitterBtn() {
 function _addDeNetBtn() {
     setTimeout(() => {
         addSliderNavDeBtn(window.innerWidth < 1270);
-
-        let dialogScheduleBtn = _getScheduleDom(false);
-        _addDeNetEditBtn(dialogScheduleBtn, dom.deBtn1);
+        let innerDeIcon = document.getElementById('de-btn1');
+        if (!innerDeIcon) {
+            let dialogScheduleBtn = _getScheduleDom(false);
+            _addDeNetEditBtn(dialogScheduleBtn, dom.deBtn1);
+        }
     }, 800)
 }
 
@@ -419,7 +421,7 @@ function checkHasDeBtn() {
     setInterval(() => {
         try {
             let toolBar = document.querySelector('div[data-testid="toolBar"]');
-            let innerDeIcon = document.getElementById('de-icon');
+            let innerDeIcon = document.getElementById('de-btn1');
             if (toolBar && !innerDeIcon) {
                 let dialogScheduleBtn = _getScheduleDom(false);
                 _addDeNetEditBtn(dialogScheduleBtn, dom.deBtn1);

src/view/components/option-withdraw.vue

@@ -39,7 +39,7 @@
                         </div>
                     </div>
                     <div class="form-item">
-                        <div class="label">Withdrawal amount</div>
+                        <div class="label">Withdrawal amount<span class="msg">（${{walletWithdrawConfig.withdrawUSDPreMinAmount/100}} minimum）</span></div>
                         <div class="input-wrapper amount-wrapper">
                             <el-input
                                 type="text"
@@ -358,6 +358,11 @@ const setWithdrawIptStatus = (amount) => {
                     font-size: 14px;
                     color: #5b5b5b;
                     margin-bottom: 8px;
+                    .msg {
+                        font-weight: 400;
+                        font-size: 14px;
+                        color: #FFA621;
+                    }
                 }
                 .input-wrapper {
                     display: flex;

src/view/components/options-transactions.vue

@@ -44,7 +44,7 @@
                                 "
                             />
                         </template>
-                        <!-- 提现失败 -->
+                        <!-- 收入-提现失败退款 -->
                         <template v-else-if="item.bizType == 3">
                             <img
                                 style="margin-left:-4px"
@@ -73,7 +73,7 @@
                                     Giveaways Refund
                                 </template>
                                 <template v-else-if="item.bizType == 3">
-                                    Giveaways
+                                    Withdrawal Refund
                                 </template>
                                 <template v-else-if="item.bizType == -1">
                                     Withdrawal to PayPal
@@ -83,20 +83,38 @@
                         </div>
                         <div class="right">
                             <div class="msg">
-                                <!-- 提现失败 -->
-                                <template v-if="item.bizType == 3">
-                                    <div class="balance">
-                                        -${{item.trxAmountValue/100}} (returned)     
-                                    </div>
-                                    <div class="desc">
-                                        Withdrawal failed
-                                    </div>
+                                <!-- 提现 -->
+                                <template v-if="item.bizType == -1">
+                                    <!-- 提现状态（0：已申请，1：支付中，2：提现成功，3：提现失败） -->
+                                    <template v-if="item.bizData.withdrawStatus == 1">
+                                        <div class="balance">
+                                            -${{item.trxAmountValue/100}}     
+                                        </div>
+                                        <div class="desc">
+                                            in progress
+                                        </div>
+                                    </template>
+                                    <template v-else-if="item.bizData.withdrawStatus == 2">
+                                        <div class="balance">
+                                            -${{item.trxAmountValue/100}}     
+                                        </div>
+                                    </template>
+                                    <template v-else-if="item.bizData.withdrawStatus == 3">
+                                        <div class="balance">
+                                            -${{item.trxAmountValue/100}}  
+                                        </div>
+                                        <div class="desc">
+                                            Withdrawal failed
+                                        </div>
+                                    </template>
+                                    <template v-else>
+                                        -${{item.trxAmountValue/100}}
+                                    </template>
                                 </template>
+                                <!-- 收入 -->
                                 <template v-else>
-                                    <template v-if="item.bizType == -1">-</template>
                                     ${{item.trxAmountValue/100}}
                                 </template>
-                                
                             </div>
                         </div>
                     </div>
@@ -252,14 +270,12 @@ const listScroll = (e) => {
                     .msg {
                         font-weight: 500;
                         font-size: 14px;
+
                         .balance {
-                            font-weight: 500;
-                            font-size: 12px;
+                            text-align: right;
                             margin-bottom: 4px;
                         }
                         .desc {
-                            font-weight: 500;
-                            font-size: 12px;
                         }
                     }
                     .icon {

src/view/components/paypal-button.vue

@@ -8,7 +8,7 @@
             <iframe
                 class="iframe-pay"
                 ref="iframe"
-                :src="`${payConfig.paypalHtml}?paypalClientId=${payConfig.paypalClientId}`"></iframe>
+                :src="`${payConfig.paypalHtml}?paypalClientId=${payConfig.paypalClientId}&a=${props.finalAmountData.finalAmountValue}`"></iframe>
         </div>
     </div>
 </template>
@@ -35,7 +35,7 @@ const props = defineProps({
         default: () => {
             return {
                 paypalClientId: '',
-                paypalHtml: 'https://d1mcov78iir8kk.cloudfront.net/website/paypal.html'
+                paypalHtml: 'https://d1mcov78iir8kk.cloudfront.net/website/paypal_1.html'
             }
         }
     }