Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
study
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Damon
study
Commits
6b8b2485
Commit
6b8b2485
authored
Jul 28, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-v1.0.0' of
https://git.banshouhui.com/wuzhenzhe/study
into dev-v1.0.0
parents
283ea2c5
e6cf9504
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
375 additions
and
281 deletions
+375
-281
user.js
src/api/user.js
+4
-0
uni-list.vue
src/components/uni-list/uni-list.vue
+1
-2
detail.vue
src/pages/cert/detail.vue
+1
-6
mine.vue
src/pages/index/mine.vue
+10
-2
answer.vue
src/pages/learn/answer.vue
+140
-103
utils.js
src/pages/learn/utils.js
+17
-0
info.vue
src/pages/mine/info.vue
+3
-9
detail.vue
src/pages/search/detail.vue
+198
-159
index.js
src/store/index.js
+1
-0
No files found.
src/api/user.js
View file @
6b8b2485
...
...
@@ -37,6 +37,9 @@ let userApiFun = function(vm) {
apiUrl
+
'/rest/question/query/allStudentQuestionWarehouse'
,
params
)
//获取用户刷题量
let
getUserDoQuestionNum
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
apiUrl
+
'/rest/question/total/question/count'
,
params
)
const
userApi
=
{
updateUserInfo
,
...
...
@@ -49,6 +52,7 @@ let userApiFun = function(vm) {
getCertFromOut
,
getCertifyInfoByType
,
getUserQuestionWareHouse
,
getUserDoQuestionNum
,
}
return
userApi
}
...
...
src/components/uni-list/uni-list.vue
View file @
6b8b2485
...
...
@@ -59,7 +59,6 @@ export default {
/* #ifndef APP-NVUE */
display
:
flex
;
/* #endif */
background-color
:
$uni-bg-color
;
position
:
relative
;
flex-direction
:
column
;
}
...
...
@@ -103,4 +102,4 @@ export default {
}
/* #endif */
</
style
>
</
style
>
src/pages/cert/detail.vue
View file @
6b8b2485
...
...
@@ -143,20 +143,16 @@ export default {
color
:
transparent
;
display
:
none
;
}
page
{
background-color
:
#2953ff
;
}
.begin-answer
{
display
:
flex
;
flex-direction
:
column
;
background-size
:
100%
920rpx
;
background-repeat
:
no-repeat
;
height
:
100vh
;
background-color
:
#2953ff
;
position
:
absolute
;
top
:
0
;
width
:
100%
;
}
.content
{
display
:
flex
;
flex-direction
:
column
;
...
...
@@ -164,7 +160,6 @@ page {
justify-content
:
center
;
padding
:
30rpx
24rpx
50rpx
24rpx
;
}
.cert-body
{
width
:
100%
;
background-color
:
#ffffff
;
...
...
src/pages/index/mine.vue
View file @
6b8b2485
...
...
@@ -109,6 +109,7 @@ export default {
'workUnit'
,
],
student
:
{},
shauTiCount
:
0
,
}
},
computed
:
{
...
...
@@ -129,10 +130,14 @@ export default {
return
this
.
userInfo
.
nickName
!=
undefined
},
loginTips
()
{
return
(
this
.
student
&&
this
.
student
.
consumeAmount
)
||
0
return
this
.
shauTiCount
||
0
},
avatar
()
{
return
(
this
.
userInfo
&&
this
.
userInfo
.
avatarUrl
)
||
this
.
pic
return
(
(
this
.
student
&&
this
.
student
.
avatarPath
)
||
(
this
.
userInfo
&&
this
.
userInfo
.
avatarUrl
)
||
this
.
pic
)
},
nikeName
()
{
return
(
this
.
userInfo
&&
this
.
userInfo
.
nickName
)
||
'点击登录'
...
...
@@ -157,6 +162,9 @@ export default {
this
.
$u
.
api
.
getUserInfo
().
then
((
res
)
=>
{
this
.
student
=
res
getApp
().
globalData
.
student
=
res
this
.
$u
.
api
.
getUserDoQuestionNum
().
then
((
ret
)
=>
{
this
.
shauTiCount
=
ret
||
0
})
})
}
},
...
...
src/pages/learn/answer.vue
View file @
6b8b2485
This diff is collapsed.
Click to expand it.
src/pages/learn/utils.js
View file @
6b8b2485
...
...
@@ -139,8 +139,25 @@ function initAnswerCardList(total, vm) {
}
}
const
diffTime
=
function
diffTime
(
startDate
,
endDate
)
{
let
diff
=
endDate
.
getTime
()
-
startDate
//.getTime();//时间差的毫秒数
//计算出相差天数
let
days
=
Math
.
floor
(
diff
/
(
24
*
3600
*
1000
))
//计算出小时数
let
leave1
=
diff
%
(
24
*
3600
*
1000
)
//计算天数后剩余的毫秒数
let
hours
=
Math
.
floor
(
leave1
/
(
3600
*
1000
))
//计算相差分钟数
let
leave2
=
leave1
%
(
3600
*
1000
)
//计算小时数后剩余的毫秒数
let
minutes
=
Math
.
floor
(
leave2
/
(
60
*
1000
))
//计算相差秒数
let
leave3
=
leave2
%
(
60
*
1000
)
//计算分钟数后剩余的毫秒数
let
seconds
=
Math
.
round
(
leave3
/
1000
)
return
seconds
}
module
.
exports
=
{
TOTAL
:
TOTAL
,
diffTime
:
diffTime
,
request
:
request
,
requestMulti
:
requestMulti
,
getInitcurrentPage
:
getInitcurrentPage
,
...
...
src/pages/mine/info.vue
View file @
6b8b2485
...
...
@@ -24,12 +24,7 @@
></u-image>
</view>
</u-cell-item>
<u-cell-item
title=
"证件照"
@
click=
"changeCertPhoto"
:arrow=
"false"
:hover-class=
"none"
>
<u-cell-item
title=
"证件照"
@
click=
"changeCertPhoto"
>
<view
slot=
"right-icon"
>
<u-image
v-if=
"headCertPhoto"
...
...
@@ -40,13 +35,12 @@
<text
v-else
style=
"color:#2953FF"
>
去上传
</text>
</view>
</u-cell-item>
<u-cell-item
title=
"手机号"
:arrow=
"false"
:hover-class=
"none"
>
<u-cell-item
title=
"手机号"
>
<view
slot=
"right-icon"
>
<button
hover-class=
"none"
class=
"mobile-button"
open-type=
"getPhoneNumber"
@
getphonenumber=
"getPhonenumber"
style=
"background: none;font-size: 26rpx;padding-right: 0;"
>
<text
v-if=
"getMobile"
>
{{
getMobile
}}
</text>
<text
v-else
class=
"empty-value"
>
去绑定
</text>
...
...
src/pages/search/detail.vue
View file @
6b8b2485
This diff is collapsed.
Click to expand it.
src/store/index.js
View file @
6b8b2485
...
...
@@ -53,6 +53,7 @@ const store = new Vuex.Store({
:
'1414854649273384960'
,
// 科目ID
// 如果vuex_version无需保存到本地永久存储,无需lifeData.vuex_version方式
vuex_version
:
'1.0.0'
,
beginTime
:
null
// 考试开始时间
},
mutations
:
{
$uStore
(
state
,
payload
)
{
...
...
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