Commit 9ac9d35f by Denglingling

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

(cherry picked from commit 0a948e1a)
parent 4f5c7ec4
......@@ -213,12 +213,12 @@ const styles = StyleSheet.create({
alignItems: 'center'
},
err_icon: {
width: pxSize(20),
height: pxSize(20),
width: pxSize(18),
height: pxSize(18),
marginRight: 6
},
inner_tit: {
fontSize: 18,
fontSize: 16,
fontFamily: font_family_semibold
},
head_tou_clo: {
......
......@@ -24,7 +24,8 @@ import {
placehold_text_color,
font_family_regular,
safe_view,
font_family_medium
font_family_medium,
third_text_color
} from '../../base/BaseStyle';
import { requestLogin, autoLogin, setDomainConfigurate } from '../../action/LoginAction';
import { show, isEmpty } from '../../utils/Utils';
......@@ -44,6 +45,7 @@ class LoginPage extends Component{
subTitList: ['登录', '登录中...'],
isSubLoding: false,
isShowDomain: false, // 域名填写
version_apk: 'v1.1.0'
}
}
......@@ -232,7 +234,7 @@ class LoginPage extends Component{
}
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 tempInd = global_domain_config.indexOf('/') + 2
let tempGlobalDomain = global_domain_config.slice(tempInd)
......@@ -301,6 +303,7 @@ class LoginPage extends Component{
<View style={styles.fo_box}>
<Image source={require('../../images/logo_foo.png')} style={styles.footer_img} />
</View>
<Text style={styles.fo_vers}>{ version_apk }</Text>
</View>
<LodingModel title={subTit} show={isSubLoding} />
......@@ -459,6 +462,11 @@ const styles = StyleSheet.create({
height: pxSize(30),
marginTop: 42
},
fo_vers: {
fontSize: 10,
color: third_text_color,
paddingTop: 4
},
footer_img: {
// flex: 1
resizeMode: 'contain',
......
......@@ -50,7 +50,6 @@ export const UploadRequest = (BaseUrl, url,datas) => {
},
timeout: 20000 //20s超时
};
return fetch(`${BaseUrl}${VERSION}${url}`, opts)
.then(response => response.json())
.then(data => data)
......
......@@ -16,9 +16,10 @@ const defaultState = {
token:null,
username:'',
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
// 【国药dev】https://obs.dev.guke.tech;【国药pro】https://obs-pro.gyjtsx.com
// 【国药uat】https://obs-dev.gyjtsx.com
}
export default login = (state = defaultState, action) => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment