merge

src/pages/HomePage/HomePage.tsx

@@ -8,7 +8,7 @@ import { _asyncThrottle } from "../../utils/utils";
 import { PageCtrl } from "@/core/ctrls/PageCtrl";
 import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
 import Rulepop from "../../components/rulepop/rulepop.jsx";
-import DrawPage from "../DrawPage/DrawPage.js";
+import DrawPage from "../DrawPage/DrawPage.jsx";
 import store from '@/store/store';
 import Taskpop from '@/panels/taskpop/taskpop.js';
 import RankPage from '../RankPage/RankPage.js';

src/pages/drawpage/drawpage.jsx

@@ -13,6 +13,19 @@ import { Button, Toast } from "@grace/ui";
 import { PageCtrl } from "@/core/ctrls/PageCtrl";
 import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
 
+<<<<<<< HEAD
+=======
+import React from 'react';
+import { observer } from 'mobx-react';
+import './DrawPage.less';
+import { _asyncThrottle } from '../../utils/utils.ts';
+import store from '../../store/store.ts';
+import { CHANNEL_PARAMS } from '@/utils/constants';
+import { CircleTurntable } from '@spark/circle-turntable'
+// import { Button } from '@src/components/Button';
+// import { Marquee, Toast } from '@spark/ui';
+// import { isWeChat } from '@src/utils/share';
+>>>>>>> 9220288db04479c19dd6c72d8df036f6453c36b0
 // import { LOG_KEY, pageView, sensorLog } from '@src/utils/sensors';
 
 @observer