Merge remote-tracking branch 'origin/master'

src/views/XMHJC/aboutUs/basic/index.vue

@@ -200,7 +200,7 @@ const uploadFileOne = async (file) => {
 const uploadDataTwo = ref({});
 const uploadFileTwo = async (file) => {
   const res = await getFileStr( { fileName: file.name });
-  uploadDataTwo.value = res.uploadBody;
+  uploadDataTwo.value = res.data.uploadBody;
   file.id = res.data.id;
   file.fileName = res.data.fileName;
   file.fileUrl = res.data.fileUrl;

src/views/XMHJC/column/article.vue

@@ -155,14 +155,12 @@ import {computed, nextTick, reactive, ref} from "vue";
 import TinymceEditor from "@/components/Editor/TinymceEditor.vue";
 import {getDictOneByXmhjc, getFileList,getFileStr} from "@/api/XMHJC/common";
 import {
-  addColumnArticle,
+  addColumnArticle, deleteColumnArticle,
   editColumnArticle,
   findColumnArticleList,
   findMenuListByOpen, findSubMenuListByOpen,
   getColumnArticle
 } from "@/api/XMHJC/column";
-import {deleteAboutUsCulture} from "@/api/XMHJC/aboutUs";
-import useUserStore from "@/store/modules/user";
 
 const loading = ref(false);
 const submitLoading = ref(false);
@@ -281,6 +279,14 @@ const config = computed(() => {
         width: '160'
       },
     },
+
+    {
+      attrs: {
+        label: "点击量",
+        prop: "readNum",
+        width: '160'
+      },
+    },
     {
       attrs: {
         label: "操作",
@@ -313,7 +319,7 @@ const config = computed(() => {
                 cancelButtonText: "取消",
                 type: "warning",
               }).then(() => {
-                deleteAboutUsCulture({
+                deleteColumnArticle({
                   id: row.id,
                 })
                     .then((res) => {

src/views/XMHJC/column/index.vue

@@ -91,12 +91,11 @@ import {computed, nextTick, reactive, ref} from "vue";
 import TinymceEditor from "@/components/Editor/TinymceEditor.vue";
 import {getDictOneByXmhjc, getFileList,getFileStr} from "@/api/XMHJC/common";
 import {
-  addColumnMenu, checkDeleteColumnMenuSub,
+  addColumnMenu, checkDeleteColumnMenuSub, deleteColumnMenu,
   editColumnMenu,
   findColumnMenuList,
   getColumnMenu
 } from "@/api/XMHJC/column";
-import {deleteAboutUsCulture} from "@/api/XMHJC/aboutUs";
 import {isNullOrUndefined} from "@tinymce/tinymce-vue/lib/es2015/main/ts/Utils";
 
 const loading = ref(false);
@@ -116,8 +115,9 @@ let rules = ref({
   name: [{ required: true, message: "请输入企业文化标题", trigger: "blur" }],
   status: [{ required: true, message: "请选择启用状态", trigger: "change" }],
   subStatus: [{ required: true, message: "请选择启用状态", trigger: "change" }],
-  type: [{ required: true, message: "请输入跳转类型", trigger: "change" }],
-  listType: [{ required: true, message: "请输入列表类型", trigger: "change" }],
+  type: [{ required: true, message: "请选择跳转类型", trigger: "change" }],
+  listType: [{ required: true, message: "请选择列表类型", trigger: "change" }],
+  isRelated: [{ required: true, message: "请选择是否开启", trigger: "change" }],
   url: [{ required: true, message: "请输入第三方链接", trigger: "blur" }],
   sort: [{ required: true, message: "请输入排序", trigger: "blur" }],
   subName: [{ required: true, message: "请输入子栏目", trigger: "blur" }],
@@ -204,7 +204,7 @@ const config = computed(() => {
                 cancelButtonText: "取消",
                 type: "warning",
               }).then(() => {
-                deleteAboutUsCulture({
+                deleteColumnMenu({
                   id: row.id,
                 })
                     .then((res) => {
@@ -245,11 +245,19 @@ const formConfig = computed(() => {
     {
       type: "select",
       prop: "type",
-      label: "跳转类型",
+      label: "栏目类型",
       data: columnType.value,
       required: true,
     },
     {
+      type: "select",
+      prop: "isRelated",
+      label: "是否开启相关文章",
+      data: enableStatus.value,
+      required: true,
+      isShow: formData.data.type == "1"
+    },
+    {
       type: "slot",
       slotName: "subColumn",
       prop: "subColumn",
@@ -278,6 +286,9 @@ const formConfig = computed(() => {
       required: true,
       isShow: formData.data.type == "3"
     },
+
+
+
     {
       label: "启用状态",
       prop: "status",