Skip to content

M
max_android_panel
Commit 0db76cbc by wujiabao
Options

开发平板四期

parent c305a0a7
Showing with 23 additions and 9 deletions
client/components/BreakageComponent/defaultComponent/DefaultComponnet.jsx
import React from 'react'; import React from 'react';
import Button from '../../CommonComponent/ButtonComponent/ButtonComponent' import Button from '../../CommonComponent/ButtonComponent/ButtonComponent'
import PropTypes from "prop-types";
class DefaultComponent extends React.Component{ class DefaultComponent extends React.Component{
constructor(props){ constructor(props){
super(props) super(props)
...@@ -14,12 +15,19 @@ class DefaultComponent extends React.Component{ ...@@ -14,12 +15,19 @@ class DefaultComponent extends React.Component{
style={{marginTop:UTILPATH.getRemByPx(150),marginLeft:'50%',transform:'translate(-50%)'}} style={{marginTop:UTILPATH.getRemByPx(150),marginLeft:'50%',transform:'translate(-50%)'}}
option={this.skipInputCode.bind(this)} option={this.skipInputCode.bind(this)}
/> />
<Button {
text={'没有'} this.props.menuType===''?<Button
btnContainer={'col333 font30 bordere5e5e5'} text={'没有'}
style={{marginTop:UTILPATH.getRemByPx(30),marginLeft:'50%',transform:'translate(-50%)'}} btnContainer={'col333 font30 bordere5e5e5'}
option={this.props.pullTaskList} style={{marginTop:UTILPATH.getRemByPx(30),marginLeft:'50%',transform:'translate(-50%)'}}
/> option={this.props.pullTaskList}
/>:<Button
text={'没有'}
btnContainer={'col333 font30 bordere5e5e5'}
style={{marginTop:UTILPATH.getRemByPx(30),marginLeft:'50%',transform:'translate(-50%)'}}
option={this.context.goBackTask}
/>
}
</div> </div>
) )
} }
...@@ -30,4 +38,7 @@ class DefaultComponent extends React.Component{ ...@@ -30,4 +38,7 @@ class DefaultComponent extends React.Component{
this.props.changeSanCodePage('SanCode') this.props.changeSanCodePage('SanCode')
} }
} }
DefaultComponent.contextTypes = {
goBackTask: PropTypes.func
};
export default DefaultComponent; export default DefaultComponent;
\ No newline at end of file
client/containers/BreakageContainer/BreakageConatiner.jsx
...@@ -115,6 +115,7 @@ class BreakageContainer extends React.Component { ...@@ -115,6 +115,7 @@ class BreakageContainer extends React.Component {
switch(showPage){ switch(showPage){
case 1 : case 1 :
pages=<DefaultComponent pullTaskList={props.pullTaskList} pages=<DefaultComponent pullTaskList={props.pullTaskList}
menuType={props.menuType}
changeCodePage={this.changeCodePage.bind(this)} changeCodePage={this.changeCodePage.bind(this)}
changeSanCodePage={this.changeSanCodePage.bind(this)} changeSanCodePage={this.changeSanCodePage.bind(this)}
/> />
......
client/containers/PageContainer/PageContainer.jsx
...@@ -248,8 +248,6 @@ class PageContainer extends React.Component { ...@@ -248,8 +248,6 @@ class PageContainer extends React.Component {
this.changePages(CONFIG.showPage[9]); this.changePages(CONFIG.showPage[9]);
break; break;
} }
}else{
this.changePages(CONFIG.showPage[13]);
} }
} }
...@@ -566,6 +564,8 @@ class PageContainer extends React.Component { ...@@ -566,6 +564,8 @@ class PageContainer extends React.Component {
this.changePages(CONFIG.showPage[9]); this.changePages(CONFIG.showPage[9]);
break; break;
} }
}else{
this.changePages(CONFIG.showPage[13]);
} }
} }
......
client/index.js
...@@ -29,7 +29,7 @@ function renderPage(store) { ...@@ -29,7 +29,7 @@ function renderPage(store) {
let store = activateVendor(); let store = activateVendor();
// UTILPATH.socket.init(129,17); // UTILPATH.socket.init(129,17);
UTILPATH.socket.testIp(202); UTILPATH.socket.testIp(14);
// UTILPATH.socket.getIp(); // UTILPATH.socket.getIp();
renderPage(store); renderPage(store);
\ No newline at end of file
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