Commit 77b24add authored by 俞嘉婷's avatar 俞嘉婷

Merge branch 'master' of gitlab2.dui88.com:sparkprojects/20250711_tbguardinglife

parents 4ac671cb 99bcfa8e
......@@ -64,6 +64,6 @@ if (CFG.env == 'test') {
}
if (!getUrlParam("appID")) {
// alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
}</script><link href="//yun.duiba.com.cn/spark/v2/temp_base/1753095381475/styles/vendors.49362eb71994b599718c.css" rel="stylesheet"><link href="//yun.duiba.com.cn/spark/v2/temp_base/1753095381475/styles/main.49362eb71994b599718c.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>"use strict";
}</script><link href="//yun.duiba.com.cn/spark/v2/temp_base/1753097357390/styles/vendors.96f1d70c57e61ea0f572.css" rel="stylesheet"><link href="//yun.duiba.com.cn/spark/v2/temp_base/1753097357390/styles/main.96f1d70c57e61ea0f572.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>"use strict";
CFG.___G___ = 'yujiating%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250711_tbguardinglife.git%20(fetch)%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250711_tbguardinglife.git%20(push)%3Bmaster%3B';</script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1753095381475/js/runtime-main.26170476.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1753095381475/js/vendors.4e667ab2.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1753095381475/js/main.d8e138f0.js" crossorigin="anonymous"></script></body></html>
\ No newline at end of file
CFG.___G___ = 'qimiao%3Bmaster%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250711_tbguardinglife.git%20(fetch)%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250711_tbguardinglife.git%20(push)%3B';</script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1753097357390/js/runtime-main.8cbc4f1b.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1753097357390/js/vendors.4e667ab2.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1753097357390/js/main.cb74797b.js" crossorigin="anonymous"></script></body></html>
\ No newline at end of file
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){function r(r){for(var n,a,l=r[0],i=r[1],p=r[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="//yun.duiba.com.cn/spark/v2/temp_base/1753095381475/";var l=window.webpackJsonp=window.webpackJsonp||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var p=0;p<l.length;p++)r(l[p]);var f=i;t()}([]);
//# sourceMappingURL=runtime-main.26170476.js.map
\ No newline at end of file
!function(e){function r(r){for(var n,a,l=r[0],i=r[1],p=r[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,p||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="//yun.duiba.com.cn/spark/v2/temp_base/1753097357390/";var l=window.webpackJsonp=window.webpackJsonp||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var p=0;p<l.length;p++)r(l[p]);var f=i;t()}([]);
//# sourceMappingURL=runtime-main.8cbc4f1b.js.map
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
{"numOfComponents":5048,"numOfProject":3494}
\ No newline at end of file
{"numOfComponents":5048,"numOfProject":3503}
\ No newline at end of file
......@@ -70,23 +70,24 @@ module.exports = {
timeStamp: 1752674176944,
},
"GET /draw/doDraw.do": {
success: true,
code: "",
message: "",
code: null,
data: {
prize: {
extra: '{"fillType":"identity"}',
optionId: "o578b2f7e",
optionImg: "//yun.duiba.com.cn/polaris/A-柴.9f8cec6363ce3f8a10f50e60dcc364c98754e772.png",
optionName: "柴券官微虚拟卡券1柴券官微虚拟卡券1",
position: 5,
prizeId: "sp_virtual_gw_1",
prizeType: 1,
ruleId: "ru_draw",
optionId: "ccccdddd",
optionName: "华为手环",
optionImg: "https://www.baidu.com/hw1.png",
prizeId: "thanks",
prizeType: 2,
position: 1,
userRecordId: 666,
url: "https://www.baidu.com/order/666",
sendCount: 1,
extra: "{}",
url: null,
userRecordId: 500874953,
},
},
message: null,
success: true,
timeStamp: 1753096966655,
},
};
......@@ -9,6 +9,6 @@ module.exports ={
"IMAGE_Q1": 0.6,
"IMAGE_Q2": 0.8,
"RES_PATH": "/src/assets/",
"RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/temp_base/1753087513942",
"JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1753095381475/js"
"RES_PATH_PROD": "//yun.duiba.com.cn/spark/v2/temp_base/1753096679488",
"JS_PATH_PROD": "https://yun.duiba.com.cn/spark/v2/temp_base/1753097357390/js"
}
\ No newline at end of file
{"preLoadImg":[],"asyncLoadImg":["answerPage/bg1.jpg","answerPage/bg2.jpg","answerPage/bg3.jpg","answerPage/bg4.jpg","answerPage/bg5.jpg","answerPage/bg6.jpg","answerPage/chooseBg.png","answerPage/normalBg.png","answerPage/q1.png","answerPage/q2.png","answerPage/q3.png","answerPage/q4.png","answerPage/q5.png","answerPage/q6.png","answerPage/queBg.png","answerPage/按钮.png","bindPop/bg.png","bindPop/bind_btn.png","common/back.png","common/close.png","drawChancePop/bg.png","drawChancePop/btn.png","drawFailPop/bg.png","drawFailPop/btn.png","drawPage/bg.png","drawPage/cloud.png","drawPage/draw_btn.png","drawPage/logo.png","drawPage/pointer.png","drawPage/prize_btn.png","drawPage/red_bg.png","drawPage/rule_btn.png","drawPage/subtitle_bg.png","drawPage/task_btn.png","drawPage/title.png","drawPage/turntable_bg.png","drawPage/turntable_box.png","drawPage/turntable_btn.png","drawSucPop/bg.png","drawSucPop/happy_btn.png","drawSucPop/leaves.png","drawSucPop/light.png","drawSucPop/prize_img.png","drawSucPop/title.png","EventPanel/不慎受伤.png","EventPanel/不慎摔伤.png","EventPanel/不慎摔倒.png","EventPanel/分红致富.png","EventPanel/古井无波.png","EventPanel/夏令营不慎摔倒.png","EventPanel/家长奖励.png","EventPanel/惨遭辞退.png","EventPanel/晋升.png","EventPanel/生活美满.png","EventPanel/电商震荡.png","EventPanel/职场风波.png","EventPanel/股市震荡.png","EventPanel/获得保障.png","EventPanel/获得保障2.png","EventPanel/获得文凭.png","EventPanel/财富提升.png","EventPanel/金生无忧.png","EventPanel/鑫禧年年.png","EventPanel/钱包发瘪.png","exitPop/bg.png","exitPop/cancel_btn.png","exitPop/confirm_btn.png","focusPop/bg.png","focusPop/qrcode_bg.png","FundsPanel/bg.png","FundsPanel/close.png","FundsPanel/去配置.png","homePage/bg.png","homePage/content.png","homePage/draw_btn.png","homePage/main_btn.png","homePage/ptize_btn.png","homePage/rule_btn.png","homePage/rule_prize.png","homePage/share_btn.png","homePage/subtitle_bg.png","homePage/task_btn.png","homePage/title.png","LifeSettingsPage/0岁.png","LifeSettingsPage/10岁.png","LifeSettingsPage/20岁.png","LifeSettingsPage/30岁.png","LifeSettingsPage/ageTitle.png","LifeSettingsPage/bg.jpg","LifeSettingsPage/cityTitle.png","LifeSettingsPage/familyTitle.png","LifeSettingsPage/title.png","LifeSettingsPage/一线.png","LifeSettingsPage/三口.png","LifeSettingsPage/三线.png","LifeSettingsPage/三线外.png","LifeSettingsPage/两口.png","LifeSettingsPage/二线.png","LifeSettingsPage/四口.png","LifeSettingsPage/开始测试.png","LifeSettingsPage/更多.png","LifeSettingsPage/选择框.png","LoadingPage/loadingBg.jpg","LoadingPage/loadingFill.png","LoadingPage/loadingIp.png","mid/bg.jpg","prizePage/back.png","prizePage/bg.png","prizePage/prize_btn.png","prizePage/prize_img.png","prizePage/prize_item_bg.png","prizePage/title.png","resultPage/poster/中产.jpg","resultPage/poster/富有.jpg","resultPage/poster/小康.jpg","resultPage/poster/负债.jpg","resultPage/中产.jpg","resultPage/分享结果.png","resultPage/去抽奖.png","resultPage/去查看.png","resultPage/富有.jpg","resultPage/小康.jpg","resultPage/负债.jpg","ReviewPanel/bg.jpg","ReviewPanel/itemBg0.png","ReviewPanel/itemBg1.png","rulePop/bg.png","svga/1输出首页氛围.svga","svga/2输出弹窗氛围.svga","svga/choose.svga","svga/home.svga","svga/pop.svga","taskPop/bg.png","taskPop/grey_bg.png","taskPop/red_bg.png","taskPop/task_icon.png","taskPop/task_item_bg.png","taskPop/yellow_bg.png"]}
\ No newline at end of file
{"preLoadImg":[],"asyncLoadImg":["EventPanel/不慎受伤.png","EventPanel/不慎摔伤.png","EventPanel/不慎摔倒.png","EventPanel/分红致富.png","EventPanel/古井无波.png","EventPanel/夏令营不慎摔倒.png","EventPanel/家长奖励.png","EventPanel/惨遭辞退.png","EventPanel/晋升.png","EventPanel/生活美满.png","EventPanel/电商震荡.png","EventPanel/职场风波.png","EventPanel/股市震荡.png","EventPanel/获得保障.png","EventPanel/获得保障2.png","EventPanel/获得文凭.png","EventPanel/财富提升.png","EventPanel/金生无忧.png","EventPanel/鑫禧年年.png","EventPanel/钱包发瘪.png","FundsPanel/bg.png","FundsPanel/close.png","FundsPanel/去配置.png","LifeSettingsPage/0岁.png","LifeSettingsPage/10岁.png","LifeSettingsPage/20岁.png","LifeSettingsPage/30岁.png","LifeSettingsPage/ageTitle.png","LifeSettingsPage/bg.jpg","LifeSettingsPage/cityTitle.png","LifeSettingsPage/familyTitle.png","LifeSettingsPage/title.png","LifeSettingsPage/一线.png","LifeSettingsPage/三口.png","LifeSettingsPage/三线.png","LifeSettingsPage/三线外.png","LifeSettingsPage/两口.png","LifeSettingsPage/二线.png","LifeSettingsPage/四口.png","LifeSettingsPage/开始测试.png","LifeSettingsPage/更多.png","LifeSettingsPage/选择框.png","LoadingPage/loadingBg.jpg","LoadingPage/loadingFill.png","LoadingPage/loadingIp.png","ReviewPanel/bg.jpg","ReviewPanel/itemBg0.png","ReviewPanel/itemBg1.png","answerPage/bg1.jpg","answerPage/bg2.jpg","answerPage/bg3.jpg","answerPage/bg4.jpg","answerPage/bg5.jpg","answerPage/bg6.jpg","answerPage/chooseBg.png","answerPage/normalBg.png","answerPage/q1.png","answerPage/q2.png","answerPage/q3.png","answerPage/q4.png","answerPage/q5.png","answerPage/q6.png","answerPage/queBg.png","answerPage/按钮.png","bindPop/bg.png","bindPop/bind_btn.png","common/back.png","common/close.png","drawChancePop/bg.png","drawChancePop/btn.png","drawFailPop/bg.png","drawFailPop/btn.png","drawPage/arrow.png","drawPage/bg.png","drawPage/cloud.png","drawPage/draw_btn.png","drawPage/logo.png","drawPage/pointer.png","drawPage/prize_btn.png","drawPage/red_bg.png","drawPage/rule_btn.png","drawPage/subtitle_bg.png","drawPage/task_btn.png","drawPage/title.png","drawPage/turntable_bg.png","drawPage/turntable_box.png","drawPage/turntable_btn.png","drawSucPop/bg.png","drawSucPop/happy_btn.png","drawSucPop/leaves.png","drawSucPop/light.png","drawSucPop/prize_img.png","drawSucPop/title.png","exitPop/bg.png","exitPop/cancel_btn.png","exitPop/confirm_btn.png","focusPop/bg.png","focusPop/qrcode_bg.png","homePage/bg.png","homePage/content.png","homePage/draw_btn.png","homePage/main_btn.png","homePage/ptize_btn.png","homePage/rule_btn.png","homePage/rule_prize.png","homePage/share_btn.png","homePage/subtitle_bg.png","homePage/task_btn.png","homePage/title.png","mid/bg.jpg","prizePage/back.png","prizePage/bg.png","prizePage/prize_btn.png","prizePage/prize_img.png","prizePage/prize_item_bg.png","prizePage/title.png","resultPage/poster/中产.jpg","resultPage/poster/富有.jpg","resultPage/poster/小康.jpg","resultPage/poster/负债.jpg","resultPage/中产.jpg","resultPage/分享结果.png","resultPage/去抽奖.png","resultPage/去查看.png","resultPage/富有.jpg","resultPage/小康.jpg","resultPage/负债.jpg","rulePop/bg.png","svga/1输出首页氛围.svga","svga/2输出弹窗氛围.svga","svga/choose.svga","svga/home.svga","svga/pop.svga","taskPop/bg.png","taskPop/grey_bg.png","taskPop/red_bg.png","taskPop/task_icon.png","taskPop/task_item_bg.png","taskPop/yellow_bg.png"]}
\ No newline at end of file
......@@ -27,7 +27,7 @@ class Drawsucpop extends React.Component {
buttonName: "开心收下",
});
modalStore.closePop();
// location.href = CFG.prize;
location.href = CFG.prize;
});
render() {
const { optionName, optionImg } = this.props.popData?.prize || {};
......@@ -37,10 +37,16 @@ class Drawsucpop extends React.Component {
<span className="title"></span>
{/* <span className="leaves"></span> */}
{/* <span className="bg"></span> */}
<img className="prize_img" src={optionImg} />
<div className="prize_img" style={{ backgroundImage: `url(${optionImg})` }}></div>
<span className="prize_name">{optionName}</span>
<Button className="happy_btn md21" onClick={this.jumpPrize}></Button>
<span className="tips">奖品可在首页 我的奖品 中查看</span>
<span className="tips">奖品可在首页 【奖品】 中查看</span>
<span
className="close"
onClick={() => {
sensorMdClick("PopupClick", { pageName: "守护人生活动-中奖弹窗", buttonName: "关闭" });
modalStore.closePop();
}}></span>
</div>
);
}
......
......@@ -31,18 +31,18 @@
}
.prize_img {
left: 225px;
top: 615px;
top: 630px;
width: 301px;
height: 323px;
position: absolute;
// .sparkBg("drawSucPop/prize_img.png");
border-radius: 20px;
background-size: cover;
}
.prize_name {
width: 426px;
height: 32px;
left: 168px;
top: 1000px;
top: 970px;
position: absolute;
font-size: 28px;
line-height: 32px;
......@@ -62,7 +62,7 @@
width: 342px;
height: 20px;
left: 209px;
top: 1222px;
top: 1180px;
position: absolute;
font-size: 20px;
line-height: 20px;
......@@ -77,4 +77,12 @@
height: 103px;
.sparkBg("drawSucPop/title.png");
}
.close {
position: absolute;
left: 348px;
top: 1248px;
width: 53px;
height: 52px;
.sparkBg("common/close.png");
}
}
......@@ -114,7 +114,7 @@ class Taskpop extends React.Component {
prizePendingCode: task?.prizePendingCode,
});
if (success) {
data?.options?.[0]?.sendCount && Toast(`恭喜您领取${data.options[0].sendCount}抽奖次数`);
data?.options?.[0]?.sendCount && Toast(`恭喜您领取${data.options[0].sendCount}测试次数`);
this.getTaskList();
}
});
......
......@@ -69,8 +69,10 @@ class Drawpage extends React.Component {
this.turntableRef.launch();
this.drawResultInfo = data || {};
console.log('drawResultInfo', this.drawResultInfo)
// 转盘停止转动,指针停在index
const index = optionInfoList?.findIndex((item) => item.prizeId === this.drawResultInfo.prizeId);
const index = optionInfoList?.findIndex((item) => item.prizeId === this.drawResultInfo?.prize.prizeId);
console.info("index", index);
// !important 注意:randomOffset设置为false,这样每次旋转的偏移量就不是随机滴啦
this.turntableRef.braking(index, { immediately: false, randomOffset: false });
......@@ -158,6 +160,7 @@ class Drawpage extends React.Component {
didStop={this.stopOkHandle}
/>
<span className="pointer"></span>
<span className="arrow"></span>
{/* <span className="cloud"></span> */}
</div>
<Button className="back" onClick={this.backHome} />
......
......@@ -168,6 +168,15 @@
.sparkBg("drawPage/turntable_btn.png");
}
.arrow {
position: absolute;
left: 344px;
top: 30px;
width: 53px;
height: 79px;
.sparkBg("drawPage/arrow.png");
}
.cloud {
width: 704px;
height: 596px;
......@@ -178,4 +187,4 @@
pointer-events: none;
}
}
}
\ No newline at end of file
}
@import "../../res.less";
.homepage {
width: 750px;
height: 1624px;
height: 100vh;
left: 0px;
top: 0px;
position: absolute;
overflow-y: auto;
.bg {
width: 750px;
height: 1624px;
......
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