调整默认域名为国药PRO，登录界面增加版本号v1.1.0

(cherry picked from commit 0a948e1a)

app/containers/common/NotEnoughModel.js

@@ -213,12 +213,12 @@ const styles = StyleSheet.create({
         alignItems: 'center'
         alignItems: 'center'
     },
     },
     err_icon: {
     err_icon: {
-        width: pxSize(20),
-        height: pxSize(20),
+        width: pxSize(18),
+        height: pxSize(18),
         marginRight: 6
         marginRight: 6
     },
     },
     inner_tit: {
     inner_tit: {
-        fontSize: 18,
+        fontSize: 16,
         fontFamily: font_family_semibold
         fontFamily: font_family_semibold
     },
     },
     head_tou_clo: {
     head_tou_clo: {

app/containers/login/LoginPage.js

@@ -24,7 +24,8 @@ import {
     placehold_text_color,
     placehold_text_color,
     font_family_regular,
     font_family_regular,
     safe_view,
     safe_view,
-    font_family_medium
+    font_family_medium,
+    third_text_color
 } from '../../base/BaseStyle';
 } from '../../base/BaseStyle';
 import { requestLogin, autoLogin, setDomainConfigurate } from '../../action/LoginAction';
 import { requestLogin, autoLogin, setDomainConfigurate } from '../../action/LoginAction';
 import { show, isEmpty } from '../../utils/Utils';
 import { show, isEmpty } from '../../utils/Utils';
@@ -44,6 +45,7 @@ class LoginPage extends Component{
             subTitList: ['登录', '登录中...'],
             subTitList: ['登录', '登录中...'],
             isSubLoding: false,
             isSubLoding: false,
             isShowDomain: false, // 域名填写
             isShowDomain: false, // 域名填写
+            version_apk: 'v1.1.0'
         }
         }
     }
     }
 
 
@@ -232,7 +234,7 @@ class LoginPage extends Component{
     }
     }
 
 
     render() {
     render() {
-        let {username, password, isSubLoding, subTit, isShowDomain} = this.state
+        let {username, password, isSubLoding, subTit, isShowDomain, version_apk} = this.state
         let {global_domain_config} = this.props
         let {global_domain_config} = this.props
         let tempInd = global_domain_config.indexOf('/') + 2
         let tempInd = global_domain_config.indexOf('/') + 2
         let tempGlobalDomain = global_domain_config.slice(tempInd)
         let tempGlobalDomain = global_domain_config.slice(tempInd)
@@ -301,6 +303,7 @@ class LoginPage extends Component{
                                 <View style={styles.fo_box}>
                                 <View style={styles.fo_box}>
                                     <Image source={require('../../images/logo_foo.png')} style={styles.footer_img} />
                                     <Image source={require('../../images/logo_foo.png')} style={styles.footer_img} />
                                 </View>
                                 </View>
+                                <Text style={styles.fo_vers}>{ version_apk }</Text>
                             </View>
                             </View>
 
 
                             <LodingModel title={subTit}  show={isSubLoding} />
                             <LodingModel title={subTit}  show={isSubLoding} />
@@ -459,6 +462,11 @@ const styles = StyleSheet.create({
         height: pxSize(30),
         height: pxSize(30),
         marginTop: 42
         marginTop: 42
     },
     },
+    fo_vers: {
+        fontSize: 10,
+        color: third_text_color,
+        paddingTop: 4
+    },
     footer_img: {
     footer_img: {
         // flex: 1
         // flex: 1
         resizeMode: 'contain',
         resizeMode: 'contain',

app/network/RequestUtils.js

@@ -50,7 +50,6 @@ export const UploadRequest = (BaseUrl, url,datas) => {
         },
         },
         timeout: 20000 //20s超时
         timeout: 20000 //20s超时
     };
     };
-
     return fetch(`${BaseUrl}${VERSION}${url}`, opts)
     return fetch(`${BaseUrl}${VERSION}${url}`, opts)
         .then(response => response.json())
         .then(response => response.json())
         .then(data => data)
         .then(data => data)

app/reducers/module/login.js

@@ -16,9 +16,10 @@ const defaultState = {
     token:null,
     token:null,
     username:'',
     username:'',
     password:'',
     password:'',
-    global_domain_config: 'https://obs.uat.guke.tech', 
+    global_domain_config: 'https://obs-pro.gyjtsx.com', 
     // 默认【深圳仓】https://obs.uat.guke.tech；【十方uat】https://obs.uat.sfrx.guke.tech
     // 默认【深圳仓】https://obs.uat.guke.tech；【十方uat】https://obs.uat.sfrx.guke.tech
     // 【国药dev】https://obs.dev.guke.tech；【国药pro】https://obs-pro.gyjtsx.com
     // 【国药dev】https://obs.dev.guke.tech；【国药pro】https://obs-pro.gyjtsx.com
+    // 【国药uat】https://obs-dev.gyjtsx.com
 }
 }
 
 
 export default login = (state = defaultState, action) => {
 export default login = (state = defaultState, action) => {