Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
zhangzhonghua
/
BoneHouse_Business_APP
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
0a948e1a
authored
Aug 12, 2020
by
Denglingling
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调整默认域名为国药PRO,登录界面增加版本号v1.1.0
parent
e3183866
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
7 deletions
app/containers/common/NotEnoughModel.js
app/containers/login/LoginPage.js
app/network/RequestUtils.js
app/reducers/module/login.js
app/containers/common/NotEnoughModel.js
View file @
0a948e1a
...
...
@@ -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
:
1
8
,
fontSize
:
1
6
,
fontFamily
:
font_family_semibold
},
head_tou_clo
:
{
...
...
app/containers/login/LoginPage.js
View file @
0a948e1a
...
...
@@ -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'
,
...
...
app/network/RequestUtils.js
View file @
0a948e1a
...
...
@@ -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
)
...
...
app/reducers/module/login.js
View file @
0a948e1a
...
...
@@ -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
)
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment