merge

src/pages/HomePage/HomePage.tsx

@@ -26,6 +26,7 @@ class Homepage extends React.Component {
   componentDidMount() {
     store.updateIndex()
   }
+
   handleButtonClick = _asyncThrottle(async (number) => {
     // 活动时间判断
     // 规则 奖品始终可以点击 我的排名结束可以点击 其余常规逻辑
@@ -39,12 +40,12 @@ class Homepage extends React.Component {
       // 0 我的排名
       case 0:
         // TODO 换成我的排名页面 记得引用
-        PageCtrl.changePage(RankPage);
+        // PageCtrl.changePage(); 
         break;
 
       // 1 抽奖
       case 1:
-        // PageCtrl.changePage(DrawPage);
+        PageCtrl.changePage(DrawPage);
         break;
 
       // 2 做任务
@@ -52,6 +53,7 @@ class Homepage extends React.Component {
         // TODO
         ModalCtrl.showModal(Taskpop);
         break;
+
       // 3 答题
       case 3:
         // TODO

src/pages/drawpage/drawpage.jsx

@@ -13,19 +13,6 @@ 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