md5

package.json

@@ -20,6 +20,7 @@
     "@spark/circle-turntable": "^1.0.3",
     "@spark/dbdomain": "^1.0.25",
     "@spark/share": "^2.0.340",
+    "@spark/utils": "^2.0.88",
     "@tailwindcss/postcss": "^4.0.6",
     "@types/qrcode": "^1.5.5",
     "axios": "^1.9.0",

pnpm-lock.yaml

@@ -35,6 +35,9 @@ importers:
       '@spark/share':
         specifier: ^2.0.340
         version: 2.0.340
+      '@spark/utils':
+        specifier: ^2.0.88
+        version: 2.0.88
       '@tailwindcss/postcss':
         specifier: ^4.0.6
         version: 4.0.6
@@ -1705,7 +1708,7 @@ packages:
     resolution: {integrity: sha512-QcsKfi9PSmV9LI4WVCQjQ11FvVsGFp7AfvSw7P96VIiLLaAEzoKsVgpvMxa27iG4L3FYaLjkEUCsOgXLWxiR5Q==}
 
   '@spark/utils@2.0.88':
-    resolution: {integrity: sha512-+wxYTWja1p1ndOr/Ui+AdnlcGMhWYckm9Ona2wBaw56M71EHMQ/8oU0fWT0QKiOYO8NEiOhM7UiORvQldg5hTQ==}
+    resolution: {integrity: sha512-+wxYTWja1p1ndOr/Ui+AdnlcGMhWYckm9Ona2wBaw56M71EHMQ/8oU0fWT0QKiOYO8NEiOhM7UiORvQldg5hTQ==, tarball: http://npm.dui88.com:80/@spark%2futils/-/utils-2.0.88.tgz}
 
   '@swc/helpers@0.3.17':
     resolution: {integrity: sha512-tb7Iu+oZ+zWJZ3HJqwx8oNwSDIU440hmVMDPhpACWQWnrZHK99Bxs70gT1L2dnr5Hg50ZRWEFkQCAnOVVV0z1Q==}
@@ -2988,10 +2991,10 @@ packages:
     resolution: {integrity: sha512-iARIBPgcQrwtEr+tALF+rapJ8qSc+Set2GJQl7xT1MQzWaVkFebdJhR3alVlSiUf5U7nAANKuj3aWpwerocD5w==}
 
   html-observer@1.0.5:
-    resolution: {integrity: sha512-mAEB5Pu/AxJl0cRrK2HB37h7U98FHy7vungNJSFvczNjx6Rd81YUkDLT6aAGLaX37+ulDwwLqJmY1r01A22aQQ==}
+    resolution: {integrity: sha512-mAEB5Pu/AxJl0cRrK2HB37h7U98FHy7vungNJSFvczNjx6Rd81YUkDLT6aAGLaX37+ulDwwLqJmY1r01A22aQQ==, tarball: http://npm.dui88.com:80/html-observer/-/html-observer-1.0.5.tgz}
 
   html-shot@1.0.32:
-    resolution: {integrity: sha512-to8GOLqWSskBLd1b7AMGIyK/KWNi+b+fWpYsL3xfZiLtVqVp4o7a8MhNIsVgDTLL0MnUphyS+3eaRi+fY2jt2w==}
+    resolution: {integrity: sha512-to8GOLqWSskBLd1b7AMGIyK/KWNi+b+fWpYsL3xfZiLtVqVp4o7a8MhNIsVgDTLL0MnUphyS+3eaRi+fY2jt2w==, tarball: http://npm.dui88.com:80/html-shot/-/html-shot-1.0.32.tgz}
 
   html2canvas@1.4.1:
     resolution: {integrity: sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==}
@@ -3220,7 +3223,7 @@ packages:
     resolution: {integrity: sha512-xezGJmOb4lk/M1ZZLTR/jaBHQ4gG/lqQnJqdIv4721DMggsa1bDVlHXNeHYogaIEHD9vCRv0fcL4hMA+Coarkg==}
 
   js-md5@0.7.3:
-    resolution: {integrity: sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I=}
+    resolution: {integrity: sha1-tPL7sLMnRV9ZjWcn447Ccs0Jw/I=, tarball: http://npm.dui88.com:80/js-md5/-/js-md5-0.7.3.tgz}
 
   js-tokens@4.0.0:
     resolution: {integrity: sha1-GSA/tZmR35jjoocFDUZHzerzJJk=}
@@ -4466,7 +4469,7 @@ packages:
       typescript: '>=4.8.4'
 
   tslib@2.8.1:
-    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==, tarball: http://npm.dui88.com:80/tslib/-/tslib-2.8.1.tgz}
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
   tweedle.js@2.1.0:
     resolution: {integrity: sha512-0ReQgVjepoZkE6t0upWNgCRbplHkQJQYk1LStXugwSR728GLFmGDRuaQJlxeC/iBlxud6+P1RdODjaO25vHAqw==}

src/pages/HomePage/HomePage.tsx

@@ -78,8 +78,7 @@ class Homepage extends React.Component {
           page_name: "活动首页",
           button_name: "抽奖按钮",
         });
-        // store.doLotttery();
-        ModalCtrl.showModal(GiftPackPopup);
+        store.doLotttery();
         break;
 
       // 2 做任务

src/store/store.ts

@@ -190,7 +190,7 @@ class Store {
       return Toast.show("抽奖次数不足，快去猜谜赚次数吧～");
     }
 
-    // 打开抽奖出奖弹窗 CK_TODO
+    // 打开抽奖出奖弹窗
     return ModalCtrl.showModal(GiftPackPopup);
   };
 

src/store/task.ts

@@ -12,7 +12,7 @@ import { Toast } from "@grace/ui";
 import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
 import LongImgPop from "@/panels/longImgPop/longImgPop.jsx";
 import { handleLogClick, handleLogExposure } from "../MD";
-import { MD5 } from "crypto-js";
+import { md5 } from "@spark/utils";
 
 interface TaskItem {
   jumpUrl?: string;
@@ -175,7 +175,8 @@ const taskStore = makeAutoObservable({
   async complete(item, time=0) {
     const { id, code } = item || {};
     const timestamp = new Date().getTime();
-    const sign = MD5(store.indexData?.userId + "_" + code + "_" + timestamp + "_" + "4fe20bdefdd4804f")
+    const sign = md5(store.indexData?.userId + "_" + code + "_" + timestamp + "_" + "4fe20bdefdd4804f")
+    console.log('sign', sign)
     let params = {
       taskCode: code,
       sign,