？？？？？？？？

activitylink/.env.development

@@ -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'

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'
+# 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'

activitylink/.env.test

@@ -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'

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;
 

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: {

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({

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) => {

activitylink/src/views/zhongchou/gift/importFixedList/index.vue

@@ -35,8 +35,9 @@
         </template>
       </el-table-column>
     </el-table>
-    <!-- 底部操作区域 -->
-    <div style="margin-top: 20px; display: flex; justify-content: space-between; align-items: center;">
+    </div>
+        <!-- 底部操作区域 -->
+        <div style="margin-top: 20px; display: flex; justify-content: space-between; align-items: center;">
       <el-button type="danger" @click="batchDelete">批量删除</el-button>
       <!-- 分页 -->
       <el-pagination class="pagination" v-model:current-page="pagination.pageNum"
@@ -44,7 +45,6 @@
         :total="pagination.total" :page-sizes="[10, 20, 50, 100]" @size-change="handleSizeChange"
         @current-change="handleCurrentChange" />
     </div>
-    </div>
   </el-card>
   <el-dialog v-model="addVisible" title="添加用户" width="500" align-center>
     <el-form :model="addObj" label-width="80px">
@@ -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 || '获取数据失败')
     }

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')}`

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/, '')
       },