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
30cd5f18
Commit
30cd5f18
authored
Jul 29, 2021
by
Damon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-v1.0.0' of git.banshouhui.com:wuzhenzhe/study into dev-v1.0.0
parents
c3c1de25
41cda686
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
90 additions
and
71 deletions
+90
-71
mine.vue
src/pages/index/mine.vue
+14
-5
selectCategory.vue
src/pages/learn/selectCategory.vue
+1
-1
bank.vue
src/pages/mine/bank.vue
+68
-60
info.vue
src/pages/mine/info.vue
+7
-5
No files found.
src/pages/index/mine.vue
View file @
30cd5f18
...
@@ -156,15 +156,19 @@ export default {
...
@@ -156,15 +156,19 @@ export default {
return
{
'font-size'
:
'32rpx'
,
coloe
:
'#191C27'
,
'margin-left'
:
'26rpx'
}
return
{
'font-size'
:
'32rpx'
,
coloe
:
'#191C27'
,
'margin-left'
:
'26rpx'
}
},
},
},
},
onLoad
()
{},
onShow
()
{
onShow
()
{
if
(
this
.
userInfo
.
nickName
)
{
if
(
this
.
userInfo
.
nickName
)
{
this
.
$u
.
api
.
getUserInfo
().
then
((
res
)
=>
{
this
.
$u
.
api
.
getUserInfo
().
then
((
res
)
=>
{
this
.
student
=
res
this
.
student
=
res
getApp
().
globalData
.
student
=
res
getApp
().
globalData
.
student
=
res
this
.
$u
.
api
.
getUserDoQuestionNum
().
then
((
ret
)
=>
{
this
.
$u
.
api
.
getUserDoQuestionNum
()
.
then
((
ret
)
=>
{
this
.
shauTiCount
=
ret
||
0
this
.
shauTiCount
=
ret
||
0
})
})
.
catch
((
err
)
=>
{
console
.
log
(
err
)
})
})
})
}
}
},
},
...
@@ -174,7 +178,12 @@ export default {
...
@@ -174,7 +178,12 @@ export default {
let
length
=
this
.
countItem
.
length
let
length
=
this
.
countItem
.
length
let
count
=
0
let
count
=
0
for
(
let
key
in
this
.
student
)
{
for
(
let
key
in
this
.
student
)
{
if
(
this
.
countItem
.
indexOf
(
key
)
!=
-
1
&&
this
.
student
[
key
])
{
if
(
this
.
countItem
.
indexOf
(
key
)
!=
-
1
&&
this
.
student
[
key
]
&&
this
.
student
[
key
]
!=
' '
)
{
console
.
log
(
'count key'
,
key
)
count
=
count
+
1
count
=
count
+
1
}
}
}
}
...
...
src/pages/learn/selectCategory.vue
View file @
30cd5f18
...
@@ -158,7 +158,7 @@ export default {
...
@@ -158,7 +158,7 @@ export default {
this
.
labels
[
key1
][
0
].
push
(
item
)
this
.
labels
[
key1
][
0
].
push
(
item
)
}
}
}
}
for
(
var
i
=
0
;
i
<
this
.
labels
[
key1
].
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
this
.
labels
[
key1
]
[
0
]
.
length
;
i
++
)
{
var
data
=
this
.
labels
[
key1
][
0
][
i
]
var
data
=
this
.
labels
[
key1
][
0
][
i
]
this
.
labels
[
key2
][
i
]
=
[]
this
.
labels
[
key2
][
i
]
=
[]
for
(
var
item
of
res
)
{
for
(
var
item
of
res
)
{
...
...
src/pages/mine/bank.vue
View file @
30cd5f18
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
:border-bottom=
"false"
:border-bottom=
"false"
title-bold
title-bold
></u-navbar>
></u-navbar>
<view
class=
"content"
v-if=
"lists
.length > 0
"
>
<view
class=
"content"
v-if=
"lists"
>
<!--
<text
class=
"title"
>
{{
title
}}
</text>
-->
<!--
<text
class=
"title"
>
{{
title
}}
</text>
-->
<my-subject
<my-subject
class=
"subject-item"
class=
"subject-item"
...
@@ -45,19 +45,22 @@ export default {
...
@@ -45,19 +45,22 @@ export default {
return
{
return
{
title
:
'我的题库'
,
title
:
'我的题库'
,
nothing
:
process
.
uniEnv
.
qn_base_url
+
'zanwucuoti@3x.png'
,
nothing
:
process
.
uniEnv
.
qn_base_url
+
'zanwucuoti@3x.png'
,
lists
:
[]
,
lists
:
null
,
}
}
},
},
onLoad
()
{
onLoad
()
{
this
.
getUserQuestionWareHouseList
()
},
methods
:
{
getUserQuestionWareHouseList
()
{
this
.
$u
.
api
.
getUserQuestionWareHouse
().
then
((
res
)
=>
{
this
.
$u
.
api
.
getUserQuestionWareHouse
().
then
((
res
)
=>
{
console
.
log
(
'tiku list'
,
res
)
console
.
log
(
'tiku list'
,
res
)
let
length
=
res
.
length
let
length
=
res
.
length
if
(
res
.
length
<=
0
)
{
if
(
res
.
length
<=
0
)
{
this
.
lists
=
[]
return
}
}
let
data
=
[]
let
data
=
[]
for
(
let
i
=
0
;
i
<
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
length
;
i
++
)
{
data
[
i
]
=
{}
if
(
if
(
!
res
[
i
].
echoMap
||
!
res
[
i
].
echoMap
||
!
res
[
i
].
echoMap
.
questionWarehouseId
||
!
res
[
i
].
echoMap
.
questionWarehouseId
||
...
@@ -65,7 +68,7 @@ export default {
...
@@ -65,7 +68,7 @@ export default {
)
{
)
{
continue
continue
}
}
data
[
i
]
=
{}
//绑卡或支付时间
//绑卡或支付时间
data
[
i
].
title
=
res
[
i
].
echoMap
.
questionWarehouseId
.
title
data
[
i
].
title
=
res
[
i
].
echoMap
.
questionWarehouseId
.
title
data
[
i
].
time
=
data
[
i
].
time
=
...
@@ -88,7 +91,10 @@ export default {
...
@@ -88,7 +91,10 @@ export default {
status
=
'已激活'
status
=
'已激活'
data
[
i
].
statusStyle
=
{
color
:
'#2953FF'
}
data
[
i
].
statusStyle
=
{
color
:
'#2953FF'
}
let
leaveDay
=
0
let
leaveDay
=
0
if
(
res
[
i
].
echoMap
.
cardId
&&
res
[
i
].
echoMap
.
cardId
.
activationTime
)
{
if
(
res
[
i
].
echoMap
.
cardId
&&
res
[
i
].
echoMap
.
cardId
.
activationTime
)
{
let
diff
=
this
.
datedifference
(
sDate1
,
sDate2
)
let
diff
=
this
.
datedifference
(
sDate1
,
sDate2
)
leaveDay
=
res
[
i
].
echoMap
.
cardId
.
effectiveDay
-
diff
leaveDay
=
res
[
i
].
echoMap
.
cardId
.
effectiveDay
-
diff
leaveDay
=
leaveDay
>
0
?
leaveDay
:
0
leaveDay
=
leaveDay
>
0
?
leaveDay
:
0
...
@@ -105,11 +111,13 @@ export default {
...
@@ -105,11 +111,13 @@ export default {
}
}
data
[
i
].
status
=
status
data
[
i
].
status
=
status
}
}
if
(
data
.
length
>
0
)
{
this
.
lists
=
data
this
.
lists
=
data
console
.
log
(
'tiku data'
,
data
)
console
.
log
(
'tiku data'
,
data
)
}
})
})
},
},
methods
:
{
datedifference
(
sDate1
,
sDate2
)
{
datedifference
(
sDate1
,
sDate2
)
{
//2021-01-01,2020-02-01,31
//2021-01-01,2020-02-01,31
var
dateSpan
,
tempDate
,
iDays
var
dateSpan
,
tempDate
,
iDays
...
...
src/pages/mine/info.vue
View file @
30cd5f18
...
@@ -123,11 +123,13 @@ export default {
...
@@ -123,11 +123,13 @@ export default {
})
})
this
.
$u
.
api
.
getUserInfo
().
then
((
res
)
=>
{
this
.
$u
.
api
.
getUserInfo
().
then
((
res
)
=>
{
console
.
log
(
'huoqu userinfo'
,
res
)
console
.
log
(
'huoqu userinfo'
,
res
)
if
(
res
)
{
res
.
isCertify
=
res
.
isCertify
=
res
&&
res
.
identityNumber
&&
res
.
identityNumber
.
length
>
5
res
&&
res
.
identityNumber
&&
res
.
identityNumber
.
length
>
5
?
true
?
true
:
false
:
false
this
.
student
=
res
this
.
student
=
res
}
})
})
},
},
onShow
()
{
onShow
()
{
...
...
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