Skip to content

I
icbcRPG
Commit 25b2471a authored by zhangjinzhou's avatar zhangjinzhou
Browse files
Options

Merge branch 'master' of gitlab2.dui88.com:wildfirecode13/icbcrpg into 引导选人load

parents 94dd4a96 6fc969c1
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 39 deletions
project/mock/e-family/index.js
View file @ 25b2471a
......@@ -26,7 +26,7 @@ export const doshare = {
export const signInfo = {
"code": null,
"data": {
"continuousDays": 0,
"continuousDays": 1,
"needPopup": 0,
"signLists": [
{
......@@ -38,35 +38,35 @@ export const signInfo = {
},
{
"awardName": "欢趣豆",
"awardValue": 100,
"awardValue": 200,
"day": 2,
"ruleId": "",
"type": "joyBean"
},
{
"awardName": "欢趣豆",
"awardValue": 200,
"awardValue": 300,
"day": 3,
"ruleId": "",
"type": "joyBean"
},
{
"awardName": "欢趣豆",
"awardValue": 100,
"awardValue": 400,
"day": 4,
"ruleId": "",
"type": "joyBean"
},
{
"awardName": "欢趣豆",
"awardValue": 100,
"awardValue": 500,
"day": 5,
"ruleId": "",
"type": "joyBean"
},
{
"awardName": "欢趣豆",
"awardValue": 100,
"awardValue": 600,
"day": 6,
"ruleId": "",
"type": "joyBean"
......
project/src/components/sign/sign.jsx
View file @ 25b2471a
......@@ -10,11 +10,12 @@ import API from '../../api';
class Sign extends Component {
constructor(props) {
super(props);
const { todaySigned, continuousDays } = props.data;
const { todaySigned, continuousDays,signLists } = props.data;
this.state = {
resList: resList,
todaySigned,
continuousDays
continuousDays,
signLists
};
}
......@@ -35,7 +36,11 @@ class Sign extends Component {
};
render() {
const { todaySigned } = this.state;
const { todaySigned ,signLists,continuousDays} = this.state;
const signedList=[];
for(let i=0;i <7;i++) {
signedList[i] = i <continuousDays;
}
return (
<div className="sign " uuid="14a66aed-4e41-4fea-9d16-6aa02c1bad5a">
<img
......@@ -131,7 +136,7 @@ class Sign extends Component {
第1天
</span>
<span className="sgin_1_num " uuid="5c0b6718-64b6-40eb-b06c-f73cd91df196">
+100
+{signLists[0].awardValue}
</span>
</div>
<div className="sgin_2 " uuid="4db452f3-1f3c-4704-9fa0-eb01a567be79">
......@@ -144,7 +149,7 @@ class Sign extends Component {
第2天
</span>
<span className="sgin_2_num " uuid="833e9ef5-e365-466c-85bf-0755cf94ee68">
+100
+{signLists[1].awardValue}
</span>
</div>
<div className="sgin_5 " uuid="9c432630-cf94-4f07-8aa3-001676bf2e67">
......@@ -157,7 +162,7 @@ class Sign extends Component {
第5天
</span>
<span className="sgin_5_num " uuid="86e3ec53-08fd-4a08-ba6a-e05313166294">
+100
+{signLists[4].awardValue}
</span>
</div>
<div className="sgin_6 " uuid="1cd3c04d-2ef6-402d-93d2-119907b58b84">
......@@ -170,7 +175,7 @@ class Sign extends Component {
第6天
</span>
<span className="sgin_6_num " uuid="40335448-620f-4082-baa3-426b9a09e136">
+100
+{signLists[5].awardValue}
</span>
</div>
<div className="sgin_7 " uuid="7bee93bb-797d-4e2b-bfcf-4d56d4a68eaa">
......@@ -193,7 +198,7 @@ class Sign extends Component {
第3天
</span>
<span className="sgin_3_num " uuid="3aec9445-daf0-4652-bacb-33f2af91c0ea">
+200
+{signLists[2].awardValue}
</span>
</div>
<div className="sgin_4 " uuid="5934c1d6-e941-433c-babf-2b911fe6e1b8">
......@@ -206,10 +211,10 @@ class Sign extends Component {
第4天
</span>
<span className="sgin_4_num " uuid="68491c5e-a63c-47af-8534-879f6470725f">
+100
+{signLists[3].awardValue}
</span>
</div>
<div className="signed_1 " uuid="91dc6812-e5ab-45ea-8cf6-cfbe7ede032d">
{signedList[0] && <div className="signed_1 " uuid="91dc6812-e5ab-45ea-8cf6-cfbe7ede032d">
<img
className="signed_1_bg "
uuid="93055c77-f9cc-41c4-ab23-d0920885f86c"
......@@ -219,10 +224,10 @@ class Sign extends Component {
第1天
</span>
<span className="signed_1_num " uuid="6ca77850-6185-495a-afec-0b288f039b64">
+100
+{signLists[0].awardValue}
</span>
</div>
<div className="signed_2 " uuid="01a19090-6b12-408a-8ae2-04fa052b421e">
</div>}
{signedList[1] &&<div className="signed_2 " uuid="01a19090-6b12-408a-8ae2-04fa052b421e">
<img
className="signed_2_bg "
uuid="499e7734-4c6e-4dc1-ae57-9533cfadbe7c"
......@@ -232,10 +237,10 @@ class Sign extends Component {
第2天
</span>
<span className="signed_2_num " uuid="acfbff8d-8670-436a-8f7e-e960d7b7c82a">
+100
+{signLists[1].awardValue}
</span>
</div>
<div className="signed_3 " uuid="94200bbc-fca2-41e5-a9a5-0ab43ece60d7">
</div>}
{signedList[2] &&<div className="signed_3 " uuid="94200bbc-fca2-41e5-a9a5-0ab43ece60d7">
<img
className="signed_3_bg "
uuid="4a7e2ba6-0719-4cac-bc14-365998f2175d"
......@@ -245,10 +250,10 @@ class Sign extends Component {
第3天
</span>
<span className="signed_3_num " uuid="81f622ec-d099-4270-92c8-1da247bcf4f3">
+100
+{signLists[2].awardValue}
</span>
</div>
<div className="signed_4 " uuid="bf7a2ddd-c662-4ab2-93a5-a60693043863">
</div>}
{signedList[3] &&<div className="signed_4 " uuid="bf7a2ddd-c662-4ab2-93a5-a60693043863">
<img
className="signed_4_bg "
uuid="afb52fc3-1968-4bf5-a9ab-9d19dee08d6c"
......@@ -258,10 +263,10 @@ class Sign extends Component {
第4天
</span>
<span className="signed_4_num " uuid="09492167-4793-4be4-8a32-e37ce5d4dcc1">
+100
+{signLists[3].awardValue}
</span>
</div>
<div className="signed_5 " uuid="a49b0dac-b1ea-41e3-988d-79f164620568">
</div>}
{signedList[4] &&<div className="signed_5 " uuid="a49b0dac-b1ea-41e3-988d-79f164620568">
<img
className="signed_5_bg "
uuid="0e3d6178-e9cc-4f47-9344-585b8bc1e15f"
......@@ -271,10 +276,10 @@ class Sign extends Component {
第5天
</span>
<span className="signed_5_num " uuid="a214fe3b-e6cf-4ecb-ae8d-6bdc8f445a0d">
+100
+{signLists[4].awardValue}
</span>
</div>
<div className="signed_6 " uuid="96acf396-cef8-43a4-bd69-fb7d9c1467c6">
</div>}
{signedList[5] &&<div className="signed_6 " uuid="96acf396-cef8-43a4-bd69-fb7d9c1467c6">
<img
className="signed_6_bg "
uuid="af53284f-de9a-4ed6-94f8-90576911d120"
......@@ -284,9 +289,9 @@ class Sign extends Component {
第6天
</span>
<span className="signed_6_num " uuid="410b5238-9514-4c4f-abe1-9977ba0d29ea">
+100
+{signLists[5].awardValue}
</span>
</div>
</div>}
{todaySigned && (
<img
className="sign_signed_btn "
......@@ -302,7 +307,7 @@ class Sign extends Component {
src={this.state.resList['13b618c4-cd2a-4037-9664-b77381fbfade'].url}
/>
)}
<div className="signed_7 " uuid="7b91c31c-0de4-4148-9887-6ab24e963258">
{signedList[5] &&<div className="signed_7 " uuid="7b91c31c-0de4-4148-9887-6ab24e963258">
<img
className="signed_7_bg "
uuid="348400d8-166c-463b-b6a4-e4b3a24d9a7b"
......@@ -311,7 +316,7 @@ class Sign extends Component {
<span className="signed_7_txt " uuid="32c14336-2aa7-4bdd-8e5f-8c3763ad8c6b">
第7天
</span>
</div>
</div>}
</div>
);
}
......
project/src/pages/main3/main3.jsx
View file @ 25b2471a
......@@ -19,7 +19,8 @@ class Main3 extends Component {
nickName: '',
joyBeans: "0",
figureId:-1,
needguide: false
needguide: false,
rolepop:0
};
}
......@@ -144,7 +145,7 @@ class Main3 extends Component {
}
render() {
const { figureId, nickName, joyBeans, needguide } = this.state;
const {rolepop, figureId, nickName, joyBeans, needguide } = this.state;
return (
<div className="main3 diacontmidpos" uuid="8754a9d1-7453-474b-b722-7cb71483ae85" ref="main3" >
<img
......@@ -257,11 +258,11 @@ class Main3 extends Component {
uuid="9aec4461-b6d4-47fb-a08d-99453aff3567"
src={this.state.resList['6a414fa5-00f2-4c42-b444-f95dc9d774f2'].url}
/>
<img
{rolepop&&<img
className="main3_rolepop "
uuid="c27fef65-4506-42f8-85df-207999e11de1"
src={this.state.resList['56b64b91-4e9a-49bd-bfd0-20d10b6e6556'].url}
/>
/>}
{needguide ? <CanvasWidget className="diacontmidpos" widgetFactory={Guideact} widgetConfig={widgetConfig}
onEvent={this.onEvent.bind(this)}
......
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