From c1fd19cc98baadf98da818f8503f4915e2e10b76 Mon Sep 17 00:00:00 2001
From: ronger <ronger-x@outlook.com>
Date: Sat, 3 Feb 2024 10:58:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(styles):=20=E4=BA=A7=E5=93=81=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=20UI=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/common/comment/main.vue |  2 +-
 components/common/product/list.vue | 24 ++++++++++++++++++------
 config/api.config.js               | 14 +++++++-------
 nuxt.config.js                     |  6 +++---
 package.json                       |  2 +-
 pages/article/post/_article_id.vue |  7 +++++--
 pages/product/_product_id.vue      | 10 ++++++++++
 7 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/components/common/comment/main.vue b/components/common/comment/main.vue
index 1a48e9d..8226be6 100644
--- a/components/common/comment/main.vue
+++ b/components/common/comment/main.vue
@@ -266,7 +266,7 @@ export default {
         tab: '\t',
         cdn: apiConfig.VDITOR,
         cache: {
-          enable: this.postId ? false : true,
+          enable: !this.postId,
           id: this.postId ? this.postId : '',
         },
         after() {
diff --git a/components/common/product/list.vue b/components/common/product/list.vue
index 09f9be1..50a4229 100644
--- a/components/common/product/list.vue
+++ b/components/common/product/list.vue
@@ -1,18 +1,30 @@
 <template>
   <div class="wrapper">
     <el-row class="row-cards row-deck" :gutter="20">
-      <el-col :span="8" v-for="product in products.list" :key="product.idProduct" style="margin-right: 20px;">
+      <el-col :span="10" v-for="product in products.list" :key="product.idProduct" style="margin-right: 20px;margin-bottom: 10px;">
         <el-card :body-style="{ padding: '20px' }">
           <el-col :span="24">
             <el-image :src="product.productImgUrl"
                       style="border-radius: 10px;background: #f5f7fa;border: #f5f7fa solid 1px;" fit="cover"></el-image>
           </el-col>
-          <el-col style="padding-top: 20px;font-size: 16px;line-height: 22px;font-weight: 500;margin-bottom: 4px;">
-            <span v-html="product.productTitle"></span>
+          <el-col :span="24">
+            <el-tag
+              style="margin-right: 0.5rem;"
+              v-for="tag in product.tags?.split(',') || []"
+              :key="tag"
+              size="small"
+              effect="plain">
+              # {{ tag }}
+            </el-tag>
           </el-col>
-          <el-col style="padding-top: 30px;text-align: right;">
-<!--            <el-button type="text" class="button">立即购买</el-button>-->
-            <el-button type="text" class="button" @click="handleClick(product.idProduct)">查看详情</el-button>
+          <el-col :span="24" style="font-size: 16px;line-height: 22px;font-weight: 500;margin: 4px 0;text-align: center;">
+            <span style="font-weight: bolder;" v-html="product.productTitle"></span>
+          </el-col>
+          <el-col span="24">
+            <small v-html="product.productDescription"></small>
+          </el-col>
+          <el-col :span="24" style="text-align: center;">
+            <el-button type="text" class="button" @click="handleClick(product.idProduct)">了解更多</el-button>
           </el-col>
         </el-card>
       </el-col>
diff --git a/config/api.config.js b/config/api.config.js
index ce3ebc6..d9f982e 100644
--- a/config/api.config.js
+++ b/config/api.config.js
@@ -1,4 +1,4 @@
-import {NODE_ENV} from '../environment'
+import {NODE_ENV} from '@/environment'
 
 const apisMap = {
   development: {
@@ -8,8 +8,8 @@ const apisMap = {
     PROXY: '/proxy',
     SOCKET: 'http://localhost:3000/ws',
     GRAVATAR: '/proxy/static.rymcu.com/avatar',
-    VDITOR: 'https://static.rymcu.com/vditor@3.8.14/',
-    VDITOR_CSS: 'https://static.rymcu.com/vditor@3.8.14/dist/css/content-theme'
+    VDITOR: 'https://static.rymcu.com/vditor@3.9.8/',
+    VDITOR_CSS: 'https://static.rymcu.com/vditor@3.9.8/dist/css/content-theme'
   },
   test: {
     FE: 'https://rymcu.com',
@@ -18,8 +18,8 @@ const apisMap = {
     PROXY: 'https://static.rymcu.com/proxy',
     SOCKET: 'https://rymcu.com/wss',
     GRAVATAR: 'https://static.rymcu.com/avatar',
-    VDITOR: 'https://static.rymcu.com/vditor@3.8.14/',
-    VDITOR_CSS: 'https://static.rymcu.com/vditor@3.8.14/dist/css/content-theme'
+    VDITOR: 'https://static.rymcu.com/vditor@3.9.8/',
+    VDITOR_CSS: 'https://static.rymcu.com/vditor@3.9.8/dist/css/content-theme'
   },
   production: {
     FE: 'https://rymcu.com',
@@ -28,8 +28,8 @@ const apisMap = {
     PROXY: 'https://static.rymcu.com/proxy',
     SOCKET: 'https://rymcu.com/wss',
     GRAVATAR: 'https://static.rymcu.com/avatar',
-    VDITOR: 'https://static.rymcu.com/vditor@3.8.14/',
-    VDITOR_CSS: 'https://static.rymcu.com/vditor@3.8.14/dist/css/content-theme'
+    VDITOR: 'https://static.rymcu.com/vditor@3.9.8/',
+    VDITOR_CSS: 'https://static.rymcu.com/vditor@3.9.8/dist/css/content-theme'
   }
 }
 
diff --git a/nuxt.config.js b/nuxt.config.js
index f21b3ef..6d0b7c0 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -46,7 +46,7 @@ export default {
   ** Global CSS
   */
   css: [
-    'element-ui/lib/theme-chalk/index.css',
+    'element-ui/lib/theme-chalk/index.css'
   ],
   /*
   ** Plugins to load before mounting the App
@@ -72,7 +72,7 @@ export default {
     '@nuxtjs/axios',
     '@nuxtjs/proxy',
     '@nuxtjs/auth-next',
-    '@nuxtjs/device',
+    '@nuxtjs/device'
   ],
   auth: {
     redirect: {
@@ -128,7 +128,7 @@ export default {
   ** See https://nuxtjs.org/api/configuration-build/
   */
   build: {
-    transpile: [/^element-ui/,'defu'],
+    transpile: [/^element-ui/, 'defu'],
     optimization: {
       splitChunks: {
         minSize: 10000,
diff --git a/package.json b/package.json
index 6fac827..c010e33 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "raw-loader": "^4.0.2",
     "save-svg-as-png": "^1.4.17",
     "simple-icons": "^6.23.0",
-    "vditor": "^3.8.18",
+    "vditor": "^3.9.8",
     "vue-cropper": "^0.6.2",
     "vue-sse": "^2.5.2",
     "vuejs-avataaars": "^4.0.1"
diff --git a/pages/article/post/_article_id.vue b/pages/article/post/_article_id.vue
index eb568ad..350b5be 100644
--- a/pages/article/post/_article_id.vue
+++ b/pages/article/post/_article_id.vue
@@ -197,7 +197,7 @@
               // Vue.Vditor.highlightRender({style: 'github'}, element, this.contentEditor);
             },
             theme: {
-              cdn: apiConfig.VDITOR_CSS
+              path: apiConfig.VDITOR_CSS
             }
           },
           upload: {
@@ -427,8 +427,11 @@
           height: 480,
           placeholder: '', //_ts.$t('inputContent', _ts.$store.state.locale)
           resize: false,
-          value: articleContent
+          value: ''
         });
+
+        let mark = _ts.contentEditor.html2md(articleContent);
+        _ts.contentEditor.setValue(mark);
       })
     }
   }
diff --git a/pages/product/_product_id.vue b/pages/product/_product_id.vue
index 4384187..6d42afa 100644
--- a/pages/product/_product_id.vue
+++ b/pages/product/_product_id.vue
@@ -8,6 +8,16 @@
               {{ product.productTitle }}
             </h1>
           </div>
+          <div style="margin: 1rem 0;">
+            <el-tag
+              style="margin-right: 0.5rem;"
+              v-for="tag in product.tags?.split(',') || []"
+              :key="tag"
+              size="small"
+              effect="plain">
+              # {{ tag }}
+            </el-tag>
+          </div>
           <div class="pt-7 pipe-content__reset vditor-reset" id="articleContent" v-html="product.productContent"
                style="overflow: hidden;"></div>
         </div>