diff --git a/activitylink/.env.development b/activitylink/.env.development index 123b1ff..21d4093 100644 --- a/activitylink/.env.development +++ b/activitylink/.env.development @@ -1,7 +1,7 @@ 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='/hljw/api/aws/upload' \ No newline at end of file +VITE_APP_BASE_API = 'https://dbqb.nfdxy.net/devLotApi' +VITE_UPLOAD_URL='http://39.101.133.168:8828/hljw/api/aws/upload' +# VITE_APP_BASE_API = 'http://localhost:12699/' \ No newline at end of file diff --git a/activitylink/.env.production b/activitylink/.env.production index 7ad2e01..9542d3a 100644 --- a/activitylink/.env.production +++ b/activitylink/.env.production @@ -2,7 +2,9 @@ VITE_ENV = 'production' VITE_OUTPUT_DIR = 'dist' VITE_PUBLIC_PATH = '/testBack/' VITE_USE_MOCK = true -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_BUILD_COMPRESS = 'none' +VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false diff --git a/activitylink/package-lock.json b/activitylink/package-lock.json index ab540ac..17b08da 100644 --- a/activitylink/package-lock.json +++ b/activitylink/package-lock.json @@ -8,6 +8,7 @@ "name": "activitylink", "version": "0.0.0", "dependencies": { + "@element-plus/icons-vue": "^2.3.1", "@vitejs/plugin-vue": "^4.6.2", "axios": "^1.10.0", "element-plus": "^2.10.4", diff --git a/activitylink/package.json b/activitylink/package.json index b2fe597..4b7951e 100644 --- a/activitylink/package.json +++ b/activitylink/package.json @@ -10,6 +10,7 @@ "preview": "vite preview" }, "dependencies": { + "@element-plus/icons-vue": "^2.3.1", "@vitejs/plugin-vue": "^4.6.2", "axios": "^1.10.0", "element-plus": "^2.10.4", diff --git a/activitylink/src/api/manage/activity.js b/activitylink/src/api/manage/activity.js index 5d48774..5eec830 100644 --- a/activitylink/src/api/manage/activity.js +++ b/activitylink/src/api/manage/activity.js @@ -49,28 +49,29 @@ export function getDetailListbyActivityId(data) { } -export function getDetailMessage(activityId){ +export function getDetailMessage(data){ return request({ url: '/admin/funding/getActivityDate', method: 'post', - params: { activityId } + data }) } -export function showsetDetail(activityId){ +export function showsetDetail(data){ return request({ url: '/admin/funding/getDate', method: 'post', - params: { activityId } + data }) } -// export function showaddDetail(activityId,stock,addTotal){ +// 更新后用的 +// export function showsetDetail(data){ // return request({ -// url: '/admin/funding/addDateVirtual', +// url: '/admin/funding/getDate', // method: 'post', -// params: { activityId,stock,addTotal } +// data // }) // } @@ -82,28 +83,37 @@ export function showaddDetail(data){ }) } -export function setTime(activityId,time){ +export function setTime(data){ return request({ url: '/admin/funding/setActivityTime', method: 'post', - params: { activityId,time } + data }) } export function getMarket(){ return request({ url: '/admin/funding/getMarketList', - method: 'get', + method: 'get' }) } +export function getMarketById(data){ + return request({ + url: '/admin/funding/getMarketList', + method: 'post', + data + }) + +} + -export function deleteActivityById(activityId) +export function deleteActivityById(data) { return request({ url: '/admin/funding/deleteActivity', method: 'post', - params: { activityId } + data }) } diff --git a/activitylink/src/api/manage/gift.js b/activitylink/src/api/manage/gift.js index b8ec0e1..c1c7fab 100644 --- a/activitylink/src/api/manage/gift.js +++ b/activitylink/src/api/manage/gift.js @@ -158,4 +158,4 @@ export const importFixUsers = (file,gradeId) => { 'Content-Type': 'multipart/form-data' } }); -}; +}; \ No newline at end of file diff --git a/activitylink/src/img/1.jpg b/activitylink/src/img/1.jpg deleted file mode 100644 index 5918b7b..0000000 Binary files a/activitylink/src/img/1.jpg and /dev/null differ diff --git a/activitylink/src/img/2.png b/activitylink/src/img/2.png new file mode 100644 index 0000000..b5afaf9 Binary files /dev/null and b/activitylink/src/img/2.png differ diff --git a/activitylink/src/img/3.png b/activitylink/src/img/3.png new file mode 100644 index 0000000..87eb901 Binary files /dev/null and b/activitylink/src/img/3.png differ diff --git a/activitylink/src/router/index.js b/activitylink/src/router/index.js index 2d35cca..e95e914 100644 --- a/activitylink/src/router/index.js +++ b/activitylink/src/router/index.js @@ -28,6 +28,11 @@ const routes = [ component: () => import('../views/zhongchou/gift/index.vue'), }, { + path: 'userManagement', // 注意这里不要加斜杠，表示相对路径 + name: 'zhongchouuser', + component: () => import('../views/zhongchou/user/index.vue'), + }, + { path: 'giftManagement/importUsers', // 注意这里不要加斜杠，表示相对路径 name: 'importUsers', component: () => import('../views/zhongchou/gift/importuser/index.vue'), diff --git a/activitylink/src/utils/request.js b/activitylink/src/utils/request.js index fc242c9..403bdfe 100644 --- a/activitylink/src/utils/request.js +++ b/activitylink/src/utils/request.js @@ -26,11 +26,4 @@ service.interceptors.response.use( return Promise.reject(error) } ) -export const uploadFile = (file) => { - const formData = new FormData(); - formData.append('file', file); - return service.post('/api/upload/hljw/api/aws/upload', formData, { - headers: {'Content-Type': 'multipart/form-data'} - }); -}; export default service \ No newline at end of file diff --git a/activitylink/src/views/homePage.vue b/activitylink/src/views/homePage.vue index 636954c..1724649 100644 --- a/activitylink/src/views/homePage.vue +++ b/activitylink/src/views/homePage.vue @@ -1,6 +1,7 @@ \ No newline at end of file diff --git a/activitylink/src/views/zhongchou/user/index.vue b/activitylink/src/views/zhongchou/user/index.vue new file mode 100644 index 0000000..915b144 --- /dev/null +++ b/activitylink/src/views/zhongchou/user/index.vue @@ -0,0 +1,189 @@ + + + + + \ No newline at end of file diff --git a/activitylink/src/views/zhongchou/winning/index.vue b/activitylink/src/views/zhongchou/winning/index.vue index fc985fb..fd3504d 100644 --- a/activitylink/src/views/zhongchou/winning/index.vue +++ b/activitylink/src/views/zhongchou/winning/index.vue @@ -107,14 +107,14 @@ const fetchWinLevelList = async () => { } const handleSizeChange = (val) => { - pagination.value.pageSize = val - pagination.value.pageNum = 1 - getPrizes() + searchParams.value.pageSize = val + searchParams.value.pageNum = 1 + fetchWinList() } const handleCurrentChange = (val) => { - pagination.value.pageNum = val - getPrizes() + searchParams.value.pageNum = val + fetchWinList() } // 获取中奖列表 const fetchWinList = async () => { diff --git a/activitylink/vite.config.js b/activitylink/vite.config.js index c23f85b..bf4b5fb 100644 --- a/activitylink/vite.config.js +++ b/activitylink/vite.config.js @@ -3,7 +3,6 @@ import vue from '@vitejs/plugin-vue'; import path from 'path'; export default defineConfig({ - // 设置打包后静态资源的基础路径为 testBack base: '/testBack/', plugins: [vue()], resolve: { @@ -14,18 +13,10 @@ export default defineConfig({ server: { proxy: { '/api': { - target: 'https://dbqb.nfdxy.net', // 后端基础地址 + target: 'https://dbqb.nfdxy.net', changeOrigin: true, - rewrite: (path) => path.replace(/^\/api/, ''), // 移除 /api 前缀 - // 或者更精确的重写（根据后端路径调整）： - // rewrite: (path) => path.replace(/^\/api\/admin/, '/admin'), + rewrite: (path) => path.replace(/^\/api/, '') }, - '/upload': { - target: 'http://39.101.133.168:8828', - changeOrigin: true, - rewrite: (path) => path.replace(/^\/upload/, ''), - } - }, - }, -}, -); \ No newline at end of file + } + } +});