From a5b39762a06f9c0f0b548057182e94b5fdc3dd05 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Thu, 21 Jul 2022 17:16:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E6=A1=A3=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommonFooter.vue         | 49 +++++++++++++------------
 src/views/components/inner-transfer.vue | 33 ++++++++++++++---
 src/views/contract/exchange-store.vue   |  3 +-
 src/views/wallet/exchange-assets.vue    |  5 ++-
 src/views/wallet/funding.vue            | 16 +++++---
 5 files changed, 69 insertions(+), 37 deletions(-)

diff --git a/src/components/CommonFooter.vue b/src/components/CommonFooter.vue
index fd7dcc4..2037efd 100644
--- a/src/components/CommonFooter.vue
+++ b/src/components/CommonFooter.vue
@@ -2,7 +2,7 @@
   <!-- colto-section -->
   <footer class="footer mt-5">
     <div class="footer-upper-section">
-      <div class="item_left">
+      <div class="item_left" style="width:33%">
         <div class="logo">
           <!-- <img src="../assets/img/logo1.png" alt="logo" style="width:208px;height:68px" /> -->
             <div style="width:200px;height:100px">
@@ -14,20 +14,21 @@
         <p class="foot_p">{{$t('common.footerTips2',{name:appConfig.name})}}</p>
         <p class="foot_p">{{$t('common.footerTips3')}}</p>
       </div>
-      <div class="item_right">
-        <div class="item">
-          <p class="item_p">{{ $t("common.service") }}</p>
-          <p class="foot_p" >
-            <router-link :to="service[0].url">{{ service[0].label }}</router-link>
-            &nbsp
-            <router-link :to="service[1].url">{{ service[1].label }}</router-link>
-          </p>
-          <p class="foot_p">
-            <router-link :to="service[2].url">{{ service[2].label }}</router-link>
-            &nbsp
-            <router-link :to="service[3].url">{{ service[3].label }}</router-link>
-          </p>
+        <div class="item" style="width:33%">
+            <p class="item_p" style="text-align: center;">{{ $t("common.service") }}</p>
+            <p class="foot_p" style="text-align: center;">
+                <router-link :to="service[0].url">{{ service[0].label }}</router-link>
+                &nbsp
+                <router-link :to="service[1].url">{{ service[1].label }}</router-link>
+            </p>
+            <p class="foot_p" style="text-align: center;">
+                <router-link :to="service[2].url">{{ service[2].label }}</router-link>
+                &nbsp
+                <router-link :to="service[3].url">{{ service[3].label }}</router-link>
+            </p>
         </div>
+      <div class="item_right" style="width:33%">
+        
 
         <!-- <div class="item item1">
           <p class="item_p">{{ $t("common.college") }}</p>
@@ -41,12 +42,12 @@
           </p>
         </div> -->
 
-        <div class="item item2">
-          <p class="item_p">{{ $t("common.contactUs") }}</p>
-          <p class="foot_p">
+        <div class="item item2" style="text-align: center;width:100%">
+          <p class="item_p" style="width:100%">{{ $t("common.contactUs") }}</p>
+          <p class="foot_p" style="width:100%">
             {{ $t("common.email") }}:
           </p>
-          <p class="foot_p">
+          <p class="foot_p" style="width:100%">
             {{email}}
           </p>
         </div>
@@ -218,9 +219,9 @@ export default {
     height: 324px;
     // margin-left: 233px;
     justify-content: space-between;
-    padding:0 233px;
+    padding:0 133px;
     .item_left{
-      width: 504px;
+      width: 454px;
     //   margin-right: 300px;
       .logo{
         display: flex;
@@ -234,12 +235,12 @@ export default {
     }
 
     .item_right{
-      display: flex;
-      height: 99px;
-
+        display: flex;
+        height: 99px;
+        
       .item{
         min-width: 250px;
-        border-right: 1px solid #303D4B;
+        // border-right: 1px solid #303D4B;
         display: flex;
         flex-direction: column;
         justify-content: center;
diff --git a/src/views/components/inner-transfer.vue b/src/views/components/inner-transfer.vue
index f158d4c..70016c4 100644
--- a/src/views/components/inner-transfer.vue
+++ b/src/views/components/inner-transfer.vue
@@ -165,7 +165,6 @@ export default {
                   leaf: true
                 };
               });
-            
               resolve(arr);
             });
           }
@@ -243,12 +242,34 @@ export default {
     },
     // 互换位置
     swap() {
-      [this.form.from_account, this.form.to_account] = [
-        this.form.to_account,
-        this.form.from_account
-      ];
-      [this.fromChild, this.toChild] = [this.toChild, this.fromChild];
+      let from_account=this.form.from_account,
+      to_account=this.form.to_account,
+      fromValue=this.fromValue[0],
+      toValue=this.toValue[0]
+      this.form.from_account=to_account
+      this.form.to_account=from_account
+
+      if(fromValue==1){
+        this.fromValue=['2']
+      }else{
+        this.fromValue=['1']
+      }
+      this.$refs.to.$refs.panel.clearCheckedNodes();
+      this.$refs.to.$refs.panel.lazyLoad();
+      if(toValue==1){
+        this.toValue=[2]
+      }else{
+        this.toValue=[1]
+      }
+      // [this.form.from_account, this.form.to_account] = [
+      //   to_account,
+      //   from_account
+      // ];
+      console.info(this.form.from_account)
+      console.info(this.form.to_account)
+      // [this.fromChild, this.toChild] = [this.toChild, this.fromChild];
       this.form.pair_id = this.toChild.id;
+      this.getUserCoinAssets()
     },
 
     // 获取划转币种
diff --git a/src/views/contract/exchange-store.vue b/src/views/contract/exchange-store.vue
index 12f5067..7bd61b2 100644
--- a/src/views/contract/exchange-store.vue
+++ b/src/views/contract/exchange-store.vue
@@ -293,7 +293,8 @@ export default {
   },
   computed: {
     tips(){
-      return this.unit_amount?(`${this.unit_amount}USDT`):''
+        // return this.unit_amount?(`${this.unit_amount}USDT`):''
+        return this.unit_amount?(`USDT`):''
     },
     isLogin() {
       return Boolean(localStorage.token);
diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue
index fd03af6..4ccb2c5 100644
--- a/src/views/wallet/exchange-assets.vue
+++ b/src/views/wallet/exchange-assets.vue
@@ -623,7 +623,10 @@ export default {
 
       Wallet.withdraw(this.withdraw)
         .then(data => {
-          this.$message(this.$t("wallet.operationComplete") );
+            // this.$message(this.$t("wallet.operationComplete") );
+            $("#withdraw").modal("hide");
+            this.verShow = false
+            this.$router.push('/wallet/funding?currentTab=withdrawal')
         })
         .catch(err => { });
 
diff --git a/src/views/wallet/funding.vue b/src/views/wallet/funding.vue
index ffdcb20..8dc83cb 100644
--- a/src/views/wallet/funding.vue
+++ b/src/views/wallet/funding.vue
@@ -11,10 +11,10 @@
                     <div class="markets-pair-list mb-3">
                         <ul class="nav nav-pills" id="pills-tab" role="tablist">
                             <li class="nav-item fn-16">
-                                <a class="nav-link active" data-toggle="pill" href="#deposit" role="tab" aria-selected="false" @click="currentTab = 'deposit'">{{$t('wallet.rechargeRecord')}}</a>
+                                <a class="nav-link " :class="currentTab =='deposit'? 'active':''" data-toggle="pill" href="#deposit" role="tab" aria-selected="false" @click="currentTab = 'deposit'">{{$t('wallet.rechargeRecord')}}</a>
                             </li>
                             <li class="nav-item fn-16">
-                                <a class="nav-link " data-toggle="pill" href="#withdrawal" role="tab" aria-selected="false" @click="currentTab = 'withdrawal'">{{$t('wallet.withdrawalRecord')}}</a>
+                                <a class="nav-link " :class="currentTab =='withdrawal'? 'active':''" data-toggle="pill" href="#withdrawal" role="tab" aria-selected="false" @click="currentTab = 'withdrawal'">{{$t('wallet.withdrawalRecord')}}</a>
                             </li>
                             <!-- <li class="nav-item fn-16">
                                 <a class="nav-link " data-toggle="pill" href="#paypal" role="tab" aria-selected="false" @click="currentTab = 'paypal'">Paypal{{$t('wallet.rechargeRecord')}}</a>
@@ -40,7 +40,7 @@
                         </div>
                         <div class="tab-content">
                             <!-- 充值 -->
-                            <div v-infinite-scroll="load1" class="tab-pane funding-table fade show active" id="deposit" role="tabpanel">
+                            <div v-infinite-scroll="load1" class="tab-pane funding-table fade " :class="currentTab =='deposit'? 'active':''" id="deposit" role="tabpanel">
                                 <table class="table stripe">
                                     <thead>
                                         <tr>
@@ -74,7 +74,7 @@
                             </div>
 
                             <!-- 提币 -->
-                            <div v-infinite-scroll="load2" class="tab-pane funding-table fade show" id="withdrawal" role="tabpanel">
+                            <div v-infinite-scroll="load2" class="tab-pane funding-table fade show" :class="currentTab =='withdrawal'? 'active':''" id="withdrawal" role="tabpanel">
                                 <table class="table stripe">
                                     <thead>
                                         <tr>
@@ -259,7 +259,13 @@ export default {
 
     created() {
         console.log(this.Funding);
-        this.currentTab = "deposit";
+        console.info(this.$route.query.currentTab)
+        if(this.$route.query.currentTab){
+            this.currentTab=this.$route.query.currentTab
+        }else{
+            this.currentTab = "deposit";
+        }
+        
     }
 };
 </script>