0526

models/userModel.js

@@ -234,12 +234,12 @@ export default {
             });
         },
         closeMer() {
-            const { isOpen ,getUserInfo} = model();
+            const { isOpening, getUserInfo } = model();
             const { httpGet } = model("httpModel");
             const { success } = model("loadingModel");
             let { showDialog } = model("dialogModel");
             let { removeTips, editSuccess } = model("wordsModel");
-            if (isOpen) {
+            if (isOpening) {
                 showDialog({
                     bodyText: "停止当前营业，直到下次营业开启",
                     status: "danger",
@@ -247,14 +247,14 @@ export default {
                     confirmCallback: () => {
                         httpGet("/merchant/closeMer", {}, true).then(res => {
                             success("操作成功");
-                            getUserInfo()
+                            getUserInfo();
                         });
                     },
                 });
             } else {
                 httpGet("/merchant/closeMer", {}, true).then(res => {
                     success("操作成功");
-                    getUserInfo()
+                    getUserInfo();
                 });
             }
         },

screens/UserScreen.js

@@ -45,7 +45,7 @@ export default function UserScreen({ navigation }) {
         updateMerchant,
         banner,
         closeMer,
-        isOpen,
+        isOpening,
     } = useModel("userModel");
 
     const {
@@ -212,10 +212,10 @@ export default function UserScreen({ navigation }) {
 
                     <Layout style={styles.loginOut}>
                         <Button
-                            appearance={isOpen ? "outline" : "fill"}
+                            appearance={isOpening ? "outline" : "fill"}
                             onPress={closeMer}
                         >
-                            {isOpen ? "停止营业" : "开始营业"}
+                            {isOpening ? "停止营业" : "开始营业"}
                         </Button>
                     </Layout>
                 </Layout>
@@ -237,7 +237,7 @@ const ForwardIcon = props => (
 
 const styles = StyleSheet.create({
     container: {
-
+        backgroundColor: "transparent",
     },
     menu: {
         flex: 1,
@@ -253,6 +253,7 @@ const styles = StyleSheet.create({
     },
     loginOut: {
         paddingHorizontal: 20,
-        backgroundColor:"transparent"
+        backgroundColor: "transparent",
+        paddingVertical: 40,
     },
 });