隐藏充币和提币的提示

src/components/CommonFooter.vue

@@ -52,6 +52,9 @@
 			  <p class="foot_p" >
 				  <span class="serviceText" @click="Jump(service[2].url)">{{service[2].label}}</span>
 			  </p>
+			  <p class="foot_p" >
+			  	  <span class="serviceText" @click="Jump(service[3].url)">{{service[3].label}}</span>
+			  </p>
                 <!-- <router-link :to="service[0].url">{{
                   service[0].label
                 }}</router-link>
@@ -417,6 +420,7 @@ export default {
     getServiceLink() {
       College.getServiceList()
         .then((list) => {
+			console.log(list);
           list.forEach((item) => {
             this.service.push({
               url: `/service/${item.id}`,

src/components/CommonHeader.vue

@@ -56,6 +56,10 @@
                     <li class="nav-item">
                         <router-link class="nav-link" :to="contactUs.url">{{ contactUs.label }}</router-link>
                     </li>
+					<!-- <li class="nav-item">
+						<router-link class="nav-link" :to="about_us.url">{{ about_us.label }}</router-link>
+					</li> -->
+
 
                     <!-- <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -214,6 +218,10 @@ export default {
                 label: this.$t("common.contactUs"),
                 url: "/contact-us"
             },
+			about_us: {
+				label: this.$t("home.about_us"),
+				url: `/about_us/${167}`
+			},
             blog: {
                 label: this.$t("common.blogs"),
                 links: [

src/i18n/de.json

@@ -537,7 +537,8 @@
 		"download": "AMATAK mobile Terminal herunterladen",
 		"easy": "Offener Palmhandel jederzeit und überall",
 		"skan": "Scan-Code und Download jetzt",
-		"core_advantages": "Meine Kernkraft sind Daten"
+		"core_advantages": "Meine Kernkraft sind Daten",
+		"about_us": "über uns"
 	},
 	"option": {
 		"waitFor": "Warten auf die Lieferung",

src/i18n/en.json

@@ -598,7 +598,8 @@
 		"download": "Download AMATAK APP",
 		"easy": "Open palm trading anytime, anywhere",
 		"skan": "Scan code now to download",
-		"core_advantages": "My core strength is data"
+		"core_advantages": "My core strength is data",
+		"about_us": "About Us"
 	},
 	"option": {
 		"waitFor": "Waiting for delivery",
@@ -1195,7 +1196,7 @@
 		"ee4": "Quickly understand the digital asset trading process",
 		"ee5": "Start your encryption journey",
 		"ee6": "Graphical verification",
-		"hh0": "most",
+		"hh0": "Most",
 		"hh1": "Register via email",
 		"hh2": "Spot trading",
 		"hh3": "Contract transaction",
@@ -1234,7 +1235,7 @@
 		"hh36": "It only takes 10 seconds to register and start trading",
 		"hh41": "Free registration",
 		"hh42": "efficient",
-		"hh43": "Cryptocurrency trading and investment platform",
+		"hh43": "cryptocurrency trading and investment platform",
 		"hh44": "{name}, trade anytime, anywhere",
 		"hh45": "Trade now",
 		"hh46": "Scan the QR code to download {name} APP",

src/i18n/fra.json

@@ -537,7 +537,8 @@
 		"download": "Télécharger le terminal mobile AMATAK",
 		"easy": "Ouvrir le commerce de poche n'importe quand, n'importe où",
 		"skan": "Numériser le Code pour télécharger maintenant",
-		"core_advantages": "Mon principal avantage est les données."
+		"core_advantages": "Mon principal avantage est les données.",
+		"about_us": "à propos de nous"
 	},
 	"option": {
 		"waitFor": "En attente de clôture",

src/i18n/it.json

@@ -536,7 +536,8 @@
 		"download": "Scarica terminale mobile AMATAK",
 		"easy": "Aprire il palmo trading in qualsiasi momento, ovunque",
 		"skan": "Scansione codice e download ora",
-		"core_advantages": "La mia forza principale è dati"
+		"core_advantages": "La mia forza principale è dati",
+		"about_us": "riguardo a noi"
 	},
 	"option": {
 		"waitFor": "In attesa di consegna",

src/i18n/jp.json

@@ -535,7 +535,8 @@
 		"download": "ダウンロードAMATAKモバイル端末",
 		"easy": "いつでもどこでも、手のひらの取引を開始します。",
 		"skan": "すぐにコードをスキャンしてダウンロードします",
-		"core_advantages": "私の核心の優位はデータです。"
+		"core_advantages": "私の核心の優位はデータです。",
+		"about_us": "私たちについて"
 	},
 	"option": {
 		"coinType": "貨幣種類",

src/i18n/kor.json

@@ -535,7 +535,8 @@
 		"download": "AMATAK 이동 단 다운로드",
 		"easy": "언제 어디서나 거래 를 시작 하 다.",
 		"skan": "즉시 스 캔 다운로드",
-		"core_advantages": "저의 핵심 장점 은 데이터 입 니 다."
+		"core_advantages": "저의 핵심 장점 은 데이터 입 니 다.",
+		"about_us": "회사 소개"
 	},
 	"option": {
 		"coinType": "화폐 종류.",

src/i18n/pt.json

@@ -536,7 +536,8 @@
 		"download": "Baixe o AMATAK móvel",
 		"easy": "A qualquer momento e em qualquer lugar, abra a negociação na mão",
 		"skan": "Varre o código para baixar imediatamente",
-		"core_advantages": "Minha principal força são os dados"
+		"core_advantages": "Minha principal força são os dados",
+		"about_us": "Sobre nós"
 	},
 	"option": {
 		"waitFor": "À espera da entrega.",

src/i18n/spa.json

@@ -536,7 +536,8 @@
 		"download": "Descargar el terminal móvil AMATAK",
 		"easy": "En cualquier momento, en cualquier lugar, abrir el comercio de la palma de la mano",
 		"skan": "Descarga de código escaneado ahora",
-		"core_advantages": "Mi principal ventaja son los datos"
+		"core_advantages": "Mi principal ventaja son los datos",
+		"about_us": "Sobre nosotros"
 	},
 	"option": {
 		"waitFor": "Esperando la entrega",

src/i18n/tr.json

@@ -536,7 +536,8 @@
 		"download": "AMATAK mobil terminalini indirin",
 		"easy": "Her zaman, her yerde el ticareti açın",
 		"skan": "Şimdi indirmek için kodu tarayın",
-		"core_advantages": "Temel gücüm veri"
+		"core_advantages": "Temel gücüm veri",
+		"about_us": "Hakkımızda"
 	},
 	"option": {
 		"waitFor": "Teslim edilmeyi bekliyor",

src/i18n/tw.json

@@ -541,7 +541,8 @@
 		"download": "下載AMATAK移動端",
 		"easy": "隨時隨地，開啟掌上交易",
 		"skan": "立即掃碼下載",
-		"core_advantages": "我的覈心優勢是數據"
+		"core_advantages": "我的覈心優勢是數據",
+		"about_us": "關於我們"
 	},
 	"option": {
 		"waitFor": "等待交割",

src/router/index.js

@@ -42,6 +42,8 @@ import Otc from "./otc";
 // 公告
 import Notice from '@/views/notice'
 import NoticeDetail from '@/views/notice/detail'
+// 关于我们
+import Aboutus from '@/views/college/about_us'
 
 Vue.use(VueRouter);
 
@@ -141,7 +143,13 @@ const routes = [{
         path: "/notice/:id",
         component: NoticeDetail,
         props:true
-    }
+    },
+	{
+	    name: "about_us",
+	    path: "/about_us/:aid",
+	    component: Aboutus,
+	    props:true
+	}
 ]
 
 const router = new VueRouter({

src/views/college/about_us.vue

@@ -0,0 +1,69 @@
+<template>
+<div>
+    <div class="container">
+        <div class="row">
+            <div class="col-12 my-4" v-if="article">
+                <div class="title h2 mt-4">{{article.title}}</div>
+                <div class="single-subtitle d-flex justify-content-between border-bottom pb-2">
+                    <!-- <div class="text-muted">{{article.created_at}}</div> -->
+                </div>
+                <div class="edit-content py-4">
+                    <div v-html="article.body"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+</template>
+
+<script>
+import College from "@/api/college";
+export default {
+    data() {
+        return {
+            cid: this.$route.params.cid,
+            aid: this.$route.params.aid,
+            article: null,
+            recommend: null,
+        }
+    },
+    watch: {
+        $route() {
+            this.cid = this.$route.params.cid;
+            this.aid = this.$route.params.aid;
+            this.initPage();
+        },
+    },
+    methods: {
+        initPage() {
+            this.getArticleDetail();
+            this.getRecommend();
+        },
+        getArticleDetail() {
+			console.log(this.aid,'11111');
+            College.getArticleDetail(this.aid).then(data => {
+                this.article = data;
+            }).catch(err => {});
+        },
+        getRecommend() {
+            College.getRecommend().then(data => {
+                this.recommend = data;
+            }).catch(err => {})
+        }
+    },
+    created() {
+        this.initPage();
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+/deep/ {
+    .el-breadcrumb__inner a, .el-breadcrumb__inner.is-link{
+        color: #606266;
+    }
+    .el-breadcrumb__item:last-child .el-breadcrumb__inner{
+        color: white;
+    }
+}
+</style>

src/views/wallet/exchange-assets.vue

@@ -293,7 +293,7 @@
 											<li>1. {{$t('wallet.automaticallyCredited')}}
 												{{$t('wallet.tran',{num:10,name:depositeCoin})}}</li>
 											<li>2. {{$t('wallet.only',{name:depositeCoin})}}</li>
-											<li>3. {{depositeAdressType==2?$t('wallet.Ethereun',{name:'Ethereun'}):$t('wallet.Ethereun',{name:'TRON'})}}</li>
+											<!-- <li>3. {{depositeAdressType==2?$t('wallet.Ethereun',{name:'Ethereun'}):$t('wallet.Ethereun',{name:'TRON'})}}</li> -->
 										</ul>
 									</div>
 								</div>
@@ -469,7 +469,7 @@
 											<li>1. {{$t('wallet.enterAddress')}}</li>
 											<li>2. {{$t('wallet.notSend')}}</li>
 											<li>3. {{$t('wallet.deductionFee')}}</li>
-											<li>4. {{withdraw.addressType==2?$t('wallet.Ethereun',{name:'Ethereun'}):$t('wallet.Ethereun',{name:'TRON'})}}</li>
+											<!-- <li>4. {{withdraw.addressType==2?$t('wallet.Ethereun',{name:'Ethereun'}):$t('wallet.Ethereun',{name:'TRON'})}}</li> -->
 										</ul>
 									</div>
 								</div>