diff --git a/src/components/Send.js b/src/components/Send.js index b4ac49c..0553eb2 100644 --- a/src/components/Send.js +++ b/src/components/Send.js @@ -22,10 +22,12 @@ const styles = theme => ({ width: "100%", }, submitButtonWeb: { + background: "#FF8C00", margin: theme.spacing.unit, width: 200, }, submitButtonApp: { + background: "#FF8C00", justifyContent: "center", transform: 'translate(50%,-50%)', width: "50%", @@ -59,7 +61,19 @@ const styles = theme => ({ left: '50%', transform: 'translate(-50%,-50%)', }, + property:{ + width: 200, + fontWeight: 'normal', + justifyContent: "center", + marginBottom: theme.spacing.unit*2, + marginLeft: theme.spacing.unit, + marginRight: theme.spacing.unit, + }, + Big:{ + fontSize: '30px', + }, }); + const Send = (props) =>{ const { classes } = props; const ERR_EMPTY_MESSAGE="入力されていません"; @@ -73,6 +87,9 @@ const Send = (props) =>{ onSubmit={e=>{props.sendSubmit(e)}} >
+ {!(IS_TABLET)? + 総資産 {props.Propety} FNY + :null} { @@ -60,11 +61,13 @@ class AppSend extends Component { errorEmptyNum: false, submitModal: false, }); + alert('送金できました!'); }; render(){ return (
{this.sendSubmit(e)}} errorMoney={this.state.errorMoney} errorNum={this.state.errorNum} @@ -73,11 +76,11 @@ class AppSend extends Component { submitModal={this.state.submitModal} closeModal={this.closeModal} sendDetermine={this.sendDetermine} - handleChange={(e)=>{this.handleChange(e)}} - sendMoney={this.state.sendMoney} - studentNum={this.state.studentNum} - /> -
+ handleChange={(e)=>{this.handleChange(e)}} + sendMoney={this.state.sendMoney} + studentNum={this.state.studentNum} + /> +
); } } diff --git a/src/containers/Request_BACKUP_63967.js b/src/containers/Request_BACKUP_63967.js index 9e56ebd..9beb4f3 100644 --- a/src/containers/Request_BACKUP_63967.js +++ b/src/containers/Request_BACKUP_63967.js @@ -1,11 +1,6 @@ import React, { Component } from 'react'; import RequestInput from '../components/RequestInput.js'; import RequestButton from '../components/RequestButton.js'; -<<<<<<< HEAD -import RequestButtonModal from '../components/RequestButtonModal.js'; - -======= ->>>>>>> 携帯版の要求画面を作成 import '../App.css' class Request extends Component {