通知与推荐功能,css样式优化
Change-Id: I33d934bfdca88b7a8e6742be2a3c7323d28ffbcf
diff --git a/src/api/administer.js b/src/api/administer.js
index d90bffa..1463d5d 100644
--- a/src/api/administer.js
+++ b/src/api/administer.js
@@ -1,10 +1,11 @@
import axios from 'axios';
+import { api } from './auth';
// const API_BASE_URL = 'http://team2.10813352.xyz:8088'; // 替换为你的后端API基础URL
export const getAllUsers = async () => {
try {
- const response = await axios.get(`/user/allUser`, {
+ const response = await api.get(`/user/allUser`, {
headers: {
Authorization: localStorage.getItem('token')
}
@@ -27,7 +28,7 @@
export const searchUsers = async (key) => {
try {
- const response = await axios.get(`/user/searchUser`, {
+ const response = await api.get(`/user/searchUser`, {
params: { key },
headers: {
Authorization: localStorage.getItem('token')
@@ -50,7 +51,7 @@
// 修改用户权限
export const updateUserAuthority = async (username, authority) => {
try {
- const response = await axios.put(`/user/changeAuthority`,
+ const response = await api.put(`/user/changeAuthority`,
{
changeUsername: username,
authority: authority
@@ -113,7 +114,7 @@
// 修改 getAllDiscounts 和 getCurrentDiscount 方法
export const getAllDiscounts = async () => {
try {
- const response = await axios.get(`/discount/all`, {
+ const response = await api.get(`/discount/all`, {
headers: {
Authorization: localStorage.getItem('token')
}
@@ -133,7 +134,7 @@
export const getCurrentDiscount = async () => {
try {
- const response = await axios.get(`/discount/current`, {
+ const response = await api.get(`/discount/current`, {
headers: {
Authorization: localStorage.getItem('token')
}
@@ -156,7 +157,7 @@
// 添加折扣
export const addDiscount = async (discountData) => {
try {
- const response = await axios.post(`/discount/add`, discountData, {
+ const response = await api.post(`/discount/add`, discountData, {
headers: {
Authorization: localStorage.getItem('token')
}
@@ -176,7 +177,7 @@
// 删除折扣
export const deleteDiscount = async (id) => {
try {
- const response = await axios.delete(`/discount/delete/${id}`, {
+ const response = await api.delete(`/discount/delete/${id}`, {
headers: {
Authorization: localStorage.getItem('token')
}
@@ -185,10 +186,15 @@
if (response.data && response.data.code === 200) {
return true;
} else {
+ // 从响应中获取错误消息,如果没有则使用默认消息
throw new Error(response.data?.message || "删除折扣失败");
}
} catch (error) {
- console.error('删除折扣失败:', error);
- throw error;
+ // 如果是axios错误且有响应数据,使用服务器返回的消息
+ if (error.response && error.response.data) {
+ throw new Error(error.response.data.message || "删除折扣失败");
+ }
+ // 否则使用axios错误消息或默认消息
+ throw new Error(error.message || "删除折扣失败");
}
};
\ No newline at end of file