0611

app.json

@@ -1,31 +1,37 @@
 {
-    "expo": {
-        "name": "叮咚外卖协作平台",
-        "slug": "dingdongHelp",
-        "platforms": ["ios", "android", "web"],
-        "version": "1.0.0",
-        "orientation": "portrait",
-        "icon": "./assets/images/icon.png",
-        "scheme": "myapp",
-        "splash": {
-            "image": "./assets/images/splash.png",
-            "resizeMode": "contain",
-            "backgroundColor": "#ffffff"
-        },
-        "updates": {
-            "fallbackToCacheTimeout": 0
-        },
-        "assetBundlePatterns": ["**/*"],
-        "ios": {
-            "supportsTablet": true
-        },
-        "web": {
-            "favicon": "./assets/images/favicon.png"
-        },
-        "android": {
-            "package": "com.izouma.izouma",
-            "versionCode": 1
-        },
-        "description": ""
-    }
+  "expo": {
+    "name": "叮咚外卖协作平台",
+    "slug": "dingdongHelp",
+    "platforms": [
+      "ios",
+      "android",
+      "web"
+    ],
+    "version": "1.0.0",
+    "orientation": "portrait",
+    "icon": "./assets/images/icon.png",
+    "scheme": "myapp",
+    "splash": {
+      "image": "./assets/images/splash.png",
+      "resizeMode": "contain",
+      "backgroundColor": "#ffffff"
+    },
+    "updates": {
+      "fallbackToCacheTimeout": 0
+    },
+    "assetBundlePatterns": [
+      "**/*"
+    ],
+    "ios": {
+      "supportsTablet": true
+    },
+    "web": {
+      "favicon": "./assets/images/favicon.png"
+    },
+    "android": {
+      "package": "com.izouma.izouma",
+      "versionCode": 1
+    },
+    "description": ""
+  }
 }

navigation/BottomTabNavigator.js

@@ -20,7 +20,7 @@ export default function BottomTabNavigator({ navigation, route }) {
                 name='Home'
                 component={HomeScreen}
                 options={{
-                    title: "用户",
+                    title: "叮咚外卖协助平台用户协作",
                     tabBarIcon: ({ focused }) => (
                         <TabBarIcon focused={focused} name='md-code-working' />
                     ),
@@ -30,7 +30,7 @@ export default function BottomTabNavigator({ navigation, route }) {
                 name='Links'
                 component={LinksScreen}
                 options={{
-                    title: "骑手",
+                    title: "叮咚外卖协助平台骑手协作",
                     tabBarIcon: ({ focused }) => (
                         <TabBarIcon focused={focused} name='md-book' />
                     ),

screens/HomeScreen.js

@@ -32,24 +32,24 @@ export default function HomeScreen() {
         });
 
         axiosInstance.interceptors.request.use(
-            (config) => {
+            config => {
                 config.headers = config.headers || {};
                 if (token) {
                     config.headers["Authorization"] = "Bearer " + token;
                 }
                 return config;
             },
-            (error) => {
+            error => {
                 return Promise.reject(error);
             }
         );
 
         axiosInstance.interceptors.response.use(
-            (response) => {
+            response => {
                 setError("");
                 return response.data;
             },
-            (error) => {
+            error => {
                 setError(error.response.data.error);
                 return Promise.reject(error.response.data);
             }
@@ -59,13 +59,13 @@ export default function HomeScreen() {
 
     const chooseGoods = React.useMemo(() => {
         if (selectGoodsId) {
-            return goods.find((item) => {
+            return goods.find(item => {
                 return item.id == selectGoodsId;
             });
         } else {
             return {};
         }
-    }, [selectGoodsId]);
+    }, [selectGoodsId, goods]);
 
     useFocusEffect(
         React.useCallback(() => {
@@ -76,14 +76,14 @@ export default function HomeScreen() {
                 .post("/auth/login", data, {
                     withCredentials: true,
                 })
-                .then((res) => {
+                .then(res => {
                     setToken(res);
                 });
         }, [])
     );
 
     const GoodsInfos = () => {
-        return goods.map((item) => (
+        return goods.map(item => (
             <Picker.Item
                 label={item.name + "-" + item.merchantId}
                 value={item.id}
@@ -92,13 +92,17 @@ export default function HomeScreen() {
         ));
     };
 
+     
+
     React.useEffect(() => {
         if (token) {
             console.log(token);
-            axiosInstance.get("/goods/all").then((res) => {
-                console.log(res.content);
-                setGoods(res.content);
-            });
+            axiosInstance
+                .get("/goods/all?size=999&sort=id,desc")
+                .then(res => {
+                    console.log(res.content);
+                    setGoods(res.content);
+                });
         }
     }, [token, check]);
 
@@ -128,7 +132,7 @@ export default function HomeScreen() {
                                     selectGoodsId +
                                     "&pass=true"
                             )
-                            .then((res) => {
+                            .then(res => {
                                 changeCheck(!check);
                             });
                     }}
@@ -148,7 +152,7 @@ export default function HomeScreen() {
                             .post("/shoppingCart/cart", data, {
                                 withCredentials: true,
                             })
-                            .then((res) => {
+                            .then(res => {
                                 setCartId(res.id);
                             });
                     }}
@@ -166,7 +170,7 @@ export default function HomeScreen() {
                             .post("/orderInfo/order", data, {
                                 withCredentials: true,
                             })
-                            .then((res) => {
+                            .then(res => {
                                 setOrderId(res.id);
                             });
                     }}