diff --git a/.env.development b/.env.development index e352cb4..c5a8ac9 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ VITE_OUTPUT_DIR = 'dev' VITE_PUBLIC_PATH = / #新数据接口 -VITE_APP_API_BASE_URL = "http://47.92.148.30:3003/mock/3267" +VITE_APP_API_BASE_URL = "https://dbqb.nfdxy.net/devLotApi" # Whether to open mock diff --git a/.env.production b/.env.production index 0fdc718..7a810b2 100644 --- a/.env.production +++ b/.env.production @@ -9,7 +9,7 @@ VITE_PUBLIC_PATH = /aixiaocaishen VITE_USE_MOCK = true #新数据接口 -VITE_APP_API_BASE_URL = http://47.92.148.30:3003/mock/3267 +VITE_APP_API_BASE_URL = https://dbqb.nfdxy.net/devLotApi # Whether to enable gzip or brotli compression # Optional: gzip | brotli | none diff --git a/src/api/API.js b/src/api/API.js index 186176e..6c2db42 100644 --- a/src/api/API.js +++ b/src/api/API.js @@ -2,3 +2,29 @@ import request from "../utils/request"; const APIurl = import.meta.env.VITE_APP_API_BASE_URL; +// 查询所有奖品和对应等级,按sort排序 +export const getPrizeListApi = function (params) { + return request({ + url: `/Api/api/prize/list`, + method: "POST", + data: new URLSearchParams(params), + }); +}; + +// 查询用户 +export const getUserListApi = function (params) { + return request({ + url: `/Api/api/user/list`, + method: "POST", + data: new URLSearchParams(params), + }); +}; + +// 查询中奖名单 +export const getGetPrizeUserListApi = function (params) { + return request({ + url: `/Api/admin/win/list`, + method: "POST", + data: params, + }); +}; diff --git a/src/utils/TrackballControls.js b/src/utils/TrackballControls.js index 7ea9f8b..bf70a44 100644 --- a/src/utils/TrackballControls.js +++ b/src/utils/TrackballControls.js @@ -375,7 +375,7 @@ export class TrackballControls extends THREE.EventDispatcher { event.preventDefault(); event.stopPropagation(); - return; + // return; switch (event.deltaMode) { case 2: @@ -485,7 +485,7 @@ export class TrackballControls extends THREE.EventDispatcher { this.dispose = function () { this.domElement.removeEventListener("contextmenu", contextmenu, false); this.domElement.removeEventListener("mousedown", mousedown, false); - this.domElement.removeEventListener("wheel", mousewheel, false); + // this.domElement.removeEventListener("wheel", mousewheel, false); this.domElement.removeEventListener("touchstart", touchstart, false); this.domElement.removeEventListener("touchend", touchend, false); @@ -500,7 +500,7 @@ export class TrackballControls extends THREE.EventDispatcher { this.domElement.addEventListener("contextmenu", contextmenu, false); this.domElement.addEventListener("mousedown", mousedown, false); - this.domElement.addEventListener("wheel", mousewheel, false); + // this.domElement.addEventListener("wheel", mousewheel, false); this.domElement.addEventListener("touchstart", touchstart, false); this.domElement.addEventListener("touchend", touchend, false); diff --git a/src/utils/request.js b/src/utils/request.js index e4f8432..1f0a59a 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,6 +1,5 @@ import axios from 'axios' import { ElMessage } from 'element-plus' -import { config } from '@/config' const ERROR_MESSAGES = { badRequest: '请求错误(400)', diff --git a/src/views/choujiang/hxl-cj/cj.vue b/src/views/choujiang/hxl-cj/cj.vue index 0381c39..a5707c2 100644 --- a/src/views/choujiang/hxl-cj/cj.vue +++ b/src/views/choujiang/hxl-cj/cj.vue @@ -1,7 +1,7 @@