From 6815d7787ca4fcb5f73ca9fe834734bb1d13c961 Mon Sep 17 00:00:00 2001
From: Leo_Ding <2405260743@qq.com>
Date: Thu, 3 Jul 2025 11:07:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=AC=E5=91=8A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=92=8C=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                          | 2 +-
 src/locales/lang/zh-CN/pages.js                   | 2 +-
 src/views/activity/components/EditDialog.vue      | 8 ++++----
 src/views/announcement/announcementList/index.vue | 9 +--------
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.env.dev b/.env.dev
index af2fe0a..f970060 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,7 +12,7 @@ VITE_ROUTER_BASE=/
 VITE_ROUTER_HISTORY=hash
 
 # api
-VITE_API_BASIC=http://10.10.1.6:8070
+VITE_API_BASIC=https://zh.shibeitong.com
 VITE_API_HTTP=/api/v1/
 # storage
 VITE_STORAGE_NAMESPACE = gin-admin_local_
\ No newline at end of file
diff --git a/src/locales/lang/zh-CN/pages.js b/src/locales/lang/zh-CN/pages.js
index cfec625..f0c388d 100644
--- a/src/locales/lang/zh-CN/pages.js
+++ b/src/locales/lang/zh-CN/pages.js
@@ -57,7 +57,7 @@ export default {
     // role
     'pages.system.role.add': '添加角色',
     'pages.system.role.edit': '编辑角色',
-    'pages.system.role.delTip': '确定删除该角色吗？',
+    'pages.system.role.delTip': '确定删除该条项目？',
     'pages.system.role.form.code': '编码',
     'pages.system.role.form.code.placeholder': '请输入编码',
     'pages.system.role.form.code.required': '编码是必填项！',
diff --git a/src/views/activity/components/EditDialog.vue b/src/views/activity/components/EditDialog.vue
index be449f0..f82edba 100644
--- a/src/views/activity/components/EditDialog.vue
+++ b/src/views/activity/components/EditDialog.vue
@@ -69,8 +69,7 @@
                         </a-col>
                         <a-col :span="24">
                             <a-form-item :label="'活动图片'" name="fileList">
-                                <gx-upload v-model="formData.fileList" accept-types=".jpg,.png,.webp" :fileNumber="20"
-                                    @uploadSuccess="uploadSuccess" />
+                                <gx-upload v-model="formData.fileList" accept-types=".jpg,.png,.webp" :fileNumber="20" />
                             </a-form-item>
                         </a-col>
                     </a-row>
@@ -91,6 +90,7 @@ import { useI18n } from 'vue-i18n'
 import dayjs from 'dayjs'
 import GxUpload from '@/components/GxUpload/index.vue'
 import { customersEnum, areaEnum } from "@/enums/useEnum"
+import {spliceUrl} from "@/utils/util"
 const emit = defineEmits(['ok'])
 const { t } = useI18n() // 解构出t方法
 const { modal, showModal, hideModal, showLoading, hideLoading } = useModal()
@@ -191,8 +191,8 @@ function handleOk() {
             showLoading()
             const params = {
                 ...values,
-                cover: fileList.value[0],
-                images:[...fileList.value]
+                cover:spliceUrl(formData.value.fileList[0]),
+                images:formData.value.fileList?formData.value.fileList.map(item=>spliceUrl(item)):[]
             }
             let result = null
             switch (modal.value.type) {
diff --git a/src/views/announcement/announcementList/index.vue b/src/views/announcement/announcementList/index.vue
index eb14ca4..a5aedf8 100644
--- a/src/views/announcement/announcementList/index.vue
+++ b/src/views/announcement/announcementList/index.vue
@@ -79,13 +79,6 @@
                        <template v-if="column.dataIndex === 'areaId'">
                             <span>{{ areaEnum.getName(record.areaId) }}</span>
                         </template>
-                     
-
-                        <template v-if="statusTypeEnum.is('disabled', record.status)">
-                            {{ dayjs(record.createdAt).format('YYYY-MM-DD HH:mm:ss') }}
-                        </template>
-
-
                         <template v-if="'createdAt' === column.dataIndex">
                             {{ dayjs(record.createdAt).format('YYYY-MM-DD HH:mm:ss') }}
                         </template>
@@ -187,7 +180,7 @@ function handleRemove({ id }) {
             return new Promise((resolve, reject) => {
                 ; (async () => {
                     try {
-                        const { success } = await apis.role.delRole(id).catch(() => {
+                        const { success } = await apis.announcement.delNotices(id).catch(() => {
                             throw new Error()
                         })
                         if (config('http.code.success') === success) {