Merge branch 'format' of F:\jiebang\nebula with conflicts.

components/layouts/mobile/footer.vue

@@ -3,16 +3,26 @@
     <el-col style="text-align: center;">
       <el-col :xs="24" :sm="24" :xl="12">
         <span>{{ slogan }}</span>
-        <span>{{ slogan_en }}</span>
       </el-col>
       <el-col :xs="24" :sm="24" :xl="12">
         <el-col class="row align-items-center">
           <el-col class="col-auto">
             Copyright © 2020
-            <el-link rel="nofollow" :underline="false" href="/" style="vertical-align: baseline;"><span>{{ systemName }}</span>
+            <el-link rel="nofollow" :underline="false" href="/" style="vertical-align: baseline;"><span>{{
+                systemName
+              }}</span>
             </el-link>
             .
-            <el-link rel="nofollow" :underline="false" href="http://www.beian.miit.gov.cn/" style="vertical-align: baseline;"><span>{{ beiAn }}</span>
+          </el-col>
+          <el-col>
+            <el-link rel="nofollow" :underline="false" :href="wangBeiUrl" target="_blank"
+                     style="vertical-align: baseline;"><img
+              :src="wangBeiImage" style="float:left;"/><span>{{ wangBei }}</span>
+            </el-link>
+          </el-col>
+          <el-col>
+            <el-link rel="nofollow" :underline="false" href="http://www.beian.miit.gov.cn/" target="_blank"
+                     style="vertical-align: baseline;"><span>{{ beiAn }}</span>
             </el-link>
           </el-col>
         </el-col>
@@ -22,25 +32,30 @@
 </template>
 
 <script>
-  export default {
+import wangBeiImage from '~/assets/wangbei.png'
-    name: "MobileFooter",
+
-    data() {
+export default {
-      return {
+  name: "MobileFooter",
-        systemTitle: '\u7f57\u5409\u7f51\u0020\u002d\u0020\u5185\u5bb9\u5206\u4eab\u751f\u6001\u5e73\u53f0',
+  data() {
-        systemName: 'RYMCU',
+    return {
-        systemUrl: 'https://rymcu.com',
+      systemTitle: '\u7f57\u5409\u7f51\u0020\u002d\u0020\u5185\u5bb9\u5206\u4eab\u751f\u6001\u5e73\u53f0',
-        slogan: 'rymcu · 嵌入式知识学习交流平台 ',
+      systemName: 'RYMCU',
-        slogan_en: 'Embedded knowledge learning exchange platform',
+      systemUrl: 'https://rymcu.com',
-        beiAn: '沪ICP备19042611号'
+      slogan: 'RYMCU · 嵌入式知识学习交流平台 ',
-      }
+      slogan_en: 'Embedded knowledge learning exchange platform',
+      beiAn: '赣ICP备2021003088号-1',
+      wangBeiUrl: 'http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=36012302000055',
+      wangBei: '赣公网安备 36012302000055号',
+      wangBeiImage: wangBeiImage
     }
   }
+}
 </script>
 
 <style scoped>
-  .footer {
+.footer {
-    font-size: 14px;
+  font-size: 14px;
-    align-items: center;
+  align-items: center;
-    display: flex;
+  display: flex;
-  }
+}
 </style>

components/layouts/pc/footer.vue

@@ -7,23 +7,36 @@
         </el-col>
       </el-col>
       <el-col :span="12" style="text-align: left;">
-        <el-link class="footer-link" rel="nofollow" :underline="false" :href="markdownGuide" style="vertical-align: baseline;"><span>Markdown 教程</span></el-link>
+        <el-link class="footer-link" rel="nofollow" :underline="false" :href="markdownGuide" target="_blank"
-        <el-link class="footer-link" rel="nofollow" :underline="false" :href="rules" style="vertical-align: baseline;"><span>社区规章</span></el-link>
+                 style="vertical-align: baseline;"><span>Markdown 教程</span></el-link>
-        <el-link class="footer-link" rel="nofollow" :underline="false" :href="currencyRule" style="vertical-align: baseline;"><span>货币规则</span></el-link>
+        <el-link class="footer-link" rel="nofollow" :underline="false" :href="rules" target="_blank" style="vertical-align: baseline;">
-        <el-link class="footer-link" rel="nofollow" :underline="false" :href="email" style="vertical-align: baseline;"><span>意见反馈</span></el-link>
+          <span>社区规章</span></el-link>
-        <el-link class="footer-link" rel="nofollow" :underline="false" :href="aboutMe" style="vertical-align: baseline;"><span>关于我们</span></el-link>
+        <el-link class="footer-link" rel="nofollow" :underline="false" :href="currencyRule" target="_blank"
-        <el-link class="footer-link" rel="nofollow" :underline="false" :href="github" style="vertical-align: baseline;"><span>GitHub</span></el-link>
+                 style="vertical-align: baseline;"><span>货币规则</span></el-link>
-        <el-link class="footer-link" rel="nofollow" :underline="false" :href="gitee" style="vertical-align: baseline;"><span>Gitee</span></el-link>
+        <el-link class="footer-link" rel="nofollow" :underline="false" :href="email" style="vertical-align: baseline;">
+          <span>意见反馈</span></el-link>
+        <el-link class="footer-link" rel="nofollow" :underline="false" :href="aboutMe" target="_blank"
+                 style="vertical-align: baseline;"><span>关于我们</span></el-link>
+        <el-link class="footer-link" rel="nofollow" :underline="false" :href="github" target="_blank" style="vertical-align: baseline;">
+          <span>GitHub</span></el-link>
+        <el-link class="footer-link" rel="nofollow" :underline="false" :href="gitee" target="_blank" style="vertical-align: baseline;">
+          <span>Gitee</span></el-link>
       </el-col>
       <el-col :span="12" style="text-align: right;">
         <el-col>
           <el-col class="row align-items-center">
             <el-col class="col-auto">
               Copyright © 2020
-              <el-link rel="nofollow" :underline="false" href="/" style="vertical-align: baseline;"><span>{{ systemName }}</span>
+              <el-link rel="nofollow" :underline="false" href="/" style="vertical-align: baseline;"><span>{{
+                  systemName
+                }}</span>
               </el-link>
               .
-              <el-link rel="nofollow" :underline="false" href="https://beian.miit.gov.cn/" style="vertical-align: baseline;"><span>{{ beiAn }}</span>
+              <el-link rel="nofollow" :underline="false" :href="wangBeiUrl" target="_blank" style="vertical-align: baseline;padding-left: 10px;"><img
+                :src="wangBeiImage" style="float:left;"/><span style="padding-left: 3px;">{{ wangBei }}</span>
+              </el-link>
+              <el-link rel="nofollow" :underline="false" href="https://beian.miit.gov.cn/" target="_blank"
+                       style="vertical-align: baseline;padding-left: 10px;"><span>{{ beiAn }}</span>
               </el-link>
             </el-col>
           </el-col>
@@ -34,34 +47,40 @@
 </template>
 
 <script>
-  export default {
+import wangBeiImage from '~/assets/wangbei.png'
-    name: "PcFooter",
+
-    data() {
+export default {
-      return {
+  name: "PcFooter",
-        systemTitle: '\u7f57\u5409\u7f51\u0020\u002d\u0020\u5185\u5bb9\u5206\u4eab\u751f\u6001\u5e73\u53f0',
+  data() {
-        systemName: 'RYMCU',
+    return {
-        systemUrl: 'https://rymcu.com',
+      systemTitle: '\u7f57\u5409\u7f51\u0020\u002d\u0020\u5185\u5bb9\u5206\u4eab\u751f\u6001\u5e73\u53f0',
-        slogan: 'RYMCU · 嵌入式知识学习交流平台 ',
+      systemName: 'RYMCU',
-        beiAn: '赣ICP备2021003088号-1',
+      systemUrl: 'https://rymcu.com',
-        markdownGuide: '/guides/markdown',
+      slogan: 'RYMCU · 嵌入式知识学习交流平台 ',
-        rules: '/article/20',
+      beiAn: '赣ICP备2021003088号-1',
-        email: 'mailto:support@rymcu.com',
+      markdownGuide: '/guides/markdown',
-        aboutMe: '/article/115',
+      rules: '/article/20',
-        github: 'https://github.com/rymcu',
+      email: 'mailto:support@rymcu.com',
-        gitee: 'https://gitee.com/rymcu-community',
+      aboutMe: '/article/115',
-        currencyRule: '/rules/currency'
+      github: 'https://github.com/rymcu',
-      }
+      gitee: 'https://gitee.com/rymcu-community',
+      currencyRule: '/rules/currency',
+      wangBeiUrl: 'http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=36012302000055',
+      wangBei: '赣公网安备 36012302000055号',
+      wangBeiImage: wangBeiImage
     }
   }
+}
 </script>
 
 <style scoped>
-  .footer {
+.footer {
-    font-size: 14px;
+  font-size: 14px;
-    align-items: center;
+  align-items: center;
-    display: flex;
+  display: flex;
-  }
+}
-  .footer .footer-link {
+
-    margin-left: 2rem;
+.footer .footer-link {
-  }
+  margin-left: 2rem;
+}
 </style>