Skip to content

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

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

# Conflicts:
#	dsl.json
#	project/src/pages/detail2/detail2.jsx
#	project/src/pages/detail2/detail2.less
#	project/src/pages/loading/loading.jsx合并冲突
parents ad88db55 2061f995
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 275 additions and 331 deletions
.DS_Store
View file @ d9fe4d68
No preview for this file type
dsl.json
View file @ d9fe4d68
This diff is collapsed.
project/.DS_Store
View file @ d9fe4d68
No preview for this file type
project/src/.DS_Store
View file @ d9fe4d68
No preview for this file type
project/src/pages/detail2/detail2.jsx
View file @ d9fe4d68
...@@ -9,33 +9,46 @@ class Detail2 extends Component { ...@@ -9,33 +9,46 @@ class Detail2 extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
resList: resList, resList: resList
}; };
} }
render() { render() {
const arr = [];
for(let i=0; i < 20;i++) {
arr.push(i)
}
return ( return (
<div className="detail2 " uuid="c5abc304-1a0b-4804-956a-d61c1d5b75ed"> <div className="detail2 " uuid="c5abc304-1a0b-4804-956a-d61c1d5b75ed">
<img <div className="detail2_wrapper" uuid="583667d9-e382-49d8-bfc9-50b6d800c794">
className="detail2_bg "
uuid="2b6c5d97-e458-42a0-b49b-49e9efc6abbc"
src={this.state.resList['9d6135a5-469f-4293-b931-17786c977974'].url}
/>
<div className="detail2_item " uuid="4d8289ea-9464-4a92-a81c-3e24c364e707">
<span className="detail2_item_title " uuid="48b63d65-a3d8-4b94-b979-3fcb19c9d89c">
每日签到
</span>
<span className="detail2_item_day " uuid="5e6c50df-f25c-4b91-acc7-95d4829ff7db">
2020-12-25 09:54:30
</span>
<span className="detail2_item_num " uuid="e576e938-d57d-4101-82bc-c0b0782033c9">
+418
</span>
<img <img
className="detail2_item_bg " className="detail2_bg"
uuid="46e8b6fd-f561-445c-85eb-be7136ea5183" uuid="2b6c5d97-e458-42a0-b49b-49e9efc6abbc"
src={this.state.resList['eed0f2f8-74ef-4680-a29c-d5db6818738f'].url} src={this.state.resList['9d6135a5-469f-4293-b931-17786c977974'].url}
/> />
<div className="detail2_item_list" uuid="3804f60d-697f-4d68-98b5-ca8cf2e2d3ba">
{
arr.map((i) => (
<div className="detail2_item " uuid="4d8289ea-9464-4a92-a81c-3e24c364e707">
<span className="detail2_item_title " uuid="48b63d65-a3d8-4b94-b979-3fcb19c9d89c">
每日签到{i}
</span>
<span className="detail2_item_day " uuid="5e6c50df-f25c-4b91-acc7-95d4829ff7db">
2020-12-25 09:54:30
</span>
<span className="detail2_item_num " uuid="e576e938-d57d-4101-82bc-c0b0782033c9">
+418
</span>
<img
className="detail2_item_bg "
uuid="46e8b6fd-f561-445c-85eb-be7136ea5183"
src={this.state.resList['eed0f2f8-74ef-4680-a29c-d5db6818738f'].url}
/>
</div>
))
}
</div>
</div> </div>
</div> </div>
); );
......
project/src/pages/detail2/detail2.less
View file @ d9fe4d68
.detail2 { .detail2 {
width: 750px; width: 100vw;
height: 1624px; height: 100vh;
position: fixed; position: absolute;
left: 0px; left: 0px;
top: 0px; top: 0px;
transform-origin: 0 0 0; transform-origin: 0 0 0;
.detail2_bg { overflow: hidden;
width: 750px; .detail2_wrapper {
height: 1624px; width: 100%;
position: absolute; height: 100%;
left: -2px; overflow: hidden;
top: 0px; display: flex;
transform-origin: 0 0 0; flex-direction: row;
} background-color: transparent;
.detail2_item { .detail2_bg {
width: 618px; width: 750px;
height: 91px; height: 1624px;
left: 65px;
top: 235px;
position: absolute;
.detail2_item_title {
width: 193px;
height: 23px;
left: 53px;
position: absolute;
font-size: 24px;
color: #474747;
}
.detail2_item_day {
width: 284px;
height: 16px;
left: 52px;
top: 42px;
position: absolute; position: absolute;
font-size: 20px; left: 0px;
color: #949494; top: 0px;
z-index: -1;
transform-origin: 0 0 0;
} }
.detail2_item_num { .detail2_item_list {
width: 88px; background-color: red;
height: 31px; width: 100%;
left: 455px; // height: 100%;
top: 8px; flex: 1;
position: absolute; margin-top: 214px;
font-size: 40px; display: flex;
color: #474747; flex-flow: row wrap;
} align-content: flex-start;
.detail2_item_bg { overflow-y: scroll;
width: 618px; .detail2_item {
height: 1px; margin-left:63px;
top: 90px; position: relative;
position: absolute; box-sizing: border-box;
width: 618px;
height: 107px;
// width: 618px;
// height: 91px;
// left: 65px;
// top: 235px;
// position: absolute;
.detail2_item_title {
width: 193px;
height: 23px;
left: 53px;
position: absolute;
font-size: 24px;
color: #474747;
}
.detail2_item_day {
width: 284px;
height: 16px;
left: 52px;
top: 42px;
position: absolute;
font-size: 20px;
color: #949494;
}
.detail2_item_num {
width: 88px;
height: 31px;
left: 455px;
top: 8px;
position: absolute;
font-size: 40px;
color: #474747;
}
.detail2_item_bg {
width: 618px;
height: 1px;
bottom: 0px;
position: absolute;
}
}
} }
} }
} }
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