init

mock/common/coopFrontVariable.js

@@ -26,5 +26,6 @@ module.exports = {
     }),
     "Url": "https://lifeapp-test.picclife.cn/portal-web/app_manager/downloadapps.html?operate_link=https%3A%2F%2Flifeapp-api-test.picclife.cn%2Flifeapi%2Flifeapp-svc-rel-gw%2Fapi%2Fauth_code%2Fauthorize%2Fv1%3Factivity_code%3D6130%26redirect_type%3D0%26redirect_uri%3Dhttps%253A%252F%252F96094.activity-19.m.duiba.com.cn%252FcustomShare%252Fshare%253Fid%253DDid1NTk5NTk&isBindManager=1&isNeedAuth=1",
     "SaleManUrl":"http://activity.m.duibatest.com.cn/projectx/pd2a9a8c1/index.html?appID=19487",
+    "privacyText":"privacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyTextprivacyText",
   }
 };

src/api/index.js

@@ -128,31 +128,6 @@ const API = generateAPI({
     },
   },
 
-  /** 上传图片 */
-  uploadImg: {
-    uri: "/customActivity/duiba/imgUploadUrl",
-    method: "post",
-    contentType: "json",
-  },
-
-  /** 业务员首页*/
-  salesManIndex: {
-    uri: "works/index.do",
-    showMsg: false,
-  },
-
-  /** 审核玩法-审核首页*/
-  examineIndex: {
-    uri: "examine/examineIndex.do",
-    method: "post",
-  },
-
-  /** 同意隐私协议接口*/
-  lockAgree: {
-    uri: "works/lockAgree.do",
-  },
-
-
   // 投稿玩法-作品详情
   workDetail: 'works/workDetail.do',
   // 投稿玩法-作品评论记录
@@ -169,13 +144,6 @@ const API = generateAPI({
     withToken: true,
   },
 
-  /** 同意隐私协议接口 */
-  agreePrivacy: {
-    uri: "game/agreePrivacy.do",
-    withToken: true,
-    method: "post",
-  },
-
   // 推送使用
   outside: `inviteAssist_1/outside.do`,
 
@@ -192,10 +160,13 @@ const API = generateAPI({
     withToken: true,
   },
 
-
+////////////////////////////////////////////////////////
 
   index: "main/index.do",
 
+  /** 同意隐私协议接口*/
+  agreePrivacy: "main/agreePrivacy.do",
+
 
 });
 

src/assetList.json

-{"preLoadImg":[],"asyncLoadImg":["CodePop/bg.png","CodePop/code.png","ConfirmPop/bg.png","ConfirmPop/cancel.png","ConfirmPop/confirm.png","FillAddress/填写收货地址.png","FillAddress/提交信息按钮-不可点击.png","FillAddress/提交信息按钮-可点击.png","FillAddress/直线.png","FillAddress/返回按钮.png","FillAddress/选择按钮.png","LoadingPage/loadingBg.jpg","LoadingPage/loadingFill.png","LoadingPage/loadingIp.png","LoginPop/bg.png","LoginPop/canSubmitBtn.png","LoginPop/cannotSubmit.png","NoPrizeCard/bg.png","NoPrizeCard/bg2.png","NoPrizeCard/exchange.png","NoPrizeCard/exchange2.png","NoPrizeCard/line.png","NoPrizeCard/picture.png","NoPrizeCard/picture2.png","NoPrizeCard/prizeImg.png","NoPrizeCard/text1.png","NoPrizeCard/text2.png","NoPrizeCard/text3.png","NoPrizeCard/text4.png","PrivacyPop/bg.png","PrizePage/back.png","PrizePage/bg.png","PrizePage/bg2.png","PrizePage/bg_item.png","PrizePage/go-btn.png","PrizePage/gray_btn.png","PrizePage/img.png","PrizePage/stick.png","PrizePop/bg.png","RankNoPrizePop/bg.png","RankNoPrizePop/know.png","RankPrizePop/bg.png","RankPrizePop/light.png","RankPrizePop/prizePicture.png","ReviewFailedPop/bg.png","ReviewFailedPop/reSubmit.png","ReviewSucPop/chou.png","ReviewSucPop/gift.png","ReviewSucPop/light.png","ReviewSucPop/title.png","RulePop/bg.png","SaleManPage/IP.png","SaleManPage/PeizeList_item_bg.png","SaleManPage/PictureBG.png","SaleManPage/bg.png","SaleManPage/bianhaoBg.png","SaleManPage/good.png","SaleManPage/idbg.png","SaleManPage/iptxt.png","SaleManPage/logo.png","SaleManPage/man.png","SaleManPage/music_close.png","SaleManPage/music_open.png","SaleManPage/myPhoto.png","SaleManPage/myRank.png","SaleManPage/myRank_btn.png","SaleManPage/nothing.png","SaleManPage/pass.png","SaleManPage/pic.png","SaleManPage/pictureList_item_bianhaoBg.png","SaleManPage/prize.png","SaleManPage/rank.png","SaleManPage/rule.png","SaleManPage/shareBtn.png","SaleManPage/smalltitle.png","SaleManPage/title.png","SaleManPage/uoloadBtn.png","SaleManPage/uploadBg.png","SaleManPage/visit.png","SaleManPage/wait.png","SaleManPage/woman.png","TaskPop/already_btn.png","TaskPop/bg.png","TaskPop/bg_item.png","TaskPop/close.png","TaskPop/complete_btn.png","TaskPop/receive_btn.png","UploadPop/bg.png","UploadPop/btn.png","UploadPop/cancel.png","UploadPop/confirm.png","UploadPop/gary_confirm.png","UploadPop/uplaod.png","UploadPop/white.png","commentPop/bg.png","commentPop/btn.png","commentPop/close.png","common/back.png","common/closeBtn.png","common/happyBtn.png","common/light.png","common/task.png","drawChancePop/bg.png","drawChancePop/know_btn.png","drawChancePop/light.png","drawPage/bg.png","drawPage/cover.png","drawPage/draw_btn.png","drawPage/pointer.png","drawPage/prize_info_bg.png","drawPage/prize_info_laba.png","drawPage/turantable_bg.png","drawPage/turantable_box.png","likeLogPage/back.png","likeLogPage/bg.png","likeLogPage/item_line.png","likeLogPage/list_bg.png","likeLogPage/title.png","music/bgm.mp3","noPointPop/bg.png","noPointPop/btn.png","noPointPop/close.png","noPointPop/li8ght.png","opusPage/avatar.png","opusPage/back.png","opusPage/bg.png","opusPage/bg2.png","opusPage/big_pinglun.png","opusPage/dianzan.png","opusPage/infobg.png","opusPage/line.png","opusPage/pinglun.png","opusPage/zan.png","pointSucPop/bg.png","pointSucPop/box.png","pointSucPop/btn.png","pointSucPop/close.png","pointSucPop/light.png","pop_winPrize/prizeImg.png","pop_winPrize/wp_background.png","pop_winPrize/wp_closeButton.png","pop_winPrize/wp_light.png","pop_winPrize/wp_receiveButton.png","sharePage/agentBg.png","sharePage/assist_btn.png","sharePage/assist_text.png","sharePage/bg.png","sharePage/btn.png","sharePage/hand.png","sharePage/join_btn.png","sharePage/logo.png","sharePage/normal.png","sharePage/share_btn.png","sharePage/zanBg.png","sharePage/zanBtn.png","svga/1输出分析好友.svga","svga/2输出拜访.svga","svga/3输出首页氛围.svga","svga/4输出弹窗氛围.svga","svga/5输出展开.svga","svga/6输出切换.svga","svga/7输出抽奖.svga","userHomePage/bg.jpg","userHomePage/logo.png","userHomePage/prizeBg.png","userHomePage/prizeBg1.png","userHomePage/prizeBg2.png","userHomePage/prizeBg3.png","userHomePage/prizeBg4.png","userHomePage/rank1.png","userHomePage/rank2.png","userHomePage/rank3.png","userHomePage/rankTitle.png","userHomePage/rankTop.png","userHomePage/subBg.png","userHomePage/timeNumBg.png","userHomePage/uidbg.png","userHomePage/分享好友.png","userHomePage/奖品.png","userHomePage/抽奖.png","userHomePage/拜访清单.png","userHomePage/按钮.png","userHomePage/标题.png","userHomePage/瓜分攻略.png","userHomePage/规则.png","userHomePage/邀请明细.png","yinsirulepop/bg.png","yinsirulepop/btn.png","yinsirulepop/close.png"]}
\ No newline at end of file
+{"preLoadImg":[],"asyncLoadImg":["CodePop/bg.png","CodePop/code.png","commentPop/bg.png","commentPop/btn.png","commentPop/close.png","common/back.png","common/closeBtn.png","common/happyBtn.png","common/light.png","common/task.png","ConfirmPop/bg.png","ConfirmPop/cancel.png","ConfirmPop/confirm.png","drawChancePop/bg.png","drawChancePop/know_btn.png","drawChancePop/light.png","drawPage/bg.png","drawPage/cover.png","drawPage/draw_btn.png","drawPage/pointer.png","drawPage/prize_info_bg.png","drawPage/prize_info_laba.png","drawPage/turantable_bg.png","drawPage/turantable_box.png","FillAddress/填写收货地址.png","FillAddress/提交信息按钮-不可点击.png","FillAddress/提交信息按钮-可点击.png","FillAddress/直线.png","FillAddress/返回按钮.png","FillAddress/选择按钮.png","likeLogPage/back.png","likeLogPage/bg.png","likeLogPage/list_bg.png","likeLogPage/title.png","LoadingPage/loadingBg.jpg","LoadingPage/loadingFill.png","LoadingPage/loadingIp.png","LoginPop/bg.png","LoginPop/cannotSubmit.png","LoginPop/canSubmitBtn.png","music/bgm.mp3","noPointPop/bg.png","noPointPop/btn.png","noPointPop/close.png","noPointPop/li8ght.png","NoPrizeCard/bg.png","NoPrizeCard/bg2.png","NoPrizeCard/exchange.png","NoPrizeCard/exchange2.png","NoPrizeCard/line.png","NoPrizeCard/picture.png","NoPrizeCard/picture2.png","NoPrizeCard/prizeImg.png","NoPrizeCard/text1.png","NoPrizeCard/text2.png","NoPrizeCard/text3.png","NoPrizeCard/text4.png","opusPage/avatar.png","opusPage/back.png","opusPage/bg.png","opusPage/bg2.png","opusPage/big_pinglun.png","opusPage/dianzan.png","opusPage/infobg.png","opusPage/line.png","opusPage/pinglun.png","opusPage/zan.png","pointSucPop/bg.png","pointSucPop/box.png","pointSucPop/btn.png","pointSucPop/close.png","pointSucPop/light.png","pop_winPrize/prizeImg.png","pop_winPrize/wp_background.png","pop_winPrize/wp_closeButton.png","pop_winPrize/wp_light.png","pop_winPrize/wp_receiveButton.png","PrivacyPop/bg.png","PrizePage/back.png","PrizePage/bg.png","PrizePage/bg2.png","PrizePage/bg_item.png","PrizePage/go-btn.png","PrizePage/gray_btn.png","PrizePage/img.png","PrizePage/stick.png","PrizePop/bg.png","RankNoPrizePop/bg.png","RankNoPrizePop/know.png","RankPrizePop/bg.png","RankPrizePop/light.png","RankPrizePop/prizePicture.png","ReviewFailedPop/bg.png","ReviewFailedPop/reSubmit.png","ReviewSucPop/chou.png","ReviewSucPop/gift.png","ReviewSucPop/light.png","ReviewSucPop/title.png","RulePop/bg.png","SaleManPage/bg.png","SaleManPage/bianhaoBg.png","SaleManPage/good.png","SaleManPage/idbg.png","SaleManPage/IP.png","SaleManPage/iptxt.png","SaleManPage/logo.png","SaleManPage/man.png","SaleManPage/music_close.png","SaleManPage/music_open.png","SaleManPage/myPhoto.png","SaleManPage/myRank.png","SaleManPage/myRank_btn.png","SaleManPage/nothing.png","SaleManPage/pass.png","SaleManPage/PeizeList_item_bg.png","SaleManPage/pic.png","SaleManPage/PictureBG.png","SaleManPage/pictureList_item_bianhaoBg.png","SaleManPage/prize.png","SaleManPage/rank.png","SaleManPage/rule.png","SaleManPage/shareBtn.png","SaleManPage/smalltitle.png","SaleManPage/title.png","SaleManPage/uoloadBtn.png","SaleManPage/uploadBg.png","SaleManPage/visit.png","SaleManPage/wait.png","SaleManPage/woman.png","sharePage/agentBg.png","sharePage/assist_btn.png","sharePage/assist_text.png","sharePage/bg.png","sharePage/btn.png","sharePage/hand.png","sharePage/join_btn.png","sharePage/logo.png","sharePage/normal.png","sharePage/share_btn.png","sharePage/zanBg.png","sharePage/zanBtn.png","svga/1输出分析好友.svga","svga/2输出拜访.svga","svga/3输出首页氛围.svga","svga/4输出弹窗氛围.svga","svga/5输出展开.svga","svga/6输出切换.svga","svga/7输出抽奖.svga","TaskPop/already_btn.png","TaskPop/bg.png","TaskPop/bg_item.png","TaskPop/close.png","TaskPop/complete_btn.png","TaskPop/receive_btn.png","UploadPop/bg.png","UploadPop/btn.png","UploadPop/cancel.png","UploadPop/confirm.png","UploadPop/gary_confirm.png","UploadPop/uplaod.png","UploadPop/white.png","userHomePage/bg.jpg","userHomePage/logo.png","userHomePage/prizeBg.png","userHomePage/prizeBg1.png","userHomePage/prizeBg2.png","userHomePage/prizeBg3.png","userHomePage/prizeBg4.png","userHomePage/rank1.png","userHomePage/rank2.png","userHomePage/rank3.png","userHomePage/rankTitle.png","userHomePage/rankTop.png","userHomePage/subBg.png","userHomePage/timeNumBg.png","userHomePage/uidbg.png","userHomePage/分享好友.png","userHomePage/奖品.png","userHomePage/抽奖.png","userHomePage/拜访清单.png","userHomePage/按钮.png","userHomePage/标题.png","userHomePage/瓜分攻略.png","userHomePage/规则.png","userHomePage/邀请明细.png","yinsirulepop/bg.png","yinsirulepop/btn.png","yinsirulepop/close.png"]}
\ No newline at end of file

src/components/RulePop/RulePop.jsx

@@ -9,16 +9,19 @@ import store from "@src/store";
 class RulePop extends React.Component {
 
 
+  componentDidMount() {
+    store.initRule();
+  }
+
   clickClose = () => {
     modalStore.closePop();
   };
 
   render() {
-    const { ruleText } = store.setIndex || {};
     return <div className="RulePop modal_center">
       <div className="light"/>
       <div className="bg">
-       <div className="rankText" dangerouslySetInnerHTML={{__html: ruleText}}/>
+       <div className="rankText" dangerouslySetInnerHTML={{__html: store.ruleInfo}}/>
       </div>
       <Button className="close md42" onClick={this.clickClose}/>
     </div>;

src/components/RulePop/RulePop.less

@@ -9,22 +9,22 @@
 
   .bg {
     position: absolute;
-    left: 106px;
-    top: 337px;
-    width: 529px;
-    height: 908px;
+    left: 99px;
+    top: 282px;
+    width: 553px;
+    height: 913px;
     .sparkBg("RulePop/bg.png")
   }
 
   .rankText {
     font-size: 24px;
-    color: rgb(75, 38, 20);
+    color: #5d3e1f;
     line-height: 1.5;
     text-align: left;
     position: absolute;
-    left: 52px;
-    top: 242px;
-    width: 434px;
+    left: 50px;
+    top: 255px;
+    width: 458px;
     height: 599px;
     // overflow-x: hidden;
     overflow-y: auto;
@@ -34,9 +34,9 @@
   .close {
     position: absolute;
     left: 345px;
-    top: 1279px;
-    width: 61px;
-    height: 61px;
+    top: 1239px;
+    width: 60px;
+    height: 60px;
     .sparkBg("common/closeBtn.png")
   }
-}
\ No newline at end of file
+}

src/components/yinsirulepop/yinsirulepop.jsx

-'use strict';
+"use strict";
 
-import React from 'react';
-import { observer } from 'mobx-react';
-import './yinsirulepop.less';
-import store from '@src/store';
-import API from '@src/api';
-import { _asyncThrottle } from '@src/utils/utils';
-import modalStore from '@src/store/modal';
-import { PAGE_MAP } from '@src/utils/constants';
+import React from "react";
+import { observer } from "mobx-react";
+import "./yinsirulepop.less";
+import store from "@src/store";
+import API from "@src/api";
+import { _asyncThrottle } from "@src/utils/utils";
+import modalStore from "@src/store/modal";
+import { PAGE_MAP } from "@src/utils/constants";
+import { Button } from "@src/components/Button";
 
 @observer
 class Yinsirulepop extends React.Component {
   constructor(props) {
     super(props);
   }
+
   clickClose = () => {
     modalStore.closePop("Yinsirulepop");
-  }
+  };
 
   clickTo = _asyncThrottle(async () => {
-    const {success} = await API.lockAgree()
-    if (!success) return
+    const { success } = await API.agreePrivacy();
+    if (!success) return;
     store.changePage(PAGE_MAP.PRIZE_PAGE, { from: this.props.popData?.from });
-    store.getHomeInfo()
+    store.getHomeInfo();
     modalStore.closePop("Yinsirulepop");
-  })
+  });
+
   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.setIndex?.agreeText,
-             }}/>
-          <span className="btn md44" onClick={this.clickTo}></span>
-        </div>
+          <span className="bg">
+              <div className="ruletext"
+                   dangerouslySetInnerHTML={{ __html: store.frontVariable?.privacyText }}
+              />
+          </span>
+        <Button className="close" onClick={this.clickClose}></Button>
+        <Button className="btn md44" onClick={this.clickTo}></Button>
       </div>
     );
   }
 }
+
 export default Yinsirulepop;

src/components/yinsirulepop/yinsirulepop.less

@@ -6,47 +6,43 @@
   top: 0px;
   position: absolute;
   .popupCenterShow();
-  .cont {
-    width: 529px;
-    height: 1088px;
-    left: 109px;
-    top: 321px;
-    position: absolute;
     .bg {
-      width: 529px;
-      height: 924px;
-      left: 0px;
-      top: 0px;
       position: absolute;
+      left: 99px;
+      top: 282px;
+      width: 553px;
+      height: 913px;
       .sparkBg("yinsirulepop/bg.png");
     }
     .close {
-      width: 61px;
-      height: 61px;
-      left: 234px;
-      top: 984px;
       position: absolute;
+      left: 345px;
+      top: 1239px;
+      width: 60px;
+      height: 60px;
       .sparkBg("common/closeBtn.png");
     }
     .ruletext {
-      width: 436px;
-      height: 492px;
-      left: 49px;
-      top: 246px;
-      position: absolute;
       font-size: 24px;
-      color: #4b2614;
+      color: #5d3e1f;
+      line-height: 1.5;
+      text-align: left;
+      position: absolute;
+      left: 50px;
+      top: 255px;
+      width: 458px;
+      height: 599px;
+      // overflow-x: hidden;
+      overflow-y: auto;
       word-wrap: break-word;
-      overflow-y: scroll;
-      // background-color: #4b2614;
     }
-    .btn {
-      width: 373px;
-      height: 110px;
-      left: 70px;
-      top: 769px;
+
+  .btn {
       position: absolute;
+    left: 221px;
+    top: 1041px;
+    width: 310px;
+    height: 94px;
       .sparkBg("yinsirulepop/btn.png");
     }
-  }
 }

src/store/index.js

@@ -99,12 +99,9 @@ const store = makeAutoObservable({
     if (!success) return;
     this.setIndex = data || {};
 
-    if (!data.guideFlag && data?.agent) {
-      modalStore.pushPop("GuidePop");
-    }
-
-    if (data?.ruleGuidePopFlag) {
+    if (data?.rulePop) {
       modalStore.pushPop("RulePop");
+      this.setIndex.rulePop = false;
     }
 
     // 首页接口把绑定逻辑加上