Merge branch 'milestone-20250722-抽奖' into milestone-20250722-众筹抽奖合并专用分支

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

@@ -282,7 +282,7 @@ const totalPage = ref(10);
 
 const openGetPrize = async () => {
   if (!prizes.value[prizes.value.length - 1].isLook) {
-    addQipao("请先揭晓奖品。");
+    addQipao("请先揭晓奖品");
     return;
   }
 
@@ -374,7 +374,7 @@ const rightPage = async (item) => {
 const lookPrize = async (item) => {
   // 未进入抽奖禁止揭晓
   if (!joinLottery) {
-    addQipao("请先进入抽奖。");
+    addQipao("请先进入抽奖");
     return;
   }
   // 如果已经揭示，那返回
@@ -680,7 +680,6 @@ const createCard = (user, isBold, id) => {
 
 const removeHighlight = async () => {
   document.querySelectorAll(".highlight").forEach((node) => {
-    console.log(node.id);
     node.className = "";
     node.classList.add("element");
     node.style.backgroundColor = "rgb(255,170,22)";
@@ -1111,11 +1110,16 @@ const lotteryBtn = () => {
   }
 
   if (!currentPrize.value.isLook) {
-    addQipao("请先揭秘礼品。");
+    addQipao("请先揭秘礼品");
     return;
   }
   if (currentPrize.value.leftCount <= 0) {
-    addQipao("该礼品已抽取完毕，请揭秘下一个礼品。");
+    if (currentPrize.value.type == 0) {
+      addQipao("所以礼品都已抽取完毕");
+    } else {
+      addQipao("该礼品已抽取完毕，请揭秘下一个礼品");
+    }
+
     return;
   }
 

vite.config.js.timestamp-1753077096347-78067037e45f7.mjs

@@ -1,22 +0,0 @@
-// vite.config.js
-import { defineConfig } from "file:///E:/hxl/gitFile/activityLink/node_modules/vite/dist/node/index.js";
-import vue from "file:///E:/hxl/gitFile/activityLink/node_modules/@vitejs/plugin-vue/dist/index.mjs";
-var vite_config_default = defineConfig({
-  plugins: [
-    vue()
-  ],
-  server: {
-    proxy: {
-      "/Api": {
-        target: "https://dbqb.nfdxy.net/devLotApi",
-        // target: 'http://localhost:8080',
-        changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/Api/, "")
-      }
-    }
-  }
-});
-export {
-  vite_config_default as default
-};
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcuanMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbImNvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lID0gXCJFOlxcXFxoeGxcXFxcZ2l0RmlsZVxcXFxhY3Rpdml0eUxpbmtcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZmlsZW5hbWUgPSBcIkU6XFxcXGh4bFxcXFxnaXRGaWxlXFxcXGFjdGl2aXR5TGlua1xcXFx2aXRlLmNvbmZpZy5qc1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9pbXBvcnRfbWV0YV91cmwgPSBcImZpbGU6Ly8vRTovaHhsL2dpdEZpbGUvYWN0aXZpdHlMaW5rL3ZpdGUuY29uZmlnLmpzXCI7aW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSAndml0ZSdcbmltcG9ydCB2dWUgZnJvbSAnQHZpdGVqcy9wbHVnaW4tdnVlJ1xuXG4vLyBodHRwczovL3ZpdGUuZGV2L2NvbmZpZy9cbi8vIGV4cG9ydCBkZWZhdWx0IGRlZmluZUNvbmZpZyh7XG4vLyAgIHBsdWdpbnM6IFt2dWUoKV0sXG4vLyB9KVxuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmVDb25maWcoe1xuICBwbHVnaW5zOiBbXG4gICAgdnVlKCksXG4gIF0sXG4gIHNlcnZlcjoge1xuICAgIHByb3h5OiB7XG4gICAgICAnL0FwaSc6IHtcbiAgICAgICAgdGFyZ2V0OiAnaHR0cHM6Ly9kYnFiLm5mZHh5Lm5ldC9kZXZMb3RBcGknLFxuICAgICAgICAvLyB0YXJnZXQ6ICdodHRwOi8vbG9jYWxob3N0OjgwODAnLFxuICAgICAgICBjaGFuZ2VPcmlnaW46IHRydWUsXG4gICAgICAgIHJld3JpdGU6IChwYXRoKSA9PiBwYXRoLnJlcGxhY2UoL15cXC9BcGkvLCAnJylcbiAgICAgIH1cbiAgICB9XG4gIH1cbn0pXG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQTJRLFNBQVMsb0JBQW9CO0FBQ3hTLE9BQU8sU0FBUztBQU9oQixJQUFPLHNCQUFRLGFBQWE7QUFBQSxFQUMxQixTQUFTO0FBQUEsSUFDUCxJQUFJO0FBQUEsRUFDTjtBQUFBLEVBQ0EsUUFBUTtBQUFBLElBQ04sT0FBTztBQUFBLE1BQ0wsUUFBUTtBQUFBLFFBQ04sUUFBUTtBQUFBO0FBQUEsUUFFUixjQUFjO0FBQUEsUUFDZCxTQUFTLENBQUMsU0FBUyxLQUFLLFFBQVEsVUFBVSxFQUFFO0FBQUEsTUFDOUM7QUFBQSxJQUNGO0FBQUEsRUFDRjtBQUNGLENBQUM7IiwKICAibmFtZXMiOiBbXQp9Cg==