Skip to content

T
taochepaiRN
Commit c9a3e169 authored by 陈天文's avatar 陈天文
Browse files
Options

添加eslint代码格式校验

parent 41013d7c
Hide whitespace changes
Inline Side-by-side
Showing with 412 additions and 176 deletions
.eslintrc 0 → 100644
View file @ c9a3e169
{
"ecmaFeatures": {
"jsx": true
},
"env": {
"es6": true,
"jasmine": true,
},
"plugins": [
"react",
"react-native"
],
"extends": "airbnb",
// Map from global var to bool specifying if it can be redefined
"globals": {
"__DEV__": true,
"__WEB__": false,
"__dirname": false,
"__fbBatchedBridgeConfig": false,
"alert": false,
"cancelAnimationFrame": false,
"clearImmediate": true,
"clearInterval": false,
"clearTimeout": false,
"console": false,
"document": false,
"escape": false,
"Event": false,
"EventTarget": false,
"exports": false,
"fetch": false,
"FormData": false,
"global": false,
"jest": false,
"Map": true,
"module": false,
"navigator": false,
"process": false,
"Promise": true,
"requestAnimationFrame": true,
"require": false,
"Set": true,
"setImmediate": true,
"setInterval": false,
"setTimeout": false,
"window": false,
"XMLHttpRequest": false,
"pit": false,
// Flow global types.
"ReactComponent": false,
"ReactClass": false,
"ReactElement": false,
"ReactPropsCheckType": false,
"ReactPropsChainableTypeChecker": false,
"ReactPropTypes": false,
"SyntheticEvent": false,
"$Either": false,
"$All": false,
"$Tuple": false,
"$Supertype": false,
"$Subtype": false,
"$Shape": false,
"$Diff": false,
"$Keys": false,
"$Enum": false,
"$Exports": false,
"$FlowIssue": false,
"$FlowFixMe": false,
"$FixMe": false
},
"rules": {
"comma-dangle": 0, // disallow trailing commas in object literals
"no-cond-assign": 1, // disallow assignment in conditional expressions
"no-console": 0, // disallow use of console (off by default in the node environment)
"no-constant-condition": 0, // disallow use of constant expressions in conditions
"no-control-regex": 1, // disallow control characters in regular expressions
"no-debugger": 1, // disallow use of debugger
"no-dupe-keys": 1, // disallow duplicate keys when creating object literals
"no-empty": 0, // disallow empty statements
"no-ex-assign": 1, // disallow assigning to the exception in a catch block
"no-extra-boolean-cast": 1, // disallow double-negation boolean casts in a boolean context
"no-extra-parens": 0, // disallow unnecessary parentheses (off by default)
"no-extra-semi": 2, // disallow unnecessary semicolons
"no-func-assign": 1, // disallow overwriting functions written as function declarations
"no-inner-declarations": 0, // disallow function or variable declarations in nested blocks
"no-invalid-regexp": 1, // disallow invalid regular expression strings in the RegExp constructor
"no-negated-in-lhs": 1, // disallow negation of the left operand of an in expression
"no-obj-calls": 1, // disallow the use of object properties of the global object (Math and JSON) as functions
"no-regex-spaces": 1, // disallow multiple spaces in a regular expression literal
"no-reserved-keys": 0, // disallow reserved words being used as object literal keys (off by default)
"no-sparse-arrays": 1, // disallow sparse arrays
"no-unreachable": 2, // disallow unreachable statements after a return, throw, continue, or break statement
"use-isnan": 1, // disallow comparisons with the value NaN
"valid-jsdoc": 0, // Ensure JSDoc comments are valid (off by default)
"valid-typeof": 1, // Ensure that the results of typeof are compared against a valid string
// Best Practices
// These are rules designed to prevent you from making mistakes. They either prescribe a better way of doing something or help you avoid footguns.
"block-scoped-var": 0, // treat var statements as if they were block scoped (off by default)
"complexity": 0, // specify the maximum cyclomatic complexity allowed in a program (off by default)
"consistent-return": 0, // require return statements to either always or never specify values
"curly": 1, // specify curly brace conventions for all control statements
"default-case": 0, // require default case in switch statements (off by default)
"dot-notation": 1, // encourages use of dot notation whenever possible
"eqeqeq": [1, "allow-null"], // require the use of === and !==
"guard-for-in": 0, // make sure for-in loops have an if statement (off by default)
"no-alert": 1, // disallow the use of alert, confirm, and prompt
"no-caller": 1, // disallow use of arguments.caller or arguments.callee
"no-div-regex": 1, // disallow division operators explicitly at beginning of regular expression (off by default)
"no-else-return": 0, // disallow else after a return in an if (off by default)
"no-eq-null": 0, // disallow comparisons to null without a type-checking operator (off by default)
"no-eval": 1, // disallow use of eval()
"no-extend-native": 1, // disallow adding to native types
"no-extra-bind": 1, // disallow unnecessary function binding
"no-fallthrough": 1, // disallow fallthrough of case statements
"no-floating-decimal": 1, // disallow the use of leading or trailing decimal points in numeric literals (off by default)
"no-implied-eval": 1, // disallow use of eval()-like methods
"no-labels": 1, // disallow use of labeled statements
"no-iterator": 1, // disallow usage of __iterator__ property
"no-lone-blocks": 1, // disallow unnecessary nested blocks
"no-loop-func": 0, // disallow creation of functions within loops
"no-multi-str": 0, // disallow use of multiline strings
"no-native-reassign": 0, // disallow reassignments of native objects
"no-new": 1, // disallow use of new operator when not part of the assignment or comparison
"no-new-func": 1, // disallow use of new operator for Function object
"no-new-wrappers": 1, // disallows creating new instances of String,Number, and Boolean
"no-octal": 1, // disallow use of octal literals
"no-octal-escape": 1, // disallow use of octal escape sequences in string literals, such as var foo = "Copyright \251";
"no-proto": 1, // disallow usage of __proto__ property
"no-redeclare": 0, // disallow declaring the same variable more then once
"no-return-assign": 1, // disallow use of assignment in return statement
"no-script-url": 1, // disallow use of javascript: urls.
"no-self-compare": 1, // disallow comparisons where both sides are exactly the same (off by default)
"no-sequences": 1, // disallow use of comma operator
"no-unused-expressions": 0, // disallow usage of expressions in statement position
"no-void": 1, // disallow use of void operator (off by default)
"no-warning-comments": 0, // disallow usage of configurable warning terms in comments": 1, // e.g. TODO or FIXME (off by default)
"no-with": 1, // disallow use of the with statement
"radix": 1, // require use of the second argument for parseInt() (off by default)
"semi-spacing": 1, // require a space after a semi-colon
"vars-on-top": 0, // requires to declare all vars on top of their containing scope (off by default)
"wrap-iife": 0, // require immediate function invocation to be wrapped in parentheses (off by default)
"yoda": 1, // require or disallow Yoda conditions
// Variables
// These rules have to do with variable declarations.
"no-catch-shadow": 1, // disallow the catch clause parameter name being the same as a variable in the outer scope (off by default in the node environment)
"no-delete-var": 1, // disallow deletion of variables
"no-label-var": 1, // disallow labels that share a name with a variable
"no-shadow": 1, // disallow declaration of variables already declared in the outer scope
"no-shadow-restricted-names": 1, // disallow shadowing of names such as arguments
"no-undef": 2, // disallow use of undeclared variables unless mentioned in a /*global */ block
"no-undefined": 0, // disallow use of undefined variable (off by default)
"no-undef-init": 1, // disallow use of undefined when initializing variables
"no-unused-vars": [1, {"vars": "all", "args": "none"}], // disallow declaration of variables that are not used in the code
"no-use-before-define": 0, // disallow use of variables before they are defined
// Node.js
// These rules are specific to JavaScript running on Node.js.
"handle-callback-err": 1, // enforces error handling in callbacks (off by default) (on by default in the node environment)
"no-mixed-requires": 1, // disallow mixing regular variable and require declarations (off by default) (on by default in the node environment)
"no-new-require": 1, // disallow use of new operator with the require function (off by default) (on by default in the node environment)
"no-path-concat": 1, // disallow string concatenation with __dirname and __filename (off by default) (on by default in the node environment)
"no-process-exit": 0, // disallow process.exit() (on by default in the node environment)
"no-restricted-modules": 1, // restrict usage of specified node modules (off by default)
"no-sync": 0, // disallow use of synchronous methods (off by default)
// Stylistic Issues
// These rules are purely matters of style and are quite subjective.
"key-spacing": 0,
"keyword-spacing": 2, // enforce spacing before and after keywords
"jsx-quotes": [1, "prefer-double"],
"comma-spacing": 0,
"no-multi-spaces": 0,
"brace-style": 0, // enforce one true brace style (off by default)
"camelcase": 0, // require camel case names
"consistent-this": [1, "self"], // enforces consistent naming when capturing the current execution context (off by default)
"eol-last": 1, // enforce newline at the end of file, with no multiple empty lines
"func-names": 0, // require function expressions to have a name (off by default)
"func-style": 0, // enforces use of function declarations or expressions (off by default)
"new-cap": 0, // require a capital letter for constructors
"new-parens": 1, // disallow the omission of parentheses when invoking a constructor with no arguments
"no-nested-ternary": 0, // disallow nested ternary expressions (off by default)
"no-array-constructor": 1, // disallow use of the Array constructor
"no-lonely-if": 0, // disallow if as the only statement in an else block (off by default)
"no-new-object": 1, // disallow use of the Object constructor
"no-spaced-func": 1, // disallow space between function identifier and application
"no-ternary": 0, // disallow the use of ternary operators (off by default)
"no-trailing-spaces": 1, // disallow trailing whitespace at the end of lines
"no-underscore-dangle": 0, // disallow dangling underscores in identifiers
"no-mixed-spaces-and-tabs": 1, // disallow mixed spaces and tabs for indentation
"quotes": [1, "single", "avoid-escape"], // specify whether double or single quotes should be used
"quote-props": 0, // require quotes around object literal property names (off by default)
"semi": 2, // require or disallow use of semicolons instead of ASI
"sort-vars": 0, // sort variables within the same declaration block (off by default)
"space-in-brackets": 0, // require or disallow spaces inside brackets (off by default)
"space-in-parens": 0, // require or disallow spaces inside parentheses (off by default)
"space-infix-ops": 2, // require spaces around operators
"space-unary-ops": [1, { "words": true, "nonwords": false }], // require or disallow spaces before/after unary operators (words on by default, nonwords off by default)
"max-nested-callbacks": 0, // specify the maximum depth callbacks can be nested (off by default)
"one-var": 0, // allow just one var statement per function (off by default)
"wrap-regex": 0, // require regex literals to be wrapped in parentheses (off by default)
"generator-star-spacing": 0,
// Legacy
// The following rules are included for compatibility with JSHint and JSLint. While the names of the rules may not match up with the JSHint/JSLint counterpart, the functionality is the same.
"max-depth": 0, // specify the maximum depth that blocks can be nested (off by default)
"max-len": 0, // specify the maximum length of a line in your program (off by default)
"max-params": 0, // limits the number of parameters that can be used in the function declaration. (off by default)
"max-statements": 0, // specify the maximum number of statement allowed in a function (off by default)
"no-bitwise": 1, // disallow use of bitwise operators (off by default)
"no-plusplus": 0, // disallow use of unary operators, ++ and -- (off by default)
"react/display-name": 0,
"react/jsx-boolean-value": 0,
"react/jsx-no-duplicate-props": 2,
"react/jsx-no-undef": 1,
"react/jsx-sort-props": 0,
"react/jsx-uses-react": 1,
"react/jsx-uses-vars": 1,
"react/no-did-mount-set-state": 1,
"react/no-did-update-set-state": 1,
"react/no-multi-comp": 0,
"react/no-string-refs": 1,
"react/no-unknown-property": 0,
"react/prop-types": 0,
"react/react-in-jsx-scope": 1,
"react/self-closing-comp": 1,
"react/wrap-multilines": 0,
// Custom
"react/jsx-no-bind": 0,
"import/no-unresolved": [
2,
{
ignore: [
'\.png$',
'\.jpg$',
'NativeModules',
'base/Home',
'components/qrcode/BarcodeScanner',
'react-native-image-resizer',
'react-native-linear-gradient'
]
}
],
"import/extensions": 1,
"import/no-extraneous-dependencies": [0, {"devDependencies": true}],
"react/jsx-filename-extension": 0,
"react/no-unused-prop-types": 1,
"class-methods-use-this": 0
}
}
package.json
View file @ c9a3e169
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
"version": "0.0.1", "version": "0.0.1",
"private": true, "private": true,
"scripts": { "scripts": {
"lint": "eslint --fix src/",
"start": "node node_modules/react-native/local-cli/cli.js start", "start": "node node_modules/react-native/local-cli/cli.js start",
"mockserver": "node mockserver/app.js", "mockserver": "node mockserver/app.js",
"ios": "node node_modules/react-native/local-cli/cli.js run-ios", "ios": "node node_modules/react-native/local-cli/cli.js run-ios",
...@@ -43,6 +44,15 @@ ...@@ -43,6 +44,15 @@
"devDependencies": { "devDependencies": {
"babel-jest": "23.0.1", "babel-jest": "23.0.1",
"babel-preset-react-native": "4.0.0", "babel-preset-react-native": "4.0.0",
"eslint": "^4.19.1",
"eslint-config-airbnb": "^16.1.0",
"eslint-config-airbnb-base": "^12.1.0",
"eslint-import-resolver-webpack": "^0.10.0",
"eslint-loader": "^2.0.0",
"eslint-plugin-import": "^2.12.0",
"eslint-plugin-jsx-a11y": "^6.0.3",
"eslint-plugin-react": "^7.9.1",
"eslint-plugin-react-native": "^3.2.1",
"immutable-devtools": "^0.1.3", "immutable-devtools": "^0.1.3",
"jest": "23.1.0", "jest": "23.1.0",
"react-test-renderer": "16.3.1" "react-test-renderer": "16.3.1"
......
src/components/common-form/inputs/Datepicker.js
View file @ c9a3e169
...@@ -28,7 +28,9 @@ export default class Datepicker extends React.Component { ...@@ -28,7 +28,9 @@ export default class Datepicker extends React.Component {
} }
render() { render() {
const { iconSource, label, containerStyle, last, date, disabled, placeholder, ...others } = this.props; const {
iconSource, label, containerStyle, last, date, disabled, placeholder, ...others
} = this.props;
let dateString; let dateString;
if (Moment(date).isValid()) { if (Moment(date).isValid()) {
dateString = Moment(date).format('YYYY年MM月DD日'); dateString = Moment(date).format('YYYY年MM月DD日');
...@@ -40,7 +42,7 @@ export default class Datepicker extends React.Component { ...@@ -40,7 +42,7 @@ export default class Datepicker extends React.Component {
<TouchableHighlight <TouchableHighlight
style={{ opacity: disabled ? 0.3 : null }} style={{ opacity: disabled ? 0.3 : null }}
disabled={disabled} disabled={disabled}
underlayColor={'#ededed'} underlayColor="#ededed"
> >
<View style={[inputStyle, last && styles.last, containerStyle]} {...others} > <View style={[inputStyle, last && styles.last, containerStyle]} {...others} >
{iconSource ? <Image style={styles.icon} source={iconSource} /> : null} {iconSource ? <Image style={styles.icon} source={iconSource} /> : null}
...@@ -59,7 +61,7 @@ export default class Datepicker extends React.Component { ...@@ -59,7 +61,7 @@ export default class Datepicker extends React.Component {
/> />
{ {
Platform.OS === 'ios' ? Platform.OS === 'ios' ?
<Icon style={chevronBlockStyle} name={'chevron-right'} color={'#c2c2c2'} size={26} /> <Icon style={chevronBlockStyle} name="chevron-right" color="#c2c2c2" size={26} />
: <View style={chevronBlockStyle} /> : <View style={chevronBlockStyle} />
} }
</View> </View>
......
src/components/common-form/inputs/PhoneNumberInput.js
View file @ c9a3e169
...@@ -18,17 +18,19 @@ export default class PhoneNumberInput extends React.Component { ...@@ -18,17 +18,19 @@ export default class PhoneNumberInput extends React.Component {
} }
render() { render() {
const { containerStyle, last, style, value, onChange, ...others } = this.props; const {
containerStyle, last, style, value, onChange, ...others
} = this.props;
return ( return (
<View style={[inputStyle, last && styles.last, containerStyle]}> <View style={[inputStyle, last && styles.last, containerStyle]}>
<formatText style={[controlLabelStyle, styles.phoneLabel]}>{COUNTRY_NUMBER}</formatText> <formatText style={[controlLabelStyle, styles.phoneLabel]}>{COUNTRY_NUMBER}</formatText>
<TextInput <TextInput
onChangeText={onChange} onChangeText={onChange}
keyboardType={'numeric'} keyboardType="numeric"
underlineColorAndroid={'transparent'} underlineColorAndroid="transparent"
style={[textboxStyle, styles.textInput, style]} style={[textboxStyle, styles.textInput, style]}
placeholderTextColor={'#c2c2c2'} placeholderTextColor="#c2c2c2"
value={value} value={value}
{...others} {...others}
/> />
......
src/components/common-form/inputs/RouteInput.js
View file @ c9a3e169
...@@ -21,21 +21,23 @@ export default class RouteInput extends React.Component { ...@@ -21,21 +21,23 @@ export default class RouteInput extends React.Component {
} }
render() { render() {
const { iconSource, label, containerStyle, last, style, text, onNext, disabled, ...others } = this.props; const {
iconSource, label, containerStyle, last, style, text, onNext, disabled, ...others
} = this.props;
return ( return (
<TouchableHighlight <TouchableHighlight
style={{ opacity: disabled ? 0.3 : null }} style={{ opacity: disabled ? 0.3 : null }}
disabled={disabled} disabled={disabled}
onPress={onNext} onPress={onNext}
underlayColor={'#ededed'} underlayColor="#ededed"
> >
<View style={[inputStyle, last && styles.last, containerStyle]} {...others} > <View style={[inputStyle, last && styles.last, containerStyle]} {...others} >
{iconSource ? <Image style={styles.icon} source={iconSource} /> : null} {iconSource ? <Image style={styles.icon} source={iconSource} /> : null}
{label ? <Text style={controlLabelStyle}>{label}</Text> : null} {label ? <Text style={controlLabelStyle}>{label}</Text> : null}
{ {
Platform.OS === 'ios' ? Platform.OS === 'ios' ?
<Icon style={chevronBlockStyle} name={'chevron-right'} color={'#c2c2c2'} size={26} /> <Icon style={chevronBlockStyle} name="chevron-right" color="#c2c2c2" size={26} />
: <View style={chevronBlockStyle} /> : <View style={chevronBlockStyle} />
} }
</View> </View>
......
src/components/common-form/inputs/TextArea.js
View file @ c9a3e169
...@@ -18,10 +18,10 @@ export default class TextArea extends React.Component { ...@@ -18,10 +18,10 @@ export default class TextArea extends React.Component {
<TextInput <TextInput
style={styles.input} style={styles.input}
multiline={true} multiline={true}
underlineColorAndroid={'transparent'} underlineColorAndroid="transparent"
onChangeText={onChange} onChangeText={onChange}
placeholderTextColor={'#c2c2c2'} placeholderTextColor="#c2c2c2"
returnKeyType={'done'} returnKeyType="done"
{...others} {...others}
/> />
</View> </View>
......
src/components/common-form/inputs/TextBox.js
View file @ c9a3e169
...@@ -19,23 +19,25 @@ export default class TextBox extends React.Component { ...@@ -19,23 +19,25 @@ export default class TextBox extends React.Component {
} }
render() { render() {
const { label, hasError, containerStyle, defaultValue, last, style, onChange, ...others } = this.props; const {
label, hasError, containerStyle, defaultValue, last, style, onChange, ...others
} = this.props;
return ( return (
<View style={[inputStyle, last && styles.last, containerStyle]}> <View style={[inputStyle, last && styles.last, containerStyle]}>
{label ? <formatText style={controlLabelStyle}>{label}</formatText> : null} {label ? <formatText style={controlLabelStyle}>{label}</formatText> : null}
<TextInput <TextInput
onChangeText={onChange} onChangeText={onChange}
underlineColorAndroid={'transparent'} underlineColorAndroid="transparent"
style={[textboxStyle, style]} style={[textboxStyle, style]}
returnKeyType={'done'} returnKeyType="done"
autoCapitalize={'none'} autoCapitalize="none"
defaultValue={`${defaultValue}`} defaultValue={`${defaultValue}`}
placeholderTextColor={'#c2c2c2'} placeholderTextColor="#c2c2c2"
{...others} {...others}
/> />
{ {
hasError ? hasError ?
<Icon style={errorBlockStyle} name={'error'} color={'#ee5930'} size={18} /> <Icon style={errorBlockStyle} name="error" color="#ee5930" size={18} />
: <View style={errorBlockStyle} /> : <View style={errorBlockStyle} />
} }
</View> </View>
......
src/components/market-list-item.js
View file @ c9a3e169
...@@ -83,17 +83,17 @@ class MarketListItem extends Component { ...@@ -83,17 +83,17 @@ class MarketListItem extends Component {
} }
render() { render() {
return ( return (
<View style = {styles.container}> <View style={styles.container}>
<View style={styles.leftWarp} > <View style={styles.leftWarp} >
<Image <Image
style={styles.icon} style={styles.icon}
source={{url: this.props.item.pic}} source={{ url: this.props.item.pic }}
></Image> />
</View> </View>
<View style={styles.rightWarp} > <View style={styles.rightWarp} >
<Text style={{fontSize: 14, color: '#242527'}} >{this.props.item.carName}</Text> <Text style={{ fontSize: 14, color: '#242527' }} >{this.props.item.carName}</Text>
<Text style={{fontSize: 11, color: '#757E8B'}} >{this.formateDate(this.props.item.manufactureDate) + ' | ' + this.props.item.score + '万公里' }</Text> <Text style={{ fontSize: 11, color: '#757E8B' }} >{`${this.formateDate(this.props.item.manufactureDate)} | ${this.props.item.score}万公里` }</Text>
<Text style={{fontSize: 11, color: '#757E8B'}} >当前<Text style={{fontSize: 14, color: '#F7634F'}} >{this.props.item.bidMaxPrice}</Text>万元</Text> <Text style={{ fontSize: 11, color: '#757E8B' }} >当前<Text style={{ fontSize: 14, color: '#F7634F' }} >{this.props.item.bidMaxPrice}</Text>万元</Text>
</View> </View>
</View> </View>
); );
...@@ -127,4 +127,4 @@ const styles = StyleSheet.create({ ...@@ -127,4 +127,4 @@ const styles = StyleSheet.create({
rightWarp: { rightWarp: {
flex: 1, flex: 1,
} }
}); });
\ No newline at end of file
src/components/select.js
View file @ c9a3e169
'use strict';
import React from 'react'; import React from 'react';
import { import {
StyleSheet, StyleSheet,
Modal, Modal,
Text, Text,
Dimensions, Dimensions,
TouchableHighlight,
TouchableWithoutFeedback, TouchableWithoutFeedback,
Platform, Platform,
Picker, Picker,
...@@ -28,32 +26,34 @@ export default class Select extends React.Component { ...@@ -28,32 +26,34 @@ export default class Select extends React.Component {
} }
_setModalVisible(visible) { _setModalVisible(visible) {
this.setState({modalVisible: visible}); this.setState({ modalVisible: visible });
} }
_onChange(key) { _onChange(key) {
this.setState({selectedKey: key}); this.setState({ selectedKey: key });
this.props.onChange(key); this.props.onChange(key);
} }
_close() { _close() {
this.setState({modalVisible: false}); this.setState({ modalVisible: false });
} }
_renderAndroid() { _renderAndroid() {
const { options=this.props.models, selectedKey, onChange, style, labelStyle, ...other } = this.props; const {
options = this.props.models, style, labelStyle, ...other
} = this.props;
return ( return (
<View style={[styles.selectContainer, style]} {...other}> <View style={[styles.selectContainer, style]} {...other}>
<Text style={labelStyle} > <Text style={labelStyle} >
{options[this.state.selectedKey] ? options[this.state.selectedKey].label : ""} {options[this.state.selectedKey] ? options[this.state.selectedKey].label : ''}
</Text> </Text>
<Picker <Picker
selectedValue={this.state.selectedKey ? this.state.selectedKey : ""} selectedValue={this.state.selectedKey ? this.state.selectedKey : ''}
onValueChange={this._onChange.bind(this)} onValueChange={this._onChange.bind(this)}
style={[styles.androidPicker]} style={[styles.androidPicker]}
> >
{Object.keys(options).map((key) => ( {Object.keys(options).map(key => (
<Picker.Item <Picker.Item
key={key} key={key}
value={key} value={key}
...@@ -67,15 +67,17 @@ export default class Select extends React.Component { ...@@ -67,15 +67,17 @@ export default class Select extends React.Component {
} }
_renderIOS() { _renderIOS() {
const { options=this.props.models, selectedKey, onChange, style, labelStyle, doneLabel, doneLabelColor, ...other } = this.props; const {
var modalBackgroundStyle = { options = this.props.models, style, labelStyle, doneLabel, doneLabelColor, ...other
} = this.props;
const modalBackgroundStyle = {
backgroundColor: 'transparent', backgroundColor: 'transparent',
}; };
var innerContainerTransparentStyle = null; const innerContainerTransparentStyle = null;
return ( return (
<View style={[styles.selectContainer, style]} {...other}> <View style={[styles.selectContainer, style]} {...other}>
<Text style={labelStyle} onPress={this._setModalVisible.bind(this, true)}> <Text style={labelStyle} onPress={this._setModalVisible.bind(this, true)}>
{options[this.state.selectedKey] ? options[this.state.selectedKey].label : ""} {options[this.state.selectedKey] ? options[this.state.selectedKey].label : ''}
</Text> </Text>
<Modal <Modal
animationType="slide" animationType="slide"
...@@ -86,26 +88,30 @@ export default class Select extends React.Component { ...@@ -86,26 +88,30 @@ export default class Select extends React.Component {
<View style={[styles.container, modalBackgroundStyle]}> <View style={[styles.container, modalBackgroundStyle]}>
<View style={styles.pickerBar}> <View style={styles.pickerBar}>
<Text <Text
style={{color: doneLabelColor}} style={{ color: doneLabelColor }}
onPress={this._close.bind(this)}> onPress={this._close.bind(this)}
{doneLabel || "完成"} >
{doneLabel || '完成'}
</Text> </Text>
</View> </View>
<View onStartShouldSetResponder={ (evt) => true } <View
onResponderReject={ (evt) => {} } onStartShouldSetResponder={evt => true}
style={[styles.innerContainer, innerContainerTransparentStyle]}> onResponderReject={(evt) => {}}
<Picker selectedValue={this.state.selectedKey} style={[styles.innerContainer, innerContainerTransparentStyle]}
onValueChange={this._onChange.bind(this)} >
style={styles.pickerIOS} <Picker
> selectedValue={this.state.selectedKey}
{Object.keys(options).map((key) => ( onValueChange={this._onChange.bind(this)}
<Picker.Item style={styles.pickerIOS}
key={key} >
value={key} {Object.keys(options).map(key => (
label={options[key].label} <Picker.Item
/> key={key}
value={key}
label={options[key].label}
/>
))} ))}
</Picker> </Picker>
</View> </View>
</View> </View>
</TouchableWithoutFeedback> </TouchableWithoutFeedback>
...@@ -119,7 +125,7 @@ export default class Select extends React.Component { ...@@ -119,7 +125,7 @@ export default class Select extends React.Component {
} }
} }
var styles = StyleSheet.create({ const styles = StyleSheet.create({
selectContainer: { selectContainer: {
flex: 1, flex: 1,
alignItems: 'flex-end', alignItems: 'flex-end',
......
src/containers/routes/index.js
View file @ c9a3e169
/* @flow weak */ /* @flow weak */
import { connect } from 'react-redux';
import { createStackNavigator } from 'react-navigation'; import { createStackNavigator } from 'react-navigation';
import TabRoutes from './tabRoutes'; import TabRoutes from './tabRoutes';
...@@ -8,8 +7,8 @@ import Setting from '../other/Setting'; ...@@ -8,8 +7,8 @@ import Setting from '../other/Setting';
const AllRoutes = createStackNavigator({ const AllRoutes = createStackNavigator({
Tabs: TabRoutes, Tabs: TabRoutes,
Login: Login, Login,
Setting: Setting Setting
}, { }, {
mode: 'card', mode: 'card',
headerMode: 'screen', headerMode: 'screen',
......
src/containers/routes/tabRoutes.js
View file @ c9a3e169
import { createBottomTabNavigator } from 'react-navigation'; import { createBottomTabNavigator } from 'react-navigation';
import React from 'react'; import React from 'react';
import { import { Image } from 'react-native';
Image
} from 'react-native';
import Home from '../tabs/Home'; import Home from '../tabs/Home';
import Market from '../tabs/Market'; import Market from '../tabs/Market';
import Account from '../tabs/Account'; import Account from '../tabs/Account';
...@@ -16,45 +14,46 @@ import mineIconPress from '../../img/tabbar/toolbar-mine-icon-press.png'; ...@@ -16,45 +14,46 @@ import mineIconPress from '../../img/tabbar/toolbar-mine-icon-press.png';
const Tabs = createBottomTabNavigator({ const Tabs = createBottomTabNavigator({
Home: Home, Home,
Market: Market, Market,
Account: Account, Account,
}, { }, {
tabBarPosition: 'bottom', tabBarPosition: 'bottom',
swipeEnabled: false, swipeEnabled: false,
animationEnabled: false, animationEnabled: false,
navigationOptions:({navigation}) => { navigationOptions:({ navigation }) => {
let tabIcon, labelName, tabIconPress; let tabIcon,
switch (navigation.state.routeName) { labelName,
case 'Home': tabIconPress;
tabIcon = homeIcon;
tabIconPress = homeIconPress; switch (navigation.state.routeName) {
labelName = '首页'; case 'Home':
break; tabIcon = homeIcon;
case 'Market': tabIconPress = homeIconPress;
tabIcon = marketIcon; labelName = '首页';
tabIconPress = marketIconPress; break;
labelName = '长时拍'; case 'Market':
break; tabIcon = marketIcon;
case 'Account': tabIconPress = marketIconPress;
tabIcon = mineIcon; labelName = '长时拍';
tabIconPress = mineIconPress; break;
labelName = '我的'; case 'Account':
break; tabIcon = mineIcon;
default: tabIconPress = mineIconPress;
} labelName = '我的';
break;
default:
}
return { return {
tabBarIcon: ({ focused, tintColor }) => { tabBarIcon: ({ focused, tintColor }) => (
return ( <Image
<Image source={focused ? tabIconPress : tabIcon}
source={ focused ? tabIconPress : tabIcon } style={[{ width: 26, height: 26 }, { tintColor }]}
style={[{ width: 26, height: 26 }, { tintColor }]} />
/> ),
); tabBarLabel: labelName
}, };
tabBarLabel: labelName },
}
},
tabBarOptions: { tabBarOptions: {
activeTintColor: '#149DFF', activeTintColor: '#149DFF',
showIcon: true, showIcon: true,
...@@ -71,16 +70,17 @@ const Tabs = createBottomTabNavigator({ ...@@ -71,16 +70,17 @@ const Tabs = createBottomTabNavigator({
}); });
const navTitleMap = { const navTitleMap = {
Home: '首页', Home: '首页',
Market: '长时拍', Market: '长时拍',
Account: '我的', Account: '我的',
} };
Tabs.navigationOptions = ({navigation}) => {
let { routeName } = navigation.state.routes[navigation.state.index]; Tabs.navigationOptions = ({ navigation }) => {
let headerTitle = navTitleMap[routeName]; const { routeName } = navigation.state.routes[navigation.state.index];
const headerTitle = navTitleMap[routeName];
return { return {
headerTitle, headerTitle,
}; };
} };
export default Tabs; export default Tabs;
src/containers/tabs/Account.js
View file @ c9a3e169
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import React, { Component } from 'react'; import React, { Component } from 'react';
import { import {
TouchableOpacity,
View, View,
Button,
StyleSheet, StyleSheet,
ScrollView, Platform
Platform,
Alert
} from 'react-native'; } from 'react-native';
import Icon from 'react-native-vector-icons/Ionicons';
import CommonForm from '../../components/common-form'; import CommonForm from '../../components/common-form';
class Account extends Component { class Account extends Component {
...@@ -18,7 +14,7 @@ class Account extends Component { ...@@ -18,7 +14,7 @@ class Account extends Component {
} }
goPage(page) { goPage(page) {
this.props.navigation.navigate(page) this.props.navigation.navigate(page);
} }
render() { render() {
...@@ -63,42 +59,3 @@ function mapDispatchToProps(dispatch) { ...@@ -63,42 +59,3 @@ function mapDispatchToProps(dispatch) {
} }
export default connect(mapStateToProps, mapDispatchToProps)(Account); export default connect(mapStateToProps, mapDispatchToProps)(Account);
const styles = StyleSheet.create({
avatar: {
width: 60,
height: 60,
borderRadius: 30,
marginHorizontal:20
},
avatarHeader: {
flexDirection: 'row',
height: 90,
alignItems: 'center',
backgroundColor: '#fff',
borderBottomWidth: StyleSheet.hairlineWidth,
borderColor: '#ccc'
},
header: {
backgroundColor: '#fe6946'
},
arrow: {
flex: 3,
flexDirection: 'row',
justifyContent: 'space-between',
paddingHorizontal: 15
},
scrollView: Platform.select({
ios: {
backgroundColor: '#f5f5f5'
},
android: {}
}),
scrollViewContainer: Platform.select({
ios: {
flex: 1,
backgroundColor: '#f5f5f5'
},
android: {}
})
});
src/containers/tabs/Home.js
View file @ c9a3e169
...@@ -13,6 +13,13 @@ class Home extends Component { ...@@ -13,6 +13,13 @@ class Home extends Component {
super(props); super(props);
} }
onButtonPress() {
codePush.sync({
updateDialog: true,
installMode: codePush.InstallMode.IMMEDIATE
});
}
render() { render() {
return ( return (
<View style={styles.container} > <View style={styles.container} >
...@@ -22,12 +29,6 @@ class Home extends Component { ...@@ -22,12 +29,6 @@ class Home extends Component {
</View> </View>
); );
} }
onButtonPress() {
codePush.sync({
updateDialog: true,
installMode: codePush.InstallMode.IMMEDIATE
});
}
} }
function mapStateToProps(state) { function mapStateToProps(state) {
......
src/containers/tabs/Market.js
View file @ c9a3e169
...@@ -4,25 +4,20 @@ import React, { Component } from 'react'; ...@@ -4,25 +4,20 @@ import React, { Component } from 'react';
import { import {
Dimensions, Dimensions,
StyleSheet, StyleSheet,
WebView,
View, View,
FlatList, FlatList,
TouchableOpacity,
Text,
} from 'react-native'; } from 'react-native';
import { Map } from 'immutable'; import { Map } from 'immutable';
import FormatText from '../../components/format-text';
import MarketListItem from '../../components/market-list-item'; import MarketListItem from '../../components/market-list-item';
import * as auctionActions from '../../reducers/auction/auctionActions'; import * as auctionActions from '../../reducers/auction/auctionActions';
var Screen = Dimensions.get('window'); const Screen = Dimensions.get('window');
class Market extends Component { class Market extends Component {
constructor(props, context) { constructor(props, context) {
super(props); super(props);
this.state = { this.state = {
paused: true,
refreshState: false, refreshState: false,
}; };
this.refreshData = this.refreshData.bind(this); this.refreshData = this.refreshData.bind(this);
...@@ -33,24 +28,23 @@ class Market extends Component { ...@@ -33,24 +28,23 @@ class Market extends Component {
} }
refreshData() { refreshData() {
this.setState({refreshState: true}); this.setState({ refreshState: true });
setTimeout(() => { setTimeout(() => {
this.setState({refreshState: false}); this.setState({ refreshState: false });
}, 1000); }, 1000);
} }
render() { render() {
const { navigate } = this.props.navigation;
const { listData } = this.props.auction; const { listData } = this.props.auction;
return ( return (
<View style = {styles.container}> <View style={styles.container}>
<FlatList <FlatList
data={listData} data={listData}
onRefresh={this.refreshData} onRefresh={this.refreshData}
refreshing={this.state.refreshState} refreshing={this.state.refreshState}
renderItem={({item}) => <MarketListItem item={item}></MarketListItem>} renderItem={({ item }) => <MarketListItem item={item} />}
/> />
</View> </View>
); );
......
src/lib/configureStore.js
View file @ c9a3e169
...@@ -10,9 +10,7 @@ const devMiddleware = applyMiddleware( ...@@ -10,9 +10,7 @@ const devMiddleware = applyMiddleware(
thunk, thunk,
logger logger
)(createStore); )(createStore);
const proMiddleware = applyMiddleware( const proMiddleware = applyMiddleware(thunk)(createStore);
thunk
)(createStore);
const createStoreWithMiddleware = __DEV__ ? devMiddleware : proMiddleware; const createStoreWithMiddleware = __DEV__ ? devMiddleware : proMiddleware;
export default function configureStore(initialState) { export default function configureStore(initialState) {
......
src/reducers/actionTypes.js
View file @ c9a3e169
...@@ -7,5 +7,5 @@ export default keyMirror({ ...@@ -7,5 +7,5 @@ export default keyMirror({
SET_VERSION: null, SET_VERSION: null,
IS_DEV: null, IS_DEV: null,
GET_LIST_SUCC: null GET_LIST_SUCC: null
}); });
src/reducers/auction/auctionInitialState.js
View file @ c9a3e169
import { Record, fromJS } from 'immutable'; import { fromJS } from 'immutable';
const InitialState = fromJS({ const InitialState = fromJS({
listData: [] listData: []
......
src/reducers/auction/auctionReducer.js
View file @ c9a3e169
...@@ -8,7 +8,7 @@ const { GET_LIST_SUCC } = require('../actionTypes').default; ...@@ -8,7 +8,7 @@ const { GET_LIST_SUCC } = require('../actionTypes').default;
// alert(error.errorMessage || '网络错误'); // alert(error.errorMessage || '网络错误');
// } // }
export default function auctionReducer (state = initialState, action) { export default function auctionReducer(state = initialState, action) {
switch (action.type) { switch (action.type) {
case GET_LIST_SUCC: { case GET_LIST_SUCC: {
const listData = fromJS(action.payload); const listData = fromJS(action.payload);
......
src/reducers/device/deviceReducer.js
View file @ c9a3e169
...@@ -13,7 +13,6 @@ const initialState = new InitialState(); ...@@ -13,7 +13,6 @@ const initialState = new InitialState();
export default function deviceReducer(state = initialState, action) { export default function deviceReducer(state = initialState, action) {
if (!(state instanceof InitialState)) return initialState.merge(state); if (!(state instanceof InitialState)) return initialState.merge(state);
switch (action.type) { switch (action.type) {
case SET_PLATFORM: { case SET_PLATFORM: {
const platform = action.payload; const platform = action.payload;
return state.set('platform', platform); return state.set('platform', platform);
......
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