Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fns_backend
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Zhang Xiaojie
fns_backend
Commits
31781636
Commit
31781636
authored
Sep 29, 2021
by
xhx
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://gitlab.33.cn/CassiniatSaturn/fns_backend
into dev
parents
1785f837
6b83311f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
index.ts
src/filter/index.ts
+1
-1
index.vue
src/views/Login/index.vue
+2
-1
No files found.
src/filter/index.ts
View file @
31781636
...
@@ -10,7 +10,7 @@ export default {
...
@@ -10,7 +10,7 @@ export default {
formatDate
(
timeStamp
:
number
)
{
formatDate
(
timeStamp
:
number
)
{
const
commonLen
=
new
Date
().
getTime
().
toString
().
length
const
commonLen
=
new
Date
().
getTime
().
toString
().
length
if
(
timeStamp
.
toString
().
length
===
commonLen
)
{
if
(
timeStamp
.
toString
().
length
===
commonLen
)
{
return
moment
(
timeStamp
).
format
(
'YYYY-MM-DD
hh
:mm'
)
// September 14th 2021, 3:22:23 pm
return
moment
(
timeStamp
).
format
(
'YYYY-MM-DD
HH
:mm'
)
// September 14th 2021, 3:22:23 pm
}
else
{
}
else
{
return
''
return
''
}
}
...
...
src/views/Login/index.vue
View file @
31781636
...
@@ -65,6 +65,7 @@
...
@@ -65,6 +65,7 @@
<a-form-model-item
prop=
"phoneNumber"
>
<a-form-model-item
prop=
"phoneNumber"
>
<a-input
<a-input
placeholder=
"请输入手机号"
placeholder=
"请输入手机号"
:maxLength=
"11"
v-model=
"loginBySmsForm.phoneNumber"
v-model=
"loginBySmsForm.phoneNumber"
>
>
<a-icon
slot=
"prefix"
type=
"phone"
/>
<a-icon
slot=
"prefix"
type=
"phone"
/>
...
@@ -244,7 +245,7 @@ export default Vue.extend({
...
@@ -244,7 +245,7 @@ export default Vue.extend({
name
:
"home"
,
name
:
"home"
,
});
});
}
else
{
}
else
{
message
.
warn
(
ret
.
msg
);
//
message.warn(ret.msg);
}
}
},
},
async
loginByPwdFunc
(
name
:
string
,
pwd
:
string
)
{
async
loginByPwdFunc
(
name
:
string
,
pwd
:
string
)
{
...
...
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