Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 5e0eae53 83670309
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 69 deletions
dist/index.html
View file @ c44fca50
......@@ -33,17 +33,17 @@
// alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
}
</script>
<script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747031966592/assets/index-BRfVhzMB.js"></script>
<link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747031966592/assets/vendor-B6vCcsg8.js">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747031966592/assets/vendor-CWeaUrOh.css">
<link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747031966592/assets/index-C4XFF6gW.css">
<script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1747033518339/assets/index-pyBBWgQs.js"></script>
<link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1747033518339/assets/vendor-JhmHryzk.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/1747033518339/assets/index-DTOBU9wL.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">!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>
<body>
<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 crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1747031966592/assets/polyfills-legacy-C2MhNPfJ.js"></script>
<script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1747031966592/assets/index-legacy-DQNx6F3W.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</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-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>
</body>
</html>
......
src/components/drawpop/drawpop.tsx
View file @ c44fca50
......@@ -11,6 +11,7 @@ import Drawnoprizepop from '../drawnoprizepop/drawnoprizepop';
import Drawprizepop from '../drawprizepop/drawprizepop';
import drawSvga from "../../../src/assets/svga/8输出抽奖.svga";
import { SvgaPlayer } from '@grace/svgaplayer';
import store from '@/store/store';
// 定义 Drawpop 组件的 state 类型
type DrawpopState = {
remainDrawTimes: number;
......@@ -23,21 +24,8 @@ class Drawpop extends React.Component<{}, DrawpopState> {
constructor(props: {}) {
super(props);
this.state = {
remainDrawTimes: 1,
prizeInfo: [
{
prizeName: "谢谢参与",
prizeImg: '//yun.duiba.com.cn/polaris/%E6%95%B0%E6%8D%AE%E5%86%B3%E7%AD%96%E5%B7%A5%E5%85%B7.531c2dae250ab379fd6216eb038e60bc12ab9dd6.png'
},
{
prizeName: "谢谢参与",
prizeImg: '//yun.duiba.com.cn/polaris/%E6%95%B0%E6%8D%AE%E5%86%B3%E7%AD%96%E5%B7%A5%E5%85%B7.531c2dae250ab379fd6216eb038e60bc12ab9dd6.png'
},
{
prizeName: "谢谢参与",
prizeImg: '//yun.duiba.com.cn/polaris/%E6%95%B0%E6%8D%AE%E5%86%B3%E7%AD%96%E5%B7%A5%E5%85%B7.531c2dae250ab379fd6216eb038e60bc12ab9dd6.png'
}
],
remainDrawTimes: 0,
prizeInfo: [],
showSvga: false,
};
}
......@@ -58,6 +46,7 @@ class Drawpop extends React.Component<{}, DrawpopState> {
drawPrize = _asyncThrottle(async () => {
const { success, data } = await API.doDraw();
if (success && data) {
store.updateIndex();
this.drawInfo = data;
this.setState({
showSvga: true
......@@ -72,7 +61,8 @@ class Drawpop extends React.Component<{}, DrawpopState> {
{
this.state.showSvga && <SvgaPlayer className='svga' src={drawSvga} loop={1} onEnd={() => {
ModalCtrl.closeModal();
if (this.drawInfo.prizeType == "thanks") {
if (this.drawInfo.prizeId == "thanks") {
ModalCtrl.showModal(Drawnoprizepop)
} else {
ModalCtrl.showModal(Drawprizepop, { ...this.drawInfo })
......
src/pages/HomePage/HomePage.less
View file @ c44fca50
......@@ -103,7 +103,7 @@
top: 0px;
text-align: center;
position: absolute;
font-size: 35px;
font-size: 33px;
line-height: 28px;
color: rgba(243, 225, 27, 1);
}
......
src/pages/HomePage/HomePage.tsx
View file @ c44fca50
......@@ -120,7 +120,7 @@ class HomePage extends React.Component<any, any> {
<div className="rankinfo" onClick={this.clickRank}>
<span className="rankarr"></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>
<span className="title"></span>
......
src/pages/rankpage/rankpage.tsx
View file @ c44fca50
......@@ -83,16 +83,17 @@ class Rankpage extends React.Component<{}, RankpageState> {
rankInfos: data.rankInfos,
myRank: data.myRank,
rankOptions: data.rankOptions,
})
}, () => {
if (data.openTime > timeStamp) {
clearTimeout(this.timeCtn)
this.countdown()
}
})
}
}
timeCtn
countdown() {
console.log("!@@@@!@@", this.state.openTime - this.timeStamp)
let res = dealTime2(this.state.openTime - this.timeStamp)
this.setState({
day: String(res.day),
......
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