Commit 5efcd2f4 authored by zhangjinzhou's avatar zhangjinzhou

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

# Conflicts:
#	project/src/components/select/select.less
合并master
parents 8bd46a0e 3a069cfd
...@@ -13,7 +13,7 @@ export const homeInfo = { ...@@ -13,7 +13,7 @@ export const homeInfo = {
"figureId": "3" "figureId": "3"
} }
], ],
"newUser": true, "newUser": false,
"userInfo": { "userInfo": {
"figureId": "1", "figureId": "1",
"joyBeans": 10000, "joyBeans": 10000,
......
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
width: 612px; width: 612px;
height: 784px; height: 784px;
left: 71px; left: 71px;
top: 386px;
top: 50%;
margin-top: -392px;
position: absolute; position: absolute;
.rule_bg { .rule_bg {
width: 609px; width: 609px;
......
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
width: 612px; width: 612px;
height: 936px; height: 936px;
left: 71px; left: 71px;
top: 291px; // top: 291px;
top: 50%;
margin-top: -145px;
position: absolute; position: absolute;
.sign_bg { .sign_bg {
width: 609px; width: 609px;
......
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