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

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

@@ -87,7 +87,7 @@
             </div>
 
             <div class="treasure-row-3" :style="{'visibility': data.currencyCode? 'visible' : 'hidden'}">
-                <img class="img" :src="data.currencyIconUrl" /> <span class="txt"> {{data.tokenSymbol}} equivalent (Crypto)</span>
+                <img class="img" :src="data.currencyIconUrl" /> <span class="txt"> {{data.tokenSymbol}}  <template v-if="data.currencyCode != 'USD'">equivalent (Crypto)</template></span>
             </div>
 
             <img class="img-treasure-big" :src="require('@/assets/img/icon-card-cover-treasure-big.png')">

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

@@ -227,9 +227,9 @@
                             {{item.postTaskLuckdrop.luckdropType == PlayType.common ? '(Time expired)': 'Complete'}}
                           </template>
                           <template v-if="item.status == 3">
-                            {{ item.srcContentId ? '(Termination)' : 'Termination' }}
+                            {{ item.srcContentId && item.postTaskLuckdrop.luckdropType != PlayType.treasure ? '(Termination)' : 'Termination' }}
                           </template>
-                          <template v-if="item.status == 2 || item.status == 3 && item.srcContentId">
+                          <template v-if="(item.status == 2 || item.status == 3) && item.srcContentId && item.postTaskLuckdrop.luckdropType != PlayType.treasure">
                             {{ item.postTaskLuckdrop.receivedCount }}/{{
                                 item.postTaskLuckdrop.totalCount
                             }}

src/view/popup/withdraw/confirm.vue

@@ -72,13 +72,18 @@ let withdraw_info = inject('withdraw_info')
 withdraw_info.source = 'confirm'
 withdraw_info.state_page = {}
 let state = reactive({
-    img_enter_state: false
+    img_enter_state: false,
+    withdrawing: false
 })
 
 const clickBtn = () => {
     if (!state.img_enter_state) {
         return
     }
+    if(state.withdrawing) {
+      return;
+    }
+    state.withdrawing = true;
     withdrawRequest({
         params: {
             "amountValue": withdraw_info.data.input_amount,
@@ -87,6 +92,7 @@ const clickBtn = () => {
             "withdrawReceiveAccount": withdraw_info.data.input_address
         }
     }).then((res) => {
+        state.withdrawing = false;
         switch (res.code.toString()) {
             case '0':
                 withdraw_info.state_page.txt = ['Estimated completion with a few minutes', 'View history for the latest updates']
@@ -98,6 +104,8 @@ const clickBtn = () => {
             default:
                 message.error(res.code);
         }
+    }).catch(err => {
+      state.withdrawing = false;
     })
 
 }

src/view/popup/withdraw/info.vue

@@ -94,7 +94,7 @@ let state = reactive({
 
 const inputWithdrawCalcFee = () => {
   if(!state.input_amount) {
-    return;
+    state.input_amount = 0;
   }
   withdrawCalcFee({
     params: {