소스 검색

release 1.0.2

vbea 3 년 전
부모
커밋
3e7babca37
4개의 변경된 파일13개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 2
      Strides-APP/android/app/version.properties
  2. 1 1
      Strides-APP/app.json
  3. 9 2
      Strides-APP/index.js
  4. 1 1
      Strides-Admin/vue.config.js

+ 2 - 2
Strides-APP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Fri Jan 13 12:37:35 CST 2023
-VERSION_CODE=74
+#Fri Jan 13 17:25:44 CST 2023
+VERSION_CODE=75

+ 1 - 1
Strides-APP/app.json

@@ -2,7 +2,7 @@
   "name": "JuicePlus",
   "displayName": "ChargEco",
   "versionCode": 80,
-  "versionName": "V1.0.1",
+  "versionName": "V1.0.2",
   "product": false,
   "debug": false
 }

+ 9 - 2
Strides-APP/index.js

@@ -2,7 +2,7 @@
  * @format
  */
 import React from 'react';
-import {AppRegistry, StatusBar} from 'react-native';
+import {AppRegistry, KeyboardAvoidingView, StatusBar} from 'react-native';
 import 'react-native-gesture-handler';
 import './app/utils/notification';
 import './app/utils/constant';
@@ -12,14 +12,21 @@ import {name as appName} from './app.json';
 //import {ModalPortal} from 'react-native-modals';
 import ModalPortal from './app/components/ModalPortal';
 import {RootSiblingParent} from 'react-native-root-siblings';
+import { SafeAreaView } from 'react-native-safe-area-context';
 
 
 const Index = () => {
   return (
     <RootSiblingParent>
       <StatusBar barStyle="dark-content" backgroundColor={colorPrimaryDark}/>
-      <Router />
+      { isIOS
+        ? <KeyboardAvoidingView style={ui.flex1} behavior="padding">
+            <Router />
+          </KeyboardAvoidingView>
+        : <Router />
+      }
       <ModalPortal />
+      <SafeAreaView style={{flex: 0, backgroundColor: 'white'}}></SafeAreaView>
     </RootSiblingParent>
   );
 };

+ 1 - 1
Strides-Admin/vue.config.js

@@ -24,7 +24,7 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: process.env.ENV === 'production' ? '/crm' : '/csms',
+  publicPath: '/csms',
   outputDir: 'dist',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',