Skip to content

M
manager-app-sz
提交 48da0be2 authored 作者: 吴强's avatar 吴强
浏览文件
操作

eslint error fix

上级 4f76889e
隐藏空白字符变更
内嵌 并排
正在显示 包含 92 行增加 和 32 行删除
package-lock.json
浏览文件 @ 48da0be2
...@@ -289,9 +289,9 @@ ...@@ -289,9 +289,9 @@
"integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
}, },
"antd-mobile": { "antd-mobile": {
"version": "2.0.2", "version": "2.0.3",
"resolved": "http://registry.npm.taobao.org/antd-mobile/download/antd-mobile-2.0.2.tgz", "resolved": "http://registry.npm.taobao.org/antd-mobile/download/antd-mobile-2.0.3.tgz",
"integrity": "sha1-H/AYqApnWjmAz+JnRgZAgBbBedA=", "integrity": "sha1-fu4PLiUfcKfwdN0HuiDvxZsF6IU=",
"requires": { "requires": {
"array-tree-filter": "1.0.1", "array-tree-filter": "1.0.1",
"babel-runtime": "6.26.0", "babel-runtime": "6.26.0",
...@@ -2512,9 +2512,9 @@ ...@@ -2512,9 +2512,9 @@
} }
}, },
"dva-loading": { "dva-loading": {
"version": "1.0.3", "version": "1.0.4",
"resolved": "http://registry.npm.taobao.org/dva-loading/download/dva-loading-1.0.3.tgz", "resolved": "http://registry.npm.taobao.org/dva-loading/download/dva-loading-1.0.4.tgz",
"integrity": "sha1-7/qUSW+086OvHhWUEPDtxVrPneg=", "integrity": "sha1-QN3fui3bbgR9QqQtxR1Q+tZC0Cs=",
"requires": { "requires": {
"babel-runtime": "6.26.0" "babel-runtime": "6.26.0"
} }
...@@ -5636,9 +5636,9 @@ ...@@ -5636,9 +5636,9 @@
} }
}, },
"moment": { "moment": {
"version": "2.19.1", "version": "2.19.2",
"resolved": "http://registry.npm.taobao.org/moment/download/moment-2.19.1.tgz", "resolved": "http://registry.npm.taobao.org/moment/download/moment-2.19.2.tgz",
"integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc=" "integrity": "sha1-in93TJWmRVC0x+vUlmg5CPlBnb4="
}, },
"morgan": { "morgan": {
"version": "1.6.1", "version": "1.6.1",
...@@ -7124,9 +7124,9 @@ ...@@ -7124,9 +7124,9 @@
} }
}, },
"react": { "react": {
"version": "16.0.0", "version": "16.1.1",
"resolved": "http://registry.npm.taobao.org/react/download/react-16.0.0.tgz", "resolved": "http://registry.npm.taobao.org/react/download/react-16.1.1.tgz",
"integrity": "sha1-zn348ZQbA28Cssyp29DLHw6FXi0=", "integrity": "sha1-1cTveVUH4wEigt1RJh/5wOgk/h8=",
"requires": { "requires": {
"fbjs": "0.8.16", "fbjs": "0.8.16",
"loose-envify": "1.3.1", "loose-envify": "1.3.1",
...@@ -7477,6 +7477,11 @@ ...@@ -7477,6 +7477,11 @@
"react-native-drawer-layout": "1.3.2" "react-native-drawer-layout": "1.3.2"
} }
}, },
"react-native-fetch-polyfill": {
"version": "1.1.2",
"resolved": "http://registry.npm.taobao.org/react-native-fetch-polyfill/download/react-native-fetch-polyfill-1.1.2.tgz",
"integrity": "sha1-JWtaCr14zEmS96fPglQ9ovISSnM="
},
"react-native-menu": { "react-native-menu": {
"version": "0.23.0", "version": "0.23.0",
"resolved": "http://registry.npm.taobao.org/react-native-menu/download/react-native-menu-0.23.0.tgz", "resolved": "http://registry.npm.taobao.org/react-native-menu/download/react-native-menu-0.23.0.tgz",
......
package.json
浏览文件 @ 48da0be2
...@@ -34,22 +34,22 @@ ...@@ -34,22 +34,22 @@
"preset": "jest-expo" "preset": "jest-expo"
}, },
"dependencies": { "dependencies": {
"antd-mobile": "^2.0.2", "antd-mobile": "^2.0.3",
"dva-core": "^1.1.0", "dva-core": "^1.1.0",
"dva-loading": "^1.0.3", "dva-loading": "^1.0.4",
"fastjson_ref_resolver": "0.0.3", "fastjson_ref_resolver": "0.0.3",
"lodash": "^4.17.4", "lodash": "^4.17.4",
"moment": "^2.19.1", "moment": "^2.19.2",
"rc-form": "^1.4.8", "rc-form": "^1.4.8",
"react": "^16.0.0-beta.5", "react": "^16.1.1",
"react-native": "^0.49.3", "react-native": "^0.49.3",
"react-native-camera": "^0.12.0", "react-native-camera": "^0.12.0",
"react-native-code-push": "^5.1.3-beta", "react-native-code-push": "^5.1.3-beta",
"react-native-device-info": "^0.12.1", "react-native-device-info": "^0.12.1",
"react-native-fetch-polyfill": "^1.1.2",
"react-native-splash-screen": "^3.0.6", "react-native-splash-screen": "^3.0.6",
"react-native-vector-icons": "^4.4.2", "react-native-vector-icons": "^4.4.2",
"react-navigation": "^1.0.0-beta.19", "react-navigation": "^1.0.0-beta.19",
"react-native-fetch-polyfill": "^1.1.2",
"react-redux": "^5.0.6", "react-redux": "^5.0.6",
"redux-persist": "^4.10.1" "redux-persist": "^4.10.1"
} }
......
src/models/index.js
浏览文件 @ 48da0be2
...@@ -8,6 +8,8 @@ import DSRInfoDetail from './dangshireninfo/dsrinfodetail'; ...@@ -8,6 +8,8 @@ import DSRInfoDetail from './dangshireninfo/dsrinfodetail';
import peopleInfo from './peopleInfo/peopleInfo'; import peopleInfo from './peopleInfo/peopleInfo';
import domain from './domain'; import domain from './domain';
import userInfo from './userinfo/userinfo'; import userInfo from './userinfo/userinfo';
import QSInfo from './quanshuInfo/qsinfo';
import QSInfoDetail from './quanshuInfo/qsinfodetail';
export default [ export default [
welcome, welcome,
...@@ -20,4 +22,6 @@ export default [ ...@@ -20,4 +22,6 @@ export default [
DSRInfoDetail, DSRInfoDetail,
peopleInfo, peopleInfo,
userInfo, userInfo,
QSInfo,
QSInfoDetail,
]; ];
src/routes/main/quanshuInfo/index.js
浏览文件 @ 48da0be2
...@@ -3,12 +3,16 @@ ...@@ -3,12 +3,16 @@
*/ */
import { StackNavigator } from 'react-navigation'; import { StackNavigator } from 'react-navigation';
import QuanshuList from './quanshuList'; import QuanshuList from './quanshuList';
import QuanshuDetailScreen from './quanshuDetail';
const quanshuInfoErJiScreen = StackNavigator( const quanshuInfoErJiScreen = StackNavigator(
{ {
quanshuInfoList: { quanshuInfoList: {
screen: QuanshuList, screen: QuanshuList,
}, },
quanshuInfoDetail: {
screen: QuanshuDetailScreen,
},
}, },
{ {
headerMode: 'none', headerMode: 'none',
......
src/routes/main/quanshuInfo/quanshuDetail.js
浏览文件 @ 48da0be2
/** /**
* Created by zhouhuan on 2017/11/13. * Created by zhouhuan on 2017/10/30.
*/ */
import React from 'react';
import { ScrollView } from 'react-native';
import { List, WhiteSpace, WingBlank } from 'antd-mobile';
import { connect } from 'react-redux';
import { createAction } from '../../../utils';
@connect(({ QSInfoDetail }) => ({ QSInfoDetail }))
class QuanshuDetailScreen extends React.Component {
componentDidMount() {
const { id } = this.props.navigation.state.params;
this.props.dispatch(createAction('QSInfoDetail/getDSRInfoDetail')(id));
}
validateNoNull = (rule, value, callback) => {
if (value) {
callback();
} else {
callback(new Error('At least four charactors for account'));
}
};
render() {
const { singularData, metas } = this.props.QSInfoDetail;
return (
<ScrollView>
<WhiteSpace />
<WingBlank>
<List>
{
metas.map((m) => {
return (
<List.Item
key={m.key}
extra={singularData[m.key]}
>
{m.label}
</List.Item>
);
})
}
</List>
</WingBlank>
</ScrollView>
);
}
}
export default QuanshuDetailScreen;
src/routes/main/quanshuInfo/quanshuList.js
浏览文件 @ 48da0be2
...@@ -9,28 +9,28 @@ import { createAction } from '../../../utils/index'; ...@@ -9,28 +9,28 @@ import { createAction } from '../../../utils/index';
import FlatListItem from '../../../components/FlatListItem'; import FlatListItem from '../../../components/FlatListItem';
import SearchComponent from '../../../components/searchComponent'; import SearchComponent from '../../../components/searchComponent';
@connect(({ DSRInfo }) => ({ DSRInfo/* , loading: !!loading.effects['obligeeInfo/getObligeeInfo'] */ })) @connect(({ QSInfo }) => ({ QSInfo/* , loading: !!loading.effects['obligeeInfo/getObligeeInfo'] */ }))
class QuanshuList extends Component { class QuanshuList extends Component {
componentDidMount() { componentDidMount() {
const { dispatch } = this.props; const { dispatch } = this.props;
dispatch(createAction('DSRInfo/getDSRList')({ clear: '', pName: this.props.DSRInfo.searchValue })); dispatch(createAction('QSInfo/getQSList')({ clear: '', pZhengShuMingCheng: this.props.QSInfo.searchValue }));
} }
onSearchSubmit = (pName) => { onSearchSubmit = (pZhengShuMingCheng) => {
this.props.dispatch(createAction('DSRInfo/getDSRList')({ clear: 'clear', pName })); this.props.dispatch(createAction('QSInfo/getQSList')({ clear: 'clear', pZhengShuMingCheng }));
}; };
onSearchChange = (pName) => { onSearchChange = (pZhengShuMingCheng) => {
this.props.dispatch(createAction('DSRInfo/setSearchValue')(pName)); this.props.dispatch(createAction('QSInfo/setSearchValue')(pZhengShuMingCheng));
}; };
// 上拉加载更多 // 上拉加载更多
onEndReached = () => { onEndReached = () => {
// 以下是制造新数据 // 以下是制造新数据
if (!this.props.loading) { if (!this.props.loading) {
// console.info('执行了上啦加载'); // console.info('执行了上啦加载');
this.props.dispatch(createAction('DSRInfo/getDSRList')({ clear: '', pName: this.props.DSRInfo.searchValue })); this.props.dispatch(createAction('QSInfo/getQSList')({ clear: '', pZhengShuMingCheng: this.props.QSInfo.searchValue }));
} }
}; };
onPressItem = (id) => { onPressItem = (id) => {
this.props.dispatch(createAction('DSRInfo/jumpPage')(id)); this.props.dispatch(createAction('QSInfo/jumpPage')(id));
}; };
getItemLayout = (data, index) => ( getItemLayout = (data, index) => (
{ length: 120, offset: (120 + 1) * index, index } { length: 120, offset: (120 + 1) * index, index }
...@@ -65,7 +65,7 @@ class QuanshuList extends Component { ...@@ -65,7 +65,7 @@ class QuanshuList extends Component {
// 下拉刷新 // 下拉刷新
renderRefresh = () => { renderRefresh = () => {
if (!this.props.loading) { if (!this.props.loading) {
this.props.dispatch(createAction('DSRInfo/getDSRList')({ clear: 'clear', pName: this.props.DSRInfo.searchValue })); this.props.dispatch(createAction('QSInfo/getQSList')({ clear: 'clear', pZhengShuMingCheng: this.props.QSInfo.searchValue }));
} }
}; };
/** /**
...@@ -79,8 +79,8 @@ class QuanshuList extends Component { ...@@ -79,8 +79,8 @@ class QuanshuList extends Component {
renderItem = ({ item }) => { renderItem = ({ item }) => {
return ( return (
<FlatListItem <FlatListItem
title={item.dangShiRenXingMing} title={item.zhengShuMingCheng}
meta={this.props.DSRInfo.metas} meta={this.props.QSInfo.metas}
item={item} item={item}
onPressItem={this.onPressItem} onPressItem={this.onPressItem}
/> />
...@@ -92,7 +92,7 @@ class QuanshuList extends Component { ...@@ -92,7 +92,7 @@ class QuanshuList extends Component {
<View> <View>
<SearchComponent onSearchSubmit={this.onSearchSubmit} onSearchChange={this.onSearchChange} /> <SearchComponent onSearchSubmit={this.onSearchSubmit} onSearchChange={this.onSearchChange} />
<FlatList <FlatList
data={this.props.DSRInfo.sourceData} data={this.props.QSInfo.sourceData}
keyExtractor={this.keyExtractor} keyExtractor={this.keyExtractor}
renderItem={this.renderItem} renderItem={this.renderItem}
// 决定当距离内容最底部还有多远时触发onEndReached回调；数值范围0~1，例如：0.5表示可见布局的最底端距离content最底端等于可见布局一半高度的时候调用该回调 // 决定当距离内容最底部还有多远时触发onEndReached回调；数值范围0~1，例如：0.5表示可见布局的最底端距离content最底端等于可见布局一半高度的时候调用该回调
......
src/utils/config.js
浏览文件 @ 48da0be2
...@@ -30,8 +30,8 @@ const config = { ...@@ -30,8 +30,8 @@ const config = {
productId: 'manager-app-sz', productId: 'manager-app-sz',
footerText: '上海铂蓝信息科技有限公司', footerText: '上海铂蓝信息科技有限公司',
contextPath: '', contextPath: '',
// apiContextPath: 'http://14.21.68.149:9089/test', apiContextPath: 'http://14.21.68.149:9089/test',
apiContextPath: 'http://192.168.1.22:8080/bm', // apiContextPath: 'http://192.168.1.22:8080/bm',
defaultDateFormat, defaultDateFormat,
defaultTimeFormat, defaultTimeFormat,
defaultDateTimeFormat, defaultDateTimeFormat,
......
src/utils/request.js
浏览文件 @ 48da0be2
...@@ -35,6 +35,7 @@ export default async function request(url, params = {}, options = {}, auth = tru ...@@ -35,6 +35,7 @@ export default async function request(url, params = {}, options = {}, auth = tru
if (queryParams) { if (queryParams) {
realUrl = `${url}?${queryParams}`; realUrl = `${url}?${queryParams}`;
} }
console.log(fetch);
return fetch(realUrl, _.defaults(options, defaultOptions)) return fetch(realUrl, _.defaults(options, defaultOptions))
.then(checkStatus) .then(checkStatus)
.then(parseObject); .then(parseObject);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论