Merge remote-tracking branch 'origin/master'

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] || GamePage;
+    }[skinId] || HomePage;
     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

@@ -7,7 +7,8 @@ import API from "@src/api";
 import {_asyncThrottle, getUrlParam} from "@src/utils/utils";
 import {REG_TEL} from "@src/utils/constants";
 import modalStore from "@src/store/modal";
-import {LOG_KEY, pageView, sensorLog} from "@src/utils/sensors";
+import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
+import { LOG_KEY, MatterShareOpt, MatterViewDuration, MatterViewOpt, pageView, sensorLog } from "../../utils/sensors.js";
 
 @observer
 class LoginPop extends React.Component {
@@ -21,14 +22,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: "发送验证码按钮",
     });
@@ -53,7 +54,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: "发送验证码按钮",
     });
@@ -69,7 +70,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';
 
 @observer
 class NoPrizeCard extends React.Component {
@@ -18,14 +18,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 +42,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/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/settlechance/settlechance.jsx

@@ -3,12 +3,51 @@
 import React from 'react';
 import { observer } from 'mobx-react';
 import './settlechance.less';
-
+import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
+import { LOG_KEY, MatterShareOpt, MatterViewDuration, MatterViewOpt, pageView, sensorLog } from "../../utils/sensors.js";
 @observer
 class Settlechance 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", "d14278", {
+      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: "我知道了按钮",
+    });
+  }
+  doDraw = ()=>{
+    ModalCtrl.closeModal()
+    sensorLog(LOG_KEY.click, "b14276", "d14278", {
+      page_name: "结算弹窗",
+      button_name: "去抽奖按钮",
+    });
+  }
   render() {
     return (
       <div className="settlechance modal_center">

src/components/settlenochance/settlenochance.jsx

@@ -3,12 +3,41 @@
 import React from 'react';
 import { observer } from 'mobx-react';
 import './settlenochance.less';
+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/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';
@@ -34,7 +35,6 @@ class Homepage extends React.Component {
     await store.updateIndex();
     await shareStore.doAssist();
     this.initSensor();
-
   }
 
   handleButtonClick = _asyncThrottle(async (number) => {
@@ -98,7 +98,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;