Commit 7733a068 authored by cc's avatar cc

update

parent ee5c8b5a
This diff is collapsed.
...@@ -42,7 +42,7 @@ const API = generateAPI({ ...@@ -42,7 +42,7 @@ const API = generateAPI({
uri: 'inviteAssist_1/doAssist.do', uri: 'inviteAssist_1/doAssist.do',
withToken: true, withToken: true,
method: 'post', method: 'post',
showMsg: false, // showMsg: false,
}, },
/** 获取地区 */ /** 获取地区 */
getParentCode: "/gaw/address/getChildrenByParentCode", getParentCode: "/gaw/address/getChildrenByParentCode",
......
...@@ -152,6 +152,15 @@ ...@@ -152,6 +152,15 @@
} }
} }
} }
.noRank{
width: 610px;
position: absolute;
left:calc(50% - 610px/2);
top:1015px;
text-align: center;
font-size: 28px;
color: #333334;
}
.rankList{ .rankList{
width:610px; width:610px;
height: calc(100vh - 820px); height: calc(100vh - 820px);
......
...@@ -91,29 +91,33 @@ class RankPage extends React.Component<any, any> { ...@@ -91,29 +91,33 @@ class RankPage extends React.Component<any, any> {
<div className="rankTitle"> <div className="rankTitle">
<div className="title1">排名</div> <div className="title1">排名</div>
<div className="title2">用户昵称</div> <div className="title2">用户昵称</div>
<div className="title3">成功组局数/月</div> <div className="title3">成功闯关数</div>
</div> </div>
<div className="myRankInfo"> <div className="myRankInfo">
<div className="title1">{myRankInfo?.index == -1 ? '3000+' : !myRankInfo?.index ? '--' : myRankInfo?.index}</div> <div className="title1">{myRankInfo?.index == -1 ? '未上榜' : !myRankInfo?.index ? '-' : myRankInfo?.index}</div>
<div className="title2">{myRankInfo?.userName}(我)</div> <div className="title2">{myRankInfo?.userName}(我)</div>
<div className="title3">{myRankInfo?.score}</div> <div className="title3">{!myRankInfo?.index ? '-' : myRankInfo?.score}</div>
</div> </div>
<div className="rankList"> {
{ rankList && rankList.length > 0 ?
(rankList || []).map((item,index)=>{ <div className="rankList">
return( {
<div className="rankItem"> (rankList || []).map((item,index)=>{
<div className="rank"> return(
{item?.index < 4 ? <span></span> : item?.index} <div className="rankItem">
<div className="rank">
{item?.index < 4 ? <span></span> : item?.index}
</div>
<div className="name">{item?.userName}</div>
<div className="score">{item?.score}</div>
</div> </div>
<div className="name">{item?.userName}</div> )
<div className="score">{item?.score}</div> })
</div> }
)
}) </div>
} : <div className="noRank">暂无数据</div>
}
</div>
<span className="back" onClick={this.clickBack}></span> <span className="back" onClick={this.clickBack}></span>
</div>; </div>;
} }
......
...@@ -6,7 +6,7 @@ import './taskpop.less'; ...@@ -6,7 +6,7 @@ import './taskpop.less';
import { unwatchPageVisibility, watchPageVisibility } from '@/core/page-visibility-notify.ts'; import { unwatchPageVisibility, watchPageVisibility } from '@/core/page-visibility-notify.ts';
// import { handleLogClick, handleLogExposure } from '../../../MD'; // import { handleLogClick, handleLogExposure } from '../../../MD';
// import { RES_PATH } from '../../../sparkrc'; // import { RES_PATH } from '../../../sparkrc';
import { _throttle } from '../../utils/utils.ts'; import { _asyncThrottle, _throttle } from '../../utils/utils.ts';
import { TASK_CODE,CHANNEL_PARAMS, extranceName } from '../../utils/constants.ts'; import { TASK_CODE,CHANNEL_PARAMS, extranceName } from '../../utils/constants.ts';
import { setCookies } from '../../store/fetcher.ts'; import { setCookies } from '../../store/fetcher.ts';
import taskStore from '../../store/task.ts'; import taskStore from '../../store/task.ts';
...@@ -70,7 +70,7 @@ class Taskpop extends React.Component { ...@@ -70,7 +70,7 @@ class Taskpop extends React.Component {
}; };
/** 去完成 */ /** 去完成 */
taskDoHandle = _throttle(async (item) => { taskDoHandle = _asyncThrottle(async (item) => {
const {taskStatus, code} = item || {}; const {taskStatus, code} = item || {};
// if(code == TASK_CODE.INVITE){ // if(code == TASK_CODE.INVITE){
// MatterShareOpt(LOG_KEY.click,"b7870","d8729") // MatterShareOpt(LOG_KEY.click,"b7870","d8729")
...@@ -83,7 +83,7 @@ class Taskpop extends React.Component { ...@@ -83,7 +83,7 @@ class Taskpop extends React.Component {
}) })
/** 领奖 */ /** 领奖 */
taskPrizeHandle = _throttle(async (item) => { taskPrizeHandle = _asyncThrottle(async (item) => {
const { code, taskStatus } = item || {}; const { code, taskStatus } = item || {};
sensorLog(LOG_KEY.click, "b14312", "d14314", { sensorLog(LOG_KEY.click, "b14312", "d14314", {
page_name: "做任务,赚次数弹窗", page_name: "做任务,赚次数弹窗",
...@@ -122,7 +122,7 @@ class Taskpop extends React.Component { ...@@ -122,7 +122,7 @@ class Taskpop extends React.Component {
<div className="center_info"> <div className="center_info">
<span className="title">{`${val?.title}(${val?.completedSize}/${val?.intervalLimitSize})`}</span> <span className="title">{`${val?.title}(${val?.completedSize}/${val?.intervalLimitSize})`}</span>
{/* 「浏览企业人人保」、「浏览畅行保产品计划A赠险」、「浏览畅行保产品计划B赠险」 app端任务描述取描述 后端直接接口处理了 */} {/* 「浏览企业人人保」、「浏览畅行保产品计划A赠险」、「浏览畅行保产品计划B赠险」 app端任务描述取描述 后端直接接口处理了 */}
<span className="subtitle textover">{val?.subTitle}</span> <span className="subtitle">{val?.subTitle}</span>
</div> </div>
<img src={val?.icon} className="icon" /> <img src={val?.icon} className="icon" />
<div className="btns"> <div className="btns">
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
font-size: 22px; font-size: 22px;
color: #94590d; color: #94590d;
// line-height: 25px; // line-height: 25px;
// .lineClampN(2); .lineClampN(2);
} }
} }
.icon { .icon {
......
...@@ -197,12 +197,7 @@ const shareStore = makeAutoObservable({ ...@@ -197,12 +197,7 @@ const shareStore = makeAutoObservable({
const { success, code, data, message } = await API.doAssist({ inviteCode: CFG.inviteCode }); const { success, code, data, message } = await API.doAssist({ inviteCode: CFG.inviteCode });
if (success) { if (success) {
Toast.show("助力成功~") Toast.show("助力成功~")
// modalStore.pushPop("Assistsuccesspop"); }
// modalStore.pushPop("AssistSuccess");
} else {
// modalStore.pushPop("AssistFail", {message, code});
// modalStore.pushPop("Assistfailpop", { message, code });
}
sessionStorage.setItem("inviteCode", CFG.inviteCode); sessionStorage.setItem("inviteCode", CFG.inviteCode);
history.replaceState({}, "", location.href.replace(new RegExp(`[?&]inviteCode=[^&]*`), "")); history.replaceState({}, "", location.href.replace(new RegExp(`[?&]inviteCode=[^&]*`), ""));
}, },
......
...@@ -196,7 +196,7 @@ const taskStore = makeAutoObservable({ ...@@ -196,7 +196,7 @@ const taskStore = makeAutoObservable({
prizePendingCode: prizePendingCode, prizePendingCode: prizePendingCode,
}); });
if (success && data) { if (success && data) {
Toast.show(`抽奖次数+${data?.options?.[0]?.sendCount || 0}`); Toast.show(`答题次数+${data?.options?.[0]?.sendCount || 0}`);
await taskStore.getTaskList(); await taskStore.getTaskList();
await store.updateIndex(); await store.updateIndex();
} }
......
...@@ -8,11 +8,11 @@ export const errMessageMap = { ...@@ -8,11 +8,11 @@ export const errMessageMap = {
1021: "活动已结束", 1021: "活动已结束",
1007: "活动太火爆了,奖品已抢完咯~", 1007: "活动太火爆了,奖品已抢完咯~",
100001: "登录过期啦,请重新登录哦~", 100001: "登录过期啦,请重新登录哦~",
200306: "助力失败,不能给自己助力哦~", 200306: "无法为自己助力哦~",
200303: '助力机会已用完,一起来参与活动吧~', 200303: '助力机会已用完,一起来参与活动吧~',
200304: "好友今日任务已完成,明天再来助力吧~", 200304: "好友今日助力次数已达上限~",
200305: "已为好友助力哦~", 200305: "已为好友助力哦~",
20002: "活动已结束,感谢您的关注~" 20002: "活动已结束"
}; };
/** /**
......
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