Merge branch 'master' of gitlab2.dui88.com:sparkprojects/kww_daydaygetcredits_250512

config/AssetsMin/ImageCompress.ts

@@ -37,6 +37,9 @@ export async function compressAllImage(
 
   let completed = 0;
 
+  const chunkSize = 20;
+  const totalBatches = Math.ceil(paths.length / chunkSize);
+
   if (platform == "win32") {
 
     const now = Date.now();
@@ -46,29 +49,34 @@ export async function compressAllImage(
     if (!fsSync.existsSync("C:\\Temp\\duiba")) await fs.mkdir("C:\\Temp\\duiba");
     if (!fsSync.existsSync(tempDir)) await fs.mkdir(tempDir);
 
-    const ps = paths.map(async (imgPath, idx) => {
-      const tempName = `${tempDir}/${idx}.png`;
-      await fs.copyFile(imgPath, tempName);
-      execSync(`"${pngquantPath}" ${compressOptions} "${tempName}"`);
-      await fs.copyFile(tempName, imgPath);
-      completed++;
-      onProgress(completed, paths.length);
-    });
+    for (let i = 0; i < paths.length; i += chunkSize) {
+      const currentBatch = Math.floor(i / chunkSize) + 1;
+      // console.log(`正在处理第 ${currentBatch}/${totalBatches} 批图片压缩...\n`);
+
+      const chunk = paths.slice(i, i + chunkSize);
+
+      const ps = chunk.map(async (imgPath, idx) => {
+        const tempName = `${tempDir}/${i + idx}.png`;
+        await fs.copyFile(imgPath, tempName);
+        execSync(`"${pngquantPath}" ${compressOptions} "${tempName}"`);
+        await fs.copyFile(tempName, imgPath);
+        completed++;
+        onProgress(completed, paths.length);
+      });
 
-    await Promise.all(ps);
+      await Promise.all(ps);
+    }
 
     await fs.rm(tempDir, {recursive: true});
 
   } else {
-
-    const chunkSize = 20;
-    const totalBatches = Math.ceil(paths.length / chunkSize);
     // 批次执行
     for (let i = 0; i < paths.length; i += chunkSize) {
       const currentBatch = Math.floor(i / chunkSize) + 1;
-      console.log(`正在处理第 ${currentBatch}/${totalBatches} 批图片压缩...`);
+      // console.log(`正在处理第 ${currentBatch}/${totalBatches} 批图片压缩...\n`);
 
       const chunk = paths.slice(i, i + chunkSize);
+
       let command = "";
 
       chunk.forEach((imgPath) => {

config/DuibaPublish/DuibaPublish.ts

@@ -5,6 +5,7 @@ import * as path from "path";
 import {findFiles} from "../commom/helper.ts";
 import {compressAllImage} from "../AssetsMin/ImageCompress.ts";
 import {compressAllSvga} from "../AssetsMin/SvgaCompress.ts";
+import ProgressBar from "progress";
 
 interface IDuibaPublishOptions {
   buildVersion: string | number,
@@ -37,10 +38,18 @@ export default function DuibaPublish(options: IDuibaPublishOptions) {
       console.log(chalk.green("开始压缩图片了"));
       const imgPaths = findFiles(path.resolve("dist"), /\.png$/);
 
-      process.stdout.write(chalk.green(`\r压缩图片进度：${0}/${imgPaths.length}`));
+      const bar = new ProgressBar(`压缩图片进度 [:bar] :current/${imgPaths.length} :percent :elapseds`, {
+        complete: "●",
+        incomplete: "○",
+        width: 20,
+        total: imgPaths.length,
+        callback: () => {
+          console.log("%cAll complete.", "color: green");
+        }
+      })
+
       await compressAllImage(imgPaths, (cur, total) => {
-        // process.stdout.write("\r");
-        process.stdout.write(chalk.green(`\r压缩图片进度：${cur}/${total}`));
+        bar.tick();
       });
 
       console.log(chalk.green("\n压缩图片结束了\n"));

dist/index.html

@@ -33,17 +33,17 @@
         // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
       }
     </script>
-    <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747036116277/assets/index-B1Qjd6_B.js"></script>
-    <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747036116277/assets/vendor-Cz0uqDij.js">
-    <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747036116277/assets/vendor-BQh5NVNk.css">
-    <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747036116277/assets/index-Cqq-BG5O.css">
+    <script type="module" crossorigin src="./assets/index-C9BDrz-q.js"></script>
+    <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747212563745/assets/vendor-Dulh-I3m.js">
+    <link rel="stylesheet" crossorigin href="./assets/vendor-BQh5NVNk.css">
+    <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747212563745/assets/index-X2kXvCpX.css">
     <script type="module">import.meta.url;import("_").catch(()=>1);(async function*(){})().next();if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
     <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
   </head>
   <body>
     <div id="root"></div>
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-    <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1747036116277/assets/polyfills-legacy-CC61kNVN.js"></script>
-    <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1747036116277/assets/index-legacy-n_kbpnjN.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+    <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-arANKBzQ.js"></script>
+    <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-gk8j6KLl.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
   </body>
 </html>

mock/address.ts

+export default [
+  {
+    url: "/gaw/address/getChildrenByParentCode",
+    response: ({ query }) => {
+      return {
+        "success": true,
+        "code": "0000000000",
+        "desc": "OK",
+        "timestamp": 1736580360076,
+        "data": [{
+          "name": "东华门街道",
+          "adCode": "110101001",
+          "level": 4
+        },
+          {
+            "name": "景山街道",
+            "adCode": "110101002",
+            "level": 4
+          },
+          {
+            "name": "交道口街道",
+            "adCode": "110101003",
+            "level": 4
+          },
+          {
+            "name": "安定门街道",
+            "adCode": "110101004",
+            "level": 4
+          },
+          {
+            "name": "北新桥街道",
+            "adCode": "110101005",
+            "level": 4
+          },
+          {
+            "name": "东四街道",
+            "adCode": "110101006",
+            "level": 4
+          },
+          {
+            "name": "朝阳门街道",
+            "adCode": "110101007",
+            "level": 4
+          },
+          {
+            "name": "建国门街道",
+            "adCode": "110101008",
+            "level": 4
+          },
+          {
+            "name": "东直门街道",
+            "adCode": "110101009",
+            "level": 4
+          },
+          {
+            "name": "和平里街道",
+            "adCode": "110101010",
+            "level": 4
+          },
+          {
+            "name": "前门街道",
+            "adCode": "110101011",
+            "level": 4
+          },
+          {
+            "name": "崇文门外街道",
+            "adCode": "110101012",
+            "level": 4
+          },
+          {
+            "name": "东花市街道",
+            "adCode": "110101013",
+            "level": 4
+          },
+          {
+            "name": "龙潭街道",
+            "adCode": "110101014",
+            "level": 4
+          },
+          {
+            "name": "体育馆路街道",
+            "adCode": "110101015",
+            "level": 4
+          },
+          {
+            "name": "天坛街道",
+            "adCode": "110101016",
+            "level": 4
+          },
+          {
+            "name": "永定门外街道",
+            "adCode": "110101017",
+            "level": 4
+          }
+        ]
+      }
+    },
+
+  },
+]

mock/assist.ts

+export default [
+  {
+    url: '/inviteAssist_1/getInviteCode.do',
+    response: ({ query }) => {
+      return {
+        "code": null,
+        "data": {
+          "dueTime": null,
+          "extra": null,
+          "inviteCode": "ZHHUJS",
+          "timestamp": 1746965897230
+        },
+        "message": null,
+        "success": true,
+        "timeStamp": 1746965897241
+      }
+    }
+  }
+]

mock/home.ts

-import { AESDecrypt, AESEncrypt } from "./Crypto";
-
-export default [
-  {
-    url: '/tcs/index.do',
-    response: ({ query }) => {
-      return {
-        "success": true,
-        "code": "",
-        "message": "",
-        "timeStamp": Date.now(),
-        "data": {
-          "startTime": Date.now() - 1000000,
-          "endTime": Date.now() + 1000000,
-          "remainTimes": 12,
-          "uid": "uiduiduiduiduiduiduid",
-        }
-      }
-    },
-  },
-  {
-    url: '/tcs/start.do',
-    response: ({ query }) => {
-      return {
-        "success": true,
-        "code": "",
-        "message": "",
-        "data": AESEncrypt(JSON.stringify({
-          recordId: "recordId",
-          countdownSeconds: 120,
-          guide: true,
-        }), "3C8C48E792E9241B", "cDOiBC1n2QrkAY2P"),
-      }
-    },
-  },
-  {
-    url: '/tcs/submit.do',
-    response: ({ query }) => {
-      return {
-        success: true,
-        code: "",
-        message: "",
-        data: {
-          score: 888,
-          rank: 1,
-          prizeName: "一等奖",
-          reachTargetScore: 666,
-          drawChance: 10,
-        }
-      }
-    },
-  },
-  {
-    url: '/tcs/guide.do',
-    response: ({ query }) => {
-      return {
-        success: true,
-        code: "",
-        message: "",
-        data: null,
-      }
-    },
-  },
-  {
-    url: "/gaw/address/getChildrenByParentCode",
-    response: ({ query }) => {
-      return {
-        "success": true,
-        "code": "0000000000",
-        "desc": "OK",
-        "timestamp": 1736580360076,
-        "data": [{
-          "name": "东华门街道",
-          "adCode": "110101001",
-          "level": 4
-        },
-        {
-          "name": "景山街道",
-          "adCode": "110101002",
-          "level": 4
-        },
-        {
-          "name": "交道口街道",
-          "adCode": "110101003",
-          "level": 4
-        },
-        {
-          "name": "安定门街道",
-          "adCode": "110101004",
-          "level": 4
-        },
-        {
-          "name": "北新桥街道",
-          "adCode": "110101005",
-          "level": 4
-        },
-        {
-          "name": "东四街道",
-          "adCode": "110101006",
-          "level": 4
-        },
-        {
-          "name": "朝阳门街道",
-          "adCode": "110101007",
-          "level": 4
-        },
-        {
-          "name": "建国门街道",
-          "adCode": "110101008",
-          "level": 4
-        },
-        {
-          "name": "东直门街道",
-          "adCode": "110101009",
-          "level": 4
-        },
-        {
-          "name": "和平里街道",
-          "adCode": "110101010",
-          "level": 4
-        },
-        {
-          "name": "前门街道",
-          "adCode": "110101011",
-          "level": 4
-        },
-        {
-          "name": "崇文门外街道",
-          "adCode": "110101012",
-          "level": 4
-        },
-        {
-          "name": "东花市街道",
-          "adCode": "110101013",
-          "level": 4
-        },
-        {
-          "name": "龙潭街道",
-          "adCode": "110101014",
-          "level": 4
-        },
-        {
-          "name": "体育馆路街道",
-          "adCode": "110101015",
-          "level": 4
-        },
-        {
-          "name": "天坛街道",
-          "adCode": "110101016",
-          "level": 4
-        },
-        {
-          "name": "永定门外街道",
-          "adCode": "110101017",
-          "level": 4
-        }
-        ]
-      }
-    },
-
-  },
-  {
-    url: '/draw/myPrizeRecord.do',
-    response: ({ query }) => {
-      return {
-        "success": true,
-        "code": "",
-        "message": "",
-        "data": [
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: '',
-            boolThirdObject: true
-          },
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: '',
-            boolThirdObject: false
-          },
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: false,
-            prizeId: '',
-            boolThirdObject: true
-          },
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: ''
-          },
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: ''
-          },
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: ''
-          },
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: ''
-          },
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: ''
-          },
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: ''
-          },
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: ''
-          },
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: ''
-          },
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: ''
-          },
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: ''
-          },
-          {
-            extra: {
-              name: "一等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: ''
-          },
-          {
-            extra: {
-              name: "四等奖",
-              icon: 'https://yun.duiba.com.cn/polaris/shareImg.721503d9417b09af6346ae018493aec558ca31af.png',
-            },
-            needFillAddress: true,
-            prizeId: ''
-          }
-        ]
-      }
-    }
-  },
-  {
-    url: '/inviteAssist_1/getInviteCode.do',
-    response: ({ query }) => {
-      return {
-        "code": null,
-        "data": {
-          "dueTime": null,
-          "extra": null,
-          "inviteCode": "ZHHUJS",
-          "timestamp": 1746965897230
-        },
-        "message": null,
-        "success": true,
-        "timeStamp": 1746965897241
-      }
-    }
-  }
-]

mock/main.ts

+
+export default [
+  {
+    url: '/main/index.do',
+    response: ({ query }) => {
+      const signDay = Math.random() * 7 >> 0;
+      return {
+        success: true,
+        code: "",
+        message: "",
+        timeStamp: Date.now(),
+        data: {
+          actStartTime: Date.now() - 1000000,
+          actEndTime: Date.now() + 1000000,
+          currentTime: Date.now(),
+          guideFlag: false,
+          currentStoreNum: 923,
+          storeLimitNum: 2222,
+          continueSignDays: 3,
+          todaySignFlag: false,
+          signRecords: new Array(7).fill(1).map((_, index) => {
+            return {
+              id: index,
+              day: index + 1,
+              creditsNum: 100 + Math.random() * 100 >> 0,
+              boolSign: index < signDay,
+            }
+          }),
+          overflowBubble: {
+            id: 1,
+            creditsNum: 100,
+            expireTime: Date.now() + 10000000,
+          },
+          bubbleRecords: new Array(4).fill(1).map((_, index) => {
+            return {
+              id: index,
+              creditsNum: 100 + Math.random() * 100 >> 0,
+              expireTime: Date.now() + 10000000,
+              type: 1 + Math.random() * 2 >> 0,
+            }
+          }),
+          returnAwardCreditsNum: 1111,
+          downGoldVo: {
+            creditsNum: 100,
+            multipleValue: 5,
+            taskId: "5555555",
+            url: "urlurlurlurlurlurl",
+          },
+          downGoldVo: null,
+        }
+      }
+    },
+  },
+  {
+    url: '/main/completeGuide.do',
+    response: ({ query }) => {
+      return {
+        success: true,
+        code: "",
+        message: "",
+        data: {
+          creditsNum: 100,
+        },
+      }
+    },
+  },
+  {
+    url: '/main/sign.do',
+    response: ({ query }) => {
+      return {
+        success: true,
+        code: "",
+        message: "",
+        data: {
+          signCredits: 100,
+          extraCredits: 100,
+          boolLimit: true,
+          multipleValue: 3,
+          url: "urlurlurlurlurl",
+          taskId: "taskId",
+          newLuckCreditsNum: 33,
+        },
+      }
+    },
+  },
+  {
+    url: '/main/receiveBubble.do',
+    response: ({ query }) => {
+      return {
+        success: true,
+        code: "",
+        message: "",
+        data: {
+          creditNum: 888,
+        }
+      }
+    },
+  },
+  {
+    url: '/main/startVideo.do',
+    response: ({ query }) => {
+      return {
+        success: true,
+        code: "",
+        message: "",
+        data: {
+          creditNum: 888,
+        }
+      }
+    },
+  },
+]

src/api/index.ts

@@ -24,14 +24,7 @@ const API = generateAPI({
     uri: "userLogin.check",
     showMsg: false,
   },
-
   records: "records.query",
-
-  drawIndex: 'draw/index.do',
-  doDraw: {
-    uri: 'draw/draw.do',
-    withToken: true,
-  },
   getInviteCode: {
     uri: 'inviteAssist_1/getInviteCode.do',
     withToken: true,
@@ -42,12 +35,6 @@ const API = generateAPI({
     withToken: true,
     method: 'post',
   },
-  getPrizeList: 'draw/myPrizeRecord.do',
-  receivePrize: {
-    uri: "draw/objectReceive.do",
-    withToken: true,
-    method: "post"
-  },
   /** 获取地区 */
   getParentCode: "/gaw/address/getChildrenByParentCode",
 
@@ -66,6 +53,12 @@ const API = generateAPI({
   // 挑战-助力
   getChallengeAssist: "challenge/assist.do",
 
+  index: "main/index.do",
+  completeGuide: "main/completeGuide.do",
+  sign: "main/sign.do",
+  receiveBubble: "main/receiveBubble.do",
+
+
 })
 
 // console.log('======', API)

src/api/utils.ts

@@ -101,10 +101,11 @@ export interface IApiList {
  * @returns
  * @param apiList
  */
-export function generateAPI<T extends IApiList>(apiList: T): { [key in keyof T]: (params?, headers?) => Promise<IRes> } {
+export function generateAPI<T>(apiList: T): { [key in keyof T]: (params?, headers?) => Promise<IRes> } {
   const api = {} as { [key in keyof T]: (params?, headers?) => Promise<IRes> };
   for (const key in apiList) {
-    let value: string | IApiCfg = apiList[key];
+    // @ts-ignore
+    let value: IApiCfg = apiList[key];
     if (typeof value === 'string') {
       value = {
         uri: value,

src/app.less

 
 @import "./res.less";
-@import "tailwindcss";
+//@import "tailwindcss";
 
 * {
   margin: 0;