0518

components/OrderCard.js

@@ -27,7 +27,7 @@ export default function OrderCard(props) {
     } = useModel("wordsModel");
     const { showDialog } = useModel("dialogModel");
     const { receivedOrder } = useModel("orderInfoModel");
-    const { info } = props;
+    const { info, updateInfo } = props;
     const { id, payMethod, orderTime, userAddress, merchantStatus, user } =
         info || {};
 
@@ -72,7 +72,8 @@ export default function OrderCard(props) {
             style={[props.style]}
             footer={Footer}
         >
-            <Text>{getWordsStr(merchantStatus)}</Text>
+            <Text>商家{getWordsStr(merchantStatus)}</Text>
+            <Text>商家{getWordsStr(merchantStatus)}</Text>
             <Layout style={styles.orderItem1}>
                 <Text category='c2'>{id}</Text>
                 <Text category='c2'>

language/zh.js

@@ -185,4 +185,8 @@ export default {
     ALI_PAY: "支付宝",
     CASH_DELIVERY: "货到付款",
     CREDIT_CARD: "信用卡",
+    RECEIVED: "待取餐",
+    TAKE_MEAL: "已到店",
+    MEAL_DELIVERY: "正在配送中",
+    CARRY_OUT: "送达",
 };

models/goodsModel.js

@@ -0,0 +1,13 @@
+export default {
+    state: {
+        selectInfos: [],
+    },
+    actions: ({ model, setState }) => ({
+        //商家分类选择商品
+        changeSelect(list) {
+            setState({
+                selectInfos: list,
+            });
+        },
+    }),
+};

models/httpModel.js

@@ -4,6 +4,7 @@ import { AsyncStorage } from "react-native";
 export default {
     state: {
         baseUrl: "http://dingdong.izouma.com",
+        // baseUrl: "http://localhost:8080",
         token: "",
         config: {},
         httpLoading: false,

models/index.js

@@ -3,8 +3,11 @@ import httpModel from "./httpModel";
 import userModel from "./userModel";
 import wordsModel from "./wordsModel";
 import barModel from "./barModel";
+import goodsModel from "./goodsModel";
 import orderInfoModel from "./orderInfoModel";
 
+
+setModel("goodsModel", goodsModel);
 setModel("barModel", barModel);
 setModel("userModel", userModel);
 setModel("wordsModel", wordsModel);

screens/AddGoodsClassification.js

@@ -53,6 +53,7 @@ export default function AddGoodsClassification({ navigation, route }) {
         addClassTips,
     } = useModel("wordsModel");
     const { showDialog } = useModel("dialogModel", true);
+    const { selectInfos, changeSelect } = useModel("goodsModel");
     const [categoryList, changeCategoryList] = React.useState([]);
     const [merchantNatureList, changeMerchantNatureList] = React.useState([]);
     const [goods, changeGoods] = React.useState([]);
@@ -79,6 +80,8 @@ export default function AddGoodsClassification({ navigation, route }) {
     React.useEffect(() => {
         if (selectId && selectId != "new") {
             getSelectGoods();
+        } else if (selectId == "new") {
+            setGoodsClass(selectInfos);
         }
     }, [selectId]);
     function getSelectGoods() {
@@ -195,6 +198,7 @@ export default function AddGoodsClassification({ navigation, route }) {
             }
             success(tips + successText);
             setGoodsClass(_goodsClass);
+            changeSelect(_goodsClass);
         } else {
             if (signboard) {
                 let ids = topGoods.map((item) => {
@@ -263,7 +267,7 @@ export default function AddGoodsClassification({ navigation, route }) {
                         />
                     </Card>
                 </Layout>
-                <ActionButton
+                {/* <ActionButton
                     style={{ zIndex: 2 }}
                     buttonColor={theme["color-primary-500"]}
                     onPress={() => {
@@ -277,7 +281,7 @@ export default function AddGoodsClassification({ navigation, route }) {
                         });
                     }}
                     position='center'
-                />
+                /> */}
             </ScrollPage>
         </>
     );

screens/Guide1Screen.js

@@ -276,7 +276,9 @@ export default function Guide1Screen({ navigation, route }) {
                                         success(id ? "修改" : "添加" + "成功");
                                         if (id) {
                                             getInfo(res);
-                                        } else {
+                                        } else if(routeName!='AddGoods'){
+                                            changeGuideStep(1, "Guide2");
+                                        }else{
                                             changeId(res.id);
                                             navigation.dispatch(
                                                 CommonActions.setParams({

screens/Guide2Screen.js

@@ -61,6 +61,7 @@ export default function Guide1Screen({ navigation }) {
     const [name, changeName] = React.useState("");
     const [sort, changeSort] = React.useState("");
     const [goodsIds, changeGoodsIds] = React.useState("");
+    const { selectInfos, changeSelect } = useModel("goodsModel");
 
     useFocusEffect(
         React.useCallback(() => {
@@ -71,15 +72,16 @@ export default function Guide1Screen({ navigation }) {
         }, [])
     );
     React.useEffect(() => {
-        if (route.params) {
-            if (route.params.choosIds) {
-                changeGoodsIds(route.params.choosIds);
-            }
+        if (selectInfos.length > 0) {
+            let _ids = selectInfos.map((item) => {
+                return item.id;
+            });
+            changeGoodsIds(_ids.join(","));
         }
-    }, [route]);
+    }, [selectInfos]);
 
     const canNext = React.useMemo(() => {
-        if (name) {
+        if (name && sort) {
             return true;
         } else {
             return false;
@@ -144,22 +146,24 @@ export default function Guide1Screen({ navigation }) {
                             }}
                             textAlign='right'
                         />
-                        <Layout style={styles.layoutLeft} level='1'>
-                            <Button
-                                status='primary'
-                                disabled={!canNext}
-                                onPress={() => {
-                                    addClass().then((_) => {
-                                        success("添加成功");
-                                        RootNavigation.goBack();
-                                    });
-                                }}
-                            >
-                                确定
-                            </Button>
-                        </Layout>
+                        {pageName === "AddNewClass" && (
+                            <Layout style={styles.layoutLeft} level='1'>
+                                <Button
+                                    status='primary'
+                                    disabled={!canNext}
+                                    onPress={() => {
+                                        addClass().then((_) => {
+                                            success("添加成功");
+                                            RootNavigation.goBack();
+                                        });
+                                    }}
+                                >
+                                    确定
+                                </Button>
+                            </Layout>
+                        )}
                     </Card>
-                    {pageName != "AddNewClass" && (
+                    {pageName !== "AddNewClass" && (
                         <ConnectButton>
                             <Layout style={styles.layoutLeft} level='1'>
                                 <Button
@@ -169,7 +173,7 @@ export default function Guide1Screen({ navigation }) {
                                         addClass()
                                             .then((_) => {
                                                 success("添加成功");
-                                                RootNavigation.goBack();
+                                                changeGuideStep(2, "Guide3");
                                             })
                                             .then((e) => {});
                                     }}

screens/OrderListScreen.js

@@ -63,6 +63,9 @@ export default function OrderListScreen({ route }) {
             appearance='classification'
             key={item.id}
             info={item}
+            updateInfo={()=>{
+                getOrderList()
+            }}
         />
     );