From 6f83ecd9f96bd531a1bff7dfcafd56f8cce65e8a Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 9 Jan 2025 16:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=85=AC=E5=85=B1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=B1=BB=E5=9E=8B=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/index.js           |  4 ++--
 src/views/message/message.vue | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/config/index.js b/src/config/index.js
index 68aed2a..73cd2bd 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -4,8 +4,8 @@ export const productUrl='dj-admin';
 // const baseUrl = "http://192.168.1.7:8100/czg/"
 //  const baseUrl = "https://api.tianjinzhitongdaohe.com/czg/"
 
- const baseUrl = "https://web-api.hnsiyao.cn/czg/" //测试
-// const baseUrl = "https://web.hnsiyao.cn/czg/" // 线上
+//  const baseUrl = "https://web-api.hnsiyao.cn/czg/" //测试
+const baseUrl = "https://web.hnsiyao.cn/czg/" // 线上
 
 export default{
     baseUrl
diff --git a/src/views/message/message.vue b/src/views/message/message.vue
index 50f4db2..4962993 100644
--- a/src/views/message/message.vue
+++ b/src/views/message/message.vue
@@ -16,7 +16,12 @@
         <el-table v-loading="tableDataLoading" :data="tableData.list">
           <el-table-column prop="id" label="编号" width="80"> </el-table-column>
           <el-table-column prop="title" label="标题"> </el-table-column>
-          <el-table-column prop="content" label="内容">
+          <el-table-column prop="title" label="类型">
+			<template slot-scope="scope">
+				<div>{{ returnType(scope.row) }}</div>
+			</template>
+			 </el-table-column>
+          <el-table-column prop="content" label="内容" width="480">
             <template slot-scope="scope">
 				<div v-html="scope.row.content"></div>
 			</template>
@@ -359,10 +364,12 @@
 <script>
 import {$announcement} from '@/api/announcement';
 import  popAddMessage from './components/pop-add-message.vue';
+import {$types} from './data.js';
 	export default {
 		components:{popAddMessage},
 		data() {
 			return {
+				noticeTypes: $types,
 				limit: 10,
 				page: 1,
 				state: 1,
@@ -417,6 +424,10 @@ import  popAddMessage from './components/pop-add-message.vue';
 			}
 		},
 		methods: {
+			returnType(row) {
+				const item=this.noticeTypes.find(item => item.value == row.type)
+				return item.label
+			},
 			dialogMessageUpdate(e,item){
 				$announcement.update({...item,state:e}).then(({
 					data