@@ -207,8 +207,8 @@ class IndexMobile extends React.Component {
render() {
const { hidden } = this.state;
- const TabBarHidden = location.pathname === '/indexMobile' ? hidden : true;
- const navbarIconShow = !['/indexMobile/commobileBill'].includes(location.pathname);
+ const TabBarHidden = location.pathname === "/indexMobile" ? hidden : true;
+ const navbarIconShow = !["/indexMobile/commobileBill"].includes(location.pathname);
const msg = this.props.app.unRead;
const msgObj = commonUtils.isJSON(msg) ? JSON.parse(msg) : {};
return (
@@ -216,14 +216,13 @@ class IndexMobile extends React.Component {
: null}
onLeftClick={() => {
if (TabBarHidden && navbarIconShow) {
window.history.back(-1);
}
- }
- }
+ }}
className={styles.iconColor}
>
{this.state.title}
@@ -231,9 +230,17 @@ class IndexMobile extends React.Component {
@@ -243,139 +250,153 @@ class IndexMobile extends React.Component {
tintColor="#33A3F4"
barTintColor="white"
hidden={TabBarHidden}
- style={{ display: location.pathname === '/indexMobile' ? 'block' : 'none' }}
+ style={{ display: location.pathname === "/indexMobile" ? "block" : "none" }}
>
+ icon={
+
}
- selectedIcon={
+ selectedIcon={
+
}
- selected={this.state.selectedTab === 'message'}
+ selected={this.state.selectedTab === "message"}
badge={msgObj.iCount || 0}
onPress={() => {
const { app } = this.props;
const { token } = app;
commonBusiness.clearSocketData({ token, value: {}, sModelsId: 100 });
this.setState({
- selectedTab: 'message', title: '消息',
+ selectedTab: "message",
+ title: "消息",
});
- this.props.dispatch(history.push('/indexMobile'));
+ this.props.dispatch(history.push("/indexMobile"));
}}
data-seed="logId"
>
- {this.state.selectedTab === 'message' ? this.renderContent(this.state.selectedTab) : ''}
+ {this.state.selectedTab === "message" ? this.renderContent(this.state.selectedTab) : ""}
}
selectedIcon={
-
}
title="现场"
key="scene"
// badge="new"
- selected={this.state.selectedTab === 'scene'}
+ selected={this.state.selectedTab === "scene"}
onPress={() => {
const { app } = this.props;
const { token } = app;
commonBusiness.clearSocketData({ token, value: {}, sModelsId: 100 });
this.setState({
- selectedTab: 'scene', title: '现场',
+ selectedTab: "scene",
+ title: "现场",
});
- this.props.dispatch(history.push('/indexMobile'));
+ this.props.dispatch(history.push("/indexMobile"));
}}
data-seed="logId1"
>
- {this.state.selectedTab === 'scene' ? this.renderContent(this.state.selectedTab) : ''}
+ {this.state.selectedTab === "scene" ? this.renderContent(this.state.selectedTab) : ""}
}
selectedIcon={
-
}
title="工作台"
key="workbench"
// badge="2"
- selected={this.state.selectedTab === 'workbench'}
+ selected={this.state.selectedTab === "workbench"}
onPress={() => {
const { app } = this.props;
const { token } = app;
commonBusiness.clearSocketData({ token, value: {}, sModelsId: 100 });
this.setState({
- selectedTab: 'workbench', title: '工作台',
+ selectedTab: "workbench",
+ title: "工作台",
});
- this.props.dispatch(history.push('/indexMobile'));
+ this.props.dispatch(history.push("/indexMobile"));
}}
>
- {this.state.selectedTab === 'workbench' ? this.renderContent(this.state.selectedTab) : ''}
+ {this.state.selectedTab === "workbench" ? this.renderContent(this.state.selectedTab) : ""}
}
selectedIcon={
-
}
title="我的"
key="contacts"
// badge="4"
- selected={this.state.selectedTab === 'myself'}
+ selected={this.state.selectedTab === "myself"}
onPress={() => {
const { app } = this.props;
const { token } = app;
commonBusiness.clearSocketData({ token, value: {}, sModelsId: 100 });
this.setState({
- selectedTab: 'myself', title: '我的',
+ selectedTab: "myself",
+ title: "我的",
});
- this.props.dispatch(history.push('/indexMobile'));
+ this.props.dispatch(history.push("/indexMobile"));
}}
>
- {this.state.selectedTab === 'myself' ? this.renderContent(this.state.selectedTab) : ''}
+ {this.state.selectedTab === "myself" ? this.renderContent(this.state.selectedTab) : ""}
@@ -383,6 +404,4 @@ class IndexMobile extends React.Component {
);
}
}
-export default connect(({ app, routing }) =>
- ({ app, routing }))(IndexMobile);
-
+export default connect(({ app, routing }) => ({ app, routing }))(IndexMobile);
diff --git a/src/routes/mobile/IndexSrmMobile.js b/src/routes/mobile/IndexSrmMobile.js
index a95d61e..9ba66f7 100644
--- a/src/routes/mobile/IndexSrmMobile.js
+++ b/src/routes/mobile/IndexSrmMobile.js
@@ -1,8 +1,9 @@
/* eslint-disable */
import React from 'react';
import 'antd-mobile-v2/dist/antd-mobile.css';
-import { Icon, NavBar, TabBar, Modal } from 'antd-mobile';
-import { connect,history } from 'dva';
+import { Icon, NavBar, TabBar, Modal } from 'antd-mobile-v2';
+// import { history } from 'dva/router';
+import { connect,history } from 'umi';
import styles from './IndexMobile.less';
import SceneSrmMobile from './common/SceneSrmMobile';
diff --git a/src/routes/mobile/commobileList/commobileList.js b/src/routes/mobile/commobileList/commobileList.js
index fa60bc6..488a216 100644
--- a/src/routes/mobile/commobileList/commobileList.js
+++ b/src/routes/mobile/commobileList/commobileList.js
@@ -4,7 +4,7 @@
*/
import React from 'react';
-import { connect } from 'dva';
+import { connect } from 'umi';
import CommobileListComponent from '../../../mobile/common/CommobileList';
import * as commonUtils from '../../../utils/utils';
diff --git a/src/utils/common/message.js b/src/utils/common/message.js
index 4e61299..e02e027 100644
--- a/src/utils/common/message.js
+++ b/src/utils/common/message.js
@@ -1,6 +1,6 @@
/* eslint-disable */
import { Modal, message as antdMessage } from 'antd-v4';
-import { Modal as mobileModal } from 'antd-mobile';
+import { Modal as mobileModal } from 'antd-mobile-v2';
const { warning } = Modal;
const antdMobileAlert = mobileModal.alert;