Merge branch 'master' of http://121.37.12.51:13000/jialong.yu/FE_IASF_server

src/components/modules/module.vue

@@ -80,8 +80,8 @@
         <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>
+          <div v-if="item.type === 'upload' || item.type === 'video' || item.type === 'media'" class="uploader-wrap">
             <el-upload
-            v-if="item.type === 'upload'"
               class="uploader"
               accept=".jpg,.png,.jpeg"
               :on-success="res => uploadSuccess(res, data.form)"
@@ -115,6 +115,8 @@
               :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>

src/const/modules.js

@@ -5562,7 +5562,7 @@ export default {
           type: 'upload',
           prop: 'pic',
           label: '图片',
-          required: true
+          required: false
         },
       ],
       form: {

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

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>

src/styles/page/page.scss

@@ -149,6 +149,14 @@ $avatar-height: 80px;
     color: #8c939d;
   }
 }
+/deep/.uploader-wrap {
+  display: flex;
+  .del {
+    margin-left: 5px;
+    font-size: 18px;
+    cursor: pointer;
+  }
+}
 /deep/.uploader {
   .el-upload {
     position: relative;