Merge branch 'master' of ssh://101.201.226.163:50022/binbin0314/datang-admin

src/api/contentIntro.js

@@ -79,3 +79,19 @@ export function UPDATE_DETAIL(params) {
         return res.data
     })
 }
+
+/**
+ * 内容发布/取消（保存）
+ * @param params
+ * @returns {Promise<T | never>}
+ * @constructor
+ */
+export function ACTIVE_DETAIL(params) {
+    return request({
+        url: `${contentIntro}/active`,
+        method: 'post',
+        data:params
+    }).then(res => {
+        return res.data
+    })
+}

src/components/Detail/editor.vue

@@ -21,6 +21,7 @@ export default {
   watch: {
     content(val){
       if(val){
+        console.log('val: ', val);
         this.setValue(val)
       }
     }

src/components/News/addOrEdit.vue

@@ -96,7 +96,7 @@
         ADD_DETAIL,
         UPDATE_DETAIL,
         QUERY_DETAIL
-    } from '@/api/contentDetail';
+    } from '@/api/contentIntro';
     import Alert from "@/utils/alert";
 
     export default {
@@ -134,7 +134,7 @@
                         { type: 'string', required: true, message: '请输入标题', trigger: 'blur' }
                     ],
                     showPage: [
-                        { type: 'array', required: true, message: '请选择页面显示位置', trigger: 'change' }
+                        { type: 'array', required: true, message: '请选择页面显示位置', trigger: 'blur' }
                     ],
                     content: [
                         { type: 'string', required: true, message: '请输入正文' }
@@ -146,8 +146,14 @@
         mounted() {
             if(this.currList && this.currList && !this.showAdd){
                 const { showPage } = this.currList
+                console.log('showPage: ', showPage, showPage.slice(0, 2));
                 this.getDetail()
-                this.formLabelAlign = this.currList
+                for(let key  in this.currList){
+                    if(key !== 'showPage'){
+                        this.formLabelAlign[key] = this.currList[key]
+                    }
+                }
+                console.log('this.formLabelAlign: ', this.formLabelAlign);
                 this.formLabelAlign.showPage.splice(0, 1, showPage.slice(0, 2))
                 this.formLabelAlign.showPage.splice(1, 1, showPage)
             }else{
@@ -209,8 +215,7 @@
                 this.$refs.ruleForm.validate((valid) => {
                     if (valid) {
                         if(this.showAdd){
-                            console.log('formName: ', formName);
-                            // this.addCarousel(formName)
+                            this.addCarousel(formName)
                         }else{
                             this.updateCarousel(formName)
                         }
@@ -225,11 +230,10 @@
              * 添加详情
              */
             async addCarousel(formName){
-                const { showPage, content } = formName;
-                const params = {
-                    showPage: showPage[1],
-                    content
-                };
+                console.log('formName: ', formName);
+                const { showPage } = formName;
+                const params = formName;
+                params.showPage = showPage[1],
                 await ADD_DETAIL(params).then((res) => {
                     if(res.code === 200){
                         Alert.success('添加成功');
@@ -265,11 +269,9 @@
              */
             async getDetail(){
                 try {
-                    const { detailId, showPage } = this.currList
+                    const { introId, showPage } = this.currList
                     const params = {
-                        detailId,
-                        pageNum: 1,
-                        pageSize: 10,
+                        introId,
                         showPage
                     };
                     await QUERY_DETAIL(params).then(res => {

src/components/News/detailContent.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="w-full">
+<div class="w-full line-height-30">
   <!-- <el-descriptions title="垂直带边框列表" direction="vertical" :column="3" border>
     <el-descriptions-item label="发表时间">{{ $moment(list.publishTime).format('YYYY-MM-DD HH:mm') }}</el-descriptions-item>
     <el-descriptions-item label="创建时间">{{ $moment(list.createdAt).format('YYYY-MM-DD HH:mm') }}</el-descriptions-item>
@@ -17,15 +17,16 @@
     <div>发表时间: {{ $moment(list.publishTime).format('YYYY-MM-DD HH:mm') }}</div>
     <div>创建时间: {{ $moment(list.createdAt).format('YYYY-MM-DD HH:mm') }}</div>
     <div>修改时间: {{ $moment(list.updatedAt).format('YYYY-MM-DD HH:mm') }}</div>
-    <div></div>
     <div>标题显示类型: {{ list.showType == 0 ? '文本' : list.showType == 1 ? '图片' : list.showType == 2 ? '视频' : '' }}</div>
-    <div class="ml-5">跳转路径: {{ list.jumpUrl }}</div>
+    <div>跳转路径: {{ list.jumpUrl }}</div>
     <div v-if="detailContent && detailContent.content" v-html="detailContent.content"></div>
     <div v-else>暂无</div>
     <div>责编: {{ list.editor }}</div>
     <div>来源: {{ list.source }}</div>
     <!-- 关联文章信息 -->
+    <!-- <div>
 
+    </div> -->
   </div>
 </template>
 

src/components/News/index.vue

@@ -64,7 +64,18 @@
                     label="提交状态"
                     align="center"
                     >
-                    <template slot-scope="lists">{{ setCode(lists.row.submitStatus) }}</template>
+                    <template slot-scope="lists">
+                        <el-tooltip :content="lists.row.submitStatus === 1 ? '发布' : '保存'" placement="top">
+                            <el-switch
+                                v-model="lists.row.submitStatus"
+                                active-color="#13ce66"
+                                inactive-color="#409EFF"
+                                :active-value="1"
+                                :inactive-value="0"
+                                @change="changeActive(lists.row)">
+                            </el-switch>
+                        </el-tooltip>
+                    </template>
                 </el-table-column>
 
                 <el-table-column
@@ -124,7 +135,8 @@
     import {
         POST_QUERY_DETAIL,
         QUERY_DETAIL,
-        DELETE_DETAIL
+        DELETE_DETAIL,
+        ACTIVE_DETAIL
     } from '@/api/contentIntro';
     import Alert from "@/utils/alert";
     import {tabList} from '../../filters/code';
@@ -226,6 +238,28 @@
                 }
             },
 
+            /**
+             * 内容发布/取消（保存）
+             */
+            async changeActive(row){
+                try {
+
+                    const params = {
+                        introId: row.introId,
+                        submitStatus: row.submitStatus
+                    };
+                    await ACTIVE_DETAIL(params).then(res => {
+                        if(res.code === 200){
+                            Alert.success(row.submitStatus === 0 ? '内容保存成功' : '内容发布成功');
+                        }else{
+                            Alert.fail(res.msg || '提交状态修改失败');
+                        }
+                    });
+                } catch (error) {
+                    console.log('error: ', error);
+                }
+            },
+
             // 设置显示位置
             setCode(showPage){
                 let item = null