From 26f93ef2e0e7c046983aa0ae163cfc0da4997335 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 17 Apr 2023 15:31:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=95=BF=E9=A1=B5=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=8F=AF=E4=BB=A5=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/modules/module.vue      | 72 +++++++++++++-------------
 src/const/modules.js                   |  2 +-
 src/pages/column/page/talentCenter.vue |  4 +-
 src/styles/page/page.scss              | 10 +++-
 4 files changed, 49 insertions(+), 39 deletions(-)

diff --git a/src/components/modules/module.vue b/src/components/modules/module.vue
index a05dab1..c9eb4ce 100644
--- a/src/components/modules/module.vue
+++ b/src/components/modules/module.vue
@@ -80,41 +80,43 @@
         <el-form-item v-for="(item, i) in data.forms" :key="i" :prop="item.prop" :label="item.label">
           <el-input v-if="item.type === 'input'" v-model="data.form[item.prop]" placeholder="请输入" maxlength="100"></el-input>
           <el-input v-if="item.type === 'textarea'" v-model="data.form[item.prop]" type="textarea" placeholder="请输入" maxlength="300"></el-input>
-          <el-upload
-            v-if="item.type === 'upload'"
-            class="uploader"
-            accept=".jpg,.png,.jpeg"
-            :on-success="res => uploadSuccess(res, data.form)"
-            :show-file-list="false"
-            :headers="headers"
-            :action="api.upload">
-              <img v-if="data.form[item.prop]" :src="data.form[item.prop]" class="avatar">
-              <div class="uploader-default" v-else>
-                <i class="el-icon-plus"></i>
-                <p>上传图片</p>
-              </div>
-              <div slot="tip" class="el-upload__tip">
-                <p>只支持.jpg,.png格式</p>
-              </div>
-          </el-upload>
-          <el-upload
-            v-if="item.type === 'video'"
-            accept=".mp4,.mov,.avi"
-            :on-success="res => uploadSuccess(res, data.form, item)"
-            :file-list="fileList"
-            :headers="headers"
-            :action="api.upload">
-              <el-button>上传视频</el-button>
-          </el-upload>
-          <!-- 图片视频都可上传 -->
-          <el-upload
-            v-if="item.type === 'media'"
-            :on-success="res => uploadSuccess(res, data.form, item)"
-            :file-list="fileList"
-            :headers="headers"
-            :action="api.upload">
-              <el-button>上传资源</el-button>
-          </el-upload>
+          <div v-if="item.type === 'upload' || item.type === 'video' || item.type === 'media'" class="uploader-wrap">
+            <el-upload
+              class="uploader"
+              accept=".jpg,.png,.jpeg"
+              :on-success="res => uploadSuccess(res, data.form)"
+              :show-file-list="false"
+              :headers="headers"
+              :action="api.upload">
+                <img v-if="data.form[item.prop]" :src="data.form[item.prop]" class="avatar">
+                <div class="uploader-default" v-else>
+                  <i class="el-icon-plus"></i>
+                  <p>上传图片</p>
+                </div>
+                <div slot="tip" class="el-upload__tip">
+                  <p>只支持.jpg,.png格式</p>
+                </div>
+            </el-upload>
+            <el-upload
+              v-if="item.type === 'video'"
+              accept=".mp4,.mov,.avi"
+              :on-success="res => uploadSuccess(res, data.form, item)"
+              :file-list="fileList"
+              :headers="headers"
+              :action="api.upload">
+                <el-button>上传视频</el-button>
+            </el-upload>
+            <!-- 图片视频都可上传 -->
+            <el-upload
+              v-if="item.type === 'media'"
+              :on-success="res => uploadSuccess(res, data.form, item)"
+              :file-list="fileList"
+              :headers="headers"
+              :action="api.upload">
+                <el-button>上传资源</el-button>
+            </el-upload>
+            <i v-if="!item.required" class="el-icon-delete del" @click="data.form[item.prop] = ''"></i>
+          </div>
           <div v-if="item.type === 'link'" class="flex">
             <el-input class="m-r-10" v-model="data.form.link.linkName"></el-input>
             <el-button @click="toLink(data.form)">设置链接</el-button>
diff --git a/src/const/modules.js b/src/const/modules.js
index 405c1ee..4e07e62 100644
--- a/src/const/modules.js
+++ b/src/const/modules.js
@@ -5562,7 +5562,7 @@ export default {
           type: 'upload',
           prop: 'pic',
           label: '图片',
-          required: true
+          required: false
         },
       ],
       form: {
diff --git a/src/pages/column/page/talentCenter.vue b/src/pages/column/page/talentCenter.vue
index e1dc928..ca4e84b 100644
--- a/src/pages/column/page/talentCenter.vue
+++ b/src/pages/column/page/talentCenter.vue
@@ -40,7 +40,7 @@
                       <h6 class="c-title">{{ modules[3].form.title }}</h6>
                       <div class="more">查看更多 ></div>
                     </div>
-                    <p class="des" v-html="modules[3].form.des"></p>
+                    <div class="des" v-html="modules[3].form.des"></div>
                     <div class="cover" @click="toSet(3)">点击更换标题、链接与描述</div>
                   </div>
                   <p class="hot">热门岗位</p>
@@ -61,7 +61,7 @@
                       <h6 class="c-title">{{ modules[6].form.title }}</h6>
                       <div class="more">查看更多 ></div>
                     </div>
-                    <p class="des" v-html="modules[6].form.des"></p>
+                    <div class="des" v-html="modules[6].form.des"></div>
                     <div class="cover" @click="toSet(6)">点击更换标题、链接与描述</div>
                   </div>
                   <p class="hot">热门岗位</p>
diff --git a/src/styles/page/page.scss b/src/styles/page/page.scss
index bc888f3..b5b018c 100644
--- a/src/styles/page/page.scss
+++ b/src/styles/page/page.scss
@@ -149,7 +149,15 @@ $avatar-height: 80px;
     color: #8c939d;
   }
 }
-/deep/ .uploader {
+/deep/.uploader-wrap {
+  display: flex;
+  .del {
+    margin-left: 5px;
+    font-size: 18px;
+    cursor: pointer;
+  }
+}
+/deep/.uploader {
   .el-upload {
     position: relative;
     width: $avatar-width;

From 0d2eeac8233a950cc763e14f2c09c8cf5cf20705 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 18 Apr 2023 10:00:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=87=BA=E7=89=88=E7=A4=BE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/article/add/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/article/add/index.vue b/src/pages/article/add/index.vue
index ffe2fc4..0b5626e 100644
--- a/src/pages/article/add/index.vue
+++ b/src/pages/article/add/index.vue
@@ -2,7 +2,7 @@
   <div class="page">
     <p class="page-name mb">文章详情</p>
     <el-form :model="form" :rules="rules" class="input-form model" label-width="140px">
-      <el-form-item class="lg" prop="articleTemplate" label="独立文章模板">
+      <el-form-item v-if="!isPublication" class="lg" prop="articleTemplate" label="独立文章模板">
         <el-popover
           placement="top-start"
           trigger="hover"
@@ -211,7 +211,9 @@
           ></el-input>
         </el-form-item>
       </template>
-      <!-- 非出版物的才显示下面字段 -->
+      <el-form-item v-if="isPublication" prop="mainBody" label="正文">
+        <Editor api-key='rnk6zw9v267xqz7pf98twt1vmrvltmd436je7a642pckltda' v-model="form.mainBody" :init="editorConfig" />
+      </el-form-item>
       <div v-else-if="!isPublication" class="item-line">
         <el-form-item prop="source" label="来源">
           <el-input