merge

src/components/CodePop/CodePop.jsx

 import React from "react";
 import {observer} from "mobx-react";
 import "./CodePop.less";
-import {Button} from "@src/components/Button";
-import modalStore from "@src/store/modal";
 import QRCode from "qrcode";
-import store from "@src/store";
-import {LOG_KEY, pageView, sensorLog} from "@src/utils/sensors";
+import store from '../../store/store';
+import { Button } from '@grace/ui';
+import {_asyncThrottle} from "../../utils/utils";
+import { PageCtrl } from "@/core/ctrls/PageCtrl";
+import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
+import { LOG_KEY, MatterShareOpt, MatterViewDuration, MatterViewOpt, pageView, sensorLog } from "../../utils/sensors.js";
 
 @observer
 class CodePop extends React.Component {
@@ -39,7 +41,7 @@ class CodePop extends React.Component {
 
   /** 关闭 */
   clickClose = () => {
-    modalStore.closePop();
+    ModalCtrl.closeModal()
     sensorLog(LOG_KEY.click, "b12854", "d12855", {
       page_name: "扫码唤端页",
       button_name: "关闭按钮",
@@ -48,7 +50,7 @@ class CodePop extends React.Component {
 
   render() {
     const {codeImg} = this.state;
-    return <div className="CodePop modal_center md4">
+    return <div className="CodePop modal_center">
       <div className="light"/>
       <div className="bg">
         <img className="code" src={codeImg}/>

src/components/NoPrizeCard/NoPrizeCard.jsx

 import React from "react";
 import { observer } from "mobx-react";
 import "./NoPrizeCard.less";
-// import { SvgaPlayer } from "@grace/svgaplayer";
-// import { RES_PATH } from "../../../sparkrc";
 import { SvgaPlayer } from "@grace/svgaplayer";
 import { Swiper, SwiperSlide } from "swiper/react";
 import "swiper/css";
@@ -71,7 +69,6 @@ class NoPrizeCard extends React.Component {
   render() {
     const { card } = this.state;
     const { data } = this.props;
-    console.log(data, 123123);
     return <div className="NoPrizeCard modal_center">
       {
         card === true ?

src/components/prizepop/prizepop.less

@@ -5,6 +5,7 @@
   left: 0px;
   top: 0px;
   position: absolute;
+  .popupCenterShow();
   .light {
     width: 750px;
     height: 1008px;

src/pages/CapsulePage/CapsulePage.jsx

@@ -15,7 +15,7 @@ import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
 import { SvgaPlayer } from "@grace/svgaplayer";
 import Homepage from "../HomePage/HomePage.tsx";
 import Prizepop from "../../components/prizepop/prizepop.jsx";
-import Noprizecard from "../../components/noprizecard/noprizecard.jsx";
+import Noprizecard from "../../components/NoPrizeCard/NoPrizeCard.jsx";
 
 import machineSvga from "../../assets/svga/1输出扭蛋机常态.svga";
 import normalSvga from "../../assets/svga/2输出待机啊.svga";

src/pages/HomePage/HomePage.tsx

@@ -17,6 +17,9 @@ import shareStore from '@/store/share.js';
 import { LOG_KEY, MatterShareOpt, MatterViewDuration, MatterViewOpt, pageView, sensorLog } from "@/utils/sensors.js";
 import { CHANNEL_PARAMS, extranceName } from '@/utils/constants.js';
 
+import CodePop from "../../components/CodePop/CodePop.jsx"
+import NoPrizeCard from "../../components/NoPrizeCard/NoPrizeCard.jsx"
+
 @observer
 class Homepage extends React.Component {
   constructor(props) {
@@ -96,7 +99,9 @@ class Homepage extends React.Component {
           page_name: "活动首页",
           button_name: "规则按钮",
         });
-        ModalCtrl.showModal(Rulepop);
+        // ModalCtrl.showModal(Rulepop);
+        // todo
+        ModalCtrl.showModal(NoPrizeCard);
         break;
 
       // 6 拜访清单