From 03887cfaa392f415f66862290c14ee56cef108f7 Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Wed, 10 Jan 2024 15:20:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=B3=E4=BA=8E=E6=88=91?=
 =?UTF-8?q?=E4=BB=AC=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CommonHeader.vue | 11 +++++-
 src/i18n/de.json                |  3 +-
 src/i18n/en.json                |  3 +-
 src/i18n/fra.json               |  3 +-
 src/i18n/it.json                |  3 +-
 src/i18n/jp.json                |  3 +-
 src/i18n/kor.json               |  3 +-
 src/i18n/pt.json                |  3 +-
 src/i18n/spa.json               |  3 +-
 src/i18n/tr.json                |  3 +-
 src/i18n/tw.json                |  3 +-
 src/router/index.js             | 11 +++++-
 src/views/college/about_us.vue  | 69 +++++++++++++++++++++++++++++++++
 src/views/college/detail.vue    |  1 +
 14 files changed, 108 insertions(+), 14 deletions(-)
 create mode 100644 src/views/college/about_us.vue

diff --git a/src/components/CommonHeader.vue b/src/components/CommonHeader.vue
index 672b118..725d43b 100644
--- a/src/components/CommonHeader.vue
+++ b/src/components/CommonHeader.vue
@@ -39,9 +39,9 @@
                         <router-link class="nav-link" :to="purchase.url">{{ purchase.label }}</router-link>
                     </li> -->
 					<!-- 学院 -->
-                    <!-- <li class="nav-item">
+                    <li class="nav-item">
                         <router-link class="nav-link" :to="learn.url">{{ learn.label }}</router-link>
-                    </li> -->
+                    </li>
 					
                     <!-- <li class="nav-item">
                         <a href="/newProduct" class="nav-link" target="_blank">{{ $t('common.newzone') }}</a>
@@ -56,6 +56,9 @@
                     <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 +217,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: [
diff --git a/src/i18n/de.json b/src/i18n/de.json
index b8a0c2c..8bb50d9 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -536,7 +536,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",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 488d853..5ffddc0 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -597,7 +597,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",
diff --git a/src/i18n/fra.json b/src/i18n/fra.json
index 31e8711..93ef612 100644
--- a/src/i18n/fra.json
+++ b/src/i18n/fra.json
@@ -536,7 +536,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",
diff --git a/src/i18n/it.json b/src/i18n/it.json
index d94502e..5dc75b3 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -535,7 +535,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",
diff --git a/src/i18n/jp.json b/src/i18n/jp.json
index 9b67807..387145f 100644
--- a/src/i18n/jp.json
+++ b/src/i18n/jp.json
@@ -534,7 +534,8 @@
 		"download": "ダウンロードAMATAKモバイル端末",
 		"easy": "いつでもどこでも、手のひらの取引を開始します。",
 		"skan": "すぐにコードをスキャンしてダウンロードします",
-		"core_advantages": "私の核心の優位はデータです。"
+		"core_advantages": "私の核心の優位はデータです。",
+		"about_us": "私たちについて"
 	},
 	"option": {
 		"coinType": "貨幣種類",
diff --git a/src/i18n/kor.json b/src/i18n/kor.json
index 3a235eb..32c5d66 100644
--- a/src/i18n/kor.json
+++ b/src/i18n/kor.json
@@ -534,7 +534,8 @@
 		"download": "AMATAK 이동 단 다운로드",
 		"easy": "언제 어디서나 거래 를 시작 하 다.",
 		"skan": "즉시 스 캔 다운로드",
-		"core_advantages": "저의 핵심 장점 은 데이터 입 니 다."
+		"core_advantages": "저의 핵심 장점 은 데이터 입 니 다.",
+		"about_us": "회사 소개"
 	},
 	"option": {
 		"coinType": "화폐 종류.",
diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index e398582..31d145f 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -535,7 +535,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.",
diff --git a/src/i18n/spa.json b/src/i18n/spa.json
index 604de96..4eb2364 100644
--- a/src/i18n/spa.json
+++ b/src/i18n/spa.json
@@ -535,7 +535,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",
diff --git a/src/i18n/tr.json b/src/i18n/tr.json
index 0c64aec..26b8e4e 100644
--- a/src/i18n/tr.json
+++ b/src/i18n/tr.json
@@ -535,7 +535,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",
diff --git a/src/i18n/tw.json b/src/i18n/tw.json
index 78c76ed..17eaab8 100644
--- a/src/i18n/tw.json
+++ b/src/i18n/tw.json
@@ -540,7 +540,8 @@
 		"download": "下載AMATAK移動端",
 		"easy": "隨時隨地，開啟掌上交易",
 		"skan": "立即掃碼下載",
-		"core_advantages": "我的覈心優勢是數據"
+		"core_advantages": "我的覈心優勢是數據",
+		"about_us": "關於我們"
 	},
 	"option": {
 		"waitFor": "等待交割",
diff --git a/src/router/index.js b/src/router/index.js
index 77047d8..f6f1094 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -36,7 +36,8 @@ import ForgotPwd from '@/views/forgotPwd';
 
 // 合约
 import Contract from '@/views/contract'
-
+// 关于我们
+import Aboutus from '@/views/college/about_us'
 // OTC
 import Otc from "./otc";
 // 公告
@@ -141,7 +142,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({
diff --git a/src/views/college/about_us.vue b/src/views/college/about_us.vue
new file mode 100644
index 0000000..90dbae0
--- /dev/null
+++ b/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>
diff --git a/src/views/college/detail.vue b/src/views/college/detail.vue
index 30c47e2..e78825b 100644
--- a/src/views/college/detail.vue
+++ b/src/views/college/detail.vue
@@ -62,6 +62,7 @@ export default {
             this.getRecommend();
         },
         getArticleDetail() {
+			console.log(this.aid,'11111');
             College.getArticleDetail(this.aid).then(data => {
                 this.article = data;
             }).catch(err => {});