Skip to content

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

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

# Conflicts:
#	project/src/resconfig/resList.js
合并master
parents 932cde49 cec7f22f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 3577 deletions
.DS_Store
View file @ 89bc4263
No preview for this file type
dsl.json
View file @ 89bc4263
This source diff could not be displayed because it is too large. You can view the blob instead.
project/.DS_Store
View file @ 89bc4263
No preview for this file type
project/.gitignore
View file @ 89bc4263
node_modules
dist
\ No newline at end of file
dist
.DS_Store
\ No newline at end of file
project/src/.DS_Store
View file @ 89bc4263
No preview for this file type
project/src/app.jsx
View file @ 89bc4263
......@@ -3,12 +3,11 @@ import ReactDOM from "react-dom";
import MD from '../MD';
import { MOCK_STATUS } from '../sparkrc';
import "./app.less";
import Detail2 from "./pages/detail2/detail2.jsx";
//此处为spark-cli动态生成
import Loading from "./pages/loading/loading.jsx";
import Mainpage from "./pages/mainpage/mainpage.jsx";
import Main3 from "./pages/main3/main3.jsx";
import Detail2 from "./pages/detail2/detail2.jsx";
import { Aup, AUPOP, AUP_MBX_STATE } from './pop';
import { AUPOP, AUP_MBX_STATE } from './pop';
MOCK_STATUS && (require('../mock/index'));
MD();
......
project/src/components/sign/sign.jsx
View file @ 89bc4263
......@@ -16,7 +16,7 @@ class Sign extends Component {
componentDidMount() {
setTimeout(() => {
Toast('sdfsdfsdfsdf', 1000 * 100);
// Toast('sdfsdfsdfsdf', 1000 * 100);
}, 1000);
}
......
project/src/pages/detail2/detail2.jsx
View file @ 89bc4263
......@@ -13,9 +13,16 @@ class Detail2 extends Component {
};
}
componentDidMount(){
setTimeout(() => {
this.props.navigateTo('mainpage')
}, 2000);
}
render() {
const arr = [];
for(let i=0; i < 20;i++) {
for(let i=0; i < 10;i++) {
arr.push(i)
}
return (
......@@ -29,7 +36,7 @@ class Detail2 extends Component {
<div className="detail2_item_list" uuid="3804f60d-697f-4d68-98b5-ca8cf2e2d3ba">
{
arr.map((i) => (
<div className="detail2_item " uuid="4d8289ea-9464-4a92-a81c-3e24c364e707">
<div key={i} className="detail2_item " uuid="4d8289ea-9464-4a92-a81c-3e24c364e707">
<span className="detail2_item_title " uuid="48b63d65-a3d8-4b94-b979-3fcb19c9d89c">
每日签到{i}
</span>
......
project/src/pages/detail2/detail2.less
View file @ 89bc4263
......@@ -23,7 +23,7 @@
transform-origin: 0 0 0;
}
.detail2_item_list {
background-color: red;
// background-color: red;
width: 100%;
// height: 100%;
flex: 1;
......@@ -37,7 +37,8 @@
position: relative;
box-sizing: border-box;
width: 618px;
height: 107px;
height: 91px;
padding: 25px 0 0 ;
// width: 618px;
// height: 91px;
......
project/src/pages/main3/main3.jsx
View file @ 89bc4263
......@@ -3,6 +3,7 @@
import React, { Component } from 'react';
import resList from '../../resconfig/resList'; //import API from '../../api';
import { Aup, AUPOP, AUP_MBX_STATE } from '../../pop';
import './main3.less';
class Main3 extends Component {
......@@ -10,10 +11,24 @@ class Main3 extends Component {
super(props);
this.state = {
resList: resList,
nickname:'nickname',
avatar:1,
num:"1123"
};
}
componentDidMount() {
if (this.props.data) {
setTimeout(() => {
// Aup.show('PopRule', {}, this)
// Aup.show('Userinfo', {}, this);
// Aup.show('Sign', {}, this); // Aup.show('Select', {}, this);
}, 200);
}
}
render() {
const {avatar,nickname,num} = this.state;
return (
<div className="main3 " uuid="8754a9d1-7453-474b-b722-7cb71483ae85">
<img
......@@ -28,26 +43,26 @@ class Main3 extends Component {
uuid="5316b02a-5b8e-4355-b556-cd801852df7e"
src={this.state.resList['31522099-3ea6-4d2b-ae84-99e2877bd2d0'].url}
/>
<img
{avatar == 1 &&<img
className="main3_avatar1 "
uuid="f2277018-36fd-4f47-9124-d73324505dff"
src={this.state.resList['6dda365e-565e-4e15-9fc9-89b5e173dcd9'].url}
/>
<img
/>}
{avatar == 2 &&<img
className="main3_avatar2 "
uuid="07d1620b-d31e-4ef7-a63a-9b0ef49497da"
src={this.state.resList['6ff31046-e036-4218-8cc9-5d715dfa64a1'].url}
/>
<img
/>}
{avatar == 3 &&<img
className="main3_avatar3 "
uuid="dc2306b9-90e0-4e98-a967-e0f263a3217a"
src={this.state.resList['b4aa3a56-6a4f-4984-9aa2-1932c35de3b4'].url}
/>
/>}
<span className="main3_num " uuid="018875e0-9592-4854-ba0b-2cd58464a6a2">
欢趣豆：12352
欢趣豆：{num}
</span>
<span className="main3_nick " uuid="a7518930-17cc-427a-a6e5-27a593b309c4">
用户昵称
{nickname}
</span>
<img
onClick={() => {
......
project/src/pages/main3/main3.less
View file @ 89bc4263
......@@ -12,7 +12,8 @@
height: 401px;
left: 22px;
top: 38px;
position: absolute;
position: fixed;
display: block;
.main3_userinfo {
width: 375px;
height: 97px;
......@@ -44,8 +45,8 @@
position: absolute;
}
.main3_num {
width: 164px;
height: 22px;
// width: 164px;
// height: 22px;
left: 105px;
top: 57px;
position: absolute;
......@@ -53,8 +54,8 @@
color: #ffffff;
}
.main3_nick {
width: 96px;
height: 24px;
// width: 96px;
// height: 24px;
left: 105px;
top: 20px;
position: absolute;
......@@ -102,6 +103,7 @@
height: 405px;
top: 1073px;
position: absolute;
opacity: 0;
}
.main3_btn4 {
width: 279px;
......@@ -109,12 +111,14 @@
left: 440px;
top: 925px;
position: absolute;
opacity: 0;
}
.main3_btn3 {
width: 320px;
height: 315px;
top: 680px;
position: absolute;
opacity: 0;
}
.main3_btn2 {
width: 383px;
......@@ -122,12 +126,14 @@
left: 351px;
top: 419px;
position: absolute;
opacity: 0;
}
.main3_btn1 {
width: 283px;
height: 303px;
top: 308px;
position: absolute;
opacity: 0;
}
.main3_cursor {
width: 88px;
......@@ -149,5 +155,6 @@
left: 287px;
top: 1212px;
position: absolute;
display: none;
}
}
project/src/pages/mainpage/mainpage.jsx deleted 100644 → 0
View file @ 932cde49
'use strict';
import React, { Component } from 'react';
import resList from '../../resconfig/resList'; //import API from '../../api';
import './mainpage.less';
import { Aup, AUPOP, AUP_MBX_STATE } from '../../pop';
class Mainpage extends Component {
constructor(props) {
super(props);
this.state = {
resList: resList,
};
}
componentDidMount() {
if (this.props.data) {
setTimeout(() => {
// Aup.show('PopRule', {}, this)
// Aup.show('Userinfo', {}, this);
Aup.show('Sign', {}, this); // Aup.show('Select', {}, this);
}, 200);
}
}
render() {
return (
<div className="mainpage " uuid="1898b1e3-7737-449c-b7bf-0ee3cc1182bc">
<img
className="main_bg "
uuid="a0f83312-9ae7-4672-a6f6-4202140f86d7"
src={this.state.resList['6552b8b5-695f-49df-b74b-ad44aad81fd5'].url}
/>
<div className="main_guide1 " uuid="96dcfa18-ae8b-4f1b-aa08-6cabe9421c59">
<img
className="main_guide1_bg2 "
uuid="a0325fdb-ff80-4c8f-8acd-0b21a429222e"
src={this.state.resList['228a8b05-3ca7-49d9-b8c6-4a6081eca39c'].url}
/>
<div className="main_guide1_pop " uuid="c4a62680-a427-48b5-826a-712f63f9a78f">
<img
className="main_guide1_bg1 "
uuid="82835a57-239b-4a5f-b549-d479e4eb41df"
src={this.state.resList['79dcfca1-182c-49a1-ae2d-6c766a509ad9'].url}
/>
<span className="main_guide1_txt " uuid="2e1732e4-f5f2-4e8b-aa06-c26f2d24920d">
亲爱的朋友，欢迎来到e趣小镇，我是您的小镇管家小e！ 首先赠送你10000欢趣豆 下面跟着我一起了解e趣小镇吧！
</span>
</div>
</div>
<img
className="main_guide2 "
uuid="5774a705-4112-4719-a9eb-10ad79f9aaff"
src={this.state.resList['c88a14e8-fc0a-47b0-8e74-5e0d60a9aa27'].url}
/>
<img
className="main_guide3 "
uuid="73b50009-e44c-4466-8b59-8660fbc126cc"
src={this.state.resList['ef6eb21b-0ea0-441a-8de1-85b5c2f555fd'].url}
/>
<img
className="main_guide4 "
uuid="dd1830ef-df12-4831-b43b-3b5543907cf4"
src={this.state.resList['a4ccaf41-5a52-4cd5-82d3-6716e5c27d17'].url}
/>
<img
className="main_guide5 "
uuid="7fe077e3-50f2-4c90-a332-23525311567d"
src={this.state.resList['f843394c-9904-4134-ac2c-bde91e5a4f08'].url}
/>
<img
className="main_guide6 "
uuid="65dd0bd9-e7dd-4e2e-bc54-1ffc6dea5c37"
src={this.state.resList['907d8167-51e6-4f73-b4c6-ebc8af060aba'].url}
/>
<img
className="main_guide7 "
uuid="b56f9c9b-d76e-496f-b296-08e7253e5b35"
src={this.state.resList['fb184f33-56b2-4f62-9482-244ac9b24401'].url}
/>
<img
className="main_guide8 "
uuid="4d64de57-63e7-42da-9a3d-2900e7bb8717"
src={this.state.resList['1beada9a-81e4-4603-8446-9e961c914a9d'].url}
/>
<img
className="main_guide9 "
uuid="ac4a7c12-d6f8-40d9-8563-27f7c725b2f5"
src={this.state.resList['ef3545cf-abef-4010-99ed-16d6129c855d'].url}
/>
<img
className="main_skip "
uuid="a322a72f-6bed-4991-8029-69fcae878bb5"
src={this.state.resList['92613e30-1ac0-46f4-bc8a-a0ffa8f42b99'].url}
/>
</div>
);
}
}
export default Mainpage;
project/src/pages/mainpage/mainpage.less deleted 100644 → 0
View file @ 932cde49
.mainpage {
width: 752px;
height: 1666px;
position: absolute;
.main_bg {
width: 750px;
height: 1624px;
position: absolute;
}
.main_guide1 {
width: 752px;
height: 1666px;
position: absolute;
.main_guide1_bg2 {
width: 752px;
height: 1666px;
position: absolute;
}
.main_guide1_pop {
width: 633px;
height: 416px;
left: 44px;
top: 461px;
position: absolute;
.main_guide1_bg1 {
width: 633px;
height: 416px;
position: absolute;
}
.main_guide1_txt {
width: 417px;
height: 173px;
left: 117px;
top: 90px;
position: absolute;
font-size: 30px;
color: #434343;
}
}
}
.main_guide2 {
width: 750px;
height: 1624px;
position: absolute;
}
.main_guide3 {
width: 750px;
height: 1624px;
position: absolute;
}
.main_guide4 {
width: 750px;
height: 1624px;
position: absolute;
}
.main_guide5 {
width: 750px;
height: 1624px;
position: absolute;
}
.main_guide6 {
width: 750px;
height: 1624px;
position: absolute;
}
.main_guide7 {
width: 750px;
height: 1624px;
position: absolute;
}
.main_guide8 {
width: 750px;
height: 1624px;
position: absolute;
}
.main_guide9 {
width: 750px;
height: 1624px;
position: absolute;
}
.main_skip {
width: 107px;
height: 35px;
left: 321px;
top: 1394px;
position: absolute;
}
}
project/src/resconfig/resList.js
View file @ 89bc4263
This diff is collapsed.
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