解决冲突

package-lock.json

@@ -748,6 +748,19 @@
         "proxy-from-env": "^1.1.0"
       }
     },
+    "node_modules/binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/birpc": {
       "version": "2.4.0",
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/birpc/-/birpc-2.4.0.tgz",
@@ -1216,6 +1229,52 @@
       "resolved": "https://registry.npmmirror.com/hookable/-/hookable-5.5.3.tgz",
       "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ=="
     },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
     "node_modules/is-what": {
       "version": "4.1.16",
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/is-what/-/is-what-4.1.16.tgz",
@@ -1350,6 +1409,13 @@
         "pathe": "^2.0.1"
       }
     },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/nanoid": {
       "version": "3.3.11",
       "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.11.tgz",
@@ -1487,6 +1553,49 @@
       "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
+    "node_modules/quansync": {
+      "version": "0.2.10",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/quansync/-/quansync-0.2.10.tgz",
+      "integrity": "sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/antfu"
+        },
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/sxzz"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/readdirp/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/rfdc": {
       "version": "1.4.1",
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/rfdc/-/rfdc-1.4.1.tgz",
@@ -1558,9 +1667,10 @@
       }
     },
     "node_modules/three": {
-      "version": "0.150.1",
-      "resolved": "https://registry.npmmirror.com/three/-/three-0.150.1.tgz",
-      "integrity": "sha512-5C1MqKUWaHYo13BX0Q64qcdwImgnnjSOFgBscOzAo8MYCzEtqfQqorEKMcajnA3FHy1yVlIe9AmaMQ0OQracNA=="
+      "version": "0.178.0",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/three/-/three-0.178.0.tgz",
+      "integrity": "sha512-ybFIB0+x8mz0wnZgSGy2MO/WCO6xZhQSZnmfytSPyNpM0sBafGRVhdaj+erYh5U+RhQOAg/eXqw5uVDiM2BjhQ==",
+      "license": "MIT"
     },
     "node_modules/tinyglobby": {
       "version": "0.2.14",
@@ -1579,6 +1689,19 @@
         "url": "https://github.com/sponsors/SuperchupuDev"
       }
     },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
     "node_modules/ufo": {
       "version": "1.6.1",
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/ufo/-/ufo-1.6.1.tgz",
@@ -2256,6 +2379,12 @@
         "proxy-from-env": "^1.1.0"
       }
     },
+    "binary-extensions": {
+      "version": "2.3.0",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+      "dev": true
+    },
     "birpc": {
       "version": "2.4.0",
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/birpc/-/birpc-2.4.0.tgz",
@@ -2565,9 +2694,39 @@
     },
     "hookable": {
       "version": "5.5.3",
-      "resolved": "https://mirrors.huaweicloud.com/repository/npm/hookable/-/hookable-5.5.3.tgz",
+      "resolved": "https://registry.npmmirror.com/hookable/-/hookable-5.5.3.tgz",
       "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ=="
     },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
     "is-what": {
       "version": "4.1.16",
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/is-what/-/is-what-4.1.16.tgz",
@@ -2639,7 +2798,7 @@
     },
     "mitt": {
       "version": "3.0.1",
-      "resolved": "https://mirrors.huaweicloud.com/repository/npm/mitt/-/mitt-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/mitt/-/mitt-3.0.1.tgz",
       "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw=="
     },
     "mlly": {
@@ -2673,6 +2832,12 @@
         }
       }
     },
+    "ms": {
+      "version": "2.1.3",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true
+    },
     "nanoid": {
       "version": "3.3.11",
       "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.11.tgz",
@@ -2686,7 +2851,7 @@
     },
     "normalize-wheel-es": {
       "version": "1.2.0",
-      "resolved": "https://mirrors.huaweicloud.com/repository/npm/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz",
       "integrity": "sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw=="
     },
     "pathe": {
@@ -2702,7 +2867,7 @@
     },
     "picocolors": {
       "version": "1.1.1",
-      "resolved": "https://mirrors.huaweicloud.com/repository/npm/picocolors/-/picocolors-1.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.1.1.tgz",
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
     },
     "picomatch": {
@@ -2717,6 +2882,16 @@
       "integrity": "sha512-ttXO/InUULUXkMHpTdp9Fj4hLpD/2AoJdmAbAeW2yu1iy1k+pkFekQXw5VpC0/5p51IOR/jDaDRfRWRnMMsGOA==",
       "requires": {
         "@vue/devtools-api": "^7.7.2"
+      },
+      "dependencies": {
+        "@vue/devtools-api": {
+          "version": "7.7.7",
+          "resolved": "https://mirrors.huaweicloud.com/repository/npm/@vue/devtools-api/-/devtools-api-7.7.7.tgz",
+          "integrity": "sha512-lwOnNBH2e7x1fIIbVT7yF5D+YWhqELm55/4ZKf45R9T8r9dE2AIOy8HKjfqzGsoTHFbWbr337O4E0A0QADnjBg==",
+          "requires": {
+            "@vue/devtools-kit": "^7.7.7"
+          }
+        }
       }
     },
     "pkg-types": {
@@ -2742,9 +2917,32 @@
     },
     "proxy-from-env": {
       "version": "1.1.0",
-      "resolved": "https://mirrors.huaweicloud.com/repository/npm/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
+    "quansync": {
+      "version": "0.2.10",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/quansync/-/quansync-0.2.10.tgz",
+      "integrity": "sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==",
+      "dev": true
+    },
+    "readdirp": {
+      "version": "3.6.0",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+      "dev": true,
+      "requires": {
+        "picomatch": "^2.2.1"
+      },
+      "dependencies": {
+        "picomatch": {
+          "version": "2.3.1",
+          "resolved": "https://mirrors.huaweicloud.com/repository/npm/picomatch/-/picomatch-2.3.1.tgz",
+          "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+          "dev": true
+        }
+      }
+    },
     "rfdc": {
       "version": "1.4.1",
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/rfdc/-/rfdc-1.4.1.tgz",
@@ -2792,9 +2990,9 @@
       }
     },
     "three": {
-      "version": "0.150.1",
-      "resolved": "https://registry.npmmirror.com/three/-/three-0.150.1.tgz",
-      "integrity": "sha512-5C1MqKUWaHYo13BX0Q64qcdwImgnnjSOFgBscOzAo8MYCzEtqfQqorEKMcajnA3FHy1yVlIe9AmaMQ0OQracNA=="
+      "version": "0.178.0",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/three/-/three-0.178.0.tgz",
+      "integrity": "sha512-ybFIB0+x8mz0wnZgSGy2MO/WCO6xZhQSZnmfytSPyNpM0sBafGRVhdaj+erYh5U+RhQOAg/eXqw5uVDiM2BjhQ=="
     },
     "tinyglobby": {
       "version": "0.2.14",
@@ -2806,6 +3004,15 @@
         "picomatch": "^4.0.2"
       }
     },
+    "to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://mirrors.huaweicloud.com/repository/npm/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "requires": {
+        "is-number": "^7.0.0"
+      }
+    },
     "ufo": {
       "version": "1.6.1",
       "resolved": "https://mirrors.huaweicloud.com/repository/npm/ufo/-/ufo-1.6.1.tgz",

src/api/API.js

@@ -5,7 +5,7 @@ const APIurl = import.meta.env.VITE_APP_API_BASE_URL;
 // 查询所有奖品和对应等级,按sort排序
 export const getPrizeListApi = function (params) {
   return request({
-    url: `/Api/api/prize/list`,
+    url: `${APIurl}/api/prize/list`,
     method: "POST",
     data: new URLSearchParams(params),
   });
@@ -14,7 +14,7 @@ export const getPrizeListApi = function (params) {
 // 查询用户
 export const getUserListApi = function (params) {
   return request({
-    url: `/Api/api/user/list`,
+    url: `${APIurl}/api/user/list`,
     method: "POST",
     data: new URLSearchParams(params),
   });
@@ -23,7 +23,7 @@ export const getUserListApi = function (params) {
 // 查询中奖名单
 export const getGetPrizeUserListApi = function (params) {
   return request({
-    url: `/Api/admin/win/list`,
+    url: `${APIurl}/admin/win/list`,
     method: "POST",
     data: params,
   });
@@ -32,7 +32,7 @@ export const getGetPrizeUserListApi = function (params) {
 // 开始抽奖
 export const startLotteryApi = function (params) {
   return request({
-    url: `/Api/api/lottery/start`,
+    url: `${APIurl}/api/lottery/start`,
     method: "POST",
     data: params,
   });
@@ -41,7 +41,7 @@ export const startLotteryApi = function (params) {
 // 新增：每轮抽奖接口
 export function drawLottery(data) {
   return request({
-    url: "/lottery/start",
+    url: `${APIurl}/api/lottery/start`,
     method: "post",
     data: {
       gradeName: data.gradeName,

src/views/choujiang/Login.vue

@@ -55,7 +55,7 @@ const handleLogin = () => {
   position: fixed; /* 使用fixed定位确保背景图片覆盖整个页面 */
   top: 0;
   left: 0;
-  z-index: -1; /* 确保背景图片在其他内容下方 */
+  /* z-index: -1; 确保背景图片在其他内容下方 */
 }
 
 .login-card {

src/views/choujiang/hxl-cj/cj.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="homepage">
-    <img src="../../../assets/img/麒麟.png" alt="麒麟" class="hllogo" />
+    <img src="../../../assets/qilin.webp" alt="麒麟" class="hllogo" />
     <div class="music" @click="musicPlay()">
       <audio id="music" :src="musicFile" class="music-item" loop></audio>
       <div id="musicBox" class="music-box" title="播放/暂停背景音乐">Music</div>

src/views/choujiang/lottery/Lottery3D.vue

@@ -18,7 +18,14 @@
 </template>
 
 <script setup>
-import { ref, onMounted, onBeforeUnmount, defineExpose, watch, computed } from "vue";
+import {
+  ref,
+  onMounted,
+  onBeforeUnmount,
+  defineExpose,
+  watch,
+  computed,
+} from "vue";
 import * as THREE from "three";
 import {
   CSS3DRenderer,
@@ -38,8 +45,6 @@ const winners = computed({
   set: (val) => lotteryStore.setWinners(val),
 });
 
-
-
 const threeContainer = ref(null);
 let renderer, scene, camera, animationId;
 // let controls; // 移除controls
@@ -349,7 +354,7 @@ function switchPage(direction) {
     let targetY;
     if (isVisible) {
       // 当前页要显示的卡片
-      if (direction === 'next') {
+      if (direction === "next") {
         // 索引增大：从下方飞出
         targetY = pageLocate.y;
       } else {
@@ -358,7 +363,7 @@ function switchPage(direction) {
       }
     } else {
       // 当前页要隐藏的卡片
-      if (direction === 'next') {
+      if (direction === "next") {
         // 索引增大：向上飞走
         targetY = pageLocate.y + 1000;
       } else {
@@ -374,7 +379,7 @@ function switchPage(direction) {
       startY = object.position.y;
     } else {
       // 非当前页的卡片从隐藏位置开始
-      if (direction === 'next') {
+      if (direction === "next") {
         // 索引增大：从下方开始
         startY = pageLocate.y - 1000;
       } else {
@@ -412,7 +417,6 @@ function switchPage(direction) {
     .start();
 }
 
-
 // 鼠标滚轮事件处理
 function handleWheel(event) {
   if (isPageTransitioning || totalPages.value <= 1) return;
@@ -566,7 +570,7 @@ function changeCard1() {
     }
 
     // 移除prize类，让CardItem组件的样式重新生效
-    card.classList.remove('prize');
+    card.classList.remove("prize");
   });
   // 清空数组
   globalCardIndexes = [];
@@ -657,7 +661,7 @@ function getTotalCards() {
   return threeDCards.length;
 }
 
-  onMounted( async () => {
+onMounted(async () => {
   // 初始化 3D 场景
   scene = new THREE.Scene();
   camera = new THREE.PerspectiveCamera(
@@ -677,23 +681,41 @@ function getTotalCards() {
   }
 
   // 2. 生成高亮坐标（以数字8为例）
-  const highlightCells = NUMBER_MATRIX["0"].map(([x, y]) => `${x}-${y}`);
+  let text = "0123";
+  let step = 5;
+  let xoffset = 1;
+  let yoffset = 1;
+  let highlight = [];
+  text.split("").forEach((n) => {
+    highlight = highlight.concat(
+      NUMBER_MATRIX[n].map((item) => {
+        return `${item[0] + xoffset}-${item[1] + yoffset}`;
+      })
+    );
+    xoffset += step;
+  });
+  // const highlightCells = NUMBER_MATRIX["0"].map(([x, y]) => `${x}-${y}`);
   const config = {
     ROW_COUNT: 7, // 数字矩阵是5行
-    COLUMN_COUNT: 20, // 数字矩阵是4列
-    HIGHLIGHT_CELL: highlightCells,
+    COLUMN_COUNT: 21, // 数字矩阵是4列
+    HIGHLIGHT_CELL: highlight,
     COMPANY: "演示公司",
   };
 
-    
-    const userList = await getUserList();
+  const userList = await getUserListApi();
   // lotteryStore.setWinners(userList);
   // console.log("userList", userList);
   // 将用户数据转换为兼容格式，用于3D卡片显示
-  const member = userList.data.map(item => [item.jwcode, item.username, "PSST"]);
+  const member = userList.data.map((item) => [
+    item.jwcode,
+    item.username,
+    "PSST",
+  ]);
 
   // 将用户列表存储到store中，用于卡牌文字切换
-  const userNames = userList.data.map(item => item.jwcode || item.username || "");
+  const userNames = userList.data.map(
+    (item) => item.jwcode || item.username || ""
+  );
   lotteryStore.setAllUsers(userNames);
 
   const length = member.length;
@@ -800,7 +822,7 @@ defineExpose({
   animation: fadeInOut 2s ease-in-out infinite;
 }
 
-.price-font{
+.price-font {
   font-size: 16px;
   font-weight: bold;
   color: #ffffff;

src/views/choujiang/lottery/dataManager.js

@@ -27,7 +27,7 @@ export function useDataManager() {
 
   async function getBasicData() {
     // 获取奖品列表
-    const prizeList = await getPrizeList();
+    const prizeList = await getPrizeListApi();
     const fakePrizes = prizeList.data.map((item, index) => ({
       type: index, // 使用索引作为type
       title: item.gradeName,
@@ -45,7 +45,7 @@ export function useDataManager() {
     });
     
     // 获取真实用户数据
-    const userListResponse = await getUserList();
+    const userListResponse = await getUserListApi();
     console.log("userList", userListResponse);
     
     // 将后端返回的用户数据转换为兼容格式
@@ -76,7 +76,7 @@ export function useDataManager() {
   }
 
   async function getUsers() {
-    const userList = await getUserList();
+    const userList = await getUserListApi();
     console.log("userList", userList);
     
     // 将后端返回的用户数据转换为兼容格式