v2.9.17+8

BFBAN · Jan 7, 2025 · 67dc2a2 · 67dc2a2
1 parent dc9dd6f
commit 67dc2a2
Show file tree

Hide file tree

Showing 9 changed files with 128 additions and 77 deletions.
diff --git a/front/public/config/footerNavs.json b/front/public/config/footerNavs.json
@@ -46,22 +46,6 @@
             "showLang": [
               "zh-CN"
             ]
-          },
-          {
-            "text": "Public Translation \uD83D\uDCDA",
-            "textLang": {
-              "en-US": "Public Translation \uD83D\uDCDA",
-              "zh-CN": "帮我们翻译 \uD83D\uDCDA"
-            },
-            "src": "https://explore.transifex.com/bfban"
-          },
-          {
-            "text": "BFBAN WebSite Public Api Docs",
-            "textLang": {
-              "en-US": "BFBAN WebSite Public Api Docs",
-              "zh-CN": "联BAN网站公开API文档"
-            },
-            "src": "https://bfban.gametools.network/docs"
           }
         ]
       },
@@ -87,33 +71,12 @@
             "text": "sitestats.title",
             "src": "site_stats",
             "insideLang": true
-          },
-          {
-            "text": "sitestats.netstatus",
-            "src": "https://status.bfban.com/",
-            "textLang": {
-              "en-US": "Network Status",
-              "zh-CN": "网络状态"
-            }
-          },
-          {
-            "text": "Exterior Design",
-            "textLang": {
-              "en-US": "Exterior Design",
-              "zh-CN": "设计材料"
-            },
-            "src": "https://github.com/BFBAN/exterior-design"
           }
         ]
       },
       {
         "text": "footer.column.col4.title",
         "child": [
-          {
-            "text": "header.about",
-            "src": "about",
-            "insideLang": true
-          },
           {
             "text": "Complaint mailbox",
             "textLang": {
@@ -123,10 +86,18 @@
             "src": "mailto:[email protected]"
           },
           {
-            "text": "Contact Us",
+            "text": "Transaction mailbox (Transactions/website feedback/bugs)",
+            "textLang": {
+              "en-US": "Transaction mailbox (Transactions/website feedback/bugs)",
+              "zh-CN": "事务邮箱(事务/网站反馈/BUG)"
+            },
+            "src": "mailto:[email protected]"
+          },
+          {
+            "text": "BFBAN助手反馈邮箱",
             "textLang": {
-              "en-US": "Contact Us",
-              "zh-CN": "联系我们"
+              "en-US": "BFBAN Assistant application mailbox",
+              "zh-CN": "BFBAN助手应用程序邮箱"
             },
             "src": "mailto:[email protected]"
           },
@@ -140,6 +111,56 @@
             ]
           }
         ]
+      },
+      {
+        "text": "footer.column.col5.title",
+        "child": [
+          {
+            "text": "header.about",
+            "src": "about",
+            "insideLang": true
+          },
+          {
+            "text": "Privacy Policy",
+            "src": "https://short.bfban.com/privacy-policy",
+            "textLang": {
+              "en-US": "Privacy Policy",
+              "zh-CN": "隐私政策"
+            }
+          },
+          {
+            "text": "sitestats.netstatus",
+            "src": "https://status.bfban.com/",
+            "textLang": {
+              "en-US": "Network Status",
+              "zh-CN": "网络状态"
+            }
+          },
+          {
+            "text": "Exterior Design",
+            "textLang": {
+              "en-US": "Exterior Design",
+              "zh-CN": "设计材料"
+            },
+            "src": "https://short.bfban.com/exterior-design"
+          },
+          {
+            "text": "Public Translation \uD83D\uDCDA",
+            "textLang": {
+              "en-US": "Public Translation \uD83D\uDCDA",
+              "zh-CN": "帮我们翻译 \uD83D\uDCDA"
+            },
+            "src": "https://explore.transifex.com/bfban"
+          },
+          {
+            "text": "BFBAN WebSite Public Api Docs",
+            "textLang": {
+              "en-US": "BFBAN WebSite Public Api Docs",
+              "zh-CN": "联BAN网站公开API文档"
+            },
+            "src": "https://test.bfban.com"
+          }
+        ]
       }
     ]
   }

diff --git a/front/public/config/languages.json b/front/public/config/languages.json
@@ -92,7 +92,7 @@
       ]
     },
     {
-      "name": "kor-KOR",
+      "name": "ko-KR",
       "label": "한국어",
       "members": [
         {

diff --git a/front/src/components/Footer.vue b/front/src/components/Footer.vue
@@ -2,19 +2,19 @@
   <div>
     <Row class="ivu-card ivu-card-dis-hover footer-app-banner footer-border-top">
       <div class="container">
-        <Col :xs="{push: 1}" :lg="{push:0}" >
+        <Col :xs="{push: 1}" :lg="{push:0}">
           <h2 class="p">BFBAN APP</h2>
           <ButtonGroup shape="circle">
             <Button type="info" to="https://play.google.com/store/apps/details?id=com.cabbagelol.bfban" target="_blank">
-              <Icon type="logo-google" />
+              <Icon type="logo-google"/>
               Google Play
             </Button>
             <Button type="info" to="https://apps.apple.com/us/app/bfban-little-helper/id6446828173" target="_blank">
-              <Icon type="logo-apple" />
+              <Icon type="logo-apple"/>
               Apple Store
             </Button>
             <Button to="https://bfban-app.cabbagelol.net" target="_blank">
-              <Icon type="md-open" />
+              <Icon type="md-open"/>
             </Button>
           </ButtonGroup>
         </Col>
@@ -23,23 +23,25 @@
 
     <footer class="footer footer-border-top" v-if="!isFull">
       <div class="container">
-        <Row>
+        <Row :gutter="14">
           <Col :xs="{span: 23, pull: 0, push: 1, order: 2}" :sm="{span: 23 ,pull: 0, push: 1, order: 2}"
-               :lg="{span: 5,pull: 0, push: 0, order:0}">
-            <Badge :count="logoCount" overflow-count="999999" :class="logoCount >= 10 ? 'shake active_infinite' : ''">
-              <Avatar v-if="logoCount >= 5" size="40">
-                <router-link :to="{name: 'home', query:{ 'love': '❤'}}">😊</router-link>
-              </Avatar>
-              <img v-else
-                   v-saknan
-                   src="../assets/images/friendly-web.png"
-                   width="100"
-                   @click="logoCount += 1;"
-                   alt="logo"/>
-            </Badge>
+               :lg="{span: 4,pull: 0, push: 0, order:0}">
+            <b>
+              <Badge :count="logoCount" overflow-count="999999" :class="logoCount >= 10 ? 'shake active_infinite' : ''">
+                <Avatar v-if="logoCount >= 5" size="40">
+                  <router-link :to="{name: 'home', query:{ 'love': '❤'}}">😊</router-link>
+                </Avatar>
+                <img v-else
+                     v-saknan
+                     src="../assets/images/friendly-web.png"
+                     width="100"
+                     @click="logoCount += 1;"
+                     alt="logo"/>
+              </Badge>
+            </b>
             <p style="margin-right: 30px">{{ $t("footer.column.col1.text") }}</p>
           </Col>
-          <Col :xs="{span: 11 ,pull: 0, push: 1}" :lg="{span: 5,pull: 0, push: 0}"
+          <Col :xs="{span: 11 ,pull: 0, push: 1}" :lg="{span: 4,pull: 0, push: 0}"
                v-for="(i, index) in footerNavs.row" :key="index">
             <h4><b>{{ $t(i.text) }}</b></h4>
             <ul>
@@ -76,16 +78,17 @@
               </span>
               </Option>
             </Select>
-            <p v-if="languages.length > 0">
+            <div v-if="languages.length > 0" class="footer-language-members">
               <br>
-              <span>{{ $t("footer.language.members") }}</span>: <br>
-              <a :href="i.url" target="_blank"
-                 v-for='(i, index) in languages.filter(i => i.name === currentLan)[0]["members"]' :key="index">
-                {{ i.name }}
+              <span>{{ $t("footer.language.members") }}</span><br>
+              <span
+                  class="span"
+                  v-for='(i, index) in languages.filter(i => i.name === currentLan)[0]["members"]' :key="index">
+                <HtmlLink :text='i.name' :href="i.url" :key="index" :isPoptip="false"></HtmlLink>
                 <Divider type="vertical"
                          v-if="index + 1 < (languages.filter(i => i.name === currentLan)[0]['members'].length)"></Divider>
-              </a>
-            </p>
+              </span>
+            </div>
           </Col>
         </Row>
       </div>
@@ -109,9 +112,11 @@
         </Row>
       </div>
       <div align="center" class="footer-border-top footer-padding">
-        <p>&copy; {{ new Date(time.appStart()).getFullYear() }}-{{ new Date().getFullYear() }} <u>{{ infos.name || ''}}</u> All Rights Reserved. v(f):
+        <p>&copy; {{ new Date(time.appStart()).getFullYear() }}-{{ new Date().getFullYear() }}
+          <u>{{ infos.name || '' }}</u> All Rights Reserved. v(f):
           {{ infos['front-version'] || '' }} v(b): {{ infos['backend-version'] || '' }}
-          <iframe src="https://status.bfban.com/badge" class="footer-status-badge" allowTransparency="true" frameborder="0" scrolling="no"></iframe>
+          <iframe src="https://status.bfban.com/badge" class="footer-status-badge" allowTransparency="true"
+                  frameborder="0" scrolling="no"></iframe>
         </p>
       </div>
     </footer>
@@ -125,6 +130,7 @@ import packageInfo from '../../package.json';
 import backendPackageInfo from '/public/config/backend-package.json';
 import footerNavs from '/public/config/footerNavs.json';
 import link from '/public/config/link.json';
+import HtmlLink from '@/components/HtmlLink.vue'
 import Application from "@/assets/js/application";
 
 export default new Application({
@@ -146,6 +152,7 @@ export default new Application({
   created() {
     this.loadData();
   },
+  components: {HtmlLink},
   watch: {
     $route: "loadData",
   },
@@ -260,4 +267,13 @@ export default new Application({
 .footer-app-banner .p {
   padding: 10px 100px 10px 0;
 }
+
+.footer-language-members {
+  margin-bottom: 15px;
+}
+
+.footer-language-members .span {
+  line-height: 1.5rem;
+  display: inline-flex;
+}
 </style>
diff --git a/front/src/components/HtmlLink.vue b/front/src/components/HtmlLink.vue
@@ -1,5 +1,5 @@
 <template>
-  <Poptip padding="0" max-width="300" trigger="hover" transfer :disabled="getProtocol == 'mailto:'"
+  <Poptip padding="0" max-width="300" trigger="hover" transfer :disabled="!isPoptip || getProtocol == 'mailto:'"
           @on-popper-show="onPoptipShow(false)"
           @on-popper-hide="onPoptipShow(true)">
     <span class="html-link">
@@ -103,14 +103,22 @@ export default {
   computed: {
     isIframeShow() {
       // TODO 正则
-      if (!this.afterData.href) return false;
-      let url = new URL(this.afterData.href);
-      return url.protocol.indexOf('http:') >= 0 || url.protocol.indexOf('https:') >= 0;
+      try {
+        if (!this.afterData.href) return false;
+        let url = new URL(this.afterData.href);
+        return url.protocol.indexOf('http:') >= 0 || url.protocol.indexOf('https:') >= 0;
+      } catch (e) {
+        return false;
+      }
     },
     getProtocol() {
-      if (!this.afterData.href) return '';
-      let url = new URL(this.afterData.href);
-      return url.protocol;
+      try {
+        if (!this.afterData && !this.afterData.href) return '';
+        let url = new URL(this.afterData.href);
+        return url.protocol;
+      } catch (e) {
+        return '';
+      }
     }
   }
 }

diff --git a/front/src/i18n.js b/front/src/i18n.js
@@ -24,7 +24,7 @@ import es_local from './lang/es.json'
 import fr_local from './lang/fr.json'
 import it_local from './lang/it.json'
 import ja_JP_local from './lang/ja_JP.json' // 日语
-import ko_local from './lang/ko.json' // 韩语
+import ko_local from './lang/ko_KR.json' // 韩语
 import tr_local from './lang/tr.json' // 土耳其
 import ru_local from './lang/ru.json' // 俄语
 import zh_cn_local from './lang/zh_CN.json' // 中文

diff --git a/front/src/lang/en.json b/front/src/lang/en.json
@@ -516,6 +516,9 @@
       "col4": {
         "title": "Contact us"
       },
+      "col5": {
+        "title": "Other"
+      },
       "sponsor": {
         "join": "Become Sponsor",
         "title": "Sponsor"

diff --git a/front/src/lang/ko.json → front/src/lang/ko_KR.json b/front/src/lang/ko.json → front/src/lang/ko_KR.json
diff --git a/front/src/lang/zh_CN.json b/front/src/lang/zh_CN.json
@@ -516,6 +516,9 @@
       "col4": {
         "title": "联系方式"
       },
+      "col5": {
+        "title": "其他"
+      },
       "sponsor": {
         "join": "成为赞助商",
         "title": "赞助商"

diff --git a/transifex.yaml b/transifex.yaml
@@ -16,7 +16,7 @@ git:
       fr_FR: fr
       it_IT: it
       ja_JP: ja_JP
-      ko_KR: ko
+      ko_KR: ko_KR
       ru_RU: ru
       tr_TR: tr
       zh_TW: zh_TW