panhui 5 tahun lalu
induk
melakukan
74f5c632ef
4 mengubah file dengan 11 tambahan dan 6 penghapusan
  1. 1 1
      App.tsx
  2. 2 2
      login/model.ts
  3. 3 1
      notice/NoticeScreen.tsx
  4. 5 2
      utils/SystemUtils.ts

+ 1 - 1
App.tsx

@@ -54,7 +54,7 @@ export default function App() {
                 bottom={50}
                 left={20}
               >
-                骑手端测试版 (0819) 版本一
+                骑手端测试版 (0820) 版本三
               </Button>
               <Navigation colorScheme={colorScheme} />
             </Div>

+ 2 - 2
login/model.ts

@@ -20,7 +20,7 @@ const MapModel = (now) => ({
     return request
       .post('/auth/loginByRegister', {
         data: {
-          phone: username,
+          phone: submitPhone(username),
           password,
           identity: 'RIDER',
         },
@@ -87,7 +87,7 @@ const MapModel = (now) => ({
         const { getInit } = now(User);
         return getInit();
       })
-      .then(() => { 
+      .then(() => {
         toastHide();
         toastSuccess('注册成功');
       })

+ 3 - 1
notice/NoticeScreen.tsx

@@ -83,6 +83,7 @@ function SysNoticeScreen({ navigation }) {
   const { sysNoticeList, sendPushNotification } = useModel(IM, [
     'sysNoticeList',
   ]);
+  const { t } = useTranslation();
   return (
     <>
       {/* <Button
@@ -115,7 +116,7 @@ function SysNoticeScreen({ navigation }) {
         ListEmptyComponent={() => {
           return (
             <Text color="gary200" fontSize="sm" textAlign="center" py={20}>
-              t('zan-wu-shu-ju')
+              {t('zan-wu-shu-ju')}
             </Text>
           );
         }}
@@ -128,6 +129,7 @@ function SysNoticeScreen({ navigation }) {
 function UserChatScreen({ navigation }) {
   const { chatList } = useModel(IM, ['chatList']);
   const { id } = useModel(User, ['id']);
+  const { t } = useTranslation();
   return (
     <FlatList
       renderItem={({ item }) => {

+ 5 - 2
utils/SystemUtils.ts

@@ -1,10 +1,11 @@
 import i18n from '../i18n';
 import * as Linking from 'expo-linking';
 
-// import { Toast, ModalIndicator, PopoverPicker } from 'teaset';
+import { Toast, ModalIndicator, PopoverPicker } from 'teaset';
 import { Platform } from 'react-native';
 
 function connect(navigation) {
+  toastHide();
   navigation.navigate('Modal', {
     screen: 'Alert',
     params: {
@@ -28,6 +29,7 @@ function promot(
     secureTextEntry: false,
   }
 ) {
+  toastHide();
   navigation.navigate('Modal', {
     screen: 'Promot',
     params,
@@ -43,6 +45,7 @@ function alert(
     hasCancel: true,
   }
 ) {
+  toastHide();
   navigation.navigate('Modal', {
     screen: 'Alert',
     params,
@@ -84,5 +87,5 @@ export {
   toastSuccess,
   getMoney,
   alert,
-  // PopoverPicker,
+  PopoverPicker,
 };