Merge branch 'master' of gitlab2.dui88.com:sparkprojects/rb_strongestbrain_250520

mock/main.ts

@@ -14,6 +14,7 @@ export default [
           "uid": "laboris Lorem sit officia aliqua",
           "currentTimestamp": 99790918.1204935,
           "actEndTimestamp": 42625488.007563084,
+          "privacyText":'143sjhbkrjgjkfgbjfb   fnsjnfdrhgkfngjknfcmgfcm fjkxdngjhrdkghkfxgjfb',
           "rankPop1": {
             "prizeName": null,
             "prizeImg": "//yun.duiba.com.cn/polaris/045CCBB8-F6C7-43DB-9F81-45F52430A878.441c8f13daf61c48b85fe383e764d9089f1d4a66.png",

src/App.tsx

@@ -35,7 +35,7 @@ class App extends Component {
       myPrize: MyPrize, // TODO 举例子 新宿台奖品页
       index: LoadingDemo,
       sharepage:SharePage,
-    }[skinId] || HomePage;
+    }[skinId] || GamePage;
     PageCtrl.changePage(defaultPage);
   }
 

src/api/index.ts

@@ -155,9 +155,6 @@ const API = generateAPI({
   ////////////////////////////////////////////////////////
 
 
-  /** 同意隐私协议接口*/
-  agreePrivacy: "main/agreePrivacy.do",
-
   buriedPoint: {
     uri: "home/buriedPoint.do",
     showMsg: false,
@@ -199,6 +196,10 @@ const API = generateAPI({
     withToken: true,
   },
 
+   /** 同意隐私协议接口 */
+  agreePrivacy: {
+    uri: "zqdn/agreePrivacy.do",
+  },
 
 })
 

src/components/CodePop/CodePop.jsx

@@ -18,11 +18,11 @@ class CodePop extends React.Component {
 
   componentDidMount = async () => {
     await this.creatCode();
-    pageView("b12854", {
-      page_name: "扫码唤端页",
+    pageView("b14292", {
+      page_name: "换端弹窗",
     });
-    sensorLog(LOG_KEY.exposure, "b12854", "d12855", {
-      page_name: "扫码唤端页",
+    sensorLog(LOG_KEY.exposure, "b14292", "d14293", {
+      page_name: "换端弹窗",
       button_name: "关闭按钮",
     });
   };
@@ -42,8 +42,8 @@ class CodePop extends React.Component {
   /** 关闭 */
   clickClose = () => {
     ModalCtrl.closeModal()
-    sensorLog(LOG_KEY.click, "b12854", "d12855", {
-      page_name: "扫码唤端页",
+    sensorLog(LOG_KEY.click, "b14292", "d14293", {
+      page_name: "换端弹窗",
       button_name: "关闭按钮",
     });
   };

src/components/LoginPop/LoginPop.jsx

@@ -19,14 +19,14 @@ class LoginPop extends React.Component {
   };
 
   componentDidMount() {
-    pageView("b12830", {
+    pageView("b14257", {
       page_name: "手机号登录页",
     });
-    sensorLog(LOG_KEY.exposure, "b12830", "d12832", {
+    sensorLog(LOG_KEY.exposure, "b14257", "d14260", {
       page_name: "手机号登录页",
       button_name: "登录按钮",
     });
-    sensorLog(LOG_KEY.exposure, "b12830", "d12831", {
+    sensorLog(LOG_KEY.exposure, "b14257", "d14258", {
       page_name: "手机号登录页",
       button_name: "发送验证码按钮",
     });
@@ -51,7 +51,7 @@ class LoginPop extends React.Component {
   };
 
   clickSend = _asyncThrottle(async () => {
-    sensorLog(LOG_KEY.click, "b12830", "d12831", {
+    sensorLog(LOG_KEY.click, "b14257", "d14258", {
       page_name: "手机号登录页",
       button_name: "发送验证码按钮",
     });
@@ -67,7 +67,7 @@ class LoginPop extends React.Component {
   });
 
   closeLogin = _asyncThrottle(async () => {
-    sensorLog(LOG_KEY.click, "b12830", "d12832", {
+    sensorLog(LOG_KEY.click, "b14257", "d14260", {
       page_name: "手机号登录页",
       button_name: "登录按钮",
     });

src/components/NoPrizeCard/NoPrizeCard.jsx

@@ -4,11 +4,11 @@ import "./NoPrizeCard.less";
 import { SvgaPlayer } from "@grace/svgaplayer";
 import { Swiper, SwiperSlide } from "swiper/react";
 import "swiper/css";
-import { LOG_KEY, pageView, sensorLog } from "../../utils/sensors.js";
 import { _throttle, randomNum } from "../../utils/utils";
 import { Button } from "@grace/ui";
 import { PageCtrl } from "@/core/ctrls/PageCtrl";
 import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
+import { LOG_KEY, MatterShareOpt, MatterViewOpt, pageView, sensorLog,MatterViewDuration } from '../../utils/sensors.js';
 
 import afterSvga from "../../assets/svga/7输出撕开.svga";
 
@@ -19,13 +19,14 @@ class NoPrizeCard extends React.Component {
   };
 
   componentDidMount() {
-    pageView("b12872", {
-      page_name: "祝福语翻转页",
+    pageView("b14284", {
+      page_name: "抽中未中奖弹窗",
     });
-    sensorLog(LOG_KEY.exposure, "b12872", "d12873", {
-      page_name: "祝福语翻转页",
-      button_name: "点击切换有惊喜按钮",
+    sensorLog(LOG_KEY.exposure, "b14284", "d14285", {
+      page_name: "抽中未中奖弹窗",
+      button_name: "点击翻转按钮",
     });
+    
   }
 
   /** card1文本选择 */
@@ -42,9 +43,9 @@ class NoPrizeCard extends React.Component {
 
   /** 切换按钮*/
   clickExchange1 = () => {
-    sensorLog(LOG_KEY.click, "b12872", "d12873", {
-      page_name: "祝福语翻转页",
-      button_name: "点击切换有惊喜按钮",
+    sensorLog(LOG_KEY.click, "b14284", "d14285", {
+      page_name: "抽中未中奖弹窗",
+      button_name: "点击翻转按钮",
     });
     this.setState({
       card: false,

src/components/exitPop/exitPop.jsx

+import { observer } from 'mobx-react';
+import React, { Component } from 'react';
+import './exitPop.less';
+import { Button } from '@grace/ui';
+import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
+import { PageCtrl } from "@/core/ctrls/PageCtrl";
+import HomePage from '@/pages/HomePage/HomePage.tsx';
+
+@observer
+class ExitPop extends Component {
+
+  closeModal = () => {
+    ModalCtrl.closeModal();
+  }
+
+  backHome = () => {
+    PageCtrl.changePage(HomePage)
+    this.closeModal();
+  }
+
+  render() {
+    return (
+      <div className="exitPop modal_center">
+        <div className="bg"></div>
+        <Button className="continueBtn" onClick={this.closeModal}></Button>
+        <Button className="sureBtn" onClick={this.backHome}></Button>
+        <Button className="closeBtn" onClick={this.closeModal}></Button>
+      </div>
+    );
+  }
+}
+
+export default ExitPop;

src/components/exitPop/exitPop.less

+@import '../../res.less';
+
+.exitPop {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+
+  .bg {
+    position: absolute;
+    left: 72px;
+    top: 405px;
+    width: 632px;
+    height: 642px;
+    .sparkBg("exitPop/bg.png");
+  }
+
+  .continueBtn {
+    position: absolute;
+    left: 141px;
+    top: 792px;
+    width: 210px;
+    height: 87px;
+    .sparkBg("exitPop/continueBtn.png");
+  }
+
+  .sureBtn {
+    position: absolute;
+    left: 373px;
+    top: 792px;
+    width: 210px;
+    height: 87px;
+    .sparkBg("exitPop/sureBtn.png");
+  }
+  
+  .closeBtn {
+    position: absolute;
+    left: 343px;
+    top: 1048px;
+    width: 64px;
+    height: 64px;
+    .sparkBg("exitPop/closeBtn.png");
+  }
+  
+  
+}
\ No newline at end of file

src/components/prizepop/prizepop.jsx

@@ -7,14 +7,29 @@ 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, MatterViewOpt, pageView, sensorLog,MatterViewDuration } from '../../utils/sensors.js';
 
 @observer
 class Prizepop extends React.Component {
   constructor(props) {
     super(props);
   }
+  componentDidMount(){
+    pageView("b14281", {
+      page_name: "抽中中奖弹窗",
+    });
+
+    sensorLog(LOG_KEY.exposure, "b14281", "d14283", {
+        page_name: "抽中中奖弹窗",
+        button_name: "开心收下按钮",
+    });
+  }
 
   handleReceive = _asyncThrottle(() => {
+    sensorLog(LOG_KEY.click, "b14281", "d14283", {
+        page_name: "抽中中奖弹窗",
+        button_name: "开心收下按钮",
+    });
     ModalCtrl.closeModal()
   })
 

src/components/settlenochance/settlenochance.jsx

@@ -7,12 +7,40 @@ import { Button, Toast } 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 Settlenochance extends React.Component {
   constructor(props) {
     super(props);
   }
+  componentDidMount(){
+    pageView("b14276", {
+      page_name: "结算弹窗",
+    });
+    sensorLog(LOG_KEY.exposure, "b14276", "d14279", {
+      page_name: "结算弹窗",
+      button_name: "关闭按钮",
+    });
+    sensorLog(LOG_KEY.exposure, "b14276", "d14277", {
+      page_name: "结算弹窗",
+      button_name: "我知道了按钮",
+    });
+  }
+  onClose = ()=>{
+    ModalCtrl.closeModal()
+    sensorLog(LOG_KEY.click, "b14276", "d14279", {
+      page_name: "结算弹窗",
+      button_name: "关闭按钮",
+    });
+  }
+  onClose2 = ()=>{
+    ModalCtrl.closeModal()
+    sensorLog(LOG_KEY.click, "b14276", "d14277", {
+      page_name: "结算弹窗",
+      button_name: "我知道了按钮",
+    });
+  }
   render() {
     return (
       <div className="settlenochance modal_center">

src/pages/GamePage/Game.ts

@@ -15,7 +15,9 @@ import { Level9 } from "@/pages/GamePage/Level/Level9.ts";
 import { Level10 } from "@/pages/GamePage/Level/Level10.ts";
 import { Level13 } from "@/pages/GamePage/Level/Level13.ts";
 import { Level14 } from "@/pages/GamePage/Level/Level14.ts";
+import { Level15 } from "@/pages/GamePage/Level/Level15.ts";
 import { Level18 } from "@/pages/GamePage/Level/Level18.ts";
+import { Level20 } from "@/pages/GamePage/Level/Level20.ts";
 import { Level21 } from "@/pages/GamePage/Level/Level21.ts";
 import { Level22 } from "@/pages/GamePage/Level/Level22.ts";
 import { Level23 } from "@/pages/GamePage/Level/Level23.ts";
@@ -32,10 +34,10 @@ export class Game extends Base {
     const qsBg = this.addChild(new Sprite(Assets.get("问题.png")));
     qsBg.position.set(49, 316);
 
-    // this.level = this.addChild(new Level21());
+    this.level = this.addChild(new Level13());
     globalEvent.on(GameEvent.NextLevel, this.nextLevel, this);
 
-    this.nextLevel();
+    // this.nextLevel();
 
   }
 

src/pages/GamePage/GamePage.tsx

@@ -20,6 +20,7 @@ import bgImg from "../../assets/GamePage/bg.jpg";
 import { ModalCtrl } from "@/core/ctrls/ModalCtrl.tsx";
 import TipPanel from "@/panels/TipPanel/TipPanel.tsx";
 import { LevelArr } from "@/pages/GamePage/Level/LevelConfig.ts";
+import ExitPop from '@/components/exitPop/exitPop';
 
 export function getApp(): Application {
   return window["__app"];
@@ -100,7 +101,8 @@ class GamePage extends React.Component<any, any> {
   };
 
   clickBack = () => {
-    PageCtrl.backPage();
+    ModalCtrl.showModal(ExitPop)
+    // PageCtrl.backPage();
   }
 
   clickTip = () => {

src/pages/GamePage/Level/Level13.ts

@@ -20,12 +20,12 @@ export class Level13 extends LevelBase {
     this.addChild(new Sprite(Assets.get(`level${this.level}/D.png`)))
       .position.set(198, 687);
 
-    this.B = this.addChild(new Sprite(Assets.get(`level${this.level}/B.png`)));
-    this.B.position.set(463, 1086);
-
     this.C = this.addChild(new Sprite(Assets.get(`level${this.level}/C.png`)));
     this.C.position.set(198, 687);
 
+    this.B = this.addChild(new Sprite(Assets.get(`level${this.level}/B.png`)));
+    this.B.position.set(463, 1086);
+
     this.A = this.addChild(new Sprite(Assets.get(`level${this.level}/A.png`)));
     this.A.position.set(161, 1086);
 
@@ -35,22 +35,28 @@ export class Level13 extends LevelBase {
     this.right.interactive = false;
     this.right.eventMode = "none";
 
-    this.C.on("pointerdown", this.onAPointerDown, this);
-    this.C.on("pointerup", this.onAPointerUp, this);
-    this.C.on("globalpointermove", this.onAPointerMove, this);
+    [this.A, this.B, this.C].forEach((item) => {
+      item.on("pointerdown", this.onAPointerDown, this);
+      item.on("pointerup", this.onAPointerUp, this);
+      item.on("globalpointermove", this.onAPointerMove, this);
+    });
+
   }
 
-  pos = null;
+  target: Sprite = null;
+  pos: { x: number, y: number } = null;
 
   onAPointerUp(e) {
     this.pos = null;
+    this.target = null;
   }
 
   onAPointerDown(e) {
+    this.target = e.target;
     const { x, y } = e.data.global;
     this.pos = {
-      x: x - this.C.x,
-      y: y - this.C.y
+      x: x - e.target.x,
+      y: y - e.target.y
     }
   }
 
@@ -59,11 +65,13 @@ export class Level13 extends LevelBase {
     const { x, y } = e.data.global;
     const nx = x - this.pos.x;
     const ny = y - this.pos.y;
-    this.C.position.set(nx, ny);
+    this.target.position.set(nx, ny);
+
+    const { x: cx, y: cy } = this.C;
 
     if (
-      nx < 10 || nx > 410
-      || ny < 480 || ny > 900
+      cx < 10 || cx > 410
+      || cy < 480 || cy > 900
     ) {
       this.setTouchEnable(false);
       Tween.get(this.right)

src/pages/GamePage/Level/Level15.ts

+import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
+import { Assets, Rectangle, Sprite } from "pixi.js";
+import { Ease, Tween } from "@/core/tween";
+import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+
+export class Level15 extends LevelBase {
+
+  level: number = 15;
+
+  A: Sprite;
+  B: Sprite;
+  C: Sprite;
+  D: Sprite;
+  mi: Sprite;
+  mi2: Sprite;
+
+  right: Sprite;
+  error: Sprite;
+
+  onLoad() {
+    super.onLoad();
+
+    this.D = this.addChild(new Sprite(Assets.get(`level${this.level}/D.png`)));
+    this.D.position.set(460, 766);
+
+    this.mi = this.addChild(new Sprite(Assets.get(`level${this.level}/mi.png`)));
+    this.mi.position.set(129, 675);
+
+    this.mi2 = this.addChild(new Sprite(Assets.get(`level${this.level}/mi2.png`)));
+    this.mi2.position.set(129, 719);
+    this.mi2.alpha = 0;
+
+    const table = this.addChild(new Sprite(Assets.get(`level${this.level}/img.png`)));
+    table.position.set(0, 665);
+    table.interactive = false;
+    table.eventMode = "none";
+
+    this.A = this.addChild(new Sprite(Assets.get(`level${this.level}/A.png`)));
+    this.A.position.set(78, 1169);
+
+    this.B = this.addChild(new Sprite(Assets.get(`level${this.level}/B.png`)));
+    this.B.position.set(311, 1159);
+
+    this.C = this.addChild(new Sprite(Assets.get(`level${this.level}/C.png`)));
+    this.C.position.set(495, 1149);
+
+    this.right = this.addChild(new Sprite(Assets.get(`level${this.level}/right.png`)));
+    this.right.position.set(146, 825);
+    this.right.alpha = 0;
+    this.right.interactive = false;
+    this.right.eventMode = "none";
+
+    this.error = this.addChild(new Sprite(Assets.get(`level${this.level}/error.png`)));
+    this.error.interactive = false;
+    this.error.eventMode = "none";
+
+    [this.D].forEach((item) => {
+      item.on("pointerdown", this.onAPointerDown, this);
+      item.on("pointerup", this.onAPointerUp, this);
+      item.on("globalpointermove", this.onAPointerMove, this);
+    });
+    [this.A, this.B, this.C].forEach((item) => {
+      item.on("pointertap", this.onTapOption.bind(this, item));
+    });
+
+  }
+
+
+  onTapOption(item: Sprite) {
+    this.setTouchEnable(false);
+    const wait = 2000;
+
+    this.error.visible = true;
+    this.error.position.set(item.x + item.width - 30, item.y + item.height - 50);
+    Tween.removeTweens(this.error);
+    Tween.get(this.error)
+      .wait(wait)
+      .call(() => {
+        this.error.visible = false;
+        this.setTouchEnable(true);
+      });
+  }
+
+  target: Sprite = null;
+  pos: { x: number, y: number } = null;
+
+  onAPointerUp(e) {
+    this.pos = null;
+    this.target = null;
+  }
+
+  onAPointerDown(e) {
+    this.target = e.target;
+    const { x, y } = e.data.global;
+    this.pos = {
+      x: x - e.target.x,
+      y: y - e.target.y
+    }
+    this.addChild(e.target);
+  }
+
+  onAPointerMove(e) {
+    if (!this.pos) return;
+    const { x, y } = e.data.global;
+    const nx = x - this.pos.x;
+    const ny = y - this.pos.y;
+    this.target.position.set(nx, ny);
+
+    this.check();
+  }
+
+  check() {
+
+    const { x: ax, y: ay, width: aw, height: ah } = this.target;
+
+    const isIns = new Rectangle(ax + 60, ay, aw - 60, ah)
+      .intersects(new Rectangle(180, 840, 37, 55));
+
+    if (isIns) {
+      this.setTouchEnable(false);
+      this.target.eventMode = "none";
+      this.target.interactive = false;
+
+      Tween.get(this.D).to({ x: 144, y: 824, width: 93, height: 96 }, 666, Ease.quadInOut);
+
+      this.target = null;
+      this.pos = null;
+
+      Tween.get(this.D)
+        .wait(666)
+        .to({ alpha: 0 }, 666, Ease.quadInOut);
+
+      Tween.get(this.mi)
+        .wait(666)
+        .to({ alpha: 0 }, 666, Ease.quadInOut);
+
+      Tween.get(this.mi2)
+        .wait(666)
+        .to({ alpha: 1 }, 666, Ease.quadInOut);
+
+      Tween.get(this.right)
+        .wait(999)
+        .to({ alpha: 1 }, 666, Ease.quadInOut)
+        .wait(2000)
+        .call(() => {
+          globalEvent.emit(GameEvent.NextLevel);
+        });
+
+    }
+
+  }
+
+  onDestroy() {
+    super.onDestroy();
+    Tween.removeTweens(this.right);
+    [this.A, this.B].forEach((item) => {
+      item.off("globalpointermove", this.onAPointerMove, this);
+    });
+  }
+
+}

src/pages/GamePage/Level/Level20.ts

+import { LevelBase } from "@/pages/GamePage/Components/LevelBase.ts";
+import { Assets, Rectangle, Sprite } from "pixi.js";
+import { Ease, Tween } from "@/core/tween";
+import { GameEvent, globalEvent } from "@/pages/GamePage/GameEvent.ts";
+
+export class Level20 extends LevelBase {
+
+  level: number = 20;
+
+  A: Sprite;
+  B: Sprite;
+  C: Sprite;
+
+  right: Sprite;
+
+  onLoad() {
+    super.onLoad();
+
+    this.addChild(new Sprite(Assets.get(`level${this.level}/box.png`)))
+      .position.set(95, 959);
+
+    this.A = this.addChild(new Sprite(Assets.get(`level${this.level}/A.png`)));
+    this.A.position.set(84, 743);
+
+    this.B = this.addChild(new Sprite(Assets.get(`level${this.level}/B.png`)));
+    this.B.position.set(351, 664);
+
+    this.C = this.addChild(new Sprite(Assets.get(`level${this.level}/C.png`)));
+    this.C.position.set(536, 839);
+
+    this.addChild(this.qs);
+
+    const top = this.addChild(new Sprite(Assets.get(`level${this.level}/top.png`)))
+    top.position.set(95, 970);
+    top.interactive = false;
+    top.eventMode = "none";
+
+    this.right = this.addChild(new Sprite(Assets.get(`level${this.level}/right.png`)));
+    this.right.position.set(503, 1146);
+    this.right.alpha = 0;
+    this.right.interactive = false;
+    this.right.eventMode = "none";
+
+    [this.A, this.B, this.C, this.qs].forEach((item) => {
+      item.on("pointerdown", this.onAPointerDown, this);
+      item.on("pointerup", this.onAPointerUp, this);
+      item.on("globalpointermove", this.onAPointerMove, this);
+    });
+
+  }
+
+  target: Sprite = null;
+  pos: { x: number, y: number } = null;
+
+  onAPointerUp(e) {
+    this.pos = null;
+    this.target = null;
+  }
+
+  onAPointerDown(e) {
+    this.target = e.target;
+    const { x, y } = e.data.global;
+    this.pos = {
+      x: x - e.target.x,
+      y: y - e.target.y
+    }
+  }
+
+  onAPointerMove(e) {
+    if (!this.pos) return;
+    const { x, y } = e.data.global;
+    const nx = x - this.pos.x;
+    const ny = y - this.pos.y;
+    this.target.position.set(nx, ny);
+
+    this.check();
+  }
+
+  check() {
+
+    const { x: ax, y: ay, width: aw, height: ah } = this.target;
+
+    const isIns = new Rectangle(ax, ay, aw, ah)
+      .intersects(new Rectangle(280, 1000, 260, 180));
+
+    if (isIns) {
+
+      this.target.eventMode = "none";
+      this.target.interactive = false;
+
+      const pos = new Map([
+        [this.A, { x: 184, y: 864 }],
+        [this.B, { x: 285, y: 854 }],
+        [this.C, { x: 370, y: 905 }],
+        [this.qs, { x: 255, y: 950, angle: 45 }],
+      ]).get(this.target);
+
+      Tween.get(this.target)
+        .to({ x: pos.x, y: pos.y, angle: pos.angle || 0 }, 666, Ease.quadInOut);
+
+      this.target = null;
+      this.pos = null;
+
+      if (
+        !this.A.interactive
+        && !this.B.interactive
+        && !this.C.interactive
+        && !this.qs.interactive
+      ) {
+        Tween.get(this.right)
+          .to({ alpha: 1 }, 666, Ease.quadInOut)
+          .wait(2000)
+          .call(() => {
+            globalEvent.emit(GameEvent.NextLevel);
+          });
+      }
+
+    }
+
+  }
+
+  onDestroy() {
+    super.onDestroy();
+    Tween.removeTweens(this.right);
+    [this.A, this.B].forEach((item) => {
+      item.off("globalpointermove", this.onAPointerMove, this);
+    });
+  }
+
+}

src/pages/GamePage/Level/LevelConfig.ts

@@ -10,7 +10,9 @@ import { Level9 } from "@/pages/GamePage/Level/Level9.ts";
 import { Level10 } from "@/pages/GamePage/Level/Level10.ts";
 import { Level13 } from "@/pages/GamePage/Level/Level13.ts";
 import { Level14 } from "@/pages/GamePage/Level/Level14.ts";
+import { Level15 } from "@/pages/GamePage/Level/Level15.ts";
 import { Level18 } from "@/pages/GamePage/Level/Level18.ts";
+import { Level20 } from "@/pages/GamePage/Level/Level20.ts";
 import { Level21 } from "@/pages/GamePage/Level/Level21.ts";
 import { Level22 } from "@/pages/GamePage/Level/Level22.ts";
 import { Level23 } from "@/pages/GamePage/Level/Level23.ts";
@@ -31,13 +33,13 @@ export const LevelArr = [
   { cls: Level9, tip: `掐断烟头` }, // 12
   { cls: Level13, tip: `打开盖子看看` },
   { cls: Level14, tip: `将香蕉移动到牛奶中<br/>变成香蕉牛奶` },
-  { cls: Level14, tip: `猫吃老鼠` },  // 15
+  { cls: Level15, tip: `猫吃老鼠` },
   { cls: Level14, tip: `移动笼子罩住小鸭子` }, // 16
   { cls: Level14, tip: `别忘了，人是高等动物哦` }, // 17
   { cls: Level18, tip: `移开乌云露出太阳<br/>让冰块融化` },
   { cls: Level14, tip: `将冰箱放大至能够装下长颈鹿` }, // 19
-  { cls: Level14, tip: `别忘了把题目也装进箱子里` }, // 20
-  { cls: Level21, tip: `移动鸡蛋，碰一碰便知` }, // 21
+  { cls: Level20, tip: `别忘了把题目也装进箱子里` },
+  { cls: Level21, tip: `移动鸡蛋，碰一碰便知` },
   { cls: Level22, tip: `移开圣诞老人的衣服看看` },
   { cls: Level23, tip: `一样重` },
   { cls: Level23, tip: `将雪球合在一起滚成大雪球` }, // 24

src/pages/HomePage/HomePage.tsx

@@ -11,6 +11,7 @@ import Rulepop from "../../components/rulepop/rulepop.jsx";
 import CapsulePage from "../CapsulePage/CapsulePage.jsx";
 import store from '@/store/store';
 import Taskpop from '@/panels/taskpop/taskpop.jsx';
+import Yinsirulepop from '@/panels/yinsirulepop/yinsirulepop.jsx';
 import RankPage from '../RankPage/RankPage.js';
 import MyPrize from '../MyPrize/MyPrize.js';
 import shareStore from '@/store/share.js';
@@ -33,7 +34,6 @@ class Homepage extends React.Component {
     await store.updateIndex();
     await shareStore.doAssist();
     this.initSensor();
-
   }
 
   handleButtonClick = _asyncThrottle(async (number) => {
@@ -97,7 +97,12 @@ class Homepage extends React.Component {
           page_name: "活动首页",
           button_name: "奖品按钮",
         });
-        PageCtrl.changePage(MyPrize);
+        if (!store.indexData?.agreePrivacy) {
+          ModalCtrl.showModal(Yinsirulepop);
+        } else {
+          PageCtrl.changePage(MyPrize);
+        }
+        
         break;
 
       // 5 活动规则

src/panels/yinsirulepop/yinsirulepop.jsx

+'use strict';
+
+import React from 'react';
+import { observer } from 'mobx-react';
+import './yinsirulepop.less';
+import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
+import { PageCtrl } from "@/core/ctrls/PageCtrl";
+import { _asyncThrottle } from '../../utils/utils.ts';
+import API from '../../api/index.ts';
+import store from '/src/store/store.ts';
+import { LOG_KEY, MatterShareOpt, MatterViewOpt, pageView, sensorLog,MatterViewDuration } from '../../utils/sensors.js';
+@observer
+class Yinsirulepop extends React.Component {
+  constructor(props) {
+    super(props);
+  }
+  componentDidMount() {
+
+    pageView("b14296", {
+        page_name: "隐私协议页",
+    });
+
+    sensorLog(LOG_KEY.exposure, "b14296", "d14297", {
+        page_name: "隐私协议页",
+        button_name: "同意按钮",
+    });
+  }
+  clickClose = () => {
+    ModalCtrl.closeModal();
+  }
+
+  clickTo = _asyncThrottle(async () => {
+    sensorLog(LOG_KEY.click, "b14296", "d14297", {
+      page_name: "隐私协议页",
+      button_name: "同意按钮",
+    });
+    const {success} = await API.agreePrivacy()
+    if (!success) return
+    PageCtrl.changePage(MyPrize);
+    ModalCtrl.closeModal();
+  })
+  render() {
+    return (
+      <div className="yinsirulepop modal_center">
+        <div className="cont">
+          <span className="bg"></span>
+          <span className="close" onClick={this.clickClose}></span>
+          <div className="ruletext"
+             dangerouslySetInnerHTML={{
+               __html: store?.indexData?.privacyText,
+             }}/>
+          <span className="btn md39" onClick={this.clickTo}></span>
+        </div>
+      </div>
+    );
+  }
+}
+export default Yinsirulepop;

src/panels/yinsirulepop/yinsirulepop.less

+@import "../../res.less";
+.yinsirulepop {
+  width: 750px;
+  height: 1624px;
+  left: 0px;
+  top: 0px;
+  position: absolute;
+  .popupCenterShow();
+  .cont {
+    width: 750px;
+    height: 1051px;
+    left: 0px;
+    top: 318px;
+    position: absolute;
+    .bg {
+      width: 606px;
+      height: 956px;
+      left: 80px;
+      top: 0px;
+      position: absolute;
+      .sparkBg("yinsirulepop/bg.png");
+    }
+    .close {
+      width: 64px;
+      height: 64px;
+      left: 336px;
+      top: 959px;
+      position: absolute;
+      .sparkBg("yinsirulepop/close.png");
+    }
+    .ruletext {
+      width: 429px;
+      height: 523px;
+      left: 158px;
+      top: 170px;
+      position: absolute;
+      font-size: 25px;
+      color: #99391b;
+      word-wrap: break-word;
+      overflow-y: scroll;
+    }
+    .btn {
+      width: 263px;
+      height: 92px;
+      left: 238px;
+      top: 726px;
+      position: absolute;
+      .sparkBg("yinsirulepop/btn.png");
+    }
+  }
+}

src/store/store.ts

@@ -83,6 +83,7 @@ class Store {
       url: string,
     },
     isAgent:string,
+    agreePrivacy:boolean,
 
   } = {};
   firstIn = true;