Skip to content

L
LuzhouLaojiaoSnake_250428
Commit dfe7289d authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/MD.ts
parents c145dd95 f666f0ad
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 23 deletions
dist/index.html
View file @ dfe7289d
...@@ -33,17 +33,17 @@ ...@@ -33,17 +33,17 @@
// alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。") // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
} }
</script> </script>
<script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747033518339/assets/index-pyBBWgQs.js"></script> <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747034120591/assets/index-Y5UvYVnw.js"></script>
<link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747033518339/assets/vendor-JhmHryzk.js"> <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747034120591/assets/vendor-BlOINAc9.js">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747033518339/assets/vendor-CWeaUrOh.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747034120591/assets/vendor-CWeaUrOh.css">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747033518339/assets/index-DTOBU9wL.css"> <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747034120591/assets/index-C1uFbexf.css">
<script type="module">import.meta.url;import("_").catch(()=>1);(async function*(){})().next();if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script> <script type="module">import.meta.url;import("_").catch(()=>1);(async function*(){})().next();if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
<script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script> <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
</head> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>
<script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script> <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
<script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1747033518339/assets/polyfills-legacy-C2MhNPfJ.js"></script> <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1747034120591/assets/polyfills-legacy-C2MhNPfJ.js"></script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1747033518339/assets/index-legacy-Cm77u4XZ.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script> <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1747034120591/assets/index-legacy-Jty3tVQH.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
</body> </body>
</html> </html>
......
src/pages/HomePage/HomePage.tsx
View file @ dfe7289d
...@@ -106,7 +106,7 @@ class HomePage extends React.Component<any, any> { ...@@ -106,7 +106,7 @@ class HomePage extends React.Component<any, any> {
render() { render() {
const { remainTimes, remainDrawTimes, rank } = store.indexData const { remainTimes, remainDrawTimes, rank } = store.indexData
return <div className="homepage" ref={(el) => this.root = el}> return <div className="homepage md1" ref={(el) => this.root = el}>
<span className="bg"></span> <span className="bg"></span>
<div className="infobox"> <div className="infobox">
<span className="infobg"></span> <span className="infobg"></span>
...@@ -117,24 +117,24 @@ class HomePage extends React.Component<any, any> { ...@@ -117,24 +117,24 @@ class HomePage extends React.Component<any, any> {
<img src={rank?.prizeImg}></img> <img src={rank?.prizeImg}></img>
</span> </span>
</div> </div>
<div className="rankinfo" onClick={this.clickRank}> <div className="rankinfo md5" onClick={this.clickRank}>
<span className="rankarr"></span> <span className="rankarr"></span>
<span className="ranklab">我的排名</span> <span className="ranklab">我的排名</span>
<span className="ranknum">{(rank?.rank == -1 ? "999+" : rank?.rank > 999 ? '999+' : ((rank?.rank || '--') + "名"))}</span> <span className="ranknum">{(rank?.rank == -1 ? "999+" : rank?.rank > 999 ? '999+' : ((rank?.rank || '--') + "名"))}</span>
</div> </div>
</div> </div>
<span className="title"></span> <span className="title"></span>
<Button className="prizebtn" onClick={this.clickPrize}></Button> <Button className="prizebtn md2" onClick={this.clickPrize}></Button>
<Button className="rulebtn" onClick={this.clickRule}></Button> <Button className="rulebtn md3" onClick={this.clickRule}></Button>
{/* <span className="musicon"></span> {/* <span className="musicon"></span>
<span className="musicf"></span> */} <span className="musicf"></span> */}
<MusicBtn className={`${musicStore.mute ? 'musicf' : 'musicon'}`}></MusicBtn> <MusicBtn className={`${musicStore.mute ? 'musicf md4' : 'musicon md4'}`}></MusicBtn>
<Button className="mainbtn" onClick={this.startGame}> <Button className="mainbtn md7" onClick={this.startGame}>
<SvgaPlayer className='btnsvga' src={btnSvga}></SvgaPlayer> <SvgaPlayer className='btnsvga' src={btnSvga}></SvgaPlayer>
<span className="mianimg"></span> <span className="mianimg"></span>
<span className="mainnum">剩余次数：{remainTimes || 0}</span> <span className="mainnum">剩余次数：{remainTimes || 0}</span>
</Button> </Button>
<Button className="shopbtn" onClick={this.clickShop}> <Button className="shopbtn md6" onClick={this.clickShop}>
<WxOpenModule <WxOpenModule
id={"sharewxbtn"} id={"sharewxbtn"}
appid={'wxb3b1041867218f81'} appid={'wxb3b1041867218f81'}
...@@ -142,7 +142,7 @@ class HomePage extends React.Component<any, any> { ...@@ -142,7 +142,7 @@ class HomePage extends React.Component<any, any> {
envVersion={'release'} envVersion={'release'}
path={'/pages/unify/unify?orgId=200282401019674482&targetUrl=%2Fpages%2Fcoupon%2Fcoupons-list'}></WxOpenModule> path={'/pages/unify/unify?orgId=200282401019674482&targetUrl=%2Fpages%2Fcoupon%2Fcoupons-list'}></WxOpenModule>
</Button> </Button>
<Button className="drawbtn" onClick={this.clickDraw}> <Button className="drawbtn md8" onClick={this.clickDraw}>
<span className="drawimg"></span> <span className="drawimg"></span>
<div className="drawnum"> <div className="drawnum">
<span className="drawnumbg"></span> <span className="drawnumbg"></span>
......
src/panels/FailPanel/FailPanel.tsx
View file @ dfe7289d
import React from "react"; import React from "react";
import {observer} from "mobx-react"; import { observer } from "mobx-react";
import "./FailPanel.less"; import "./FailPanel.less";
import {Button} from "@grace/ui"; import { Button } from "@grace/ui";
import {_asyncThrottle} from "@/utils/utils.ts"; import { _asyncThrottle } from "@/utils/utils.ts";
import { ModalCtrl } from "@/core/ctrls/ModalCtrl.tsx"; import { ModalCtrl } from "@/core/ctrls/ModalCtrl.tsx";
import { PageCtrl } from "@/core/ctrls/PageCtrl.tsx"; import { PageCtrl } from "@/core/ctrls/PageCtrl.tsx";
import HomePage from "@/pages/HomePage/HomePage.tsx"; import HomePage from "@/pages/HomePage/HomePage.tsx";
...@@ -33,18 +33,18 @@ class FailPanel extends React.Component<IFailPanelProps> { ...@@ -33,18 +33,18 @@ class FailPanel extends React.Component<IFailPanelProps> {
render() { render() {
const {score, rank} = this.props; const { score, rank } = this.props;
return <div className="FailPanel"> return <div className="FailPanel">
<div className="bg"/> <div className="bg"/>
<div className="rank">当前排名:NO.{rank <= 0 ? "999+" : rank}</div> <div className="rank">当前排名:NO.{rank <= 0 ? "999+" : rank}</div>
<div className="score">{score}<span>分</span></div> <div className="score">{score}<span>分</span></div>
<div className="tip"> <div className="tip">
单局游戏分数达200<br/> 单局游戏分数达200<br />
即可获得<span>1次抽奖机会</span> 即可获得<span>1次抽奖机会</span>
</div> </div>
<Button className="btn" onClick={this.clickBtn}/> <Button className="btn md21" onClick={this.clickBtn} />
<Button className="close" onClick={this.clickClose}/> <Button className="close md22" onClick={this.clickClose} />
</div>; </div>;
} }
} }
......
src/panels/SucPanel/SucPanel.tsx
View file @ dfe7289d
...@@ -42,8 +42,8 @@ class SucPanel extends React.Component<ISucPanelProps> { ...@@ -42,8 +42,8 @@ class SucPanel extends React.Component<ISucPanelProps> {
<div className="rank">当前排名:NO.{rank <= 0 ? "999+" : rank}</div> <div className="rank">当前排名:NO.{rank <= 0 ? "999+" : rank}</div>
<div className="score">{score}<span>分</span></div> <div className="score">{score}<span>分</span></div>
<div className="tip">恭喜获得抽奖机会<span>+1</span></div> <div className="tip">恭喜获得抽奖机会<span>+1</span></div>
<Button className="btn" onClick={this.clickBtn}/> <Button className="btn md23" onClick={this.clickBtn}/>
<Button className="close" onClick={this.clickClose}/> <Button className="close md24" onClick={this.clickClose}/>
</div>; </div>;
} }
} }
......
src/store/store.ts
View file @ dfe7289d
...@@ -7,6 +7,7 @@ import Ranknoprizepop from '@/components/ranknoprizepop/ranknoprizepop'; ...@@ -7,6 +7,7 @@ import Ranknoprizepop from '@/components/ranknoprizepop/ranknoprizepop';
import Rankprizepop from '@/components/rankprizepop/rankprizepop'; import Rankprizepop from '@/components/rankprizepop/rankprizepop';
import { getUrlParam } from '@/utils/utils'; import { getUrlParam } from '@/utils/utils';
import { isWechatMiniProgram, isWeiXin } from '@/AppTools'; import { isWechatMiniProgram, isWeiXin } from '@/AppTools';
import { handleLogExposure } from '@/MD';
class Store { class Store {
...@@ -105,6 +106,25 @@ class Store { ...@@ -105,6 +106,25 @@ class Store {
const { success, data } = await API.queryTasks(); const { success, data } = await API.queryTasks();
if (success) { if (success) {
this.taskList = data.item; this.taskList = data.item;
for (let i = 0; i < data.item.length; i++) {
if (data.item[i].code === 'login') {
if (data.item[i].taskStatus == 1) {
handleLogExposure(9)
}
} else if (data.item[i].code === 'invite') {
if (data.item[i].taskStatus == 0) {
handleLogExposure(10, 1)
} else if (data.item[i].taskStatus == 1) {
handleLogExposure(10, 2)
}
} else if (data.item[i].code === 'scan') {
if (data.item[i].taskStatus == 0) {
handleLogExposure(11, 1)
} else if (data.item[i].taskStatus == 1) {
handleLogExposure(11, 2)
}
}
}
} }
} }
async doAssist() { async doAssist() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment