From 4e2f6d3995117d4ae82c79b18fa496b2fb39627d Mon Sep 17 00:00:00 2001 From: lihuilin Date: Sun, 27 Jul 2025 10:00:44 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BC=9F=EF=BC=9F=EF=BC=9F=EF=BC=9F=EF=BC=9F?= =?UTF-8?q?=EF=BC=9F=EF=BC=9F=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- activitylink/.env.development | 7 ------ activitylink/.env.production | 22 +++++------------- activitylink/.env.test | 7 ------ activitylink/src/api/API.js | 2 +- activitylink/src/api/manage/gift.js | 3 +-- activitylink/src/api/manage/level.js | 1 - activitylink/src/utils/request.js | 4 ++-- .../views/zhongchou/gift/importFixedList/index.vue | 26 +++++++++++++++------- activitylink/src/views/zhongchou/gift/index.vue | 4 ++-- activitylink/vite.config.js | 2 +- 10 files changed, 30 insertions(+), 48 deletions(-) delete mode 100644 activitylink/.env.development delete mode 100644 activitylink/.env.test diff --git a/activitylink/.env.development b/activitylink/.env.development deleted file mode 100644 index 663e7fc..0000000 --- a/activitylink/.env.development +++ /dev/null @@ -1,7 +0,0 @@ -VITE_ENV = 'development' -VITE_OUTPUT_DIR = 'dev' -VITE_PUBLIC_PATH = '/testBack/' -VITE_APP_BASE_API = 'https://dbqb.nfdxy.net/devLotApi/' -# VITE_APP_BASE_API = 'http://localhost:12699' -VITE_USE_MOCK = true -VITE_UPLOAD_URL='http://39.101.133.168:8828/hljw/api/aws/upload' diff --git a/activitylink/.env.production b/activitylink/.env.production index 80b1c0f..13c65f5 100644 --- a/activitylink/.env.production +++ b/activitylink/.env.production @@ -1,18 +1,6 @@ -# VITE_ENV = 'production' -# VITE_OUTPUT_DIR = 'dist' -# VITE_PUBLIC_PATH = '/prodBack/' -# VITE_USE_MOCK = true -# VITE_UPLOAD_URL='https://api.homilychart.com/hljw/api/aws/upload' -# VITE_APP_BASE_API = 'https://dbqb.nfdxy.net/devLotApi' -# VITE_BUILD_COMPRESS = 'none' -# VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false -# VITE_UPLOAD_URL='https://api.homilychart.com/hljw/api/aws/upload' -# VITE_APP_BASE_API = 'https://dbqb.nfdxy.net/devLotApi/' - -VITE_ENV = 'test' -VITE_OUTPUT_DIR = 'dist' -VITE_PUBLIC_PATH = '/testBack/' -VITE_APP_BASE_API = 'https://dbqb.nfdxy.net/devLotApi/' +VITE_ENV = 'production' +VITE_PUBLIC_PATH = '/prodBack/' VITE_USE_MOCK = true -# VITE_UPLOAD_URL='http://39.101.133.168:8828/hljw/api/aws/upload' -VITE_UPLOAD_URL='https://api.homilychart.com/hljw/api/aws/upload' \ No newline at end of file +# VITE_APP_BASE_API = 'https://hwjb.homilychart.com/devLotApi/' +VITE_APP_BASE_API = 'http://localhost:12699/devLotApi' +# VITE_UPLOAD_URL='https://api.homilychart.com/hljw/api/aws/upload' \ No newline at end of file diff --git a/activitylink/.env.test b/activitylink/.env.test deleted file mode 100644 index 4e76d2d..0000000 --- a/activitylink/.env.test +++ /dev/null @@ -1,7 +0,0 @@ -VITE_ENV = 'test' -VITE_OUTPUT_DIR = 'dist' -VITE_PUBLIC_PATH = '/testBack/' -VITE_APP_BASE_API = 'https://dbqb.nfdxy.net/devLotApi/' -VITE_USE_MOCK = true -# VITE_UPLOAD_URL='http://39.101.133.168:8828/hljw/api/aws/upload' -VITE_UPLOAD_URL='https://api.homilychart.com/hljw/api/aws/upload' \ No newline at end of file diff --git a/activitylink/src/api/API.js b/activitylink/src/api/API.js index 186176e..051dae8 100644 --- a/activitylink/src/api/API.js +++ b/activitylink/src/api/API.js @@ -1,4 +1,4 @@ import request from "../utils/request"; -const APIurl = import.meta.env.VITE_APP_API_BASE_URL; +const APIurl = import.meta.env.VITE_APP_BASE_API; diff --git a/activitylink/src/api/manage/gift.js b/activitylink/src/api/manage/gift.js index c32a17e..f18db56 100644 --- a/activitylink/src/api/manage/gift.js +++ b/activitylink/src/api/manage/gift.js @@ -1,9 +1,8 @@ import request from '@/utils/request' -const baseUrl = import.meta.env.VITE_APP_BASE_API //奖品新增 export function addPrize(data) { return request({ - url: baseUrl+'/admin/prize/add', + url: '/admin/prize/add', method: 'post', data: data, headers: { diff --git a/activitylink/src/api/manage/level.js b/activitylink/src/api/manage/level.js index 73210f3..d16213e 100644 --- a/activitylink/src/api/manage/level.js +++ b/activitylink/src/api/manage/level.js @@ -1,6 +1,5 @@ import request from '@/utils/request' -const baseUrl = import.meta.env.VITE_APP_BASE_API // 等级查询 export function getLevelList(data) { return request({ diff --git a/activitylink/src/utils/request.js b/activitylink/src/utils/request.js index dbce302..97ccc8d 100644 --- a/activitylink/src/utils/request.js +++ b/activitylink/src/utils/request.js @@ -7,10 +7,10 @@ import router from '@/router' // 创建基础实例 // const router = useRouter() const service = axios.create({ - baseURL: import.meta.env.VITE_APP_BASE_API, + baseURL: 'http://localhost:12699', timeout: 10000 }) - +// import.meta.env.VITE_APP_BASE_API // 请求拦截器 service.interceptors.request.use( (config) => { diff --git a/activitylink/src/views/zhongchou/gift/importFixedList/index.vue b/activitylink/src/views/zhongchou/gift/importFixedList/index.vue index 54cc367..0df4511 100644 --- a/activitylink/src/views/zhongchou/gift/importFixedList/index.vue +++ b/activitylink/src/views/zhongchou/gift/importFixedList/index.vue @@ -35,8 +35,9 @@ - -
+
+ +
批量删除
- @@ -133,17 +133,27 @@ const handleFileChange = async (e) => { // 查全部 const getFixUsers = async () => { try { - const res = await getFixUserList({ + const data = { username: searchObj.value.username, jwcode: searchObj.value.jwcode, - pageNum: pagination.value.pageNum, - pageSize: pagination.value.pageSize, - gradeId: gradeId.value - }) + gradeId: gradeId.value, + + // 0x3f3f3f3f + } + if(data.jwcode || data.username){ + data.pageNum = pagination.value.pageNum + data.pageSize = 0x3f3f3f3f + }else{ + data.pageNum = pagination.value.pageNum, + data.pageSize = pagination.value.pageSize + } + const res = await getFixUserList(data ) + if (res.code === 200) { tableData.value = res.data.list pagination.value.total = res.data.total + console.log('总条数',res.data.total) } else { ElMessage.error(res.message || '获取数据失败') } diff --git a/activitylink/src/views/zhongchou/gift/index.vue b/activitylink/src/views/zhongchou/gift/index.vue index b7c9928..dc9a6b1 100644 --- a/activitylink/src/views/zhongchou/gift/index.vue +++ b/activitylink/src/views/zhongchou/gift/index.vue @@ -147,7 +147,7 @@ const editForm = ref({ gradeId: null, imageUrl: null }) -const uploadUrl = import.meta.env.VITE_UPLOAD_URL +const uploadUrl = 'https://api.homilychart.com/hljw/api/aws/upload' const formRef = ref(null) const uploadRef = ref(null) @@ -329,7 +329,7 @@ const customUpload = async (options) => { const formData = new FormData(); formData.append('file', options.file); - const response = await axios.post(import.meta.env.VITE_UPLOAD_URL, formData, { + const response = await axios.post(uploadUrl, formData, { headers: { 'Content-Type': 'multipart/form-data', 'Authorization': `Bearer ${localStorage.getItem('token')}` diff --git a/activitylink/vite.config.js b/activitylink/vite.config.js index 36e8f7e..d364988 100644 --- a/activitylink/vite.config.js +++ b/activitylink/vite.config.js @@ -13,7 +13,7 @@ export default defineConfig({ server: { proxy: { '/api': { - target: 'https://dbqb.nfdxy.net', + target: 'https://hwjb.homilychart.com/devLotApi/', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') },