merge

src/pages/HomePage/HomePage.tsx

@@ -7,12 +7,19 @@ import Check from "@/pages/HomePage/Check/Check.tsx";
 import Sign from "@/pages/HomePage/Sign/Sign.tsx";
 import { Button } from "@grace/ui";
 import MyPrize from '../MyPrize/MyPrize';
+import Rule from '../RulePage/RulePage';
 import { PageCtrl } from '@/core/ctrls/PageCtrl';
 import { ModalCtrl } from '@/core/ctrls/ModalCtrl';
 import SucPanel from '@/panels/SucPanel/SucPanel';
 import Assist_fail from '../../components/assist_fail/assist_fail';
 import Assist_succeed from '../../components/assist_succeed/assist_succeed';
 import Choice_challenge from '../../components/choice_challenge/choice_challenge';
+import Finish_task from '../../components/finish_task/finish_task';
+import Finish_challenge from '../../components/finish_challenge/finish_challenge';
+import Consume_qg from '../../components/consume_qg/consume_qg';
+import Consume_credits from '../../components/consume_credits/consume_credits';
+import Renewmodule from '../../components/renewmodule/renewmodule';
+import Fail_challenge from '../../components/fail_challenge/fail_challenge';
 
 
 @observer
@@ -27,13 +34,17 @@ class HomePage extends React.Component<any, any> {
     //   store.doAssist()
     // }
 
-    ModalCtrl.showModal(Choice_challenge);
+    // ModalCtrl.showModal(Fail_challenge);
   }
 
-  clickPrize = ()=>{
+  clickPrize = () => {
     PageCtrl.changePage(MyPrize);
   }
 
+  clickRule = () => {
+    PageCtrl.changePage(Rule);
+  }
+
   render() {
     const {  } = store.indexData
     return <div className="homepage" ref={(el) => this.root = el}>
@@ -44,8 +55,8 @@ class HomePage extends React.Component<any, any> {
         <Button className="credits">1344691</Button>
         <Button className="cash"><span>￥</span>32.88</Button>
 
-        <Button className="rule"/>
-        <Button className="prize" onClick={this.clickPrize}/>
+        <Button className="rule" onClick={this.clickRule} />
+        <Button className="prize" onClick={this.clickPrize} />
 
       </div>
     </div>;