518

components/FormInput.js

@@ -65,11 +65,13 @@ const FormInput = React.memo((props) => {
             _props = {
                 ..._props,
                 maxLength: 6,
+                dataDetectorTypes: "phoneNumber",
                 keyboardType: "numeric",
             };
         } else if (props.type == "amount" && props.type == "money") {
             _props = {
                 ..._props,
+                dataDetectorTypes: "phoneNumber",
                 keyboardType: "numeric",
             };
         }

components/OrderCard.js

@@ -28,43 +28,89 @@ export default function OrderCard(props) {
     const { showDialog } = useModel("dialogModel");
     const { receivedOrder } = useModel("orderInfoModel");
     const { info, updateInfo } = props;
-    const { id, payMethod, orderTime, userAddress, merchantStatus, user } =
-        info || {};
+    const {
+        id,
+        payMethod,
+        orderTime,
+        userAddress,
+        merchantStatus,
+        user,
+        riderStatus,
+    } = info || {};
 
-    const Footer = (props) => (
-        <Layout {...props} style={[props.style, styles.footerContainer]}>
-            <Button
-                style={styles.footerControl}
-                appearance='outline'
-                onPress={() => {
-                    showDialog({
-                        bodyText: overTips,
-                        status: "danger",
-                        cancelable: true,
-                        confirmCallback: () => {
-                            receivedOrder(id, false).then((res) => {
+    const Footer = (props) => {
+        if (riderStatus) {
+            return (
+                <Layout
+                    {...props}
+                    style={[props.style]}
+                >
+                    <Layout style={styles.orderItem1}>
+                        <Text category='c2'>骑手：胖齐齐</Text>
+                        <Button
+                            appearance='outline'
+                            onPress={() => {
+                                Linking.openURL("tel:+" + user.phone);
+                            }}
+                        >
+                            联系骑手
+                        </Button>
+                    </Layout>
+                    <Layout style={styles.orderItem1}>
+                        <Text category='c2'>
+                            预计送达时间：2019-12-31 13:17
+                        </Text>
+                    </Layout>
+                    {riderStatus == "CARRY_OUT" && (
+                        <Layout style={styles.orderItem1}>
+                            <Text category='c2'>
+                                实际送达时间：2019-12-31 13:17
+                            </Text>
+                        </Layout>
+                    )}
+                </Layout>
+            );
+        } else if (merchantStatus == "NOT_RECEIVED") {
+            return (
+                <Layout
+                    {...props}
+                    style={[props.style, styles.footerContainer]}
+                >
+                    <Button
+                        style={styles.footerControl}
+                        appearance='outline'
+                        onPress={() => {
+                            showDialog({
+                                bodyText: overTips,
+                                status: "danger",
+                                cancelable: true,
+                                confirmCallback: () => {
+                                    receivedOrder(id, false).then((res) => {
+                                        updateInfo(res);
+                                    });
+                                },
+                            });
+                        }}
+                    >
+                        {orderButton1}
+                    </Button>
+                    <Button
+                        style={styles.footerControl}
+                        onPress={() => {
+                            receivedOrder(id, true).then((res) => {
                                 updateInfo(res);
                             });
-                        },
-                    });
-                }}
-            >
-                {orderButton1}
-            </Button>
-            <Button
-                style={styles.footerControl}
-                onPress={() => {
-                    receivedOrder(id, true).then((res) => {
-                        updateInfo(res);
-                    });
-                }}
-                appearance='outline'
-            >
-                {orderButton2}
-            </Button>
-        </Layout>
-    );
-
+                        }}
+                        appearance='outline'
+                    >
+                        {orderButton2}
+                    </Button>
+                </Layout>
+            );
+        } else {
+            return null;
+        }
+    };
     return (
         <Card
             appearance='orderCard'
@@ -72,8 +118,11 @@ export default function OrderCard(props) {
             style={[props.style]}
             footer={Footer}
         >
-            <Text>商家{getWordsStr(merchantStatus)}</Text>
-            <Text>商家{getWordsStr(merchantStatus)}</Text>
+            {riderStatus ? (
+                <Text>骑手{getWordsStr(riderStatus)}</Text>
+            ) : (
+                <Text>商家{getWordsStr(merchantStatus)}</Text>
+            )}
             <Layout style={styles.orderItem1}>
                 <Text category='c2'>{id}</Text>
                 <Text category='c2'>

components/UpLoadImage.js

@@ -46,7 +46,7 @@ export default function UpLoadImage(props) {
                     }
                 }}
             />
-            {props.hasCancel && props.value && (
+            {/* {props.hasCancel == true && props.value && (
                 <Button
                     size='tiny'
                     status='danger'
@@ -69,7 +69,7 @@ export default function UpLoadImage(props) {
                         });
                     }}
                 />
-            )}
+            )} */}
         </>
     );
 }

navigation/BasicNavigator.js

@@ -7,6 +7,7 @@ import EditGoods from "../screens/EditGoods";
 import AddGoodsClassification from "../screens/AddGoodsClassification";
 import FullReduction from "../screens/FullReduction";
 import Guide2Screen from "../screens/Guide2Screen";
+import MoneyListScreen from "../screens/MoneyListScreen";
 
 export default function BasicScreens(Screen) {
     return (
@@ -21,6 +22,7 @@ export default function BasicScreens(Screen) {
             />
             <Screen name='FullReduction' component={FullReduction} />
             <Screen name='AddNewClass' component={Guide2Screen} />
+            <Screen name='Money' component={MoneyListScreen} />
         </>
     );
 }

navigation/BottomTabNavigator.js

@@ -14,7 +14,7 @@ export default function BottomTabNavigator({ navigation, route }) {
     const theme = useTheme();
     const { tab1, tab2, tab3 } = useModel("wordsModel");
     return (
-        <BottomTab.Navigator headerMode='none' initialRouteName='Order'>
+        <BottomTab.Navigator headerMode='none' initialRouteName='Home'>
             <BottomTab.Screen
                 name='Home'
                 component={HomeScreen}

navigation/GuideStackNavigator.js

@@ -52,8 +52,11 @@ export default function GuideStackNavigator() {
             }}
             initialRouteName={initial}
         >
+            {/* 商品 */}
             <GuideStack.Screen name='Guide1' component={Guide1Screen} />
+            {/* 分类 */}
             <GuideStack.Screen name='Guide2' component={Guide2Screen} />
+            {/* 支付宝 */}
             <GuideStack.Screen name='Guide3' component={Guide3Screen} />
             <GuideStack.Screen name='Guide4' component={Guide4Screen} />
             <GuideStack.Screen name='StoreAudit' component={StoreAudit} />

screens/Guide1Screen.js

@@ -256,6 +256,19 @@ export default function Guide1Screen({ navigation, route }) {
                                 status='primary'
                                 disabled={!canNext}
                                 onPress={() => {
+                                    console.log({
+                                        id,
+                                        name,
+                                        amount,
+                                        discountAmount,
+                                        inventory,
+                                        week,
+                                        startTime,
+                                        endTime,
+                                        introduction,
+                                        img,
+                                        merchantId: mid,
+                                    });
                                     httpPost(
                                         "/goods/save",
                                         {
@@ -271,14 +284,15 @@ export default function Guide1Screen({ navigation, route }) {
                                             img,
                                             merchantId: mid,
                                         },
-                                        { body: "json" }
+                                        { body: "json" },
+                                        true
                                     ).then((res) => {
                                         success(id ? "修改" : "添加" + "成功");
                                         if (id) {
                                             getInfo(res);
-                                        } else if(routeName!='AddGoods'){
+                                        } else if (routeName != "AddGoods") {
                                             changeGuideStep(1, "Guide2");
-                                        }else{
+                                        } else {
                                             changeId(res.id);
                                             navigation.dispatch(
                                                 CommonActions.setParams({

screens/Guide3Screen.js

@@ -54,8 +54,14 @@ export default function Guide1Screen({ navigation, route }) {
     );
 
     const canNext = React.useMemo(() => {
-        return true;
-    }, [name]);
+        if(aliAccount&&aliName){
+            return true;
+        }
+        else{
+            return false;
+        }
+      
+    }, [aliName,aliAccount]);
 
     return (
         <>

screens/MoneyListScreen.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 scrollPage from "../decorator/scrollPage";
+import { useModel } from "flooks";
+import {
+    Layout,
+    Tab,
+    TabView,
+    Text,
+    useTheme,
+    Button,
+    Card,
+} from "@ui-kitten/components";
+import FormInput from "../components/FormInput";
+import { useFocusEffect } from "@react-navigation/native";
+import ScrollPage from "../components/ScrollPage";
+import NavHeaderBar from "../components/NavHeaderBar";
+import GoodsCard from "../components/GoodsCard";
+
+export default function MoneyListScreen({ navigation, route }) {
+    const theme = useTheme();
+    const { changeBackground } = useModel("barModel");
+    const { status, changeGuideStep } = useModel("userModel");
+
+    const {
+        userTitle6,
+        storeAudioText1,
+        storeAudioText2,
+        storeAudioText3,
+        storeAudioText4,
+        complete,
+    } = useModel("wordsModel");
+    const [categoryList, changeCategoryList] = React.useState([]);
+    const [merchantNatureList, changeMerchantNatureList] = React.useState([]);
+    useFocusEffect(
+        React.useCallback(() => {
+            changeBackground(theme["color-primary-500"]);
+        }, [])
+    );
+
+    return (
+        <>
+            <NavHeaderBar title={userTitle6} />
+            <ScrollPage>
+                <Layout style={styles.container}>
+                    {status == "PENDING" ? (
+                        <>
+                            <Image
+                                source={require("../assets/images/shenhe.png")}
+                                style={styles.icon}
+                            />
+                            <Text
+                                category='h6'
+                                status='info'
+                                style={styles.text}
+                            >
+                                {storeAudioText1}
+                            </Text>
+                            <Text
+                                category='h6'
+                                status='info'
+                                style={styles.text}
+                            >
+                                {storeAudioText2}
+                            </Text>
+                        </>
+                    ) : (
+                        <>
+                            <Image
+                                source={require("../assets/images/shehe1.png")}
+                                style={styles.icon}
+                            />
+                            <Text
+                                category='h6'
+                                status='primary'
+                                style={styles.text}
+                            >
+                                {storeAudioText3}
+                            </Text>
+                            <Text
+                                category='h6'
+                                status='primary'
+                                style={styles.text}
+                            >
+                                {storeAudioText4}
+                            </Text>
+                            <Button
+                                style={styles.button}
+                                onPress={() => changeGuideStep("finish")}
+                            >
+                                {complete}
+                            </Button>
+                        </>
+                    )}
+                </Layout>
+            </ScrollPage>
+        </>
+    );
+}
+
+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,
+    },
+});

screens/UserScreen.js

@@ -165,6 +165,9 @@ export default function UserScreen({ navigation }) {
                             <MenuItem
                                 title={userTitle61}
                                 accessoryRight={ForwardIcon}
+                                onPress={() => {
+                                    navigation.navigate("Money");
+                                }}
                             />
                             <MenuItem
                                 title={userTitle62}