首页跳市场

src/components/CommonHeader.vue

@@ -246,7 +246,7 @@ export default {
                 url: "/purchase"
             },
             learn: {
-                label: this.$t("common.learn"),
+                label: this.$t("common.college"),
                 url: ""
             },
             college: {

src/i18n/de.json

@@ -625,7 +625,8 @@
     "profile": {
         "realName":"Authentifizierung des realen Namens",
         "primaryCertification":"Primäre Zertifizierung",
-        "advancedCertification":"Fortgeschrittener Zertifizierungsantrag eingereicht",
+        "advancedCertification1": "Erweiterter Zertifizierungsantrag",
+        "advancedCertification2":"Fortgeschrittener Zertifizierungsantrag eingereicht",
         "toExamine":"zu untersuchen",
         "fullName":"vollständiger Name",
         "legal":"legal",

src/i18n/en.json

@@ -692,7 +692,8 @@
         "country1":"Please enter your country",
         "realName": "Real Name Authentication",
         "primaryCertification": "primary certification",
-        "advancedCertification": "Submit advanced certification application",
+        "advancedCertification1": "Advanced Certification Application",
+        "advancedCertification2": "Submit advanced certification application",
         "toExamine": "audit",
         "fullName": "Name",
         "legal": "Legal",

src/i18n/fra.json

@@ -625,7 +625,8 @@
     "profile": {
         "realName":"Authentification par nom réel",
         "primaryCertification":"Certification primaire",
-        "advancedCertification":"Demande de certification avancée soumise",
+        "advancedCertification1": "Demande de certification avancée",
+        "advancedCertification2":"Demande de certification avancée soumise",
         "toExamine":"Audit",
         "fullName":"Nom (s)",
         "legal":"Statut",

src/i18n/it.json

@@ -625,7 +625,8 @@
     "profile": {
         "realName":"Autenticazione del nome reale",
         "primaryCertification":"Certificazione primaria",
-        "advancedCertification":"Domanda di certificazione avanzata presentata",
+        "advancedCertification1": "Domanda di certificazione avanzata",
+        "advancedCertification2":"Domanda di certificazione avanzata presentata",
         "toExamine":"da esaminare",
         "fullName":"nome completo",
         "legal":"legale",

src/i18n/jp.json

@@ -636,7 +636,8 @@
         "date":"日付",
         "address":"場所",
         "primaryCertification":"ジュニア認証",
-        "advancedCertification":"高級認証申請はすでに提出されました。",
+        "advancedCertification1": "高度な認証申請",
+        "advancedCertification2":"高級認証申請はすでに提出されました。",
         "toExamine":"審査する",
         "legal":"法定",
         "pleaseEnterName":"名前を入力してください",

src/i18n/kor.json

@@ -635,7 +635,8 @@
         "date":"날짜.",
         "address":"지점.",
         "primaryCertification":"초급 인증",
-        "advancedCertification":"고급 인증 신청 이미 제출",
+        "advancedCertification1": "고급 인증 신청",
+        "advancedCertification2":"고급 인증 신청 이미 제출",
         "toExamine":"심사 하 다.",
         "legal":"법정.",
         "pleaseEnterName":"이름 을 입력 하 세 요",

src/i18n/pt.json

@@ -625,7 +625,8 @@
     "profile": {
         "realName":"Autenticação do nome real",
         "primaryCertification":"Certificação primária",
-        "advancedCertification":"O pedido de certificação avançada foi apresentado",
+        "advancedCertification1": "Aplicação de Certificação Avançada",
+        "advancedCertification2":"O pedido de certificação avançada foi apresentado",
         "toExamine":"auditoria",
         "fullName":"O nome",
         "legal":"obrigatória",

src/i18n/spa.json

@@ -625,7 +625,8 @@
     "profile": {
         "realName":"Autenticación del nombre real",
         "primaryCertification":"Certificación primaria",
-        "advancedCertification":"Solicitud de acreditación avanzada presentada",
+        "advancedCertification1": "Solicitud de Certificación Avanzada",
+        "advancedCertification2":"Solicitud de acreditación avanzada presentada",
         "toExamine":"Auditoría",
         "fullName":"Nombre",
         "legal":"Legal",

src/i18n/tr.json

@@ -625,7 +625,8 @@
     "profile":{
         "realName":"Doğrulandı",
         "primaryCertification":"Birincil sertifika",
-        "advancedCertification":"Gelişmiş sertifika başvurusu gönderildi",
+        "advancedCertification1": "Gelişmiş Sertifikasyon Başvurusu",
+        "advancedCertification2":"Gelişmiş sertifika başvurusu gönderildi",
         "toExamine":"Denetim",
         "fullName":"isim",
         "legal":"yasal",

src/i18n/tw.json

@@ -630,7 +630,8 @@
         "country1":"請輸入國家",
         "realName": "實名認證",
         "primaryCertification": "初級認證",
-        "advancedCertification": "高級認證申請已提交",
+        "advancedCertification1": "高級認證申請",
+        "advancedCertification2": "高級認證申請已提交",
         "toExamine": "稽核",
         "fullName": "姓名",
         "legal": "法定",

src/views/home/index.vue

@@ -98,14 +98,23 @@
               </div>
             <div class="cell-b" style="margin-top: 30px;">
               <div style="color:#9292AA;font-weight: bold;font-size: 20px;">${{ item.close }}</div>
-              <div><router-link to="/sign-in" style="background: #EAECEF;padding: 10px;line-height: 14px;">
+              <div>
-                <img src="../../../static/images/icon/right.png" alt="" width="20" height="20" />
+                <router-link v-if="!isLogin" to="/sign-in" style="background: #EAECEF;padding: 10px;line-height: 14px;">
-              </router-link></div>
+                  <img src="../../../static/images/icon/right.png" alt="" width="20" height="20" />
+                </router-link>
+                <!-- <router-link v-else to="/wallet/assets/exchange" style="background: #EAECEF;padding: 10px;line-height: 14px;">
+                  <img src="../../../static/images/icon/right.png" alt="" width="20" height="20" />
+                </router-link> -->
+                <router-link v-else :to="'/exchange/'+item.symbol" style="background: #EAECEF;padding: 10px;line-height: 14px;">
+                  <img src="../../../static/images/icon/right.png" alt="" width="20" height="20" />
+                </router-link>
+              </div>
             </div>
           </div>
         </template>
       </div>
-      <div class="btn3"><router-link to="/sign-in" class="target-a">{{ $t("cxiNewText.a21") }}</router-link></div>
+      <div class="btn3" v-if="!isLogin"><router-link to="/sign-in" class="target-a">{{ $t("cxiNewText.a21") }}</router-link></div>
+      <div class="btn3" v-else><router-link to="/wallet/assets/exchange" class="target-a">{{ $t("cxiNewText.a21") }}</router-link></div>
     </div>
     <div class="section-block section-block-3">
       <div class="d-flex justify-content-between" style="align-items: center;margin-top: 40px;">
@@ -156,18 +165,18 @@
       </div>
       <div style="font-size: 20px;margin-bottom: 3rem;color: #6A6E74;">{{ $t("cxiNewText.a39") }}</div>
       <div class="d-flex justify-content-between" style="align-items: center;">
-        <img src="../../../static/images/illustration-3.png" alt="" style="height:430px;margin-right:80px;">
+        <img src="../../../static/images/illustration-3.png" alt="" style="height:430px;margin-right:40px;">
         <div>
-          <div class="d-flex mb-5" style="background:#FAFAFA;align-items: center;">
+          <div class="d-flex mb-4" style="align-items: center;">
             <!-- <img src="../../../static/images/11111.png" alt="" width="80" height="80"> -->
-            <div style="width:80px;height:80px;"><!-- img代替符 --></div>
+            <div style="width:120px;height:120px;background:#FAFAFA;margin-right: 20px;"><!-- img代替符 --></div>
             <div>
-              <div>{{ $t("cxiNewText.a40") }}</div><div style="font-weight:bold;">IOS & Android</div>
+              <div style="font-size: 20px;">{{ $t("cxiNewText.a40") }}</div><div style="font-weight:bold;font-size: 28px;">IOS & Android</div>
             </div>
           </div>
-          <div class="d-flex" style="flex-wrap: wrap;">
+          <div class="d-flex" style="flex-wrap: wrap;justify-content: space-between;">
-            <div class="icon-box"><img src="../../../static/images/icon/ios.png" alt=""><div>APP Store</div></div>
+            <div class="icon-box" style="width: 95px;"><img src="../../../static/images/icon/ios.png" alt=""><div>APP Store</div></div>
-            <div class="icon-box"><img src="../../../static/images/icon/andriod.png" alt=""><div>Android APK</div></div>
+            <div class="icon-box" style="width: 120px;"><img src="../../../static/images/icon/andriod.png" alt=""><div>Android APK</div></div>
             <!-- <div class="icon-box"><img src="../../../static/images/icon/google-play.png" alt=""><div>Google Play</div></div> -->
             <!-- <div class="icon-box"><img src="../../../static/images/icon/imac.png" alt=""><div>MacOS</div></div> -->
             <!-- <div class="icon-box"><img src="../../../static/images/icon/windows.png" alt=""><div>Windows</div></div> -->
@@ -179,7 +188,8 @@
     </div>
     <div class="section-block section-block-6">
       <h1 class="mb-4">{{ $t("cxiNewText.a21") }}</h1>
-      <div class="btn3"><router-link to="/sign-up" class="target-a">{{ $t("cxiNewText.a57") }}</router-link></div>
+      <div class="btn3" v-if="!isLogin"><router-link to="/sign-up" class="target-a">{{ $t("cxiNewText.a57") }}</router-link></div>
+      <div class="btn3" v-else><router-link to="/wallet/assets/exchange" class="target-a">{{ $t("cxiNewText.a57") }}</router-link></div>
     </div>
     <div class="section1 markets" v-if="0">
       <div class="new-ticker-block new-ticker-block-section">
@@ -1647,8 +1657,8 @@ path{
 .section-block-5{
   padding: 40px 0px;
   .icon-box{
-    width: 25%;
+    // width: 36%;
-    margin-right: 20px;
+    // margin-right: 40px;
     margin-bottom: 40px;
     text-align: center;
     img{

src/views/profile/certification.vue

@@ -9,7 +9,7 @@
         <div class="col-12 mt-4">
           <el-steps :active="setp+1" align-center>
             <el-step :title="$t('profile.primaryCertification')"></el-step>
-            <el-step :title="$t('profile.advancedCertification')"></el-step>
+            <el-step :title="$t('profile.advancedCertification1')"></el-step>
             <el-step :title="$t('profile.toExamine')"></el-step>
           </el-steps>
         </div>
@@ -378,7 +378,7 @@ export default {
         }
         Profile.topAuth(data)
           .then(res => {
-            this.$message.success(this.$t("profile.advancedCertification"));
+            this.$message.success(this.$t("profile.advancedCertification2"));
             this.getAuthInfo();
           })
           .catch(err => {});

src/views/wallet/exchange-assets.vue

@@ -142,7 +142,8 @@
                         <div class="btn-group btn-group-sm" role="group" aria-label="Basic example">
                             <!-- data-target="#deposite" -->
                           <button type="button" class="btn btn-outline-primary" data-toggle="modal"  @click="enterDeposite(item)" :disabled="!item.is_withdraw">{{$t('wallet.recharge')}}</button>
-                          <button type="button" class="btn btn-outline-primary" data-toggle="modal" data-target="#withdraw" @click="enterWithdraw(item)" :disabled="!item.is_withdraw">{{$t('wallet.withdrawal')}}</button>
+                          <!-- <button type="button" class="btn btn-outline-primary" data-toggle="modal" data-target="#withdraw" @click="enterWithdraw(item)" :disabled="!item.is_withdraw">{{$t('wallet.withdrawal')}}</button> -->
+                          <button type="button" class="btn btn-outline-primary" data-target="#withdraw" @click="enterWithdraw(item)" :disabled="!item.is_withdraw">{{$t('wallet.withdrawal')}}</button>
                           <div class="btn-group btn-group-sm" role="group">
                             <button id="btnGroupDrop1" type="button" class="btn btn-outline-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{$t('wallet.transaction')}}</button>
 
@@ -419,6 +420,7 @@ export default {
             total_assets_usd: 0
         },
         userInfo:{},//账户信息
+        ProfileDetail: {},
         coinAssets: [], // 币种账户
 
         isHideZero: false, // 是否隐藏0余额资产
@@ -603,6 +605,12 @@ export default {
 
     // 进入提币
     enterWithdraw(item) {
+      // console.log(this.ProfileDetail.status)
+      if(this.ProfileDetail.status!=2){
+        this.$router.push("/profile/certification");
+        return;
+      }
+      $('#withdraw').modal('show');
       this.withdrawCoin = item.coin_name;
       this.withdraw.coin_id = item.coin_id;
       // 查找余额 手续费等信息
@@ -658,6 +666,12 @@ export default {
             this.userInfo = res
         });
     },
+    getAuthInfo() {
+        Profile.getAuthInfo({}).then(res => {
+            this.ProfileDetail = res;
+            console.log(this.ProfileDetail, 11111)
+        });
+    },
     // 滚动到页面指定位置
     PageScrollTo(num){
       document.documentElement.scrollTop = num;
@@ -669,7 +683,8 @@ created() {
     this.getUserAssets();
     this.getCoinAssets();
     this.createWalletAddress();
-    this.getUserInfo()
+    this.getUserInfo();
+    this.getAuthInfo();
 },
 
   mounted() {

src/views/wallet/funding.vue

@@ -40,7 +40,7 @@
                         </div>
                         <div class="tab-content">
                             <!-- 充值 -->
-                            <div v-infinite-scroll="load1" class="tab-pane funding-table fade " :class="currentTab =='deposit'? 'active':''" id="deposit" role="tabpanel">
+                            <div v-infinite-scroll="load1" class="tab-pane funding-table fade show" :class="currentTab =='deposit'? 'active':''" id="deposit" role="tabpanel">
                                 <table class="table stripe">
                                     <thead>
                                         <tr>
@@ -189,7 +189,10 @@ export default {
         },
 
         getDepositHistories() {
-            Wallet.depositHistory().then(data => this.depositHistories = data.data).catch(err => { });
+            Wallet.depositHistory().then(data => {
+                this.depositHistories = data.data;
+                console.log( this.depositHistories, ' this.depositHistories')
+            }).catch(err => { });
         },
 
         getRechargeManualLog() {