Commit 27569909 authored by 王勇霞's avatar 王勇霞

feat: 联调

parent faf6f80f
...@@ -14,9 +14,6 @@ import { GetCurrSkinId, getCustomShareId } from "@/utils/utils.ts"; ...@@ -14,9 +14,6 @@ import { GetCurrSkinId, getCustomShareId } from "@/utils/utils.ts";
import HomePage from "@/pages/HomePage/HomePage.tsx"; import HomePage from "@/pages/HomePage/HomePage.tsx";
import Auth from "@/pages/auth/auth.jsx"; import Auth from "@/pages/auth/auth.jsx";
import { loadFont } from "@/core/preload.ts";
import DetailPage from "@/pages/DetailPage/DetailPage.tsx";
import PrizePage from "@/pages/PrizePage/PrizePage.tsx"; import PrizePage from "@/pages/PrizePage/PrizePage.tsx";
import SharePage from "@/pages/sharePage/sharePage.jsx"; import SharePage from "@/pages/sharePage/sharePage.jsx";
......
...@@ -67,22 +67,13 @@ function dealPageRemainTime() { ...@@ -67,22 +67,13 @@ function dealPageRemainTime() {
windowVisibility((visibility) => { windowVisibility((visibility) => {
if (visibility) { if (visibility) {
startTimer = new Date().getTime(); startTimer = new Date().getTime();
//console.log('starttimer', startTimer)
} else { } else {
endTimer = new Date().getTime(); endTimer = new Date().getTime();
//console.log('endTimer', endTimer);
sendData(); sendData();
} }
}) })
const sendData = () => { const sendData = () => {
const t0 = endTimer - startTimer;
//console.log('duration', t0);
accessLog(156, {
remain: t0,
});
}; };
document.body['onbeforeunload'] = () => { document.body['onbeforeunload'] = () => {
......
...@@ -19,7 +19,6 @@ import Countdown from '@/core/components/ComCountdown/index.jsx'; ...@@ -19,7 +19,6 @@ import Countdown from '@/core/components/ComCountdown/index.jsx';
import PrizePage from "@/pages/PrizePage/PrizePage.tsx"; import PrizePage from "@/pages/PrizePage/PrizePage.tsx";
import SignCom from '@/panels/signCom/signCom.jsx'; import SignCom from '@/panels/signCom/signCom.jsx';
import SetupSuccessPop from '@/panels/setupSuccessPop'; import SetupSuccessPop from '@/panels/setupSuccessPop';
import SharePage from "../sharePage/sharePage";
@observer @observer
class HomePage extends React.Component<any, any> { class HomePage extends React.Component<any, any> {
...@@ -333,7 +332,7 @@ class HomePage extends React.Component<any, any> { ...@@ -333,7 +332,7 @@ class HomePage extends React.Component<any, any> {
<span className="recommend_products_bg"> <span className="recommend_products_bg">
<div className="r_products_list"> <div className="r_products_list">
{bannerInfo?.map((item, index) => ( {bannerInfo?.map((item, index) => (
<div className="r_products_item" key={`r_prdct_${index}`} onClick={this.handleClickBanner}> <div className="r_products_item" key={`r_prdct_${index}`} onClick={() => this.handleClickBanner(item)}>
<img className="r_product_bg" src={item.bannerImg} alt="" /> <img className="r_product_bg" src={item.bannerImg} alt="" />
</div> </div>
))} ))}
......
...@@ -35,7 +35,7 @@ class NewRecordPage extends React.Component { ...@@ -35,7 +35,7 @@ class NewRecordPage extends React.Component {
async updateList() { async updateList() {
const { pageNum, pageSize, haveMore } = this; const { pageNum, pageSize, haveMore } = this;
if (!haveMore) return; if (!haveMore) return;
const { success, data } = await this.API({ pageNum, pageSize }); const { success, data } = await this.API({ pageNum, pageSize, spId: 'sp_wealth' });
if (!success) return; if (!success) return;
this.pageNum++; this.pageNum++;
this.haveMore = data.haveMore; this.haveMore = data.haveMore;
......
...@@ -17,7 +17,7 @@ class BlackPop extends React.Component { ...@@ -17,7 +17,7 @@ class BlackPop extends React.Component {
} }
handleClose = _asyncThrottle(() => { handleClose = _asyncThrottle(() => {
window.location.href = `${CFG.domain}/projectx/${store.frontVariable.otherProjectId}/index.html?appID=${CFG.appID}&channel=${CFG.channel}` window.location.href = `${CFG.domain}/projectx/${store.frontVariable.otherProjectId}/index.html?appID=${CFG.appID}`
}) })
render() { render() {
......
...@@ -29,7 +29,7 @@ class SetupSuccessPop extends React.Component { ...@@ -29,7 +29,7 @@ class SetupSuccessPop extends React.Component {
onStop = async() => { onStop = async() => {
this.btnStarting = false; this.btnStarting = false;
// store.updateIndex(); store.updateIndex();
if (this.drawResultInfo.prizeId == "thanks") { if (this.drawResultInfo.prizeId == "thanks") {
ModalCtrl.showModal(NoPrizePanel, {type: 'final_turntable', ...this.drawResultInfo}); ModalCtrl.showModal(NoPrizePanel, {type: 'final_turntable', ...this.drawResultInfo});
} else { } else {
......
...@@ -15,6 +15,9 @@ class SignTaskPop extends React.Component { ...@@ -15,6 +15,9 @@ class SignTaskPop extends React.Component {
handleToLink = _asyncThrottle(async () => { handleToLink = _asyncThrottle(async () => {
this.props.callback?.(); this.props.callback?.();
setTimeout(() => {
ModalCtrl.closeModal();
}, 300)
location.href = this.props.otherPrizeInfo?.link || '' location.href = this.props.otherPrizeInfo?.link || ''
}) })
......
import { CHANNEL, IS_OTHER_APP, isWeiXin } from "@/AppTools";
import { ModalCtrl } from "@/core/ctrls/ModalCtrl";
import { Toast } from "@grace/ui"; import { Toast } from "@grace/ui";
// 需要过滤的错误码 // 需要过滤的错误码
......
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