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
Show 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
......@@ -115,24 +115,6 @@
"uuid": "298ea3b7-efbb-42ac-adea-ee68aa1db627",
"nodeType": "Div",
"viewType": "Component",
"children": [
{
"name": "cardone",
"properties": {
"attrs": {},
"style": {
"transformOrigin": "50% 50%",
"width": 535,
"height": 614,
"position": "absolute",
"left": 0,
"right": 0
},
"className": "cardone"
},
"uuid": "36334c7a-26df-4f9e-83d3-6ac81e49d6db",
"nodeType": "Div",
"viewType": "Component",
"children": [
{
"name": "select_role1",
......@@ -143,8 +125,8 @@
"style": {
"width": 535,
"height": 614,
"left": 0,
"top": 0,
"left": 68,
"top": 229,
"position": "absolute"
},
"className": "select_role1"
......@@ -154,49 +136,6 @@
"viewType": "Component",
"children": []
},
{
"name": "onemask",
"properties": {
"attrs": {
"source": "asset://5608e852-913b-47e0-a286-0c33a86aed10"
},
"style": {
"width": 523,
"height": 614,
"display": "block",
"left": 0,
"top": 0,
"position": "absolute",
"transformOrigin": "0 0 0"
},
"className": "onemask"
},
"uuid": "912dc687-6727-4bb1-9e87-936ea77074ce",
"nodeType": "Image",
"viewType": "Component",
"children": []
}
]
},
{
"name": "cardtwo",
"properties": {
"attrs": {},
"style": {
"width": 535,
"height": 614,
"transformOrigin": "50% 50%",
"position": "absolute",
"left": 146,
"right": 0,
"top": 410
},
"className": "cardtwo"
},
"uuid": "a24b6660-832b-4fd0-94e6-b627f4aefb68",
"nodeType": "Div",
"viewType": "Component",
"children": [
{
"name": "select_role2",
"properties": {
......@@ -206,8 +145,8 @@
"style": {
"width": 535,
"height": 614,
"left": 0,
"top": 0,
"left": 68,
"top": 229,
"position": "absolute"
},
"className": "select_role2"
......@@ -217,49 +156,6 @@
"viewType": "Component",
"children": []
},
{
"name": "twomask",
"properties": {
"attrs": {
"source": "asset://5608e852-913b-47e0-a286-0c33a86aed10"
},
"style": {
"width": 523,
"height": 614,
"display": "block",
"left": 0,
"top": 0,
"position": "absolute",
"transformOrigin": "0 0 0"
},
"className": "twomask"
},
"uuid": "d54f2e03-e401-42a3-8132-8e8138e5c4f9",
"nodeType": "Image",
"viewType": "Component",
"children": []
}
]
},
{
"name": "cardthr",
"properties": {
"attrs": {},
"style": {
"width": 535,
"height": 614,
"transformOrigin": "50% 50%",
"position": "absolute",
"left": -228,
"right": 0,
"top": 360
},
"className": "cardthr"
},
"uuid": "68b6c97e-82f0-412b-8950-2665aba842fa",
"nodeType": "Div",
"viewType": "Component",
"children": [
{
"name": "select_role3",
"properties": {
......@@ -269,8 +165,8 @@
"style": {
"width": 535,
"height": 614,
"left": 0,
"top": 0,
"left": 68,
"top": 229,
"position": "absolute"
},
"className": "select_role3"
......@@ -280,30 +176,6 @@
"viewType": "Component",
"children": []
},
{
"name": "thrmask",
"properties": {
"attrs": {
"source": "asset://5608e852-913b-47e0-a286-0c33a86aed10"
},
"style": {
"width": 523,
"height": 614,
"display": "block",
"left": 0,
"top": 0,
"position": "absolute",
"transformOrigin": "0 0 0"
},
"className": "thrmask"
},
"uuid": "28141b28-0c40-4810-8233-cc392753d698",
"nodeType": "Image",
"viewType": "Component",
"children": []
}
]
},
{
"name": "select_bg",
"properties": {
......@@ -2355,18 +2227,34 @@
"properties": {
"attrs": {},
"style": {
"width": 750,
"height": 1624,
"position": "fixed",
"width": "100vw",
"height": "100vh",
"position": "absolute",
"left": 0,
"top": 0,
"transformOrigin": "0 0 0"
"transformOrigin": "0 0 0",
"overflow": "hidden"
},
"className": "detail2"
},
"uuid": "c5abc304-1a0b-4804-956a-d61c1d5b75ed",
"nodeType": "Div",
"viewType": "Page",
"children": [
{
"name": "detail2_wrapper",
"properties": {
"attrs": {},
"style": {
"width": "100%",
"height": "100%",
"overflow": "auto"
},
"className": "detail2_wrapper"
},
"uuid": "583667d9-e382-49d8-bfc9-50b6d800c794",
"nodeType": "Div",
"viewType": "Page",
"children": [
{
"name": "detail2_bg",
......@@ -2389,16 +2277,34 @@
"viewType": "Page",
"children": []
},
{
"name": "detail2_item_list",
"properties": {
"attrs": {},
"style": {
"width": "100%",
"height": "auto",
"paddingTop": 214
},
"className": "detail2_item_list"
},
"uuid": "3804f60d-697f-4d68-98b5-ca8cf2e2d3ba",
"nodeType": "Div",
"viewType": "Page",
"children": [
{
"name": "detail2_item",
"properties": {
"attrs": {},
"style": {
"display": "flex",
"justifyContent": "center",
"alignItems": "center",
"marginLeft": 63,
"position": "relative",
"boxSizing": "border-box",
"width": 618,
"height": 91,
"left": 65,
"top": 235,
"position": "absolute"
"height": 107
},
"className": "detail2_item"
},
......@@ -2480,7 +2386,7 @@
"style": {
"width": 618,
"height": 1,
"top": 90,
"bottom": 0,
"position": "absolute"
},
"className": "detail2_item_bg"
......@@ -2493,6 +2399,10 @@
]
}
]
}
]
}
]
},
{
"name": "main3",
......@@ -3443,12 +3353,6 @@
"ext": ".png",
"uuid": "56b64b91-4e9a-49bd-bfd0-20d10b6e6556",
"url": "https://yun.duiba.com.cn/spark/assets/1605e4514fc7f6c14072f8ed1a1e4d38c020f50e.png"
},
{
"name": "selectimgbg",
"ext": ".png",
"url": "https://yun.duiba.com.cn/spark/assets/85a8a0621d283a84ccd77b272850806b54279a08.png",
"uuid": "5608e852-913b-47e0-a286-0c33a86aed10"
}
],
"animations": [],
......
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,21 +9,29 @@ class Detail2 extends Component {
constructor(props) {
super(props);
this.state = {
resList: resList,
resList: resList
};
}
render() {
const arr = [];
for(let i=0; i < 20;i++) {
arr.push(i)
}
return (
<div className="detail2 " uuid="c5abc304-1a0b-4804-956a-d61c1d5b75ed">
<div className="detail2_wrapper" uuid="583667d9-e382-49d8-bfc9-50b6d800c794">
<img
className="detail2_bg "
className="detail2_bg"
uuid="2b6c5d97-e458-42a0-b49b-49e9efc6abbc"
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
......@@ -37,6 +45,11 @@ class Detail2 extends Component {
src={this.state.resList['eed0f2f8-74ef-4680-a29c-d5db6818738f'].url}
/>
</div>
))
}
</div>
</div>
</div>
);
}
......
project/src/pages/detail2/detail2.less
View file @ d9fe4d68
.detail2 {
width: 750px;
height: 1624px;
position: fixed;
width: 100vw;
height: 100vh;
position: absolute;
left: 0px;
top: 0px;
transform-origin: 0 0 0;
overflow: hidden;
.detail2_wrapper {
width: 100%;
height: 100%;
overflow: hidden;
display: flex;
flex-direction: row;
background-color: transparent;
.detail2_bg {
width: 750px;
height: 1624px;
position: absolute;
left: -2px;
left: 0px;
top: 0px;
z-index: -1;
transform-origin: 0 0 0;
}
.detail2_item_list {
background-color: red;
width: 100%;
// height: 100%;
flex: 1;
margin-top: 214px;
display: flex;
flex-flow: row wrap;
align-content: flex-start;
overflow-y: scroll;
.detail2_item {
margin-left:63px;
position: relative;
box-sizing: border-box;
width: 618px;
height: 91px;
left: 65px;
top: 235px;
position: absolute;
height: 107px;
// width: 618px;
// height: 91px;
// left: 65px;
// top: 235px;
// position: absolute;
.detail2_item_title {
width: 193px;
height: 23px;
......@@ -48,8 +73,10 @@
.detail2_item_bg {
width: 618px;
height: 1px;
top: 90px;
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