diff --git a/Yi.Bbs.Vue3/src/assets/atom-one-dark.css b/Yi.Bbs.Vue3/src/assets/atom-one-dark.css
new file mode 100644
index 00000000..1616aafe
--- /dev/null
+++ b/Yi.Bbs.Vue3/src/assets/atom-one-dark.css
@@ -0,0 +1,96 @@
+/*
+
+Atom One Dark by Daniel Gamage
+Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
+
+base:    #282c34
+mono-1:  #abb2bf
+mono-2:  #818896
+mono-3:  #5c6370
+hue-1:   #56b6c2
+hue-2:   #61aeee
+hue-3:   #c678dd
+hue-4:   #98c379
+hue-5:   #e06c75
+hue-5-2: #be5046
+hue-6:   #d19a66
+hue-6-2: #e6c07b
+
+*/
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  color: #abb2bf;
+  background: #282c34;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #5c6370;
+  font-style: italic;
+}
+
+.hljs-doctag,
+.hljs-keyword,
+.hljs-formula {
+  color: #c678dd;
+}
+
+.hljs-section,
+.hljs-name,
+.hljs-selector-tag,
+.hljs-deletion,
+.hljs-subst {
+  color: #e06c75;
+}
+
+.hljs-literal {
+  color: #56b6c2;
+}
+
+.hljs-string,
+.hljs-regexp,
+.hljs-addition,
+.hljs-attribute,
+.hljs-meta-string {
+  color: #98c379;
+}
+
+.hljs-built_in,
+.hljs-class .hljs-title {
+  color: #e6c07b;
+}
+
+.hljs-attr,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-type,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-number {
+  color: #d19a66;
+}
+
+.hljs-symbol,
+.hljs-bullet,
+.hljs-link,
+.hljs-meta,
+.hljs-selector-id,
+.hljs-title {
+  color: #61aeee;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
+
+.hljs-link {
+  text-decoration: underline;
+}
diff --git a/Yi.Bbs.Vue3/src/components/ArticleContentInfo.vue b/Yi.Bbs.Vue3/src/components/ArticleContentInfo.vue
index 2dd7ab06..56b27d2f 100644
--- a/Yi.Bbs.Vue3/src/components/ArticleContentInfo.vue
+++ b/Yi.Bbs.Vue3/src/components/ArticleContentInfo.vue
@@ -1,3 +1,35 @@
+<style scoped>
+::v-deep pre{
+    padding: 0;
+    margin-bottom: 0;
+}
+::v-deep .header
+{
+    background-color: #409eff;
+    color: white;
+    height: 30px;
+    display: flex;
+    justify-content: flex-end;
+    padding-top: 10px;
+}
+::v-deep .code{
+padding: 0px 10px;
+
+    font-size: 14px;
+    line-height: 22px;
+    border-radius: 4px;
+
+}
+::v-deep .language
+{
+
+}
+::v-deep .copy
+{
+margin: 0px 10px;
+
+}
+</style>
 <template>
     <div>
         <div class="markdown-body" v-html="outputHtml"></div>
@@ -9,24 +41,45 @@ import { marked } from 'marked';
 
 import hljs from "highlight.js";
 //可以设置加载样式切换主题
-import 'highlight.js/styles/atom-one-dark.css'
+import '@/assets/atom-one-dark.css'
 import '@/assets/github-markdown.css'
-import { ref,watch  } from 'vue';
+import { ref, watch } from 'vue';
 
 
 
-const outputHtml=ref("")
+const outputHtml = ref("")
 const props = defineProps(['code'])
-watch(props,(n,o)=>{
+const codeHandler = (code,language) => {
+    const codeIndex = parseInt(Date.now() + "") + Math.floor(Math.random() * 10000000);
+    // 格式化第一行是右侧language和 “复制” 按钮；
+
+    if (code) {
+        try {
+            // 使用 highlight.js 对代码进行高亮显示
+            const preCode =hljs.highlightAuto(code).value;
+            // 将代码包裹在 textarea 中，由于防止textarea渲染出现问题，这里将 "<" 用 "&lt;" 代替，不影响复制功能
+            let html = `<pre class='hljs'><div class="header"><span class="language">${language}</span><span class="copy">复制代码</span></div><code class="code">${preCode}</code></pre>`;
+
+            return html;
+                      //<textarea style="position: absolute;top: -9999px;left: -9999px;z-index: -9999;" id="copy${codeIndex}">${code.replace(/<\/textarea>/g, "&lt;/textarea>")}</textarea>
+        } catch (error) {
+            console.log(error);
+        }
+    }
+
+}
+
+watch(props, (n, o) => {
     marked.setOptions({
         renderer: new marked.Renderer(),
-        highlight: function(code) {
-            return hljs.highlightAuto(code).value;
-          },
+        highlight: function (code,language) {
+           return codeHandler(code,language);
+           // return hljs.highlightAuto(code).value;
+        },
         pedantic: false,
         gfm: true,//允许 Git Hub标准的markdown
         tables: true,//支持表格
-    
+
         breaks: true,
         sanitize: false,
         smartLists: true,
@@ -36,8 +89,8 @@ watch(props,(n,o)=>{
     }
     );
     //需要注意代码块样式
-    outputHtml.value = marked(n.code).replace(/<pre>/g, "<pre class='hljs'>")
-},{immediate:true,deep:true})
+    outputHtml.value = marked(n.code);
+}, { immediate: true, deep: true })
 
 </script>