From efd7d00fa98364185a45c8b8d7ba4c616d094ee3 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 5 Aug 2022 10:03:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=97=BB=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/AppNewsCenter/AppNewsCenter.vue      |  6 +--
 .../apps/AppNewsCenter/components/detail.vue  | 43 -------------------
 .../AppNewsCenter/components/newsDetail.vue   |  6 +--
 .../AppNewsCenter/components/newsList.vue     | 12 ++++--
 .../AppNewsCenter/components/videoDetail.vue  |  4 +-
 5 files changed, 16 insertions(+), 55 deletions(-)
 delete mode 100644 project/xiushan/apps/AppNewsCenter/components/detail.vue

diff --git a/project/xiushan/apps/AppNewsCenter/AppNewsCenter.vue b/project/xiushan/apps/AppNewsCenter/AppNewsCenter.vue
index 571e5298..78b424e2 100644
--- a/project/xiushan/apps/AppNewsCenter/AppNewsCenter.vue
+++ b/project/xiushan/apps/AppNewsCenter/AppNewsCenter.vue
@@ -15,7 +15,7 @@
 
 <script>
 import {mapState} from 'vuex'
-import {addArticle, addVideo, newsDetail, newsList, videoDetail, detail} from './components'
+import {addArticle, addVideo, newsDetail, newsList, videoDetail} from './components'
 
 export default {
   name: 'AppNewsCenter',
@@ -30,8 +30,7 @@ export default {
     addVideo,
     addArticle,
     newsDetail,
-    videoDetail,
-    detail
+    videoDetail
   },
   data() {
     return {
@@ -52,7 +51,6 @@ export default {
           addArticle: addArticle,
           newsDetail: newsDetail,
           videoDetail: videoDetail,
-          detail: detail,
         },
       ]
     },
diff --git a/project/xiushan/apps/AppNewsCenter/components/detail.vue b/project/xiushan/apps/AppNewsCenter/components/detail.vue
deleted file mode 100644
index 0a76299a..00000000
--- a/project/xiushan/apps/AppNewsCenter/components/detail.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-  <ai-detail class="detail">
-    <template slot="title">
-      <ai-title title="详情" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="$emit('goBack')"></ai-title>
-    </template>
-    <template slot="content">
-      <!-- <div v-html=""></div> -->
-    </template>
-  </ai-detail>
-</template>
-
-<script>
-export default {
-  name: 'detail',
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-    detail: Object,
-  },
-  data() {
-    return {
-      id: ''
-    }
-  },
-  
-  methods: {
-    getDetail() {
-      this.id = this.$route.query.id
-      this.id && this.instance.post(``, null, {
-        params: {id: this.id}
-      }).then(res => {
-        if (res?.data) {
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style>
-
-</style>
\ No newline at end of file
diff --git a/project/xiushan/apps/AppNewsCenter/components/newsDetail.vue b/project/xiushan/apps/AppNewsCenter/components/newsDetail.vue
index bb33c6ae..e35d7eca 100644
--- a/project/xiushan/apps/AppNewsCenter/components/newsDetail.vue
+++ b/project/xiushan/apps/AppNewsCenter/components/newsDetail.vue
@@ -9,14 +9,14 @@
           <h2>{{ detail.title }}</h2>
           <p class="subTitle">类型：{{ dict.getLabel('appNewsCategory', +detail.category) }}</p>
         </template>
-        <template slot="right">
+        <!-- <template slot="right">
           <el-button type="text" size="small" icon="iconfont iconEdit" @click="handleEdit">修改</el-button>
-        </template>
+        </template> -->
         <template #content>
           <ai-article :value="detail.content"></ai-article>
         </template>
       </ai-card>
-      <ai-card title="封面信息">
+      <ai-card title="封面信息" v-show="detail.thumbUrl">
         <template #content>
           <div class="content">
             <div class="img">
diff --git a/project/xiushan/apps/AppNewsCenter/components/newsList.vue b/project/xiushan/apps/AppNewsCenter/components/newsList.vue
index b4c5799a..fb8f8ff9 100644
--- a/project/xiushan/apps/AppNewsCenter/components/newsList.vue
+++ b/project/xiushan/apps/AppNewsCenter/components/newsList.vue
@@ -46,7 +46,7 @@
               <el-button type="text" title="取消发布" v-if="row.status=='1' && permissions('app_appnews_status')" @click="changeStatus(row)">取消发布</el-button>
               <el-button type="text" v-if="row.status=='0' && permissions('app_appnews_status')" title="发布" @click="changeStatus(row)">发布</el-button>
               <el-button type="text" @click="handleEdit(row)" v-if="permissions('app_appnews_edit')">编辑</el-button>
-              <el-button type="text" @click="handleDetail(row.id)" v-if="permissions('app_appnews_detail')">详情</el-button>
+              <el-button type="text" @click="handleDetail(row)" v-if="permissions('app_appnews_view')">详情</el-button>
               <el-button type="text" @click="handleDelete(row)" v-if="permissions('app_appnews_del')">删除</el-button>
             </div>
           </template>
@@ -150,9 +150,15 @@ export default {
       this.$confirm(msg).then(() => this.changeInfo(row));
     },
 
-    handleDetail(id) {
-      this.$emit("goPage", {key: "detail", id});
+    handleDetail(row) {
+      if(row.type == 0) {
+        this.$emit("goPage", {key: "newsDetail", row});
+      } else if(row.type == 1) {
+        this.$emit("goPage", {key: "videoDetail", row});
+      }
+      
     },
+
     /**
      * 删除新闻
      * */
diff --git a/project/xiushan/apps/AppNewsCenter/components/videoDetail.vue b/project/xiushan/apps/AppNewsCenter/components/videoDetail.vue
index 3fa1b61d..a738dd1b 100644
--- a/project/xiushan/apps/AppNewsCenter/components/videoDetail.vue
+++ b/project/xiushan/apps/AppNewsCenter/components/videoDetail.vue
@@ -5,9 +5,9 @@
     </template>
     <template slot="content">
       <ai-card title="视频信息">
-        <template slot="right">
+        <!-- <template slot="right">
           <el-button type="text" icon="iconfont iconEdit" @click="handleEdit">修改</el-button>
-        </template>
+        </template> -->
         <template #content>
           <ai-wrapper
               :columnsNumber="1">