diff --git a/package-lock.json b/package-lock.json
index 32f93b0685782c486838172c89f6f1e787317013..4825bee723d4c40341dae11ed25a95af366e67fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -259,6 +259,14 @@
"lodash": "4.17.4"
}
},
+ "async-validator": {
+ "version": "1.8.1",
+ "resolved": "http://registry.npm.taobao.org/async-validator/download/async-validator-1.8.1.tgz",
+ "integrity": "sha1-ZmV4jKOSaa93Dl7gLw5VfyQ40so=",
+ "requires": {
+ "babel-runtime": "6.26.0"
+ }
+ },
"asynckit": {
"version": "0.4.0",
"resolved": "http://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz",
@@ -1897,6 +1905,11 @@
"resolved": "http://registry.npm.taobao.org/dom-align/download/dom-align-1.6.5.tgz",
"integrity": "sha1-SIkO43Vj3UPTtYC3XPt5pqyPoAQ="
},
+ "dom-scroll-into-view": {
+ "version": "1.2.1",
+ "resolved": "http://registry.npm.taobao.org/dom-scroll-into-view/download/dom-scroll-into-view-1.2.1.tgz",
+ "integrity": "sha1-6PNnMt0ImwIBqI14Fdw/iObWbH4="
+ },
"dom-walk": {
"version": "0.1.1",
"resolved": "http://registry.npm.taobao.org/dom-walk/download/dom-walk-0.1.1.tgz",
@@ -5552,6 +5565,20 @@
"prop-types": "15.6.0"
}
},
+ "rc-form": {
+ "version": "2.0.0",
+ "resolved": "http://registry.npm.taobao.org/rc-form/download/rc-form-2.0.0.tgz",
+ "integrity": "sha1-r2mw8Uq/W8klVm0Ljak/MpdwXyc=",
+ "requires": {
+ "async-validator": "1.8.1",
+ "babel-runtime": "6.26.0",
+ "create-react-class": "15.6.2",
+ "dom-scroll-into-view": "1.2.1",
+ "hoist-non-react-statics": "2.3.1",
+ "lodash": "4.17.4",
+ "warning": "3.0.0"
+ }
+ },
"rc-gesture": {
"version": "0.0.15",
"resolved": "http://registry.npm.taobao.org/rc-gesture/download/rc-gesture-0.0.15.tgz",
@@ -5878,6 +5905,11 @@
"react-native-drawer-layout": "1.3.2"
}
},
+ "react-native-dropdown": {
+ "version": "0.0.6",
+ "resolved": "http://registry.npm.taobao.org/react-native-dropdown/download/react-native-dropdown-0.0.6.tgz",
+ "integrity": "sha1-9LiZtAgsSCM0DHN3++c7wBOZFI0="
+ },
"react-native-looped-carousel": {
"version": "0.1.7",
"resolved": "http://registry.npm.taobao.org/react-native-looped-carousel/download/react-native-looped-carousel-0.1.7.tgz",
diff --git a/src/components/Cart/CartItems.js b/src/components/Cart/CartItems.js
index 4b0af76ae857c3b241e14ecf795492acacfc8508..8b87cd5a3f7dad75e496c8f89128548a383e66bd 100644
--- a/src/components/Cart/CartItems.js
+++ b/src/components/Cart/CartItems.js
@@ -95,30 +95,30 @@ export default class CartItems extends Component {
}
>
-
-
-
-
-
-
- {this.itemData.name}
- ￥{this.itemData.money}
-
-
-
-
- -
-
-
- { this.itemData.count }
-
-
- +
-
-
-
+
+
+
+
+
-
+
+ {this.itemData.name}
+ ￥{this.itemData.money}
+
+
+
+
+ -
+
+
+ { this.itemData.count }
+
+
+ +
+
+
+
+
)
diff --git a/src/components/order/AllOrders.js b/src/components/order/AllOrders.js
index 5f4c2df66f030f5c4829956b6f51cc7e3fb4f946..2b66049da741938e0c702dfe6299c1c6d616b6d0 100644
--- a/src/components/order/AllOrders.js
+++ b/src/components/order/AllOrders.js
@@ -14,63 +14,6 @@ import MallActivityList from '../shoppingmall/mallActivityList';
import ProOrder from './ProOrder';
import AndApplyOrder from './AndApplyOrder';
-const styles = StyleSheet.create({
- touchableStyle: {
- width: gScreen.width,
- flexDirection:'row',
- borderBottomWidth:1,
- borderBottomColor:gColor.borderColors,
- paddingVertical:10,
- paddingLeft:'12%',
- },
- imageStyle: {
- width: 70,
- height: 60,
- borderWidth:1,
- borderColor:gColor.color1,
- },
- total: {
- textAlign:'right',
- paddingRight:15,
- borderBottomWidth: 1,
- borderBottomColor:gColor.borderColors,
- paddingVertical:10,
- },
- dubBtn: {
- flexDirection:'row',
- justifyContent:'flex-end',
- paddingVertical:10,
- borderBottomWidth: 1,
- borderBottomColor:gColor.borderColors,
- },
- touch: {
- borderColor:gColor.importColor,
- borderWidth:1,
- width:'20%',
- borderRadius:5,
- marginRight:10,
- },
- text: {
- textAlign:'center',
- paddingVertical:6,
- color:gColor.importColor,
- },
- bac: {
- backgroundColor:gColor.importColor,
- width:'12%',
- borderRadius:5,
- paddingRight:10,
- justifyContent:'center',
- // paddingTop:'5%',
- },
- apply: {
- textAlign:'center',
- paddingVertical:8,
- justifyContent:'center',
- color:gColor.whiteColor,
- },
-
-})
export default class AllOrders extends React.Component{
@@ -154,4 +97,62 @@ export default class AllOrders extends React.Component{
)
}
-}
\ No newline at end of file
+}
+
+const styles = StyleSheet.create({
+ touchableStyle: {
+ width: gScreen.width,
+ flexDirection:'row',
+ borderBottomWidth:1,
+ borderBottomColor:gColor.borderColors,
+ paddingVertical:10,
+ paddingLeft:'12%',
+ },
+ imageStyle: {
+ width: 70,
+ height: 60,
+ borderWidth:1,
+ borderColor:gColor.color1,
+ },
+ total: {
+ textAlign:'right',
+ paddingRight:15,
+ borderBottomWidth: 1,
+ borderBottomColor:gColor.borderColors,
+ paddingVertical:10,
+ },
+ dubBtn: {
+ flexDirection:'row',
+ justifyContent:'flex-end',
+ paddingVertical:10,
+ borderBottomWidth: 1,
+ borderBottomColor:gColor.borderColors,
+ },
+ touch: {
+ borderColor:gColor.importColor,
+ borderWidth:1,
+ width:'20%',
+ borderRadius:5,
+ marginRight:10,
+ },
+ text: {
+ textAlign:'center',
+ paddingVertical:6,
+ color:gColor.importColor,
+ },
+ bac: {
+ backgroundColor:gColor.importColor,
+ width:'12%',
+ borderRadius:5,
+ paddingRight:10,
+ justifyContent:'center',
+ // paddingTop:'5%',
+ },
+ apply: {
+ textAlign:'center',
+ paddingVertical:8,
+ justifyContent:'center',
+ color:gColor.whiteColor,
+ },
+
+})
\ No newline at end of file
diff --git a/src/components/order/AndApplyOrder.js b/src/components/order/AndApplyOrder.js
index 5b0030a8a3a4198dc5bbc5be48727a00605c06e3..0e1de4155ba1a1260a34006ca8a36f05128d2563 100644
--- a/src/components/order/AndApplyOrder.js
+++ b/src/components/order/AndApplyOrder.js
@@ -6,22 +6,6 @@ import {
import MallActivityList from '../shoppingmall/mallActivityList';
-const styles = StyleSheet.create({
- touchableStyle: {
- width: gScreen.width,
- flexDirection:'row',
- borderBottomWidth:1,
- borderBottomColor:gColor.borderColors,
- paddingVertical:10,
- paddingLeft:'12%',
- },
- imageStyle: {
- width: 70,
- height: 60,
- borderWidth:1,
- borderColor:gColor.color1,
- },
-})
export default class ProOrder extends React.Component{
@@ -46,7 +30,7 @@ export default class ProOrder extends React.Component{
name={name}
price={price}
specify={specify}
- num={num} onPress={() => this.props.navigation.navigate('CategoryDetails')}
+ num={num}
nameStyle={{fontSize:gFontSize.centerText}}
priceStyle={{fontSize:gFontSize.smallText,paddingVertical:6}}
actStyle={{paddingLeft:'5%'}}
@@ -55,8 +39,7 @@ export default class ProOrder extends React.Component{
touchStyle={{borderWidth:1,borderColor:gColor.importColor,borderRadius:5,width:60,
backgroundColor:gColor.importColor,marginLeft:'30%'}}
applyStyle={{color:gColor.whiteColor,textAlign:'center',paddingVertical:6}}
- onApplyPress={ () => this.props.navi.navigate('ApplyForReturn')}
-
+ onApplyPress={ () => this.props.navi.navigate('ApplyForReturn')}
/>
)
}
@@ -70,4 +53,23 @@ export default class ProOrder extends React.Component{
)
}
-}
\ No newline at end of file
+}
+
+
+
+const styles = StyleSheet.create({
+ touchableStyle: {
+ width: gScreen.width,
+ flexDirection:'row',
+ borderBottomWidth:1,
+ borderBottomColor:gColor.borderColors,
+ paddingVertical:10,
+ paddingLeft:'12%',
+ },
+ imageStyle: {
+ width: 70,
+ height: 60,
+ borderWidth:1,
+ borderColor:gColor.color1,
+ },
+})
\ No newline at end of file
diff --git a/src/components/order/ApplyForReturn.js b/src/components/order/ApplyForReturn.js
index 2e3956e4d2f429e8f51411e3d562e375a654ff51..033fcef2aee68d299ee4501fd34848363f3faec7 100644
--- a/src/components/order/ApplyForReturn.js
+++ b/src/components/order/ApplyForReturn.js
@@ -7,9 +7,15 @@ import {
StyleSheet,
Image,
} from "react-native";
+// import DropDown from "react-native-dropdown";
+// const { Select,Option,OptionList, updatePosition } = DropDown ;
export default class ApplyForReturn extends React.Component{
+
+ static navigationOptions = {
+ title:'申请退换货'
+ }
constructor(props) {
super(props);
@@ -17,10 +23,44 @@ export default class ApplyForReturn extends React.Component{
render(){
return(
-
- 申请退换货
+
+
+ 商品名称：
+ L--阿拉伯糖（升级版）
+
+
+ 商品图片：
+
+
+
+ 购买数量：
+ 1
+
+
+ 类型：
+
+
+
+ 提交数量：
+
+
+
+ 问题描述：
+
+
)
}
-}
\ No newline at end of file
+}
+
+const styles = StyleSheet.create({
+ rowSty: {
+ flexDirection:'row',
+ padding:15,
+ borderBottomWidth:1,
+ borderColor:gColor.borderColors,
+ }
+})
\ No newline at end of file
diff --git a/src/components/order/ConfirmOrder.js b/src/components/order/ConfirmOrder.js
index 24443dc6c5afe04777a0f05e26227257cf3fa764..146e68c6ea57522e441f0ba6ee97296c047d0999 100644
--- a/src/components/order/ConfirmOrder.js
+++ b/src/components/order/ConfirmOrder.js
@@ -154,6 +154,11 @@ class BasicInput extends React.Component {
}
export default class ConfirmOrder extends React.Component{
+
+ static navigationOptions = {
+ title: "确认订单",
+ }
+
constructor(props) {
super(props);
}
diff --git a/src/components/order/MyOrder.js b/src/components/order/MyOrder.js
index 72ed2ac575d38ea7230f38c5f40d29d6e410024f..b24bd1c9191e18fd94d9415bfcf3288cc12ebe5d 100644
--- a/src/components/order/MyOrder.js
+++ b/src/components/order/MyOrder.js
@@ -12,10 +12,10 @@ export default class MyOrder extends React.Component{
super(props);
this.state = {
ImageBtn: [
- {url:require('../../imgs/u266.png'), text:'待付款'},
- {url:require('../../imgs/u266.png'), text:'待收货'},
+ {url:require('../../imgs/u266.png'), text:'待付款',nav: "PendPay"},
+ {url:require('../../imgs/u266.png'), text:'待收货',nav: "ToReceive"},
{url:require('../../imgs/u266.png'), text:'待评价'},
- {url:require('../../imgs/u266.png'), text:'退换货'},
+ {url:require('../../imgs/u266.png'), text:'退换货',nav: "Returns"},
]
}
}
@@ -37,6 +37,7 @@ export default class MyOrder extends React.Component{
imageStyle={{width: 32, height: 32,marginVertical: 10}}
touchableStyle={{width: gScreen.width/4, alignItems: "center", paddingVertical: 5,
borderBottomWidth: 1,borderBottomColor:gColor.borderColors}}
+ navigation={this.props.nav}
/>
)
diff --git a/src/components/order/NewAddress.js b/src/components/order/NewAddress.js
index e384a5b60548e2644bebca0e3a87cb7f46b86c9f..ac8d90fd8f7c60c3f0f07df5fe16a022ade8559f 100644
--- a/src/components/order/NewAddress.js
+++ b/src/components/order/NewAddress.js
@@ -5,19 +5,9 @@ import {
Text,
TextInput,
StyleSheet,
+ TouchableOpacity,
} from "react-native";
-const styles = StyleSheet.create({
- textInp: {
- height: 40,
- borderColor: '#9e9898',
- borderWidth: 1,
- padding: 0,
- // underlineColorAndroid:"transparent",
- },
-})
-
-
class UselessTextInput extends Component {
constructor(props) {
super(props);
@@ -27,6 +17,8 @@ class UselessTextInput extends Component {
render() {
return (
-
- 收货人姓名：
-
-
+
+
+
+ 收货人姓名：
+
+
+
+
+
+ 手机号码：
+
+
+
-
-
- 收货人姓名：
-
-
+
+ 省份：
+
+
+
-
-
- 收货人姓名：
-
-
+
+
+ 城市：
+
+
+
+
+
+
+ 地区或街道：
+
+
+
-
-
-
+
+
+
+
+ 保存
+
+
)
}
-}
\ No newline at end of file
+}
+
+const styles = StyleSheet.create({
+ textInp: {
+ height: 40,
+ borderColor: '#9e9898',
+ borderWidth: 1,
+ padding: 0,
+ },
+ listSty: {
+ flexDirection:'row',
+ marginTop:10,
+ justifyContent:'space-between',
+ marginRight:15
+ },
+ txtSty: {
+ marginLeft:10,
+ lineHeight:30
+ },
+ add: {
+ width:gScreen.width,
+ backgroundColor:gColor.importColor,
+ height:45,
+ position: "absolute",
+ bottom:0,
+ },
+ addr: {
+ textAlign:'center',
+ paddingVertical:13,
+ color: gColor.whiteColor,
+ }
+})
\ No newline at end of file
diff --git a/src/components/order/PendPay.js b/src/components/order/PendPay.js
new file mode 100644
index 0000000000000000000000000000000000000000..935bdf8b0a32129020886ab96511bc17e92fc29a
--- /dev/null
+++ b/src/components/order/PendPay.js
@@ -0,0 +1,68 @@
+import React, {Component} from "react";
+import {
+ ScrollView,
+ View,
+ Text,
+ TouchableOpacity,
+ StyleSheet,
+ Image,
+} from "react-native";
+import AndApplyOrder from './AndApplyOrder';
+import CustomTitle from '../public/CustomTitle';
+import ReceiveRalate from './ReceiveRalate';
+import ProOrder from './ProOrder';
+
+const styles = StyleSheet.create({
+ total: {
+ textAlign:'right',
+ paddingRight:15,
+ borderBottomWidth: 1,
+ borderBottomColor:gColor.borderColors,
+ paddingVertical:10,
+ },
+ touch: {
+ borderColor:gColor.importColor,
+ borderWidth:1,
+ width:'20%',
+ borderRadius:5,
+ marginRight:10,
+ },
+ text: {
+ textAlign:'center',
+ paddingVertical:6,
+ color:gColor.importColor,
+ },
+
+})
+
+export default class Returns extends React.Component{
+
+ static navigationOptions = {
+ title:'待付款'
+ }
+ constructor(props) {
+ super(props);
+
+ }
+
+ render(){
+ return(
+
+
+
+
+
+
+ 共1件，合计：￥999
+
+
+ )
+
+ }
+}
\ No newline at end of file
diff --git a/src/components/order/ReceiveAddr.js b/src/components/order/ReceiveAddr.js
index a996acbc75283c0ffa47a6c1159e66b680571346..ddbb369e63325aa9c1774f2007001471e33bc33a 100644
--- a/src/components/order/ReceiveAddr.js
+++ b/src/components/order/ReceiveAddr.js
@@ -11,35 +11,6 @@ import {
import ReceiveRalate from './ReceiveRalate';
import { List, Checkbox, Flex } from 'antd-mobile';
-
-const styles = StyleSheet.create({
- touch: {
- borderColor:gColor.color2,
- borderWidth:1,
- width:'15%',
- borderRadius:5,
- marginHorizontal:10,
- },
- text: {
- textAlign:'center',
- paddingVertical:6,
- color:gColor.textColor,
- },
- add: {
- width:gScreen.width,
- backgroundColor:gColor.importColor,
- height:45,
- position: "absolute",
- bottom:0,
- },
- addr: {
- textAlign:'center',
- paddingVertical:13,
- color: gColor.whiteColor,
- }
-})
-
-
export default class ReceiveAddr extends React.Component{
constructor(props) {
super(props);
@@ -55,7 +26,12 @@ export default class ReceiveAddr extends React.Component{
深圳市南山区西丽街道中山园路1001号TCL国际城你好你好你你你你你你你你你123456789
- 设为默认地址
+
+
+
+ 设为默认地址
+
+
this.props.navigation.navigate('NewAddress')}>
编辑
@@ -71,4 +47,33 @@ export default class ReceiveAddr extends React.Component{
)
}
-}
\ No newline at end of file
+}
+
+
+
+const styles = StyleSheet.create({
+ touch: {
+ borderColor:gColor.color2,
+ borderWidth:1,
+ width:'15%',
+ borderRadius:5,
+ marginHorizontal:10,
+ },
+ text: {
+ textAlign:'center',
+ paddingVertical:6,
+ color:gColor.textColor,
+ },
+ add: {
+ width:gScreen.width,
+ backgroundColor:gColor.importColor,
+ height:45,
+ position: "absolute",
+ bottom:0,
+ },
+ addr: {
+ textAlign:'center',
+ paddingVertical:13,
+ color: gColor.whiteColor,
+ }
+})
diff --git a/src/components/order/Returns.js b/src/components/order/Returns.js
new file mode 100644
index 0000000000000000000000000000000000000000..3a27770229e56a30e03ab8a88a5eaab2d284a677
--- /dev/null
+++ b/src/components/order/Returns.js
@@ -0,0 +1,68 @@
+import React, {Component} from "react";
+import {
+ ScrollView,
+ View,
+ Text,
+ TouchableOpacity,
+ StyleSheet,
+ Image,
+} from "react-native";
+import AndApplyOrder from './AndApplyOrder';
+import CustomTitle from '../public/CustomTitle';
+import ReceiveRalate from './ReceiveRalate';
+
+const styles = StyleSheet.create({
+ total: {
+ textAlign:'right',
+ paddingRight:15,
+ borderBottomWidth: 1,
+ borderBottomColor:gColor.borderColors,
+ paddingVertical:10,
+ },
+ touch: {
+ borderColor:gColor.importColor,
+ borderWidth:1,
+ width:'20%',
+ borderRadius:5,
+ marginRight:10,
+ },
+ text: {
+ textAlign:'center',
+ paddingVertical:6,
+ color:gColor.importColor,
+ },
+})
+
+export default class Returns extends React.Component{
+
+ static navigationOptions = {
+ title:'退换货'
+ }
+ constructor(props) {
+ super(props);
+
+ }
+
+ render(){
+ return(
+
+
+
+
+
+
+ 查看物流
+
+ 共1件，合计：￥999
+
+
+ )
+
+ }
+}
\ No newline at end of file
diff --git a/src/components/order/ToReceive.js b/src/components/order/ToReceive.js
new file mode 100644
index 0000000000000000000000000000000000000000..f3399b35c2d4006f9d3320502bacddae5a0cb914
--- /dev/null
+++ b/src/components/order/ToReceive.js
@@ -0,0 +1,79 @@
+import React, {Component} from "react";
+import {
+ ScrollView,
+ View,
+ Text,
+ TouchableOpacity,
+ StyleSheet,
+ Image,
+} from "react-native";
+import AndApplyOrder from './AndApplyOrder';
+import CustomTitle from '../public/CustomTitle';
+import ReceiveRalate from './ReceiveRalate';
+import ProOrder from './ProOrder';
+const styles = StyleSheet.create({
+ dubBtn: {
+ flexDirection:'row',
+ justifyContent:'flex-end',
+ paddingVertical:10,
+ borderBottomWidth: 1,
+ borderBottomColor:gColor.borderColors,
+ // justifyContent:'space-between',
+ paddingLeft:20,
+ },
+ total: {
+ textAlign:'right',
+ paddingRight:15,
+ borderBottomWidth: 1,
+ borderBottomColor:gColor.borderColors,
+ paddingVertical:10,
+ },
+ touch: {
+ borderColor:gColor.importColor,
+ borderWidth:1,
+ width:'20%',
+ borderRadius:5,
+ marginRight:10,
+ },
+ text: {
+ textAlign:'center',
+ paddingVertical:6,
+ color:gColor.importColor,
+ },
+})
+
+export default class Returns extends React.Component{
+
+ static navigationOptions = {
+ title:'待收货'
+ }
+ constructor(props) {
+ super(props);
+
+ }
+
+ render(){
+ return(
+
+
+
+
+
+
+ 查看物流
+
+
+ 确认收货
+
+ 共1件，合计：￥999
+
+
+ )
+
+ }
+}
\ No newline at end of file
diff --git a/src/components/personal/HeadLayOut.js b/src/components/personal/HeadLayOut.js
index a4f100929a37eee72363007cbb2163759b638e5a..a230ff0d6e54f866cfb86fd6728714cfacc0625e 100644
--- a/src/components/personal/HeadLayOut.js
+++ b/src/components/personal/HeadLayOut.js
@@ -10,7 +10,18 @@ export default class HeadLayOut extends React.Component{
constructor(props){
super(props);
}
-
+ renderItem = () => {
+ return (
+
+ this.props.navigation.navigate("Yiintegral")}>
+ 易积分 999
+
+
+ 现金余额 999
+
+
+ )
+ }
render(){
return(
@@ -19,15 +30,7 @@ export default class HeadLayOut extends React.Component{
style={{width:65,height:65,borderRadius:32.5,borderColor: gColor.borderColors}}/>
用户名
-
-
- 易积分 999
-
-
- 现金余额 999
-
-
-
+ { this.props.Per ? this.renderItem() : null }
)
}
diff --git a/src/components/personal/RegisterCode.js b/src/components/personal/RegisterCode.js
new file mode 100644
index 0000000000000000000000000000000000000000..d201dffac11d29d63aee8e001674b7cad7d4e13d
--- /dev/null
+++ b/src/components/personal/RegisterCode.js
@@ -0,0 +1,34 @@
+import React, {Component} from "react";
+import {
+ View,
+ Text,
+ ScrollView,
+ Image,
+} from "react-native";
+
+class RegisterCode extends Component {
+ constructor(props) {
+ super(props);
+ }
+ render() {
+ return (
+
+
+
+ 提示：
+ 此二维码用于邀请用户注册御易健平台
+
+
+
+
+ );
+ }
+}
+
+export default RegisterCode;
\ No newline at end of file
diff --git a/src/components/personal/TitleArray.js b/src/components/personal/TitleArray.js
index 7e2ad86f37a1f259d1dda9fc7c969d0d68352122..86e452f849cdbfbbe674dd16c08d887fde73d15c 100644
--- a/src/components/personal/TitleArray.js
+++ b/src/components/personal/TitleArray.js
@@ -9,7 +9,7 @@ import CustomTitle from "../public/CustomTitle";
var TextBtn = [
{title:'我的健康档案', nav: "HealthRecord"},
- {title:'注册邀请码', nav: "HealthRecord"},
+ {title:'注册邀请码', nav: "RegisterCode"},
{title:'认证', nav: "HealthRecord"},
{title:'我的家庭健康管理师', nav: "HealthRecord"},
{title:'健康管理方案', nav: "HealthRecord"},
diff --git a/src/components/personal/integral/Convertible.js b/src/components/personal/integral/Convertible.js
new file mode 100644
index 0000000000000000000000000000000000000000..367315944428eb54412ebd374e85fe1c0ade35c7
--- /dev/null
+++ b/src/components/personal/integral/Convertible.js
@@ -0,0 +1,19 @@
+import React, {Component} from "react";
+import {
+ Text,
+ ScrollView,
+} from "react-native";
+
+export default class Convertible extends Component {
+ static navigationOptions = {
+ tabBarLabel: "可兑换",
+ }
+ constructor(props) {
+ super(props);
+ }
+ render() {
+ return (
+ 可兑换
+ )
+ }
+}
\ No newline at end of file
diff --git a/src/components/personal/integral/IntegralItem.js b/src/components/personal/integral/IntegralItem.js
new file mode 100644
index 0000000000000000000000000000000000000000..97aab9a3a084a1b7ac8c10b0a9c1c2a26261cd18
--- /dev/null
+++ b/src/components/personal/integral/IntegralItem.js
@@ -0,0 +1,39 @@
+import React, {Component} from "react";
+import {
+ View,
+ StyleSheet,
+} from "react-native";
+import CustomTitle from "../../public/CustomTitle";
+
+export default class Usable extends Component {
+ constructor(props) {
+ super(props);
+ }
+ render() {
+ const { integralCount, integraltime, integralname, integraltype } = this.props.integralitems
+ return (
+
+
+
+
+ )
+ }
+}
+
+const styles = StyleSheet.create({
+ containerList: {
+ backgroundColor: gColor.whiteColor,
+ paddingVertical: 8,
+ borderTopWidth: 1,
+ borderTopColor: gColor.borderColors,
+ borderBottomWidth: 1,
+ borderBottomColor: gColor.borderColors,
+ }
+})
\ No newline at end of file
diff --git a/src/components/personal/integral/Usable.js b/src/components/personal/integral/Usable.js
new file mode 100644
index 0000000000000000000000000000000000000000..a995f196cfe475ae5bf590096af9ea9d405ccc07
--- /dev/null
+++ b/src/components/personal/integral/Usable.js
@@ -0,0 +1,44 @@
+import React, {Component} from "react";
+import {
+ View,
+ StyleSheet,
+ ScrollView,
+} from "react-native";
+import CustomTitle from "../../public/CustomTitle";
+import IntegralItem from "./IntegralItem";
+
+export default class Usable extends Component {
+ static navigationOptions = {
+ tabBarLabel: "可使用",
+ }
+ constructor(props) {
+ super(props);
+ this.state = {
+ items: [
+ {id: 1, integralCount: 655, integraltime: "2016-10-22", integralname: "张三", integraltype: "邀请好友注册" },
+ {id: 2, integralCount: 734, integraltime: "2016-05-12", integralname: "李四", integraltype: "邀请好友注册" },
+ {id: 3, integralCount: 81, integraltime: "2017-10-12", integralname: "王五", integraltype: "邀请好友注册" },
+ {id: 4, integralCount: 23, integraltime: "2016-05-12", integralname: "赵六", integraltype: "邀请好友注册" },
+ {id: 5, integralCount: 23, integraltime: "2016-05-12", integralname: "赵六", integraltype: "邀请好友注册" },
+ {id: 6, integralCount: 23, integraltime: "2016-05-12", integralname: "赵六", integraltype: "邀请好友注册" },
+
+ ]
+ }
+ }
+ renderIntegralItems = () => {
+ const itemList = this.state.items.map((item) => (
+
+ ))
+ return itemList;
+ }
+ render() {
+ return (
+
+ { this.renderIntegralItems() }
+
+ )
+ }
+}
\ No newline at end of file
diff --git a/src/components/personal/integral/ValueAdded.js b/src/components/personal/integral/ValueAdded.js
new file mode 100644
index 0000000000000000000000000000000000000000..cfb94223f2e31c75c7794fcf5be6b418dac6d925
--- /dev/null
+++ b/src/components/personal/integral/ValueAdded.js
@@ -0,0 +1,18 @@
+import React, {Component} from "react";
+import {
+ Text,
+} from "react-native";
+
+export default class ValueAdded extends Component {
+ static navigationOptions = {
+ tabBarLabel: "可增值",
+ }
+ constructor(props) {
+ super(props);
+ }
+ render() {
+ return (
+ 可增值
+ )
+ }
+}
\ No newline at end of file
diff --git a/src/components/personal/integral/Yiintegral.js b/src/components/personal/integral/Yiintegral.js
new file mode 100644
index 0000000000000000000000000000000000000000..4bb53be0c7522174d642a17174e5833c7f4633f0
--- /dev/null
+++ b/src/components/personal/integral/Yiintegral.js
@@ -0,0 +1,78 @@
+import React, {Component} from "react";
+import {
+ View,
+} from "react-native";
+import {
+ TabNavigator,
+} from "react-navigation";
+import {Button} from "antd-mobile";
+
+import HeadLayOut from "../../personal/HeadLayOut";//用户名和积分的头部
+import Usable from "./Usable";
+import Convertible from "./Convertible";
+import ValueAdded from "./ValueAdded";
+import ImageArray from "../../public/ImageArray";
+
+const YiinteralNav = TabNavigator({
+ Usable: {
+ screen: Usable,
+ },
+ Convertible: {
+ screen: Convertible,
+ },
+ ValueAdded: {
+ screen: ValueAdded,
+ },
+}, {
+ tabBarPosition: "top",
+ tabBarOptions: {
+ showIcon: false,
+ inactiveTintColor: "#9e9898",
+ activeTintColor: gColor.importColor,
+ labelStyle: {
+ fontSize: global.gFontSize.font1,
+ },
+ style: {
+ backgroundColor: global.gColor.color1,
+ },
+ indicatorStyle: {
+ height: 0,
+ }
+ },
+})
+
+
+class Yiinteral extends Component {
+ static navigationOptions = {
+ title: "御易健",
+ }
+ constructor(props) {
+ super(props);
+ this.state = {
+ imageBtnArray: [
+ {url: require("../../../imgs/btnimagey.png"), text: "兑换积分"},
+ {url: require("../../../imgs/btnimagez.png"), text: "赠送好友"},
+ ]
+ }
+ }
+ render() {
+ return (
+
+
+
+
+
+
+
+ );
+ }
+}
+
+
+export default Yiinteral;
\ No newline at end of file
diff --git a/src/components/personal/myHealthRecord/DynamicData.js b/src/components/personal/myHealthRecord/DynamicData.js
new file mode 100644
index 0000000000000000000000000000000000000000..2b98bf6b847c526fc2e5e8c1b72887d7c7c92fe3
--- /dev/null
+++ b/src/components/personal/myHealthRecord/DynamicData.js
@@ -0,0 +1,55 @@
+import React, {Component} from "react";
+import {
+ ScrollView,
+ View,
+ Text,
+ TouchableOpacity,
+ StyleSheet,
+ Image,
+} from "react-native";
+
+import ImageButton from "../../public/ImageButton";
+import ImageArray from "../../public/ImageArray";
+
+
+export default class DynamicData extends React.Component{
+
+ static navigationOptions = {
+ title:'动态监测数据'
+ }
+ constructor(props) {
+ super(props);
+ this.state = {
+ ImageBtn: [
+ {url:require('../../../imgs/u266.png'), text:'血压'},
+ {url:require('../../../imgs/u266.png'), text:'血糖'},
+ {url:require('../../../imgs/u266.png'), text:'心率'},
+ {url:require('../../../imgs/u266.png'), text:'尿酸'},
+ {url:require('../../../imgs/u266.png'), text:'体重'},
+ {url:require('../../../imgs/u266.png'), text:'体温'},
+ {url:require('../../../imgs/u266.png'), text:'血脂'},
+ {url:require('../../../imgs/u266.png'), text:'TDS'},
+ {url:require('../../../imgs/u266.png'), text:'心电'},
+ ]
+ }
+ }
+
+ render(){
+ return(
+
+
+
+ 用户名
+
+
+
+ )
+ }
+}
\ No newline at end of file
diff --git a/src/components/personal/myHealthRecord/HealthRecord.js b/src/components/personal/myHealthRecord/HealthRecord.js
index 1cb46b4442cc66180ffb15c1ad8b7ef952b60f69..21b64c48939033bfa3df3b8b7e2d7d59f42d69db 100644
--- a/src/components/personal/myHealthRecord/HealthRecord.js
+++ b/src/components/personal/myHealthRecord/HealthRecord.js
@@ -26,6 +26,7 @@ export default class HealthRecord extends Component {
title="我的动态监测"
rightIcon={}
style={styles.listItem}
+ redirectPress={()=> this.props.navigation.navigate('DynamicData')}
/>
);
diff --git a/src/components/public/ImageArray.js b/src/components/public/ImageArray.js
index 6885948c54a9c5e7b292e977f9bd127dc491f062..848ed9fa8e2b2b63827ac6bbe4d9711be12d7721 100644
--- a/src/components/public/ImageArray.js
+++ b/src/components/public/ImageArray.js
@@ -10,6 +10,7 @@ export default class ImageMode extends Component {
touchableStyle: PropTypes.object,
imageStyle: PropTypes.object,
style: PropTypes.object,
+ onPress: PropTypes.func,
}
constructor(props) {
super(props);
@@ -24,6 +25,7 @@ export default class ImageMode extends Component {
imageStyle={this.props.imageStyle}
text={item.text}
description={item.description}
+ onPress={() => this.props.navigation && this.props.navigation.navigate(item.nav)}
/>
))
return (
diff --git a/src/imgs/btnimagey.png b/src/imgs/btnimagey.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1a78492817232fb64a3badf00a1fca3c55848b1
Binary files /dev/null and b/src/imgs/btnimagey.png differ
diff --git a/src/imgs/btnimagez.png b/src/imgs/btnimagez.png
new file mode 100644
index 0000000000000000000000000000000000000000..086440eb86c5d17935fb8f65aa05f2601d3aa3d3
Binary files /dev/null and b/src/imgs/btnimagez.png differ
diff --git a/src/imgs/erweima.png b/src/imgs/erweima.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cb016b96284431a4553e752267e7c672a38d755
Binary files /dev/null and b/src/imgs/erweima.png differ
diff --git a/src/imgs/invitation.jpg b/src/imgs/invitation.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..12c585300963d6677da2b0262f4eb8433e30f332
Binary files /dev/null and b/src/imgs/invitation.jpg differ
diff --git a/src/imgs/login_radio_normall@2x.png b/src/imgs/login_radio_normall@2x.png
deleted file mode 100644
index 5b0ce312aa68fbd967af7ba931d5259473633547..0000000000000000000000000000000000000000
Binary files a/src/imgs/login_radio_normall@2x.png and /dev/null differ
diff --git a/src/imgs/login_radio_normall@3x.png b/src/imgs/login_radio_normall@3x.png
deleted file mode 100644
index 03302428f48595a31933658136756c42bfd08299..0000000000000000000000000000000000000000
Binary files a/src/imgs/login_radio_normall@3x.png and /dev/null differ
diff --git a/src/imgs/login_radio_selected@2x.png b/src/imgs/login_radio_selected@2x.png
deleted file mode 100644
index 500c8b347dea7e4aa2005f1fda639be4521d7b16..0000000000000000000000000000000000000000
Binary files a/src/imgs/login_radio_selected@2x.png and /dev/null differ
diff --git a/src/imgs/login_radio_selected@3x.png b/src/imgs/login_radio_selected@3x.png
deleted file mode 100644
index c1c91e51373d412b0a55699a2de54925a6d95020..0000000000000000000000000000000000000000
Binary files a/src/imgs/login_radio_selected@3x.png and /dev/null differ
diff --git a/src/index.js b/src/index.js
index 16224e961031ca72cc6ec1d8ceacfe174a40ba24..0fc28789d4296235d682a98abbe6dd7824380fce 100644
--- a/src/index.js
+++ b/src/index.js
@@ -25,12 +25,21 @@ import CategoryDetails from "./components/categories/CategoryDetails";//商品
import ApplyForReturn from "./components/order/ApplyForReturn";//申请退换货
import ReceiveAddr from "./components/order/ReceiveAddr";//收货地址管理
import NewAddress from "./components/order/NewAddress";//新增收货地址
-
+import PendPay from "./components/order/PendPay";//待付款
+import ToReceive from "./components/order/ToReceive";//待收货
+import Returns from "./components/order/Returns";//退换货
//个人中心
//我的健康档案
import HealthRecord from "./components/personal/myHealthRecord/HealthRecord"; //健康档案
+import Yiintegral from "./components/personal/integral/Yiintegral"; //易积分
+
+import DynamicData from "./components/personal/myHealthRecord/DynamicData";//动态监测数据
+
+//注册邀请码
+import RegisterCode from "./components/personal/RegisterCode"; //注册邀请码
+
const TabNav = TabNavigator({
HomePage: {
screen: HomePage,
@@ -99,9 +108,27 @@ const MyApp = StackNavigator({
},
NewAddress: {
screen: NewAddress,//新增收货地址
-
+ },
HealthRecord: {
screen: HealthRecord, //健康档案
+ },
+ Yiintegral: {
+ screen: Yiintegral, //易积分
+ },
+ DynamicData: {
+ screen: DynamicData,//动态监测数据
+ },
+ PendPay: {
+ screen: PendPay,//待付款
+ },
+ ToReceive: {
+ screen: ToReceive,//待收货
+ },
+ Returns: {
+ screen: Returns,//退换货
+ },
+ RegisterCode: {
+ screen: RegisterCode, //注册邀请码
}
})
diff --git a/src/page/Personal.js b/src/page/Personal.js
index 30ebb28c60d25a06c4b970f9a520878bc0e7d35a..7998d463793c930b811f5d97c570dc4b6ff49a16 100644
--- a/src/page/Personal.js
+++ b/src/page/Personal.js
@@ -27,7 +27,7 @@ export default class Personal extends Component {
render() {
return (
-
+