Commit 726ba408 authored by 李硕's avatar 李硕

提交

parent 32319826
......@@ -13,7 +13,7 @@ export const rule = {
export const index = {
"code": "",
"data": {
"newHandFlg": true,
"newHandFlg": false,
"nicknameFlg":true,
"wishCountFlg": false
},
......
......@@ -8,12 +8,14 @@ body {
font-size: 24px;
width: 100%;
height: 100%;
// overflow-y: scroll;
// overflow: hidden;
}
// #root {
// width: 750px;
// height: 1624px;
// }
\ No newline at end of file
#root {
width: 750px;
height: 1624px;
position: absolute;
top: 33%;
transform: translateY(-33%);
}
\ No newline at end of file
......@@ -2,9 +2,10 @@
top: 0px;
left: 0px;
width: 750px;
height: 1624px;
display: block;
position: absolute;
height: 100vh;
position: fixed;
// overflow: hidden;
.awardmodal {
width: 750px;
height: 1236px;
......@@ -18,9 +19,10 @@
height: 1630px;
background-color: black;
opacity: 0.9;
overflow: hidden;
top: -5px;
left: -5px;
position: fixed;
// position: fixed;
}
......@@ -31,6 +33,7 @@
position: absolute;
transform-origin: 0px 0px 0px;
}
.checkbtn {
width: 373px;
height: 102px;
......@@ -40,6 +43,7 @@
position: absolute;
transform-origin: 0px 0px 0px;
}
.awardclose1 {
width: 40px;
height: 40px;
......@@ -49,6 +53,7 @@
position: absolute;
transform-origin: 0px 0px 0px;
}
.prizeimg {
width: 262px;
height: 262px;
......@@ -60,4 +65,4 @@
// background-color: rgba(255, 255, 255, 1);
}
}
}
}
\ No newline at end of file
......@@ -2,11 +2,9 @@
top: 0px;
left: 0px;
width: 750px;
height: 1624px;
display: block;
position: absolute;
height: 100vh;
position: fixed;
// overflow: scroll;
// .guideShadow {
// width: 750px;
// height: 400px;
......@@ -22,7 +20,8 @@
height: 1624px;
opacity: 1;
position: absolute;
overflow-y: scroll;
// overflow-y: scroll;
// overflow: hidden;
transform-origin: 0px 0px 0px;
.guidebg {
......
......@@ -15,7 +15,8 @@ class Comshowprizepanel extends Component {
<div className="awardshow ">
<img className="shadow " src={this.state.resList['aa92b715-98a8-45e7-ad95-d0eef6ea1324'].url} />
<img className="prize " src={this.state.resList['89c37143-ca3d-46b6-99dc-646c58b44443'].url} />
<span className="awardcontent ">“工”送好礼!</span>
{/* <span className="awardcontent ">“工”送好礼!</span> */}
<img className="labImg22 " src={resList['44d84c3e-912f-49e4-9992-e6d47fc7cec9'].url} />
</div>
</div>
);
......
......@@ -35,6 +35,18 @@
animation: openPrize 0.4s linear 2;
}
.labImg22 {
width: 450px;
height: 90px;
opacity: 1;
left: 160px;
top: 1000px;
text-align: center;
position: absolute;
transform-origin: 0px 0px 0px;
}
.awardcontent {
width: 500px;
height: 105px;
......@@ -51,13 +63,15 @@
@keyframes openPrize {
0% {
transform: rotate(-30deg) scale(1);
transform: rotate(-30deg);
}
50% {
transform: rotate(30deg) scale(1.2);
transform: rotate(30deg);
}
100% {
transform: rotate(-30deg) scale(1);
transform: rotate(-30deg);
}
}
......
......@@ -9,11 +9,11 @@ import './pagemainscene.less';
import ruleMoadl from '../../components/comrulepanel/comrulepanel.jsx';
import { mHistory } from '../../BaseRouter.jsx';
const RuleModal = getModalHoc(ruleMoadl);
class Pagemainscene extends Component {
constructor(props) {
super(props);
this.state = {
resList: resList,
modalType: "",
prizeImg: "",
// isDo: true,
......@@ -40,11 +40,10 @@ class Pagemainscene extends Component {
})
this.modalControl(MODAL_NAME.P_RULE)
} else {
Toast(ERROR_MESSSAGE(code),2000)
Toast(ERROR_MESSSAGE(code), 2000)
}
}
async scenceJump() {
console.log('场景跳转');
mHistory.push({ pathname: '/a' });
......@@ -69,7 +68,7 @@ class Pagemainscene extends Component {
if (url) {
window.location.href = url;
} else {
Toast("请检查网络",2000);
Toast("请检查网络", 2000);
}
}
}
......@@ -78,14 +77,19 @@ class Pagemainscene extends Component {
let { modalType, prizeImg, rule } = this.state;
return (
<div className="mainscene point1">
<img className="bg12 " src={this.state.resList['0086550d-2ac4-4217-be82-bab2fb4587fe'].url} />
<img className="bg12 " src={resList['0086550d-2ac4-4217-be82-bab2fb4587fe'].url} />
<div className="mainpage ">
<img className="mainbg " src={this.state.resList['264a6134-1735-43c6-87ae-4143bf11ffde'].url} />
<img className="bankLogo" src={this.state.resList['66e62244-e960-45ce-9ae6-09a3efab360d'].url} />
<img className="awardbtn " onClick={() => { this.jumpUrl(JUMP_URL.AWARD_URL); }} src={this.state.resList['03f842be-59cf-42e9-b845-71aec8da2ef7'].url} />
<img className="rulebtn " onClick={() => { this.setRuleData() }} src={this.state.resList['f38cd0ee-a25a-49d7-b526-105c4129edbe'].url} />
<img className="startbtn point2" onClick={() => { this.scenceJump() }} src={this.state.resList['fd891b60-f234-44f2-a6a8-0e759f5e4a77'].url} />
<img className="mainbg " src={resList['264a6134-1735-43c6-87ae-4143bf11ffde'].url} />
</div>
<div className='main-ui'>
<img className="bankLogo" src={resList['66e62244-e960-45ce-9ae6-09a3efab360d'].url} />
<img className="awardbtn " onClick={() => { this.jumpUrl(JUMP_URL.AWARD_URL); }} src={resList['03f842be-59cf-42e9-b845-71aec8da2ef7'].url} />
<img className="rulebtn " onClick={() => { this.setRuleData() }} src={resList['f38cd0ee-a25a-49d7-b526-105c4129edbe'].url} />
<img className="startbtn point2" onClick={() => { this.scenceJump() }} src={resList['fd891b60-f234-44f2-a6a8-0e759f5e4a77'].url} />
</div>
{modalType == MODAL_TYPE[MODAL_NAME.P_RULE] && <RuleModal rule={rule} onClose={() => { this.modalControl() }}></RuleModal>}
</div>
);
......
.mainscene {
top: -100px;
left: 0px;
width: 750px;
height: 1624px;
......@@ -32,13 +31,23 @@
top: 0px;
left: 0px;
}
}
.main-ui {
width: 100vw;
height: 100vh;
position: fixed;
top: 33%;
transform: translateY(-33%);
left: 0;
.bankLogo {
width: 369px;
height: 32px;
opacity: 1;
left: 5px;
top: 150px;
// top: 150px;
top: 3%;
position: absolute;
transform-origin: 0px 0px 0px;
}
......@@ -46,32 +55,25 @@
.awardbtn {
width: 150px;
height: 53px;
opacity: 1;
left: 600px;
top: 209px;
position: absolute;
transform-origin: 0px 0px 0px;
right: 0;
top: 6%;
}
.rulebtn {
width: 150px;
height: 53px;
opacity: 1;
left: 0px;
top: 209px;
position: absolute;
transform-origin: 0px 0px 0px;
left: 0;
top: 6%;
}
.startbtn {
width: 408px;
height: 112px;
opacity: 1;
left: 171px;
// top: 1309px;
bottom: 390px;
bottom: calc((422px - (1624px - 100vh)) * 0.7);
position: absolute;
transform-origin: 0px 0px 0px;
}
}
}
\ No newline at end of file
......@@ -142,10 +142,7 @@ class Pageresultscene extends Component {
return (
<div className="resultscene ">
<img className="bg " src={this.state.resList['93ef9977-c6a5-4e96-ad2b-47b5b717dc19'].url} />
<img className="awardbtn2 " onClick={() => { this.jumpUrl(JUMP_URL.AWARD_URL); }} src={this.state.resList['df88f4c3-4e66-4936-84dc-654eb165ae93'].url} />
<img className="rulebtn2 " onClick={() => { this.setRuleData() }} src={this.state.resList['1b800919-334c-4223-a299-3946e453fc80'].url} />
<img className="againbtn point7" onClick={() => { this.againWish() }} src={this.state.resList['442a4667-1ae0-43f7-b1f9-37a6cedf138f'].url} />
<img className="sharebtn point6" onClick={() => { this.shareMsg() }} src={this.state.resList['73f4c449-b3e1-4797-90ce-438b9ba415de'].url} />
<div className="wishresult ">
<img className="wishbg " src={this.state.resList['57172e95-f331-47b6-af37-9464c39ba69d'].url} />
<img className="shareImg " src={this.state.resList['0dd921f7-14be-4900-b404-24574796ac07'].url} />
......@@ -176,6 +173,11 @@ class Pageresultscene extends Component {
{resultObj.content || "这个世界真的有人过着你想过的生活, 你要相信你也可以。 致敬2021,致敬你的梦想,祝心想事成!"}
</span>
</div>
<img className="awardbtn2 " onClick={() => { this.jumpUrl(JUMP_URL.AWARD_URL); }} src={this.state.resList['df88f4c3-4e66-4936-84dc-654eb165ae93'].url} />
<img className="rulebtn2 " onClick={() => { this.setRuleData() }} src={this.state.resList['1b800919-334c-4223-a299-3946e453fc80'].url} />
<img className="againbtn point7" onClick={() => { this.againWish() }} src={this.state.resList['442a4667-1ae0-43f7-b1f9-37a6cedf138f'].url} />
<img className="sharebtn point6" onClick={() => { this.shareMsg() }} src={this.state.resList['73f4c449-b3e1-4797-90ce-438b9ba415de'].url} />
<label className="shareMsgLab ">扫码许愿</label>
{modalType == MODAL_TYPE[MODAL_NAME.P_PRIZE_OPEN] && <OpenPrize></OpenPrize>}
{/* {modalType == MODAL_TYPE[MODAL_NAME.P_PRIZE_RESULT] && <PrizePanel onClose={() => { this.modalControl() }} data={prizeData}></PrizePanel>} */}
{modalType == MODAL_TYPE[MODAL_NAME.P_RULE] && <RuleModal rule={rule} onClose={() => { this.modalControl() }}></RuleModal>}
......
......@@ -12,7 +12,6 @@
height: 1624px;
opacity: 1;
position: absolute;
transform-origin: 0px 0px 0px;
}
.awardbtn2 {
......@@ -20,7 +19,7 @@
height: 53px;
opacity: 1;
left: 600px;
top: 209px;
top: 23vw;
// top: 20px;
position: absolute;
transform-origin: 0px 0px 0px;
......@@ -31,7 +30,7 @@
height: 53px;
opacity: 1;
left: -10px;
top: 209px;
top: 23vw;
// top: 20px;
position: absolute;
transform-origin: 0px 0px 0px;
......@@ -42,7 +41,8 @@
height: 103px;
opacity: 1;
left: 50px;
top: 1319px;
// top: 1319px;
bottom: 44vw;
position: absolute;
transform-origin: 0px 0px 0px;
}
......@@ -52,11 +52,25 @@
height: 102px;
opacity: 1;
left: 385px;
top: 1319px;
// top: 1319px;
bottom: 44vw;
position: absolute;
transform-origin: 0px 0px 0px;
}
.shareMsgLab {
width: 120px;
height: 30px;
// opacity: 1;
left: 560px;
top: 1145px;
color: #944c12;
text-align: center;
font-size: 23px;
position: absolute;
font: bold;
}
.shareImg {
width: 140px;
height: 140px;
......@@ -72,7 +86,8 @@
height: 1121px;
opacity: 1;
left: 5px;
top: 160px;
// top: 160px;
top: 9vw;
position: absolute;
transform-origin: 0px 0px 0px;
pointer-events: none;
......@@ -175,5 +190,8 @@
font-size: 23px;
color: rgba(148, 76, 18, 1);
}
}
}
\ No newline at end of file
......@@ -5,6 +5,7 @@
height: 1624px;
display: block;
position: absolute;
overflow: hidden;
.wishpage {
width: 750px;
......@@ -29,7 +30,7 @@
// top: 171px;
// margin-left: -10.7vw;
// margin-top: -7.5vw;
margin-left:-80px;
margin-left: -80px;
margin-top: -60px;
position: absolute;
transform-origin: 0px 0px 0px;
......@@ -45,7 +46,7 @@
// top: 0px;
// margin-left: -10.7vw;
// margin-top: -7.5vw;
margin-left:-80px;
margin-left: -80px;
margin-top: -60px;
position: absolute;
pointer-events: none;
......@@ -72,7 +73,8 @@
height: 104px;
opacity: 1;
left: 109px;
top: 1305px;
// top: 1305px;
bottom: 48vw;
position: absolute;
transform-origin: 0px 0px 0px;
display: block;
......@@ -83,7 +85,8 @@
height: 116px;
opacity: 1;
left: 106px;
top: 1305px;
// top: 1305px;
bottom: 47vw;
position: absolute;
transform-origin: 0px 0px 0px;
display: block;
......@@ -94,7 +97,8 @@
height: 116px;
opacity: 1;
left: 106px;
top: 1306px;
// top: 1306px;
bottom: 44vw;
font-size: 43px;
margin-top: 20px;
position: absolute;
......@@ -111,7 +115,9 @@
height: 92px;
opacity: 1;
left: 125px;
top: 1189px;
// top: 1189px;
bottom: 65vw;
position: absolute;
transform-origin: 0px 0px 0px;
......
......@@ -9,7 +9,7 @@ const resList = {
name: 'mainBg',
ext: '.png',
uuid: '264a6134-1735-43c6-87ae-4143bf11ffde',
url: '//yun.duiba.com.cn/spark/assets/589507100baf940e36154fb4e2b38ac629242ca6.png',
url: '//yun.duiba.com.cn/spark/assets/08e98af1b9272feff8382c801b81e67c004d4b15.jpg',
},
'03f842be-59cf-42e9-b845-71aec8da2ef7': {
name: 'awardBtn',
......@@ -33,7 +33,7 @@ const resList = {
name: 'nickTitle',
ext: '.png',
uuid: '18aff2cc-0e6d-4445-9ec6-d303d6539e26',
url: '//yun.duiba.com.cn/spark/assets/478fa963fd097f53d7f67508dc63cffd0971de11.png',
url: '//yun.duiba.com.cn/spark/assets/3d1eea0dec91251c1f293c058c42e006de123fab.png',
},
'012e2a83-6e78-4f10-9ea7-c26dab7cb711': {
name: 'closeBtn',
......@@ -63,7 +63,7 @@ const resList = {
name: 'awardBg',
ext: '.png',
uuid: '23c6394c-27f6-4d97-a161-14c7c25576cb',
url: '//yun.duiba.com.cn/spark/assets/e4fe69f733fc6f10b2b579683f92f53463c6ad83.png',
url: '//yun.duiba.com.cn/spark/assets/49d8bc777a79fb8468704d37e7c0128ca5f96b84.png',
},
'27185466-4588-425b-b55d-bd663a6885a2': {
name: 'checkBtn',
......@@ -75,7 +75,7 @@ const resList = {
name: 'bg',
ext: '.png',
uuid: '85e8f480-2736-404d-88f5-0498715afaba',
url: '//yun.duiba.com.cn/spark/assets/6d1b793d3b61b8b8b4ae4dae12c7420c76e0e01b.png',
url: '//yun.duiba.com.cn/spark/assets/46ec8e9d3dfcdedad73ba1fd0b34d3aac257cc0a.png',
},
'edd43bc3-dec8-4085-848f-9ec98b26f56d': {
name: 'tagLight',
......@@ -112,7 +112,7 @@ const resList = {
name: 'guideBg',
ext: '.png',
uuid: '7a698ace-ce6e-4602-9a87-6535e80c087a',
url: '//yun.duiba.com.cn/spark/assets/80e523b8deb0ead43488e5ef8de0908f34a43a0b.png',
url: '//yun.duiba.com.cn/spark/assets/8102142dc77f5977bb95013e1eaac84f30f4e523.png',
},
'c60ec7de-fe4e-4c4d-9038-f249b078c456': {
name: 'guideBtn',
......@@ -190,7 +190,7 @@ const resList = {
name: 'wishBg',
ext: '.png',
uuid: '57172e95-f331-47b6-af37-9464c39ba69d',
url: '//yun.duiba.com.cn/spark/assets/c76bee44f70f23a109e83e1aacf956c6dd3d88b6.png',
url: '//yun.duiba.com.cn/spark/assets/b9bcbc68b782046184137ef8c4179386e8522908.png',
},
'aa92b715-98a8-45e7-ad95-d0eef6ea1324': {
name: 'shadow',
......@@ -208,7 +208,7 @@ const resList = {
name: 'awardBg1',
ext: '.png',
uuid: 'e73c12f5-eb68-48a5-bd3b-01ea3ae1881d',
url: '//yun.duiba.com.cn/spark/assets/ce85feedd3d18d8f30c1297be25888dd2846a33f.png',
url: '//yun.duiba.com.cn/spark/assets/bc9a81311bdb163323e2c817a8303e0b142684ad.png',
},
'b8893125-a836-4af2-892b-b5b01fc56772': {
name: 'getAwardBtn',
......@@ -232,7 +232,7 @@ const resList = {
name: 'regretBg',
ext: '.png',
uuid: '8e48e42e-1f93-4f1c-bf11-a5acc6144054',
url: '//yun.duiba.com.cn/spark/assets/1d38377bec96c7d35f7baf6508672ec659b5b080.png',
url: '//yun.duiba.com.cn/spark/assets/67e3fc1761c6194f6e0e3dc6b0d3eb6dce7adf63.png',
},
'91235e12-0608-450c-82ce-2cb50f2e8806': {
name: 'prizeKnowBtn',
......@@ -244,7 +244,7 @@ const resList = {
name: 'load',
ext: '.png',
uuid: 'a4f92f5b-4926-4db0-8e98-6348dda22c8a',
url: '//yun.duiba.com.cn/spark/assets/010f739460fed427e8fa2ec633ac7a5bc7f5ffb8.png',
url: '//yun.duiba.com.cn/spark/assets/921c1acc97f0924bff9665a05669ad5aff77e5a9.png',
},
'ee411dfb-e92f-4316-a0bf-1abf0f877b04': {
name: 'loadingBg',
......@@ -281,6 +281,12 @@ const resList = {
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/dab445569b96a670e1b316fc394fce5ef9884534.png',
uuid: 'd80d731b-86f0-4c81-875a-6702d799dd40'
}
},
'44d84c3e-912f-49e4-9992-e6d47fc7cec9': {
name: 'labImg22',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/42d8ad21ebc563d7d3fa2b2e3baed04e362fad82.png',
uuid: '44d84c3e-912f-49e4-9992-e6d47fc7cec9'
},
};
export default resList;
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