0518

app.json

@@ -26,7 +26,7 @@
       "supportsTablet": true
     },
     "android": {
-      "package": "com.izouma.izouma",
+      "package": "com.izouma.dingdong",
       "versionCode": 1,
       "permissions": [
         "CAMERA",
@@ -43,4 +43,4 @@
     "description": "叮咚外卖测试版",
     "sdkVersion": "37.0.0"
   }
-}
+}

components/GoodsCard.js

@@ -87,7 +87,7 @@ export default function GoodsCard(props) {
                             </Button>
                         </Layout>
                     )}
-
+                    {/* 
                     {props.appearance == "classification" &&
                         props.type != "goodsList" && (
                             <Button
@@ -95,7 +95,7 @@ export default function GoodsCard(props) {
                                 status='danger'
                                 accessoryLeft={StarIcon}
                             />
-                        )}
+                        )} */}
                 </Layout>
             ) : (
                 <Layout style={styles.layout} />

components/GuideHeaderBar.js

@@ -5,7 +5,15 @@ import { Image, StyleSheet } from "react-native";
 
 export default function GuideHeaderBar(props) {
     const theme = useTheme();
-    const { registerInfo, showName } = useModel("userModel");
+    const { registerInfo, showName, mid } = useModel("userModel");
+
+    const title = React.useMemo(() => {
+        if (mid) {
+            return showName;
+        } else {
+            return registerInfo.showName;
+        }
+    }, [showName, registerInfo]);
     return (
         <Layout
             style={[
@@ -18,11 +26,7 @@ export default function GuideHeaderBar(props) {
                 style={styles.icon}
             />
             <Text style={styles.text} category='h6'>
-                {showName
-                    ? showName
-                    : registerInfo
-                    ? registerInfo.showName
-                    : "商家名称"}
+                {title}
             </Text>
         </Layout>
     );

components/OpenTime.js

@@ -51,13 +51,13 @@ export default function OpenTime({
     defaultValue,
 }) {
     const {
-        MON,
-        TUE,
-        WED,
-        THU,
-        FRI,
-        SAT,
-        SUN,
+        MONDAY,
+        TUESDAY,
+        WEDNESDAY,
+        THURSDAY,
+        FRIDAY,
+        SATURDAY,
+        SUNDAY,
         every,
         confirm,
         cancel,
@@ -69,32 +69,32 @@ export default function OpenTime({
     } = useModel("wordsModel");
     const weeks = [
         {
-            key: "MON",
-            label: MON,
+            key: "MONDAY",
+            label: MONDAY,
         },
         {
-            key: "TUE",
-            label: TUE,
+            key: "TUESDAY",
+            label: TUESDAY,
         },
         {
-            key: "WED",
-            label: WED,
+            key: "WEDNESDAY",
+            label: WEDNESDAY,
         },
         {
-            key: "THU",
-            label: THU,
+            key: "THURSDAY",
+            label: THURSDAY,
         },
         {
-            key: "FRI",
-            label: FRI,
+            key: "FRIDAY",
+            label: FRIDAY,
         },
         {
-            key: "SAT",
-            label: SAT,
+            key: "SATURDAY",
+            label: SATURDAY,
         },
         {
-            key: "SUN",
-            label: SUN,
+            key: "SUNDAY",
+            label: SUNDAY,
         },
     ];
     const [checkList, changeChecked] = React.useState([]);

components/UpLoadImage.js

@@ -3,7 +3,7 @@ import { Button, Layout, Icon } from "@ui-kitten/components";
 import { useModel } from "flooks";
 import { Linking } from "expo";
 import * as ImagePicker from "expo-image-picker";
-import { Image } from "react-native";
+import { Image, Platform } from "react-native";
 import * as FileSystem from "expo-file-system";
 
 export default function UpLoadImage(props) {
@@ -56,6 +56,7 @@ const getPermissionAsync = async () => {
 };
 
 const _pickImage = () => {
+    console.log(Platform);
     return new Promise(async (resolve, reject) => {
         try {
             let permissionResult = await ImagePicker.requestCameraRollPermissionsAsync();
@@ -71,9 +72,11 @@ const _pickImage = () => {
                     base64: true,
                 });
                 if (!result.cancelled) {
-                    console.log(result.base64)
-                    // let file = await FileSystem.readAsStringAsync(result.uri);
-                    resolve(result.base64);
+                    if (Platform.OS == "web") {
+                        resolve(result.uri);
+                    } else {
+                        resolve(result.base64);
+                    }
                 }
             }
         } catch (e) {

language/zh.js

@@ -134,13 +134,13 @@ export default {
     pass: "跳过",
     cancel: "取消",
     confirm: "确认",
-    MON: "周一",
-    TUE: "周二",
-    WED: "周三",
-    THU: "周四",
-    FRI: "周五",
-    SAT: "周六",
-    SUN: "周日",
+    MONDAY: "周一",
+    TUESDAY: "周二",
+    WEDNESDAY: "周三",
+    THURSDAY: "周四",
+    FRIDAY: "周五",
+    SATURDAY: "周六",
+    SUNDAY: "周日",
     every: "每天",
     start: "开始时间",
     end: "结束时间",

mapping.json

@@ -789,37 +789,10 @@
                     },
                     "variantGroups": {
                         "status": {
-                            "primary": {
-                                "borderColor": "transparent",
-                                "backgroundColor": "transparent",
-                                "textColor": "#787878",
-                                "iconTintColor": "#787878",
-                                "state": {
-                                    "focused": {
-                                        "borderColor": "transparent",
-                                        "backgroundColor": "transparent"
-                                    },
-                                    "hover": {
-                                        "borderColor": "transparent",
-                                        "backgroundColor": "transparent"
-                                    },
-                                    "active": {
-                                        "borderColor": "transparent",
-                                        "backgroundColor": "transparent"
-                                    },
-                                    "disabled": {
-                                        "borderColor": "transparent",
-                                        "backgroundColor": "transparent",
-                                        "textColor": "text-disabled-color",
-                                        "iconTintColor": "text-disabled-color"
-                                    }
-                                }
-                            }
+                            "primary": {}
                         },
                         "size": {
                             "medium": {
-                                "minWidth": "100%",
-                                "minHeight": "100%",
                                 "textFontSize": 10
                             }
                         }

models/httpModel.js

@@ -103,7 +103,7 @@ export default {
             return AsyncStorage.setItem(key, value);
         },
         removeAsyncStorage(key) {
-            AsyncStorage.removeItem(key);
+            return AsyncStorage.removeItem(key);
         },
         getAsyncStorage(key) {
             return AsyncStorage.getItem(key);

models/loadingModel.js

@@ -22,7 +22,7 @@ export default {
                 status: "success",
                 title: title,
                 show: true,
-                time: 4000,
+                time: 3000,
             });
             const { setTime } = model();
             setTime();
@@ -32,7 +32,7 @@ export default {
                 status: "warn",
                 title: title,
                 show: true,
-                time: 4000,
+                time: 3000,
             });
             const { setTime } = model();
             setTime();

models/userModel.js

@@ -1,5 +1,5 @@
 //用户状态 （商家状态，全局）
-
+import * as RootNavigation from "../navigation/RootNavigation.js";
 export default {
     state: {
         mid: 0,
@@ -89,16 +89,20 @@ export default {
         },
         registerFirst({ ...data }) {
             setState({ registerInfo: data });
-            pushRouter("RegisterSe");
+            RootNavigation.navigate("RegisterSe");
         },
         registerUser({ ...data }) {
             const { checkLogin } = model();
             const { loading, success } = model("loadingModel");
-            const { httpPost, addAsyncStorage } = model("httpModel");
-            httpPost("/auth/merchantRegister", data).then((res) => {
+            const { httpPost, addAsyncStorage, removeAsyncStorage } = model(
+                "httpModel"
+            );
+            httpPost("/auth/merchantRegister", data, {}, true).then((res) => {
                 addAsyncStorage("token", res);
                 if (res) {
-                    checkLogin();
+                    success("注册成功");
+                    removeAsyncStorage("guideStep");
+                    RootNavigation.reset("LoadingModel");
                 }
             });
             // setTimeout(() => {
@@ -124,7 +128,7 @@ export default {
                     guideStep: "finish",
                 });
             } else {
-                replaceRouter(next);
+                RootNavigation.replace(next);
             }
         },
         saveMerchant({ ...data }) {
@@ -172,5 +176,12 @@ export default {
                 return updateMerchant({ logo: img });
             }
         },
+        userLogout() {
+            const { removeAsyncStorage } = model("httpModel");
+            const { success } = model("loadingModel");
+            return removeAsyncStorage("token").then(() => {
+                success("退出成功");
+            });
+        },
     }),
 };

navigation/RootNavigation.js

@@ -1,7 +1,7 @@
 // RootNavigation.js
 import { StackActions } from "@react-navigation/native";
 import * as React from "react";
-
+import { CommonActions } from "@react-navigation/native";
 export const navigationRef = React.createRef();
 
 export function navigate(name, params) {
@@ -16,4 +16,17 @@ export function goBack() {
     navigationRef.current?.goBack();
 }
 
-// add other navigation functions that you need and export them
+export function reset(name, params) {
+    navigationRef.current?.dispatch(
+        CommonActions.reset({
+            index: 0,
+            key: null,
+            routes: [
+                {
+                    name: name,
+                    params: params,
+                },
+            ],
+        })
+    );
+}

screens/EditGoods.js

@@ -92,7 +92,7 @@ export default function EditGoods({ navigation, route }) {
                     style={styles.list}
                     data={goods}
                     renderItem={goodsItem}
-                    ListEmptyComponent={nothingTips}
+                    ListEmptyComponent={EmptyComponent}
                 />
             </Layout>
         </>

screens/HomeScreen.js

@@ -64,6 +64,10 @@ export default function HomeScreen({ navigation, route }) {
         proclamation,
         updateMerchant,
         banner,
+        userLogout,
+        monthSales,
+        goodNum,
+        badNum,
     } = useModel("userModel");
 
     const {
@@ -85,17 +89,10 @@ export default function HomeScreen({ navigation, route }) {
     const [fullReductions, changeFllReduction] = React.useState([]);
     const { showDialog } = useModel("dialogModel", true);
     const { httpPost, httpGet } = useModel("httpModel", true);
-    const [selectedIndex, setSelectedIndex] = React.useState();
 
     useFocusEffect(
         React.useCallback(() => {
             changeBackground(theme["color-primary-500"]);
-            if (route.params) {
-                setSelectedIndex(parseInt(route.params.index));
-            } else {
-                setSelectedIndex(0);
-            }
-
             httpGet("/fullReduction/my").then((res) => {
                 changeFllReduction(res);
             });
@@ -122,8 +119,17 @@ export default function HomeScreen({ navigation, route }) {
                 visible={menuVisible}
                 onBackdropPress={toggleMenu}
             >
-                <MenuItem accessoryLeft={InfoIcon} title='About' />
-                <MenuItem accessoryLeft={LogoutIcon} title='Logout' />
+                <MenuItem accessoryLeft={InfoIcon} title='切换语言' />
+                <MenuItem
+                    accessoryLeft={LogoutIcon}
+                    title='退出登录'
+                    onPress={() => {
+                        userLogout().then(() => {
+                            toggleMenu();
+                            RootNavigation.reset("LoadingModel");
+                        });
+                    }}
+                />
             </OverflowMenu>
         </React.Fragment>
     );
@@ -197,7 +203,7 @@ export default function HomeScreen({ navigation, route }) {
                                             style={styles.zanImg}
                                         />
                                         <Text category='c1' status='primary'>
-                                            0
+                                            {goodNum || 0}
                                         </Text>
                                     </Layout>
                                     <Layout
@@ -208,12 +214,12 @@ export default function HomeScreen({ navigation, route }) {
                                             style={styles.zanImg}
                                         />
                                         <Text category='c1' status='info'>
-                                            0
+                                            {badNum || 0}
                                         </Text>
                                     </Layout>
                                     <Layout>
                                         <Text category='c1' status='info'>
-                                            {homeTip2}
+                                            {homeTip2}:{monthSales || 0}
                                         </Text>
                                     </Layout>
                                 </Layout>
@@ -222,9 +228,9 @@ export default function HomeScreen({ navigation, route }) {
                                 {badgeList(fullReductions)}
                             </Layout>
                         </Layout>
-
                         <Button
-                            appearance='labelButton'
+                            appearance='ghost'
+                            status='info'
                             accessoryRight={NextIcon}
                             children={(TextProps) => (
                                 <Text
@@ -232,7 +238,8 @@ export default function HomeScreen({ navigation, route }) {
                                     numberOfLines={1}
                                     ellipsizeMode='tail'
                                 >
-                                    {homeTip3}:{proclamation}
+                                    {homeTip3}:
+                                    {proclamation || "暂无通告，点击编辑"}
                                 </Text>
                             )}
                             onPress={() => {
@@ -252,35 +259,41 @@ export default function HomeScreen({ navigation, route }) {
                     </Card>
 
                     <Layout style={styles.mainContent}>
-                        <TabView
-                            tabBarStyle={styles.tab}
-                            appearance='homeTab'
-                            selectedIndex={selectedIndex}
-                            onSelect={(index) => setSelectedIndex(index)}
-                            indicatorStyle={styles.tabIndicator}
+                        <Tab.Navigator
+                            initialRouteName='homeTab1'
+                            tabBarOptions={{
+                                activeTintColor: "#FFC21C",
+                                inactiveTintColor: "#000",
+                                style: styles.tab,
+                                indicatorStyle: styles.tabIndicator,
+                                labelStyle: styles.tab,
+                            }}
                         >
-                            <Tab
-                                title={homeTab1}
-                                appearance='homeTab'
-                                style={styles.tab}
-                            >
-                                <HomePage1 />
-                            </Tab>
-                            <Tab
-                                title={homeTab2}
-                                appearance='homeTab'
-                                style={styles.tab}
-                            >
-                                <HomePage2 />
-                            </Tab>
-                            <Tab
-                                title={homeTab3}
-                                appearance='homeTab'
-                                style={styles.tab}
-                            >
-                                <HomePage3 />
-                            </Tab>
-                        </TabView>
+                            <Tab.Screen
+                                name='homeTab1'
+                                component={HomePage1}
+                                options={{
+                                    tabBarLabel: ({ focused }) =>
+                                        labelText(focused, homeTab1),
+                                }}
+                            />
+                            <Tab.Screen
+                                name='homeTab2'
+                                component={HomePage2}
+                                options={{
+                                    tabBarLabel: ({ focused }) =>
+                                        labelText(focused, homeTab2),
+                                }}
+                            />
+                            <Tab.Screen
+                                name='homeTab3'
+                                component={HomePage3}
+                                options={{
+                                    tabBarLabel: ({ focused }) =>
+                                        labelText(focused, homeTab3),
+                                }}
+                            />
+                        </Tab.Navigator>
                     </Layout>
                 </Layout>
             </ScrollPage>
@@ -321,6 +334,7 @@ const styles = StyleSheet.create({
     FlexRow: {
         flexDirection: "row",
         alignItems: "center",
+        marginTop: 2,
     },
     zanImg: {
         width: 12,
@@ -348,8 +362,10 @@ const styles = StyleSheet.create({
         marginRight: 15,
     },
     labelText: {
-        width: 223,
         textAlign: "left",
+        fontSize: 13,
+        paddingHorizontal: 10,
+        minWidth: 120,
     },
     homeCard: {
         position: "absolute",
@@ -363,19 +379,13 @@ const styles = StyleSheet.create({
         backgroundColor: "transparent",
     },
     tab: {
-        backgroundColor: "transparent",
-        zIndex: 2,
+        backgroundColor: "#eee",
     },
     tabContainer: {
         backgroundColor: "transparent",
     },
     tabIndicator: {
-        height: 13,
-        // borderRadius: "50%",
-        bottom: 18,
-        maxWidth: 27,
-        marginHorizontal: 49,
-        zIndex: 1,
+        backgroundColor: "#FFC21C",
     },
 });
 

screens/HomeScreenPage1.js

@@ -182,6 +182,7 @@ export default function HomePage1(props) {
                     appearance='homePage1Card'
                     disabled={true}
                     style={styles.card}
+                    backgroundColor='#F0F0F0'
                     header={(props) => (
                         <Text {...props} style={[styles.title, props.style]}>
                             店主推荐
@@ -259,12 +260,14 @@ const styles = StyleSheet.create({
         justifyContent: "space-between",
         paddingVertical: 10,
         width: width - 30,
+        backgroundColor: "#F0F0F0",
     },
     title: {
         alignSelf: "stretch",
     },
     card: {
         alignItems: "center",
+        backgroundColor: "#F0F0F0",
     },
     container: {
         backgroundColor: "#F0F0F0",

screens/UserScreen.js

@@ -88,7 +88,9 @@ export default function UserScreen({ navigation }) {
                             accessoryRight={ForwardIcon}
                             style={styles.menuItem}
                             onPress={() => {
-                                navigation.navigate("Home", { index: 2 });
+                                navigation.navigate("Home", {
+                                    screen: "homeTab3",
+                                });
                             }}
                         />
 
@@ -114,7 +116,7 @@ export default function UserScreen({ navigation }) {
                             />
                         </MenuGroup>
 
-                        <MenuGroup title={userTitle3} style={styles.menuGroup}>
+                        <MenuGroup title={userTitle3} style={styles.menuGroup2}>
                             <MenuItem
                                 title={userTitle31}
                                 accessoryRight={ForwardIcon}
@@ -138,7 +140,7 @@ export default function UserScreen({ navigation }) {
                                 }}
                             />
                         </MenuGroup>
-                        <MenuGroup title={userTitle4} style={styles.menuGroup}>
+                        <MenuGroup title={userTitle4} style={styles.menuGroup2}>
                             <MenuItem
                                 title={userTitle41}
                                 accessoryRight={ForwardIcon}
@@ -152,12 +154,14 @@ export default function UserScreen({ navigation }) {
                         <MenuItem
                             title={userTitle5}
                             accessoryRight={ForwardIcon}
-                            style={styles.menuItem}
+                            style={styles.menuGroup2}
                             onPress={() => {
-                                navigation.navigate("Home", { index: 1 });
+                                navigation.navigate("Home", {
+                                    screen: "homeTab2",
+                                });
                             }}
                         />
-                        <MenuGroup title={userTitle6} style={styles.menuGroup}>
+                        <MenuGroup title={userTitle6} style={styles.menuGroup2}>
                             <MenuItem
                                 title={userTitle61}
                                 accessoryRight={ForwardIcon}
@@ -204,4 +208,7 @@ const styles = StyleSheet.create({
     menuGroup: {
         marginTop: 3,
     },
+    menuGroup2: {
+        marginTop: 6,
+    },
 });