Merge branch 'master' of http://47.92.161.104:10080/shuzhan/enterprise-portal

src/views/base/activityInfo-detail.vue

@@ -120,8 +120,8 @@ export default {
       loading: false,
       submitting: false,
       editorConfig: {
-        height: 300,
-        width: 600,
+        height: 400,
+        width: "90%",
       },
       uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
       typeList: [],

src/views/base/cooperationInfo-detail.vue

@@ -104,7 +104,7 @@ export default {
         ],
         type: [{ required: true, message: "类型不能为空", trigger: "blur" }],
         picUrl: [
-          { required: true, message: "图片地址不能为空", trigger: "blur" },
+          { required: false, message: "图片地址不能为空", trigger: "blur" },
         ],
         title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
         content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
@@ -131,8 +131,8 @@ export default {
       loading: false,
       submitting: false,
       editorConfig: {
-        height: 300,
-        width: 600,
+        height: 400,
+        width: "90%",
       },
       uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
       typeList: [],

src/views/base/cooperationInfo-list.vue

@@ -117,7 +117,7 @@
           <span v-else>未上架</span>
         </template></el-table-column
       >
-      <el-table-column label="操作" width="150" fixed="right">
+      <el-table-column label="操作" width="150">
         <template slot-scope="{ row }">
           <el-button size="mini" type="warning" @click="handleEdit(row)"
             >编辑</el-button

src/views/base/newsInfo-detail.vue

@@ -144,8 +144,8 @@ export default {
       loading: false,
       submitting: false,
       editorConfig: {
-        height: 500,
-        width: 600,
+        height: 400,
+        width: "90%",
       },
       uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
       newsInfoList: [],

src/views/base/recruitInfo-detail.vue

@@ -256,8 +256,8 @@ export default {
       educationResult: [],
       salaryLevelResult: [],
       editorConfig: {
-        height: 300,
-        width: 600,
+        height: 400,
+        width: "90%",
       },
       uploadUrl: Constant.serverUrl + "/tinymce/upload?token=" + getToken(),
       companyInfoResult: [],

src/views/base/whisperingWall-list.vue

@@ -102,9 +102,9 @@
       ></el-table-column>
       <el-table-column label="操作" width="150" fixed="right">
         <template slot-scope="{ row }">
-          <el-button size="mini" type="warning" @click="handleEdit(row)"
+          <!-- <el-button size="mini" type="warning" @click="handleEdit(row)"
             >编辑</el-button
-          >
+          > -->
           <el-button size="mini" type="danger" @click="handleDelete(row)"
             >删除</el-button
           >