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

src/components/Banner/index.vue

@@ -150,9 +150,9 @@
                 POST_QUERY_CAROUSEL(params).then(res => {
                     if(res.code === 200){
                         this.lists = res.data.list
-                        this.pageNum = res.data.pageNum
-                        this.pageSize = res.data.pageSize
-                        this.count = res.data.size
+                        this.pageNum = +res.data.pageNum
+                        this.pageSize = +res.data.pageSize
+                        this.count = +res.data.total
                     }else{
                         Alert.fail(res.msg || '获取失败');
                     }

src/components/Detail/addOrEdit.vue

@@ -14,7 +14,7 @@
                 <editor ref="editor" :content="formLabelAlign.content" />
             </el-form-item>
             <el-form-item>
-                <el-button type="primary" @click="submit(formLabelAlign)">确定</el-button>
+                <el-button type="primary" @click="submit(formLabelAlign)" :loading="loading">确定</el-button>
                 <el-button @click="$emit('close')">取消</el-button>
             </el-form-item>
         </el-form>
@@ -52,6 +52,7 @@
                     label: 'title',
                     children: 'children'
                 },
+                loading: false,
                 rules: {
                     content: [
                         { type: 'string', required: true, message: '请输入正文' }
@@ -98,35 +99,49 @@
              * 添加详情
              */
             async addCarousel(formName){
-                const params = formName;
-                await ADD_DETAIL(params).then((res) => {
-                    if(res.code === 200){
-                        Alert.success('添加成功');
-                        this.$emit('close')
-                    }else{
-                        Alert.fail(res.msg || '添加失败');
-                    }
-                })
+                try {
+                    this.loading = true;
+                    const params = formName;
+                    await ADD_DETAIL(params).then((res) => {
+                        this.loading = false;
+                        if(res.code === 200){
+                            Alert.success('添加成功');
+                            this.$emit('close')
+                        }else{
+                            Alert.fail(res.msg || '添加失败');
+                        }
+                    })
+                } catch (error) {
+                    this.loading = false;
+                    console.error('error: ', error);
+                }
             },
 
             /**
              * 修改详情
              */
             async updateCarousel(formName){
-                const { detailId, showPage, content } = formName;
-                const params = {
-                    detailId,
-                    showPage,
-                    content
-                };
-                await UPDATE_DETAIL(params).then((res) => {
-                    if(res.code === 200){
-                        Alert.success('修改成功');
-                        this.$emit('close')
-                    }else{
-                        Alert.fail(res.msg || '修改失败');
-                    }
-                })
+                try {
+                    this.loading = true;
+                    const { detailId, showPage, content } = formName;
+                    const params = {
+                        detailId,
+                        showPage,
+                        content
+                    };
+                    await UPDATE_DETAIL(params).then((res) => {
+                        this.loading = false;
+                        if(res.code === 200){
+                            Alert.success('修改成功');
+                            this.$emit('close')
+                        }else{
+                            Alert.fail(res.msg || '修改失败');
+                        }
+                    })
+                } catch (error) {
+                    this.loading = false;
+                    console.error('error: ', error);
+                }
             },
 
             /**

src/components/Detail/editor.vue

@@ -11,7 +11,6 @@ import "highlight.js/styles/github.css"; // code block highlight
 import { init } from "echarts/lib/echarts";
 
 export default {
-  name: "mytuieditor",
   props:{
     content:{
       type: String,
@@ -29,8 +28,6 @@ export default {
     this.initialize();
     this.$nextTick(() => {
       this.setValue(this.content)
-      var editorSection=document.getElementById("editorSection");
-      editorSection.style.height = "800px";
     })
   },
   beforeDestroy() {
@@ -44,7 +41,7 @@ export default {
           el: document.querySelector("#editorSection"),
           initialEditType: "wysiwyg",
           previewStyle: "vertical",
-          height: "300px"
+          height: "800px",
         });
         this.tuieditor.getHtml();
       }

src/components/Detail/index.vue

@@ -106,7 +106,7 @@
         </div>
 
         <el-dialog
-            width="800px"
+            width="1200px"
             :show-close="false"
             :visible.sync="showModal">
             <add-or-edit ref="distribution" :show-add="showAdd" :currList="currList" v-if="showModal" @close="close"></add-or-edit>

src/components/News/addContentRelation.vue

@@ -99,9 +99,9 @@ export default {
           POST_QUERY_DETAIL(params).then(res => {
               if(res.code === 200){
                   this.lists = res.data.list
-                  this.pageNum = res.data.pageNum
-                  this.pageSize = res.data.pageSize
-                  this.count = res.data.size
+                  this.pageNum = +res.data.pageNum
+                  this.pageSize = +res.data.pageSize
+                  this.count = +res.data.total
               }else{
                   Alert.fail(res.msg || '获取失败');
               }

src/components/News/addOrEdit.vue

@@ -75,7 +75,7 @@
                 <add-content-relation ref="distribution" @setRelationValue="setRelationValue"></add-content-relation>
             </el-form-item>
             <el-form-item>
-                <el-button type="primary" @click="submit(formLabelAlign)">确定</el-button>
+                <el-button type="primary" @click="submit(formLabelAlign)" :loading="loading">确定</el-button>
                 <el-button @click="$emit('close')">取消</el-button>
             </el-form-item>
         </el-form>
@@ -126,6 +126,7 @@
                     label: 'title',
                     children: 'children'
                 },
+                loading: false,
                 rules: {
                     title: [
                         { type: 'string', required: true, message: '请输入标题', trigger: 'blur' }
@@ -152,6 +153,9 @@
             if(code === '0207'){
                 this.formLabelAlign.showType = 2
             }
+            if(!this.formLabelAlign.publishTime){
+                this.formLabelAlign.publishTime = new Date()
+            }
         },
 
         methods: {
@@ -220,30 +224,45 @@
              * 添加详情
              */
             async addCarousel(formName){
-                const params = formName;
-                await ADD_DETAIL(params).then((res) => {
-                    if(res.code === 200){
-                        Alert.success('添加成功');
-                        this.$emit('close', true)
-                    }else{
-                        Alert.fail(res.msg || '添加失败');
-                    }
-                })
+                console.log('addddd');
+                try {
+                    this.loading = true;
+                    const params = formName;
+                    await ADD_DETAIL(params).then((res) => {
+                        this.loading = false;
+                        if(res.code === 200){
+                            Alert.success('添加成功');
+                            this.$emit('close', true)
+                        }else{
+                            Alert.fail(res.msg || '添加失败');
+                        }
+                    })
+                } catch (error) {
+                    this.loading = false;
+                    console.error('error: ', error);
+                }
             },
 
             /**
              * 修改详情
              */
             async updateCarousel(formName){
-                const params = formName;
-                await UPDATE_DETAIL(params).then((res) => {
-                    if(res.code === 200){
-                        Alert.success('修改成功');
-                        this.$emit('close', true)
-                    }else{
-                        Alert.fail(res.msg || '修改失败');
-                    }
-                })
+                try {
+                    this.loading = true;
+                    const params = formName;
+                    await UPDATE_DETAIL(params).then((res) => {
+                        this.loading = false;
+                        if(res.code === 200){
+                            Alert.success('修改成功');
+                            this.$emit('close', true)
+                        }else{
+                            Alert.fail(res.msg || '修改失败');
+                        }
+                    })
+                } catch (error) {
+                    this.loading = false;
+                    console.error('error: ', error);
+                }
             },
 
             /**

src/components/News/detailContent.vue

@@ -1,9 +1,9 @@
 <template>
 <div class="w-full line-height-36">
   <el-row :gutter="20">
-    <el-col :span="6"><div><span class="font-bold">发表时间： </span>{{ list.publishTime ? $moment(list.publishTime).format('YYYY-MM-DD HH:mm') : '暂无' }}</div></el-col>
-    <el-col :span="6"><div><span class="font-bold">创建时间： </span>{{ list.createdAt ? $moment(list.createdAt).format('YYYY-MM-DD HH:mm') : '暂无' }}</div></el-col>
-    <el-col :span="6"><div><span class="font-bold">修改时间： </span>{{ list.updatedAt ? $moment(list.updatedAt).format('YYYY-MM-DD HH:mm') : '暂无' }}</div></el-col>
+    <el-col :span="6"><div><span class="font-bold">发表时间： </span>{{ list.publishTime ? $moment(list.publishTime).format('YYYY-MM-DD') : '暂无' }}</div></el-col>
+    <el-col :span="6"><div><span class="font-bold">创建时间： </span>{{ list.createdAt ? $moment(list.createdAt).format('YYYY-MM-DD') : '暂无' }}</div></el-col>
+    <el-col :span="6"><div><span class="font-bold">修改时间： </span>{{ list.updatedAt ? $moment(list.updatedAt).format('YYYY-MM-DD') : '暂无' }}</div></el-col>
     <el-col :span="6"><div><span class="font-bold">新闻类型： </span>{{ list.showType == 1 ? '图片新闻' : list.showType == 2 ? '视频新闻' : '普通新闻' }}</div></el-col>
   </el-row>
   <div><span class="font-bold">跳转路径： </span>{{ list.jumpUrl }}</div>

src/components/News/index.vue

@@ -109,7 +109,7 @@
         </div>
 
         <el-dialog
-            width="800px"
+            width="1200px"
             :show-close="false"
             :visible.sync="showModal">
             <add-or-edit ref="distribution" :show-add="showAdd" :currList="currList" v-if="showModal" @close="close"></add-or-edit>
@@ -174,9 +174,9 @@
                         if(res.data.list && res.data.list.length){
                             this.lists = res.data.list
                         }
-                        this.pageNum = res.data.pageNum
-                        this.pageSize = res.data.pageSize
-                        this.count = res.data.size
+                        this.pageNum = +res.data.pageNum
+                        this.pageSize = +res.data.pageSize
+                        this.count = +res.data.total
                     }else{
                         Alert.fail(res.msg || '获取失败');
                     }