Commit 76997d4c authored by haiyoucuv's avatar haiyoucuv

Merge remote-tracking branch 'origin/master'

parents 4f0c5b6b cdafe4c4
This diff is collapsed.
...@@ -11,7 +11,7 @@ export default [ ...@@ -11,7 +11,7 @@ export default [
"actStartTimestamp": Date.now()-42625488.007563084, "actStartTimestamp": Date.now()-42625488.007563084,
"answerChance": 666, "answerChance": 666,
"rank": null, "rank": null,
"uid": "123213", "uid": "00000000000",
"currentTimestamp": Date.now(), "currentTimestamp": Date.now(),
"actEndTimestamp": Date.now()+42625488.007563084, "actEndTimestamp": Date.now()+42625488.007563084,
"avatar": "/src/assets/homePage/head.png", "avatar": "/src/assets/homePage/head.png",
......
...@@ -152,7 +152,8 @@ ...@@ -152,7 +152,8 @@
left: 145px; left: 145px;
top: 67px; top: 67px;
position: absolute; position: absolute;
font-size: 30px; // font-size: 30px;
font-size: 28px;
line-height: 33px; line-height: 33px;
color: rgba(30, 76, 169, 1); color: rgba(30, 76, 169, 1);
.lineClamp1(); .lineClamp1();
......
...@@ -38,7 +38,6 @@ class Taskpop extends React.Component { ...@@ -38,7 +38,6 @@ class Taskpop extends React.Component {
MatterViewOpt("b14312", { MatterViewOpt("b14312", {
page_name: "做任务,赚次数弹窗", page_name: "做任务,赚次数弹窗",
entrance: extranceName[CFG.channel],
}); });
sensorLog(LOG_KEY.exposure, "b14312", "d14314", { sensorLog(LOG_KEY.exposure, "b14312", "d14314", {
......
...@@ -216,9 +216,9 @@ const shareStore = makeAutoObservable({ ...@@ -216,9 +216,9 @@ const shareStore = makeAutoObservable({
//CFG.projectId三元判断为真,前面的是正式,需要修改的地方为中间页链接,可咨询东哥链接(奖品页唤端) ios需要多encode一次 //CFG.projectId三元判断为真,前面的是正式,需要修改的地方为中间页链接,可咨询东哥链接(奖品页唤端) ios需要多encode一次
const testCustomId = "Did1NjEwNzk"; //奖品-测试中间页 const testCustomId = "Did1NjEwNzk"; //奖品-测试中间页
const prodCustomId = "Did1NjExMjc"; //奖品-正式中间页 const prodCustomId = "Did1NjExMjc"; //奖品-正式中间页
//pafc25ff1 为正式项目 需替换为正式项目ID //pd3ee4a37 为正式项目 需替换为正式项目ID
windowJumpUrl( windowJumpUrl(
CFG.projectId == "pafc25ff1" CFG.projectId == "pd3ee4a37"
? "https://lifeapp.picclife.cn/portal/app_manager/downloadapps.html?operate_link=" + ? "https://lifeapp.picclife.cn/portal/app_manager/downloadapps.html?operate_link=" +
encodeURIComponent( encodeURIComponent(
`https://lifeapp-api.picclife.cn/lifeapi/lifeapp-svc-gw/api/auth_code/authorize/v1?activity_code=613402&redirect_type=0&redirect_uri=${isIos() `https://lifeapp-api.picclife.cn/lifeapi/lifeapp-svc-gw/api/auth_code/authorize/v1?activity_code=613402&redirect_type=0&redirect_uri=${isIos()
......
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