panhui 5 vuotta sitten
vanhempi
commit
77660858c6

+ 1 - 1
App.js

@@ -135,7 +135,7 @@ export default function App(props) {
                                         cardStyleInterpolator:
                                             CardStyleInterpolators.forHorizontalIOS,
                                     }}
-                                    initialRouteName='CouponAdd'
+                                    // initialRouteName='OrderSetting'
                                 >
                                     {/* <Stack.Screen
                                     name='LoadingModel'

+ 101 - 0
components/Complaint.js

@@ -0,0 +1,101 @@
+import React from "react";
+import { StyleSheet } from "react-native";
+import {
+    Modal,
+    Card,
+    Text,
+    Button,
+    Layout,
+    Avatar,
+    Icon,
+    Divider,
+} from "@ui-kitten/components";
+import { useModel } from "flooks";
+
+export default function Complaint(props) {
+    const { getWordsStr } = useModel("wordsModel");
+    const { info } = props;
+    const { id, amount, fullAmount, name, endDate, startDate } = info || {};
+    const code = React.useMemo(() => {
+        if (amount) {
+            return (amount > 0 ? "+ " : "- ") + amount.toFixed(2);
+        } else {
+            return "+ 0.00";
+        }
+    }, [amount]);
+    return (
+        <Card appearance='walletCard' style={{ marginBottom: 15 }}>
+            <Layout>
+                <Text category='c1'>投诉类型:商家少送/漏送商品</Text>
+                <Text category='c1'>投诉时间:2020-05-13 12:45</Text>
+            </Layout>
+
+            <Divider style={styles.drivider} />
+
+            <Text category='h1' status='info'>
+                您的订单已经被取消收款方老司机的发链接SDK溜老司机
+                的上路考订水房间了圣诞节弗兰克斯家电快溜缝胶看楼上的甲方看了圣诞节放凌空加施蒂
+                <br />
+            </Text>
+
+            <Layout style={styles.imgList}>
+                <Avatar style={styles.avatar} shape='rounded'></Avatar>
+                <Avatar style={styles.avatar} shape='rounded'></Avatar>
+                <Avatar style={styles.avatar} shape='rounded'></Avatar>
+            </Layout>
+        </Card>
+    );
+}
+
+const ForwardIcon = props => (
+    <Icon
+        {...props}
+        name='arrow-ios-forward'
+        fill='#B4B4B4'
+        style={{ width: 15, height: 15, fontWeight: 500 }}
+    />
+);
+const styles = StyleSheet.create({
+    main: {
+        flexDirection: "row",
+        alignItems: "center",
+        backgroundColor: "transparent",
+    },
+    left: {
+        width: 80,
+        flexShrink: 0,
+        alignItems: "center",
+    },
+    center: {
+        flex: 1,
+        marginLeft: 14,
+        backgroundColor: "transparent",
+    },
+    text2: {
+        paddingTop: 6,
+    },
+    code: {
+        alignSelf: "flex-start",
+    },
+    icon: {
+        width: 20,
+        position: "absolute",
+        right: 0,
+        top: "50%",
+        marginTop: -10,
+    },
+    imgList: {
+        flexDirection: "row",
+        marginTop: 20,
+    },
+    avatar: {
+        width: 53,
+        height: 53,
+        backgroundColor: "#eee",
+        marginRight: 13,
+    },
+
+    drivider: {
+        marginVertical: 10,
+    },
+});

+ 84 - 0
components/Email.js

@@ -0,0 +1,84 @@
+import React from "react";
+import { StyleSheet } from "react-native";
+import {
+    Modal,
+    Card,
+    Text,
+    Button,
+    Layout,
+    Avatar,
+    Icon,
+} from "@ui-kitten/components";
+import { useModel } from "flooks";
+
+export default function Email(props) {
+    const { getWordsStr } = useModel("wordsModel");
+    const { info, pressEvent } = props;
+    const { id, avatar, name, sendTime, type, content } = info || {};
+    return (
+        <Card appearance='walletCard' onPress={pressEvent}>
+            <Layout style={styles.main}>
+                <Button size='tiny' style={styles.btn} status='primary' />
+                {/* <Button size='tiny' style={styles.btn} status='info' /> */}
+                <Avatar
+                    style={styles.avatar}
+                    shape='rounded'
+                    source={{
+                        uri: avatar,
+                    }}
+                />
+                <Layout style={styles.center}>
+                    <Layout style={styles.top}>
+                        <Text category='c1'>{name || "系统提醒"}</Text>
+                        <Text category='h1' style={styles.time}>
+                            {sendTime || "12月26日"}
+                        </Text>
+                    </Layout>
+                    <Text
+                        category='h1'
+                        status='info'
+                        numberOfLines={1}
+                        ellipsizeMode='tail'
+                    >
+                        {content ||
+                            "您的订单已经被取消收款方老司机的发链接SDK溜老司机的您的订单已经被取消收款方老司机的发链接SDK溜老司机的"}
+                    </Text>
+                </Layout>
+            </Layout>
+        </Card>
+    );
+}
+const styles = StyleSheet.create({
+    main: {
+        flexDirection: "row",
+        alignItems: "center",
+        backgroundColor: "transparent",
+    },
+    avatar: {
+        width: 33,
+        height: 33,
+        backgroundColor: "#eee",
+    },
+    center: {
+        flex: 1,
+        marginLeft: 14,
+        backgroundColor: "transparent",
+    },
+    top: {
+        flexDirection: "row",
+        alignItems: "center",
+        backgroundColor: "transparent",
+        justifyContent: "space-between",
+    },
+    time: {
+        color: "#787878",
+    },
+    btn: {
+        maxWidth: 10,
+        width: 10,
+        height: 10,
+        borderRadius: 10,
+        marginRight: 10,
+        paddingHorizontal: 0,
+    },
+});

+ 1 - 1
components/ListComponent.js

@@ -9,7 +9,6 @@ import EmptyComponent from "./EmptyComponent";
 export default function ListComponent(props) {
     const [state, dispatch] = React.useReducer(DataListReducer, initDataState);
     const { page, size, finish, loading, refreshing, dataList, error } = state;
-
     const {
         getInfo,
         renderItem,
@@ -22,6 +21,7 @@ export default function ListComponent(props) {
         showList,
         extraData,
         delId,
+        setChild,
     } = props;
 
     useFocusEffect(

+ 734 - 0
mapping.json

@@ -2637,6 +2637,740 @@
                     }
                 }
             }
+        },
+        "Select": {
+            "meta": {
+                "scope": "all",
+                "parameters": {
+                    "minWidth": {
+                        "type": "number"
+                    },
+                    "minHeight": {
+                        "type": "number"
+                    },
+                    "paddingHorizontal": {
+                        "type": "number"
+                    },
+                    "paddingVertical": {
+                        "type": "number"
+                    },
+                    "borderRadius": {
+                        "type": "number"
+                    },
+                    "borderColor": {
+                        "type": "string"
+                    },
+                    "borderWidth": {
+                        "type": "number"
+                    },
+                    "backgroundColor": {
+                        "type": "string"
+                    },
+                    "placeholderMarginHorizontal": {
+                        "type": "number"
+                    },
+                    "placeholderFontFamily": {
+                        "type": "string"
+                    },
+                    "placeholderFontSize": {
+                        "type": "number"
+                    },
+                    "placeholderFontWeight": {
+                        "type": "string"
+                    },
+                    "placeholderColor": {
+                        "type": "string"
+                    },
+                    "textMarginHorizontal": {
+                        "type": "number"
+                    },
+                    "textFontFamily": {
+                        "type": "string"
+                    },
+                    "textFontSize": {
+                        "type": "number"
+                    },
+                    "textFontWeight": {
+                        "type": "string"
+                    },
+                    "textColor": {
+                        "type": "string"
+                    },
+                    "iconWidth": {
+                        "type": "number"
+                    },
+                    "iconHeight": {
+                        "type": "number"
+                    },
+                    "iconTintColor": {
+                        "type": "string"
+                    },
+                    "iconMarginHorizontal": {
+                        "type": "number"
+                    },
+                    "popoverMaxHeight": {
+                        "type": "number"
+                    },
+                    "popoverBorderRadius": {
+                        "type": "number"
+                    },
+                    "popoverBorderColor": {
+                        "type": "string"
+                    },
+                    "popoverBorderWidth": {
+                        "type": "number"
+                    },
+                    "labelColor": {
+                        "type": "string"
+                    },
+                    "labelFontFamily": {
+                        "type": "string"
+                    },
+                    "labelFontSize": {
+                        "type": "number"
+                    },
+                    "labelFontWeight": {
+                        "type": "string"
+                    },
+                    "labelMarginBottom": {
+                        "type": "number"
+                    },
+                    "captionMarginTop": {
+                        "type": "number"
+                    },
+                    "captionColor": {
+                        "type": "string"
+                    },
+                    "captionFontFamily": {
+                        "type": "string"
+                    },
+                    "captionFontSize": {
+                        "type": "number"
+                    },
+                    "captionFontWeight": {
+                        "type": "number"
+                    }
+                },
+                "appearances": {
+                    "default": {
+                        "default": true
+                    }
+                },
+                "variantGroups": {
+                    "status": {
+                        "basic": {
+                            "default": true
+                        },
+                        "primary": {
+                            "default": false
+                        },
+                        "success": {
+                            "default": false
+                        },
+                        "info": {
+                            "default": false
+                        },
+                        "warning": {
+                            "default": false
+                        },
+                        "danger": {
+                            "default": false
+                        },
+                        "control": {
+                            "default": false
+                        }
+                    },
+                    "size": {
+                        "small": {
+                            "default": false
+                        },
+                        "medium": {
+                            "default": true
+                        },
+                        "large": {
+                            "default": false
+                        }
+                    }
+                },
+                "states": {
+                    "hover": {
+                        "default": false,
+                        "priority": 0,
+                        "scope": "all"
+                    },
+                    "disabled": {
+                        "default": false,
+                        "priority": 1,
+                        "scope": "all"
+                    },
+                    "active": {
+                        "default": false,
+                        "priority": 2,
+                        "scope": "all"
+                    },
+                    "focused": {
+                        "default": false,
+                        "priority": 3,
+                        "scope": "all"
+                    }
+                }
+            },
+            "appearances": {
+                "default": {
+                    "mapping": {
+                        "paddingHorizontal": 8,
+                        "iconWidth": 24,
+                        "iconHeight": 24,
+                        "iconMarginHorizontal": 8,
+                        "placeholderMarginHorizontal": 8,
+                        "textMarginHorizontal": 8,
+                        "textFontFamily": "text-subtitle-2-font-family",
+                        "placeholderFontFamily": "text-paragraph-1-font-family",
+                        "labelMarginBottom": 4,
+                        "labelFontSize": "text-label-font-size",
+                        "labelFontWeight": "text-label-font-weight",
+                        "labelFontFamily": "text-label-font-family",
+                        "captionMarginTop": 4,
+                        "captionFontSize": "text-caption-1-font-size",
+                        "captionFontWeight": "text-caption-1-font-weight",
+                        "captionFontFamily": "text-caption-1-font-family",
+                        "popoverMaxHeight": 220,
+                        "popoverBorderRadius": "border-radius",
+                        "popoverBorderWidth": "border-width",
+                        "popoverBorderColor": "border-basic-color-4"
+                    },
+                    "variantGroups": {
+                        "status": {
+                            "basic": {
+                                "borderColor": "border-basic-color-4",
+                                "backgroundColor": "background-basic-color-2",
+                                "textColor": "text-basic-color",
+                                "labelColor": "text-hint-color",
+                                "captionColor": "text-hint-color",
+                                "placeholderColor": "text-hint-color",
+                                "iconTintColor": "text-hint-color",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "color-primary-default",
+                                        "backgroundColor": "background-basic-color-1"
+                                    },
+                                    "hover": {
+                                        "borderColor": "border-basic-color-4",
+                                        "backgroundColor": "background-basic-color-3"
+                                    },
+                                    "active": {
+                                        "borderColor": "color-primary-default",
+                                        "backgroundColor": "background-basic-color-1"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "border-basic-color-4",
+                                        "backgroundColor": "background-basic-color-2",
+                                        "placeholderColor": "text-disabled-color",
+                                        "textColor": "text-disabled-color",
+                                        "iconTintColor": "text-disabled-color"
+                                    }
+                                }
+                            },
+                            "primary": {
+                                "borderColor": "color-primary-default",
+                                "backgroundColor": "background-basic-color-2",
+                                "textColor": "text-basic-color",
+                                "labelColor": "text-hint-color",
+                                "captionColor": "text-primary-color",
+                                "placeholderColor": "text-hint-color",
+                                "iconTintColor": "text-hint-color",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "color-primary-focus",
+                                        "backgroundColor": "background-basic-color-1"
+                                    },
+                                    "hover": {
+                                        "borderColor": "color-primary-hover",
+                                        "backgroundColor": "background-basic-color-3"
+                                    },
+                                    "active": {
+                                        "borderColor": "color-primary-active",
+                                        "backgroundColor": "background-basic-color-1",
+                                        "iconTintColor": "text-basic-color"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "border-basic-color-4",
+                                        "backgroundColor": "background-basic-color-2",
+                                        "placeholderColor": "text-disabled-color",
+                                        "textColor": "text-disabled-color",
+                                        "iconTintColor": "text-disabled-color"
+                                    }
+                                }
+                            },
+                            "success": {
+                                "borderColor": "color-success-default",
+                                "backgroundColor": "background-basic-color-2",
+                                "textColor": "text-basic-color",
+                                "labelColor": "text-hint-color",
+                                "captionColor": "text-success-color",
+                                "placeholderColor": "text-hint-color",
+                                "iconTintColor": "text-hint-color",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "color-success-focus",
+                                        "backgroundColor": "background-basic-color-1"
+                                    },
+                                    "hover": {
+                                        "borderColor": "color-success-hover",
+                                        "backgroundColor": "background-basic-color-3"
+                                    },
+                                    "active": {
+                                        "borderColor": "color-success-active",
+                                        "backgroundColor": "background-basic-color-1",
+                                        "iconTintColor": "text-basic-color"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "border-basic-color-4",
+                                        "backgroundColor": "background-basic-color-2",
+                                        "placeholderColor": "text-disabled-color",
+                                        "textColor": "text-disabled-color",
+                                        "iconTintColor": "text-disabled-color"
+                                    }
+                                }
+                            },
+                            "info": {
+                                "borderColor": "color-info-default",
+                                "backgroundColor": "background-basic-color-2",
+                                "textColor": "text-basic-color",
+                                "labelColor": "text-hint-color",
+                                "captionColor": "text-info-color",
+                                "placeholderColor": "text-hint-color",
+                                "iconTintColor": "text-hint-color",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "color-info-focus",
+                                        "backgroundColor": "background-basic-color-1"
+                                    },
+                                    "hover": {
+                                        "borderColor": "color-info-hover",
+                                        "backgroundColor": "background-basic-color-3"
+                                    },
+                                    "active": {
+                                        "borderColor": "color-info-active",
+                                        "backgroundColor": "background-basic-color-1",
+                                        "iconTintColor": "text-basic-color"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "border-basic-color-4",
+                                        "backgroundColor": "background-basic-color-2",
+                                        "placeholderColor": "text-disabled-color",
+                                        "textColor": "text-disabled-color",
+                                        "iconTintColor": "text-disabled-color"
+                                    }
+                                }
+                            },
+                            "warning": {
+                                "borderColor": "color-warning-default",
+                                "backgroundColor": "background-basic-color-2",
+                                "textColor": "text-basic-color",
+                                "labelColor": "text-hint-color",
+                                "captionColor": "text-warning-color",
+                                "placeholderColor": "text-hint-color",
+                                "iconTintColor": "text-hint-color",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "color-warning-focus",
+                                        "backgroundColor": "background-basic-color-1"
+                                    },
+                                    "hover": {
+                                        "borderColor": "color-warning-hover",
+                                        "backgroundColor": "background-basic-color-3"
+                                    },
+                                    "active": {
+                                        "borderColor": "color-warning-active",
+                                        "backgroundColor": "background-basic-color-1",
+                                        "iconTintColor": "text-basic-color"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "border-basic-color-4",
+                                        "backgroundColor": "background-basic-color-2",
+                                        "placeholderColor": "text-disabled-color",
+                                        "textColor": "text-disabled-color",
+                                        "iconTintColor": "text-disabled-color"
+                                    }
+                                }
+                            },
+                            "danger": {
+                                "borderColor": "color-danger-default",
+                                "backgroundColor": "background-basic-color-2",
+                                "textColor": "text-basic-color",
+                                "labelColor": "text-hint-color",
+                                "captionColor": "text-danger-color",
+                                "placeholderColor": "text-hint-color",
+                                "iconTintColor": "text-hint-color",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "color-danger-focus",
+                                        "backgroundColor": "background-basic-color-1"
+                                    },
+                                    "hover": {
+                                        "borderColor": "color-danger-hover",
+                                        "backgroundColor": "background-basic-color-3"
+                                    },
+                                    "active": {
+                                        "borderColor": "color-danger-active",
+                                        "backgroundColor": "background-basic-color-1",
+                                        "iconTintColor": "text-basic-color"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "border-basic-color-4",
+                                        "backgroundColor": "background-basic-color-2",
+                                        "placeholderColor": "text-disabled-color",
+                                        "textColor": "text-disabled-color",
+                                        "iconTintColor": "text-disabled-color"
+                                    }
+                                }
+                            },
+                            "control": {
+                                "borderColor": "color-basic-control-transparent-500",
+                                "backgroundColor": "color-basic-control-transparent-300",
+                                "textColor": "text-control-color",
+                                "labelColor": "text-control-color",
+                                "captionColor": "text-control-color",
+                                "placeholderColor": "text-control-color",
+                                "iconTintColor": "text-control-color",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "color-control-transparent-focus-border",
+                                        "backgroundColor": "color-basic-control-transparent-500"
+                                    },
+                                    "hover": {
+                                        "borderColor": "color-control-transparent-hover-border",
+                                        "backgroundColor": "color-basic-control-transparent-400"
+                                    },
+                                    "active": {
+                                        "borderColor": "color-control-transparent-active-border",
+                                        "backgroundColor": "background-basic-color-1",
+                                        "iconTintColor": "text-basic-color"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "color-control-transparent-disabled-border",
+                                        "backgroundColor": "color-control-transparent-disabled",
+                                        "textColor": "text-control-color",
+                                        "labelColor": "text-control-color",
+                                        "placeholderColor": "text-control-color",
+                                        "iconTintColor": "text-control-color"
+                                    }
+                                }
+                            }
+                        },
+                        "size": {
+                            "small": {
+                                "borderRadius": "border-radius",
+                                "borderWidth": "border-width",
+                                "minHeight": "size-small",
+                                "paddingVertical": 3,
+                                "textFontSize": "text-subtitle-2-font-size",
+                                "textFontWeight": "text-subtitle-2-font-weight",
+                                "placeholderFontSize": "text-paragraph-1-font-size",
+                                "placeholderFontWeight": "text-paragraph-1-font-weight"
+                            },
+                            "medium": {
+                                "borderRadius": "border-radius",
+                                "borderWidth": "border-width",
+                                "minHeight": "size-medium",
+                                "paddingVertical": 7,
+                                "textFontSize": "text-subtitle-1-font-size",
+                                "textFontWeight": "text-subtitle-1-font-weight",
+                                "placeholderFontSize": "text-paragraph-1-font-size",
+                                "placeholderFontWeight": "text-paragraph-1-font-weight"
+                            },
+                            "large": {
+                                "borderRadius": "border-radius",
+                                "borderWidth": "border-width",
+                                "minHeight": "size-large",
+                                "paddingVertical": 11,
+                                "textFontSize": "text-subtitle-1-font-size",
+                                "textFontWeight": "text-subtitle-1-font-weight",
+                                "placeholderFontSize": "text-paragraph-1-font-size",
+                                "placeholderFontWeight": "text-paragraph-1-font-weight"
+                            }
+                        }
+                    }
+                },
+                "bar": {
+                    "mapping": {
+                        "paddingHorizontal": 8,
+                        "iconWidth": 24,
+                        "iconHeight": 24,
+                        "iconMarginHorizontal": 8,
+                        "placeholderMarginHorizontal": 8,
+                        "textMarginHorizontal": 8,
+                        "textFontFamily": "text-subtitle-2-font-family",
+                        "placeholderFontFamily": "text-paragraph-1-font-family",
+                        "labelMarginBottom": 4,
+                        "labelFontSize": "text-label-font-size",
+                        "labelFontWeight": "text-label-font-weight",
+                        "labelFontFamily": "text-label-font-family",
+                        "captionMarginTop": 4,
+                        "captionFontSize": "text-caption-1-font-size",
+                        "captionFontWeight": "text-caption-1-font-weight",
+                        "captionFontFamily": "text-caption-1-font-family",
+                        "popoverMaxHeight": 220,
+                        "popoverBorderRadius": "border-radius",
+                        "popoverBorderWidth": "border-width",
+                        "popoverBorderColor": "border-basic-color-4"
+                    },
+                    "variantGroups": {
+                        "status": {
+                            "basic": {
+                                "borderColor": "transparent",
+                                "backgroundColor": "transparent",
+                                "textColor": "#fff",
+                                "labelColor": "#fff",
+                                "captionColor": "#fff",
+                                "placeholderColor": "text-hint-color",
+                                "iconTintColor": "#fff",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "transparent",
+                                        "backgroundColor": "transparent"
+                                    },
+                                    "hover": {
+                                        "borderColor": "transparent",
+                                        "backgroundColor": "transparent"
+                                    },
+                                    "active": {
+                                        "borderColor": "transparent",
+                                        "backgroundColor": "transparent"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "border-basic-color-4",
+                                        "backgroundColor": "background-basic-color-2",
+                                        "placeholderColor": "text-disabled-color",
+                                        "textColor": "text-disabled-color",
+                                        "iconTintColor": "text-disabled-color"
+                                    }
+                                }
+                            },
+                            "primary": {
+                                "borderColor": "color-primary-default",
+                                "backgroundColor": "background-basic-color-2",
+                                "textColor": "text-basic-color",
+                                "labelColor": "text-hint-color",
+                                "captionColor": "text-primary-color",
+                                "placeholderColor": "text-hint-color",
+                                "iconTintColor": "text-hint-color",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "color-primary-focus",
+                                        "backgroundColor": "background-basic-color-1"
+                                    },
+                                    "hover": {
+                                        "borderColor": "color-primary-hover",
+                                        "backgroundColor": "background-basic-color-3"
+                                    },
+                                    "active": {
+                                        "borderColor": "color-primary-active",
+                                        "backgroundColor": "background-basic-color-1",
+                                        "iconTintColor": "text-basic-color"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "border-basic-color-4",
+                                        "backgroundColor": "background-basic-color-2",
+                                        "placeholderColor": "text-disabled-color",
+                                        "textColor": "text-disabled-color",
+                                        "iconTintColor": "text-disabled-color"
+                                    }
+                                }
+                            },
+                            "success": {
+                                "borderColor": "color-success-default",
+                                "backgroundColor": "background-basic-color-2",
+                                "textColor": "text-basic-color",
+                                "labelColor": "text-hint-color",
+                                "captionColor": "text-success-color",
+                                "placeholderColor": "text-hint-color",
+                                "iconTintColor": "text-hint-color",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "color-success-focus",
+                                        "backgroundColor": "background-basic-color-1"
+                                    },
+                                    "hover": {
+                                        "borderColor": "color-success-hover",
+                                        "backgroundColor": "background-basic-color-3"
+                                    },
+                                    "active": {
+                                        "borderColor": "color-success-active",
+                                        "backgroundColor": "background-basic-color-1",
+                                        "iconTintColor": "text-basic-color"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "border-basic-color-4",
+                                        "backgroundColor": "background-basic-color-2",
+                                        "placeholderColor": "text-disabled-color",
+                                        "textColor": "text-disabled-color",
+                                        "iconTintColor": "text-disabled-color"
+                                    }
+                                }
+                            },
+                            "info": {
+                                "borderColor": "color-info-default",
+                                "backgroundColor": "background-basic-color-2",
+                                "textColor": "text-basic-color",
+                                "labelColor": "text-hint-color",
+                                "captionColor": "text-info-color",
+                                "placeholderColor": "text-hint-color",
+                                "iconTintColor": "text-hint-color",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "color-info-focus",
+                                        "backgroundColor": "background-basic-color-1"
+                                    },
+                                    "hover": {
+                                        "borderColor": "color-info-hover",
+                                        "backgroundColor": "background-basic-color-3"
+                                    },
+                                    "active": {
+                                        "borderColor": "color-info-active",
+                                        "backgroundColor": "background-basic-color-1",
+                                        "iconTintColor": "text-basic-color"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "border-basic-color-4",
+                                        "backgroundColor": "background-basic-color-2",
+                                        "placeholderColor": "text-disabled-color",
+                                        "textColor": "text-disabled-color",
+                                        "iconTintColor": "text-disabled-color"
+                                    }
+                                }
+                            },
+                            "warning": {
+                                "borderColor": "color-warning-default",
+                                "backgroundColor": "background-basic-color-2",
+                                "textColor": "text-basic-color",
+                                "labelColor": "text-hint-color",
+                                "captionColor": "text-warning-color",
+                                "placeholderColor": "text-hint-color",
+                                "iconTintColor": "text-hint-color",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "color-warning-focus",
+                                        "backgroundColor": "background-basic-color-1"
+                                    },
+                                    "hover": {
+                                        "borderColor": "color-warning-hover",
+                                        "backgroundColor": "background-basic-color-3"
+                                    },
+                                    "active": {
+                                        "borderColor": "color-warning-active",
+                                        "backgroundColor": "background-basic-color-1",
+                                        "iconTintColor": "text-basic-color"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "border-basic-color-4",
+                                        "backgroundColor": "background-basic-color-2",
+                                        "placeholderColor": "text-disabled-color",
+                                        "textColor": "text-disabled-color",
+                                        "iconTintColor": "text-disabled-color"
+                                    }
+                                }
+                            },
+                            "danger": {
+                                "borderColor": "color-danger-default",
+                                "backgroundColor": "background-basic-color-2",
+                                "textColor": "text-basic-color",
+                                "labelColor": "text-hint-color",
+                                "captionColor": "text-danger-color",
+                                "placeholderColor": "text-hint-color",
+                                "iconTintColor": "text-hint-color",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "color-danger-focus",
+                                        "backgroundColor": "background-basic-color-1"
+                                    },
+                                    "hover": {
+                                        "borderColor": "color-danger-hover",
+                                        "backgroundColor": "background-basic-color-3"
+                                    },
+                                    "active": {
+                                        "borderColor": "color-danger-active",
+                                        "backgroundColor": "background-basic-color-1",
+                                        "iconTintColor": "text-basic-color"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "border-basic-color-4",
+                                        "backgroundColor": "background-basic-color-2",
+                                        "placeholderColor": "text-disabled-color",
+                                        "textColor": "text-disabled-color",
+                                        "iconTintColor": "text-disabled-color"
+                                    }
+                                }
+                            },
+                            "control": {
+                                "borderColor": "color-basic-control-transparent-500",
+                                "backgroundColor": "color-basic-control-transparent-300",
+                                "textColor": "text-control-color",
+                                "labelColor": "text-control-color",
+                                "captionColor": "text-control-color",
+                                "placeholderColor": "text-control-color",
+                                "iconTintColor": "text-control-color",
+                                "state": {
+                                    "focused": {
+                                        "borderColor": "color-control-transparent-focus-border",
+                                        "backgroundColor": "color-basic-control-transparent-500"
+                                    },
+                                    "hover": {
+                                        "borderColor": "color-control-transparent-hover-border",
+                                        "backgroundColor": "color-basic-control-transparent-400"
+                                    },
+                                    "active": {
+                                        "borderColor": "color-control-transparent-active-border",
+                                        "backgroundColor": "background-basic-color-1",
+                                        "iconTintColor": "text-basic-color"
+                                    },
+                                    "disabled": {
+                                        "borderColor": "color-control-transparent-disabled-border",
+                                        "backgroundColor": "color-control-transparent-disabled",
+                                        "textColor": "text-control-color",
+                                        "labelColor": "text-control-color",
+                                        "placeholderColor": "text-control-color",
+                                        "iconTintColor": "text-control-color"
+                                    }
+                                }
+                            }
+                        },
+                        "size": {
+                            "small": {
+                                "borderRadius": "border-radius",
+                                "borderWidth": "border-width",
+                                "minHeight": "size-small",
+                                "paddingVertical": 3,
+                                "textFontSize": "text-subtitle-2-font-size",
+                                "textFontWeight": "text-subtitle-2-font-weight",
+                                "placeholderFontSize": "text-paragraph-1-font-size",
+                                "placeholderFontWeight": "text-paragraph-1-font-weight"
+                            },
+                            "medium": {
+                                "borderRadius": "border-radius",
+                                "borderWidth": "border-width",
+                                "minHeight": "size-medium",
+                                "paddingVertical": 7,
+                                "textFontSize": "text-subtitle-1-font-size",
+                                "textFontWeight": "text-subtitle-1-font-weight",
+                                "placeholderFontSize": "text-paragraph-1-font-size",
+                                "placeholderFontWeight": "text-paragraph-1-font-weight"
+                            },
+                            "large": {
+                                "borderRadius": "border-radius",
+                                "borderWidth": "border-width",
+                                "minHeight": "size-large",
+                                "paddingVertical": 11,
+                                "textFontSize": "text-subtitle-1-font-size",
+                                "textFontWeight": "text-subtitle-1-font-weight",
+                                "placeholderFontSize": "text-paragraph-1-font-size",
+                                "placeholderFontWeight": "text-paragraph-1-font-weight"
+                            }
+                        }
+                    }
+                }
+            }
         }
     }
 }

+ 58 - 0
models/complaintModel.js

@@ -0,0 +1,58 @@
+//优惠券操作
+
+import * as TimeUtil from "../Utils/TimeUtil";
+export default {
+    state: {
+        defaultStartTime: TimeUtil.getDateStr(),
+        defaultEndTime: TimeUtil.getAddDateStr(),
+    },
+    actions: ({ model, setState }) => ({
+        //获取商家投诉
+        getMyList(page, size) {
+            return Promise.resolve({
+                content: [1, 2, 3, 4, 5, 6, 7],
+                last: true,
+            });
+            // const { mid } = model("userModel");
+            // const { httpGet } = model("httpModel");
+            // return httpGet(
+            //     "/complaint/all",
+            //     {
+            //         page,
+            //         size,
+            //         query: {
+            //             merchantId: mid,
+            //         },
+            //     },
+            //     true
+            // );
+        },
+        saveInfo(info) {
+            let { httpPost } = model("httpModel");
+            let { mid } = model("userModel");
+            let { success } = model("loadingModel");
+            return httpPost(
+                "/coupon/save",
+                {
+                    ...info,
+                    merchantId: mid,
+                },
+                { body: "json" },
+                true
+            ).then(res => {
+                success("保存成功");
+                return Promise.resolve(res);
+            });
+        },
+        removeInfo(id) {
+            let { removeEvent } = model("dialogModel");
+            let { success } = model("loadingModel");
+            removeEvent(() => {
+                httpPost("/coupon/del/" + id, {}, true).then(res => {
+                    success("删除成功");
+                    return Promise.resolve(res);
+                });
+            });
+        },
+    }),
+};

+ 53 - 0
models/emailModel.js

@@ -0,0 +1,53 @@
+//优惠券操作
+export default {
+    state: {},
+    actions: ({ model, setState }) => ({
+        //获取商家投诉
+        getMyList(page, size) {
+            return Promise.resolve({
+                content: [1, 2, 3, 4, 5, 6, 7],
+                last: true,
+            });
+            // const { mid } = model("userModel");
+            // const { httpGet } = model("httpModel");
+            // return httpGet(
+            //     "/email/all",
+            //     {
+            //         page,
+            //         size,
+            //         query: {
+            //             merchantId: mid,
+            //         },
+            //     },
+            //     true
+            // );
+        },
+        saveInfo(info) {
+            let { httpPost } = model("httpModel");
+            let { mid } = model("userModel");
+            let { success } = model("loadingModel");
+            return httpPost(
+                "/coupon/save",
+                {
+                    ...info,
+                    merchantId: mid,
+                },
+                { body: "json" },
+                true
+            ).then(res => {
+                success("保存成功");
+                return Promise.resolve(res);
+            });
+        },
+        removeInfo(id) {
+            let { removeEvent } = model("dialogModel");
+            let { success } = model("loadingModel");
+            removeEvent(() => {
+                httpPost("/coupon/del/" + id, {}, true).then(res => {
+                    success("删除成功");
+                    return Promise.resolve(res);
+                });
+            });
+        },
+    }),
+};

+ 5 - 0
models/index.js

@@ -7,8 +7,13 @@ import goodsModel from "./goodsModel";
 import orderInfoModel from "./orderInfoModel";
 import appUserModel from "./appUserModel";
 import couponModel from "./couponModel";
+import complaintModel from "./complaintModel";
+import emailModel from "./emailModel";
 
 
+
+setModel("emailModel", emailModel);
+setModel("complaintModel", complaintModel);
 setModel("goodsModel", goodsModel);
 setModel("couponModel", couponModel);
 setModel("barModel", barModel);

+ 3 - 0
navigation/BasicNavigator.js

@@ -11,6 +11,7 @@ import MoneyListScreen from "../screens/MoneyListScreen";
 import Bank from "../screens/Bank";
 import SetEvent from "../screens/Set";
 import Coupon from "../screens/Coupon";
+import Appraisal from "../screens/Appraisal";
 
 export default function BasicScreens(Screen) {
     return (
@@ -32,6 +33,8 @@ export default function BasicScreens(Screen) {
             {SetEvent(Screen)}
 
             {Coupon(Screen)}
+
+            {Appraisal(Screen)}
         </>
     );
 }

+ 96 - 0
screens/Appraisal/ComplaintlistScreen.js

@@ -0,0 +1,96 @@
+import * as WebBrowser from "expo-web-browser";
+import * as React from "react";
+import {
+    Image,
+    Platform,
+    StyleSheet,
+    TouchableOpacity,
+    View,
+    ImageBackground,
+} from "react-native";
+import { useModel } from "flooks";
+import {
+    Layout,
+    Tab,
+    TabView,
+    Text,
+    useTheme,
+    Button,
+    Card,
+    List,
+    Select,
+    SelectItem,
+    IndexPath,
+    Avatar,
+    Divider,
+} from "@ui-kitten/components";
+import { useFocusEffect } from "@react-navigation/native";
+import ScrollPage from "../../components/ScrollPage";
+import NavHeaderBar from "../../components/NavHeaderBar";
+import Complaint from "../../components/Complaint";
+
+import ListComponent from "../../components/ListComponent";
+
+// 余额
+const data = ["2020-03", "2020-04", "2020-05"];
+const ItemSeparatorComponent = props => <Divider />;
+
+export default function CouponListScreen({ navigation, route }) {
+    const theme = useTheme();
+    const { changeBackground } = useModel("barModel");
+    const { getUserInfo, money } = useModel("appUserModel");
+    const { httpPost, httpGet } = useModel("httpModel", true);
+    const [selectedIndex, setSelectedIndex] = React.useState(
+        new IndexPath(data.length - 1)
+    );
+
+    const {
+        userTitle6,
+        storeAudioText1,
+        storeAudioText2,
+        storeAudioText3,
+        storeAudioText4,
+        complete,
+    } = useModel("wordsModel");
+    const { getMyList } = useModel("complaintModel");
+
+    useFocusEffect(
+        React.useCallback(() => {
+            changeBackground(theme["color-primary-500"]);
+        }, [])
+    );
+
+    const walletItem = ({ item, index }) => (
+        <Complaint key={index} info={item} />
+    );
+
+    return (
+        <>
+            <NavHeaderBar title='我的投诉' />
+            <ListComponent
+                getInfo={getMyList}
+                renderItem={walletItem}
+                style={styles.list}
+                separatorStyle={styles.separatorStyle}
+                showEmpty={true}
+            />
+        </>
+    );
+}
+
+const styles = StyleSheet.create({
+    top: {
+        alignItems: "center",
+        paddingVertical: 10,
+        marginBottom: 10,
+    },
+    list: {
+        flex: 1,
+        backgroundColor: "rgb(242, 242, 242)",
+        paddingHorizontal: 15,
+        paddingTop: 20,
+    },
+    separatorStyle: {
+        marginHorizontal: 13,
+    },
+});

+ 128 - 0
screens/Appraisal/EmailDetail.js

@@ -0,0 +1,128 @@
+import * as WebBrowser from "expo-web-browser";
+import * as React from "react";
+import {
+    Image,
+    Platform,
+    StyleSheet,
+    TouchableOpacity,
+    View,
+    ImageBackground,
+} from "react-native";
+import { useModel } from "flooks";
+import {
+    Layout,
+    Tab,
+    TabView,
+    Text,
+    useTheme,
+    Button,
+    Card,
+    List,
+    Select,
+    SelectItem,
+    IndexPath,
+    Avatar,
+    Divider,
+} from "@ui-kitten/components";
+import { useFocusEffect } from "@react-navigation/native";
+import ScrollPage from "../../components/ScrollPage";
+import NavHeaderBar from "../../components/NavHeaderBar";
+import Email from "../../components/Email";
+
+import ListComponent from "../../components/ListComponent";
+
+// 余额
+const data = ["2020-03", "2020-04", "2020-05"];
+const ItemSeparatorComponent = props => <Divider />;
+
+export default function EmailDetailScreen({ navigation, route }) {
+    const theme = useTheme();
+    const { changeBackground } = useModel("barModel");
+    const { getUserInfo, money } = useModel("appUserModel");
+    const { httpPost, httpGet } = useModel("httpModel", true);
+
+    const {} = useModel("wordsModel");
+    // const { getMyList } = useModel("emailModel");
+
+    useFocusEffect(
+        React.useCallback(() => {
+            changeBackground(theme["color-primary-500"]);
+        }, [])
+    );
+
+    const emailItem = ({ item, index }) => <Email key={index} info={item} />;
+
+    return (
+        <>
+            <NavHeaderBar title='系统邮箱' />
+            <Layout style={styles.main}>
+                <Layout style={styles.top}>
+                    <Text category='c1'>订单提示</Text>
+                    <Text category='c1'>12月26日</Text>
+                </Layout>
+
+                {/* 普通内容 */}
+                <Text category='c1' style={styles.content}>
+                    您的订单已经被取消收款方老司机的发链接SDK溜老司机的上路考订水房间了圣诞节弗兰克斯家电快溜缝胶看楼上的甲方看了圣诞节放凌空加施蒂利克福建省浪蝶狂蜂监考老师的加菲看楼上的积分了开机啥的敖德萨所多
+                </Text>
+
+                {/* 提现到账 */}
+                <Layout>
+                    <Text category='h4'>
+                        153.98<Text category='c1'>元</Text>
+                    </Text>
+                    <Text category='c1' style={styles.text}>
+                        提现到:<Text category='c1'>中国大众银行(4756)</Text>
+                    </Text>
+                    <Text category='c1' style={styles.text}>
+                        到账时间:<Text category='c1'>2020-12-31 10:48</Text>
+                    </Text>
+                </Layout>
+
+                {/* 审核提交 */}
+                <Text category='c1' style={styles.wait}>
+                    您所提交的商品正在审核中,请您耐心等待...
+                </Text>
+            </Layout>
+        </>
+    );
+}
+
+const styles = StyleSheet.create({
+    top: {
+        flexDirection: "row",
+        alignItems: "center",
+        paddingVertical: 10,
+        marginBottom: 10,
+        justifyContent: "space-between",
+    },
+    list: {
+        flex: 1,
+        backgroundColor: "#fff",
+        paddingHorizontal: 15,
+        // paddingTop: 20,
+        marginTop: 20,
+    },
+    separatorStyle: {
+        marginHorizontal: 13,
+    },
+    main: {
+        marginTop: 10,
+        paddingHorizontal: 15,
+        paddingVertical: 10,
+    },
+    content: {
+        color: "#787878",
+        paddingVertical: 10,
+        borderTopWidth: 1,
+        borderColor: "#E5E5E5",
+    },
+    text: {
+        color: "#787878",
+        marginTop: 5,
+    },
+    wait: {
+        textAlign: "center",
+        paddingVertical: 20,
+    },
+});

+ 106 - 0
screens/Appraisal/SystemEmail.js

@@ -0,0 +1,106 @@
+import * as WebBrowser from "expo-web-browser";
+import * as React from "react";
+import {
+    Image,
+    Platform,
+    StyleSheet,
+    TouchableOpacity,
+    View,
+    ImageBackground,
+} from "react-native";
+import { useModel } from "flooks";
+import {
+    Layout,
+    Tab,
+    TabView,
+    Text,
+    useTheme,
+    Button,
+    Card,
+    List,
+    Select,
+    SelectItem,
+    IndexPath,
+    Avatar,
+    Divider,
+} from "@ui-kitten/components";
+import { useFocusEffect } from "@react-navigation/native";
+import ScrollPage from "../../components/ScrollPage";
+import NavHeaderBar from "../../components/NavHeaderBar";
+import Email from "../../components/Email";
+
+import ListComponent from "../../components/ListComponent";
+
+// 余额
+const data = ["2020-03", "2020-04", "2020-05"];
+const ItemSeparatorComponent = props => <Divider />;
+
+export default function SystemEmailScreen({ navigation, route }) {
+    const theme = useTheme();
+    const { changeBackground } = useModel("barModel");
+    const { getUserInfo, money } = useModel("appUserModel");
+    const { httpPost, httpGet } = useModel("httpModel", true);
+    const [selectedIndex, setSelectedIndex] = React.useState(
+        new IndexPath(data.length - 1)
+    );
+
+    const {
+        userTitle6,
+        storeAudioText1,
+        storeAudioText2,
+        storeAudioText3,
+        storeAudioText4,
+        complete,
+    } = useModel("wordsModel");
+    const { getMyList } = useModel("emailModel");
+
+    useFocusEffect(
+        React.useCallback(() => {
+            changeBackground(theme["color-primary-500"]);
+        }, [])
+    );
+
+    const emailItem = ({ item, index }) => (
+        <Email
+            key={index}
+            info={item}
+            pressEvent={() => {
+                console.log("aaaaaa");
+                navigation.navigate("EmailDetail", {
+                    id: index,
+                });
+            }}
+        />
+    );
+
+    return (
+        <>
+            <NavHeaderBar title='系统邮箱' />
+            <ListComponent
+                getInfo={getMyList}
+                renderItem={emailItem}
+                style={styles.list}
+                separatorStyle={styles.separatorStyle}
+                showEmpty={true}
+            />
+        </>
+    );
+}
+
+const styles = StyleSheet.create({
+    top: {
+        alignItems: "center",
+        paddingVertical: 10,
+        marginBottom: 10,
+    },
+    list: {
+        flex: 1,
+        backgroundColor: "#fff",
+        paddingHorizontal: 15,
+        // paddingTop: 20,
+        marginTop: 20,
+    },
+    separatorStyle: {
+        marginHorizontal: 13,
+    },
+});

+ 19 - 0
screens/Appraisal/index.js

@@ -0,0 +1,19 @@
+import * as WebBrowser from "expo-web-browser";
+import * as React from "react";
+import ComplaintlistScreen from "./ComplaintlistScreen";
+import SystemEmail from "./SystemEmail";
+import EmailDetail from "./EmailDetail";
+
+export default function Set(Screen) {
+    return (
+        <>
+            {/* 投诉列表 */}
+            <Screen name='Complaintlist' component={ComplaintlistScreen} />
+
+            {/* 系统邮箱 */}
+            <Screen name='SystemEmail' component={SystemEmail} />
+            {/* 邮件详情 */}
+            <Screen name='EmailDetail' component={EmailDetail} />
+        </>
+    );
+}

+ 189 - 0
screens/Bank/MoneyListScreen.js

@@ -0,0 +1,189 @@
+import * as WebBrowser from "expo-web-browser";
+import * as React from "react";
+import {
+    Image,
+    Platform,
+    StyleSheet,
+    TouchableOpacity,
+    View,
+    ImageBackground,
+} from "react-native";
+import { useModel } from "flooks";
+import {
+    Layout,
+    Tab,
+    TabView,
+    Text,
+    useTheme,
+    Button,
+    Card,
+    List,
+    Select,
+    SelectItem,
+    IndexPath,
+    Avatar,
+    Divider,
+    TopNavigation,
+    TopNavigationAction,
+    Icon,
+} from "@ui-kitten/components";
+import { useFocusEffect } from "@react-navigation/native";
+import NavHeaderBar from "../../components/NavHeaderBar";
+import MoneyRecord from "../../components/MoneyRecord";
+
+import ListComponent from "../../components/ListComponent";
+const BackIcon = props => <Icon {...props} fill='#fff' name='arrow-back' />;
+
+// 余额
+const data = ["全部账单", "收入账单", "提现账单"];
+const ItemSeparatorComponent = props => <Divider />;
+
+export default function MoneyListScreen({ navigation, route }) {
+    const theme = useTheme();
+    const { changeBackground } = useModel("barModel");
+    const { getUserInfo, money } = useModel("appUserModel");
+    const { httpPost, httpGet } = useModel("httpModel", true);
+    const [selectedIndex, setSelectedIndex] = React.useState(new IndexPath(0));
+    const displayValue = data[selectedIndex.row];
+    const [child, setChild] = React.useState();
+
+    useFocusEffect(
+        React.useCallback(() => {
+            changeBackground(theme["color-primary-500"]);
+            getUserInfo();
+        }, [])
+    );
+
+    const renderOption = (title, index) => (
+        <SelectItem key={index} title={title} />
+    );
+    const selectElement = () => (
+        <Layout style={[styles.select]}>
+            <Select
+                value={displayValue}
+                selectedIndex={selectedIndex}
+                onSelect={index => {
+                    setSelectedIndex(index);
+                    // child.onRefresh();
+                    console.log(child);
+                }}
+                appearance='bar'
+                state='primary'
+            >
+                {data.map(renderOption)}
+            </Select>
+        </Layout>
+    );
+
+    const {
+        userTitle6,
+        storeAudioText1,
+        storeAudioText2,
+        storeAudioText3,
+        storeAudioText4,
+        complete,
+    } = useModel("wordsModel");
+
+    useFocusEffect(
+        React.useCallback(() => {
+            changeBackground(theme["color-primary-500"]);
+            getUserInfo();
+        }, [])
+    );
+
+    // 获取列表
+    function getList(page, size) {
+        return httpGet(
+            "/moneyRecord/my",
+            {
+                page,
+                size,
+            },
+            true
+        );
+    }
+    const renderBackAction = () => (
+        <TopNavigationAction
+            icon={BackIcon}
+            onPress={() => navigation.goBack()}
+        />
+    );
+
+    const walletItem = ({ item, index }) => (
+        <MoneyRecord key={index} info={item} />
+    );
+
+    return (
+        <>
+            <TopNavigation
+                alignment='center'
+                title={selectElement}
+                accessoryLeft={renderBackAction}
+            />
+            <ListComponent
+                setChild={setChild}
+                getInfo={getList}
+                renderItem={walletItem}
+                style={styles.list}
+                separatorStyle={styles.separatorStyle}
+                showEmpty={true}
+                extraData={{ child: child }}
+            />
+        </>
+    );
+}
+
+const styles = StyleSheet.create({
+    container: {
+        flex: 1,
+        paddingBottom: 33,
+        paddingVertical: 40,
+        alignItems: "center",
+    },
+    icon: {
+        width: 90,
+        height: 80,
+        marginBottom: 26,
+    },
+    text: {
+        fontWeight: "500",
+        marginBottom: 7,
+    },
+    button: {
+        marginTop: 19,
+    },
+    lay: {
+        flexDirection: "row",
+        paddingHorizontal: 17,
+        paddingBottom: 20,
+    },
+    flex1: {
+        flex: 1,
+        flexShrink: 0,
+    },
+    money: {
+        textAlign: "center",
+        fontWeight: "normal",
+    },
+    tiltle: {
+        fontSize: 12,
+        color: "#A43506",
+        alignSelf: "center",
+        flexShrink: 0,
+    },
+    selectMain: {
+        backgroundColor: "transparent",
+    },
+    select: {
+        paddingVertical: 10,
+        paddingHorizontal: 20,
+        backgroundColor: "transparent",
+    },
+    list: {
+        backgroundColor: "#fff",
+        flex: 1,
+    },
+    separatorStyle: {
+        marginHorizontal: 13,
+    },
+});

+ 2 - 0
screens/Bank/index.js

@@ -4,6 +4,7 @@ import BankScreen from "./MainScreen";
 import AddBankScreen from "./AddScreen";
 import RechargeScreen from "./RechargeScreen";
 import RechargeDetailScreen from "./RechargeDetailScreen";
+import MoneyListScreen from "./MoneyListScreen";
 
 export default function Bank(Screen) {
     return (
@@ -13,6 +14,7 @@ export default function Bank(Screen) {
             <Screen name='ChooseBank' component={BankScreen} />
             <Screen name='Recharge' component={RechargeScreen} />
             <Screen name='RechargeDetail' component={RechargeDetailScreen} />
+            <Screen name='MyRecord' component={MoneyListScreen} />
         </>
     );
 }

+ 7 - 2
screens/HomeScreen.js

@@ -112,14 +112,19 @@ export default function HomeScreen({ navigation, route }) {
     const renderRightActions = () => (
         <React.Fragment>
             <TopNavigationAction icon={SearchIcon} />
-            <TopNavigationAction icon={MailIcon} />
+            <TopNavigationAction
+                icon={MailIcon}
+                onPress={() => {
+                    RootNavigation.navigate("SystemEmail");
+                }}
+            />
             <TopNavigationAction icon={ShareIcon} />
             <OverflowMenu
                 anchor={renderMenuAction}
                 visible={menuVisible}
                 onBackdropPress={toggleMenu}
             >
-                <MenuItem accessoryLeft={InfoIcon} title='切换语言' />
+                {/* <MenuItem accessoryLeft={InfoIcon} title='切换语言' /> */}
                 <MenuItem
                     accessoryLeft={LogoutIcon}
                     title='退出登录'

+ 167 - 0
screens/Set/OrderSetting.js

@@ -0,0 +1,167 @@
+import * as WebBrowser from "expo-web-browser";
+import * as React from "react";
+import {
+    Image,
+    Platform,
+    StyleSheet,
+    TouchableOpacity,
+    View,
+    ImageBackground,
+} from "react-native";
+import { useModel } from "flooks";
+import {
+    Layout,
+    Tab,
+    TabView,
+    Text,
+    useTheme,
+    Button,
+    Card,
+    List,
+    Select,
+    SelectItem,
+    IndexPath,
+    Avatar,
+    Divider,
+    MenuItem,
+    Toggle,
+    Icon,
+} from "@ui-kitten/components";
+import { useFocusEffect } from "@react-navigation/native";
+import ScrollPage from "../../components/ScrollPage";
+import NavHeaderBar from "../../components/NavHeaderBar";
+import Email from "../../components/Email";
+
+import ListComponent from "../../components/ListComponent";
+
+// 余额
+const data = ["2020-03", "2020-04", "2020-05"];
+const ItemSeparatorComponent = props => <Divider />;
+
+export default function OrderSettingScreen({ navigation, route }) {
+    const theme = useTheme();
+    const { changeBackground } = useModel("barModel");
+    // const { automaticOrder } = useModel("userModel");
+    const { httpPost, httpGet } = useModel("httpModel", true);
+
+    const {} = useModel("wordsModel");
+    // const { getMyList } = useModel("emailModel");
+
+    const [automaticOrder, changeautoMaticOrder] = React.useState(true);
+    const [voice1, changeVoice1] = React.useState(true);
+    const [voice2, changeVoice2] = React.useState(true);
+
+    useFocusEffect(
+        React.useCallback(() => {
+            changeBackground(theme["color-primary-500"]);
+        }, [])
+    );
+
+    const emailItem = ({ item, index }) => <Email key={index} info={item} />;
+
+    return (
+        <>
+            <NavHeaderBar title='订单' />
+
+            <MenuItem
+                title='自动接单'
+                accessoryRight={props => (
+                    <Toggle
+                        key='Toggle'
+                        checked={automaticOrder}
+                        onChange={changeautoMaticOrder}
+                    />
+                )}
+                style={styles.menuItem}
+            />
+
+            <Text style={styles.title}>订单语音配置</Text>
+            <MenuItem
+                title='接单提醒'
+                accessoryRight={props => (
+                    <Toggle
+                        key='Toggle'
+                        checked={voice1}
+                        onChange={changeVoice1}
+                    />
+                )}
+                style={styles.menuItem}
+            />
+            <MenuItem
+                title='骑手取餐提醒'
+                accessoryRight={props => (
+                    <Toggle
+                        key='Toggle'
+                        checked={voice2}
+                        onChange={changeVoice2}
+                    />
+                )}
+                style={styles.menuItem}
+            />
+
+            <MenuItem
+                title='我的对账单'
+                accessoryRight={ForwardIcon}
+                style={styles.bottom}
+                onPress={() => {
+                    navigation.navigate("MyRecord");
+                }}
+            />
+        </>
+    );
+}
+
+const ForwardIcon = props => (
+    <Icon
+        {...props}
+        name='arrow-ios-forward'
+        fill='#B4B4B4'
+        style={{ width: 15, height: 15, fontWeight: 500 }}
+    />
+);
+
+const styles = StyleSheet.create({
+    top: {
+        flexDirection: "row",
+        alignItems: "center",
+        paddingVertical: 10,
+        marginBottom: 10,
+        justifyContent: "space-between",
+    },
+    list: {
+        flex: 1,
+        backgroundColor: "#fff",
+        paddingHorizontal: 15,
+        // paddingTop: 20,
+        marginTop: 20,
+    },
+    separatorStyle: {
+        marginHorizontal: 13,
+    },
+    main: {
+        marginTop: 10,
+        paddingHorizontal: 15,
+        paddingVertical: 10,
+    },
+    content: {
+        color: "#787878",
+        paddingVertical: 10,
+        borderTopWidth: 1,
+        borderColor: "#E5E5E5",
+    },
+    text: {
+        color: "#787878",
+        marginTop: 5,
+    },
+    wait: {
+        textAlign: "center",
+        paddingVertical: 20,
+    },
+    menuItem: {},
+    title: {
+        padding: 15,
+    },
+    bottom: {
+        marginTop: 10,
+    },
+});

+ 3 - 0
screens/Set/index.js

@@ -6,6 +6,7 @@ import ClassificationManageScreen from "./ClassificationManageScreen";
 import SystemClassificationEditScreen from "./SystemClassificationEditScreen";
 import ClassificationEditScreen from "./ClassificationEditScreen";
 import FirstOrderScreen from "./FirstOrderScreen";
+import OrderSetting from "./OrderSetting";
 
 export default function Set(Screen) {
     return (
@@ -31,6 +32,8 @@ export default function Set(Screen) {
             />
             {/* 首单优惠 */}
             <Screen name='FirstOrder' component={FirstOrderScreen} />
+            {/* 首单优惠 */}
+            <Screen name='OrderSetting' component={OrderSetting} />
         </>
     );
 }

+ 33 - 16
screens/UserScreen.js

@@ -93,7 +93,6 @@ export default function UserScreen({ navigation }) {
                                 });
                             }}
                         />
-
                         <MenuGroup title={userTitle2} style={styles.menuGroup}>
                             <MenuItem
                                 title={userTitle21}
@@ -121,7 +120,6 @@ export default function UserScreen({ navigation }) {
                                 }}
                             />
                         </MenuGroup>
-
                         <MenuGroup title={userTitle3} style={styles.menuGroup2}>
                             <MenuItem
                                 title={userTitle31}
@@ -133,10 +131,16 @@ export default function UserScreen({ navigation }) {
                             <MenuItem
                                 title={userTitle32}
                                 accessoryRight={ForwardIcon}
+                                onPress={() => {
+                                    navigation.navigate("ClassificationManage");
+                                }}
                             />
                             <MenuItem
                                 title={userTitle33}
                                 accessoryRight={ForwardIcon}
+                                onPress={() => {
+                                    navigation.navigate("ClassificationManage");
+                                }}
                             />
                             <MenuItem
                                 title={userTitle34}
@@ -150,23 +154,34 @@ export default function UserScreen({ navigation }) {
                             <MenuItem
                                 title={userTitle41}
                                 accessoryRight={ForwardIcon}
+                                onPress={() => {
+                                    navigation.navigate("Complaintlist");
+                                }}
                             />
                             <MenuItem
                                 title={userTitle42}
                                 accessoryRight={ForwardIcon}
+                                onPress={() => {
+                                    navigation.navigate("Complaintlist");
+                                }}
+                            />
+                        </MenuGroup>
+                        <MenuGroup title={userTitle5} style={styles.menuGroup2}>
+                            <MenuItem
+                                title='自动回复'
+                                accessoryRight={ForwardIcon}
+                                onPress={() => {
+                                    navigation.navigate("Automatic");
+                                }}
+                            />
+                            <MenuItem
+                                title='我的投诉'
+                                accessoryRight={ForwardIcon}
+                                onPress={() => {
+                                    navigation.navigate("Complaintlist");
+                                }}
                             />
                         </MenuGroup>
-
-                        <MenuItem
-                            title={userTitle5}
-                            accessoryRight={ForwardIcon}
-                            style={styles.menuGroup2}
-                            onPress={() => {
-                                navigation.navigate("Home", {
-                                    screen: "homeTab2",
-                                });
-                            }}
-                        />
                         <MenuGroup title={userTitle6} style={styles.menuGroup2}>
                             <MenuItem
                                 title={userTitle61}
@@ -178,9 +193,11 @@ export default function UserScreen({ navigation }) {
                             <MenuItem
                                 title={userTitle62}
                                 accessoryRight={ForwardIcon}
+                                onPress={() => {
+                                    navigation.navigate("Bank");
+                                }}
                             />
                         </MenuGroup>
-
                         {/* <MenuGroup title='Akveo React Native'>
                             <MenuItem title='UI Kitten' />
                             <MenuItem title='Kitten Tricks' />
@@ -192,9 +209,9 @@ export default function UserScreen({ navigation }) {
     );
 }
 
-const StarIcon = (props) => <Icon {...props} name='star' />;
+const StarIcon = props => <Icon {...props} name='star' />;
 
-const ForwardIcon = (props) => (
+const ForwardIcon = props => (
     <Icon
         {...props}
         name='arrow-ios-forward'