Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
party-build-cloud
Project
Project
Details
Activity
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
wangqinghua
party-build-cloud
Commits
6403513f
Commit
6403513f
authored
Jun 15, 2019
by
wangqinghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
出题采纳
parent
893c7985
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
370 additions
and
22 deletions
+370
-22
accept.module.ts
src/pages/discover-pages/accept/accept.module.ts
+13
-0
accept.scss
src/pages/discover-pages/accept/accept.scss
+282
-0
accept.ts
src/pages/discover-pages/accept/accept.ts
+39
-0
response.ts
src/pages/discover-pages/response/response.ts
+12
-0
stuff-detail.ts
src/pages/home-pages/stuff-detail/stuff-detail.ts
+1
-1
discover.ts
src/pages/tabs/discover/discover.ts
+13
-18
mine.ts
src/pages/tabs/mine/mine.ts
+2
-0
tabs.service.ts
src/pages/tabs/tabs.service.ts
+8
-3
No files found.
src/pages/discover-pages/accept/accept.module.ts
0 → 100644
View file @
6403513f
import
{
NgModule
}
from
'@angular/core'
;
import
{
IonicPageModule
}
from
'ionic-angular'
;
import
{
AcceptPage
}
from
'./accept'
;
@
NgModule
({
declarations
:
[
AcceptPage
,
],
imports
:
[
IonicPageModule
.
forChild
(
AcceptPage
),
],
})
export
class
AcceptPageModule
{}
src/pages/discover-pages/accept/accept.scss
0 → 100644
View file @
6403513f
page-accept
{
.main-container
{
height
:
calc
(
100%
-
8rem
);
background-color
:
#e6e8ed
;
padding
:
1
.8rem
;
}
.bgc
{
position
:
absolute
;
top
:
0
;
left
:
0
;
z-index
:
0
;
}
.learn-item
{
width
:
100%
;
padding-bottom
:
1rem
;
}
ion-slides
{
height
:
calc
(
100%
-
4rem
);
}
.swiper-slide
,
.slide-zoom
{
text-align
:
left
;
}
.swiper-slide
{
justify-content
:
normal
;
align-items
:
normal
;
}
.learn-title
{
background-color
:
rgba
(
18
,
28
,
52
,
0
.34
);
font-size
:
1
.8rem
;
color
:
#ffffff
;
text-align
:
center
;
padding
:
1rem
;
border-top-left-radius
:
.8rem
;
border-top-right-radius
:
.8rem
;
}
.item-container
{
background-color
:
#fff
;
border-bottom-left-radius
:
.8rem
;
border-bottom-right-radius
:
.8rem
;
overflow-y
:
scroll
;
}
.item-title
{
padding
:
1rem
;
font-size
:
1
.5rem
;
}
.item-content
{
padding
:
1rem
;
font-size
:
1
.6rem
;
div
{
p
{
margin-bottom
:
1rem
;
margin-left
:
1rem
;
line-height
:
1
.5rem
;
}
}
}
.footer-subject
{
padding
:
0
1rem
;
position
:
absolute
;
left
:
0
;
bottom
:
4rem
;
height
:
5rem
;
width
:
100%
;
background-color
:
#e6e8ed
;
display
:
flex
;
font-size
:
1
.8rem
;
div
{
line-height
:
5rem
;
}
.prev
{
flex
:
3
;
}
.next
{
flex
:
3
;
text-align
:
right
;
}
.index
{
flex
:
3
;
text-align
:
center
;
}
}
.footer-submit
{
position
:
absolute
;
left
:
0
;
bottom
:
0
;
height
:
4rem
;
width
:
100%
;
border-top
:
.1rem
solid
#34b4fc
;
display
:
flex
;
div
{
line-height
:
4rem
;
}
.time
{
text-align
:
center
;
flex
:
4
;
}
.submit
{
background-color
:
#34b4fc
;
color
:
#ffffff
;
text-align
:
center
;
flex
:
1
;
}
}
.item-ios
p
{
margin
:
15px
0
;
white-space
:
normal
;
}
label
{
position
:
relative
;
display
:
inline-block
;
height
:
2rem
;
line-height
:
2rem
;
input
{
display
:
none
;
}
}
.content-textarea
{
padding
:
10px
;
min-height
:
100px
;
width
:
100%
;
border
:
1px
solid
#ddd
;
}
.selectIndex
{
display
:
inline-block
;
vertical-align
:
middle
;
width
:
2rem
;
text-align
:
center
;
height
:
2rem
;
line-height
:
1
.9rem
;
border
:
1px
solid
#ddd
;
border-radius
:
50%
;
margin-right
:
5px
;
color
:
#666
;
font-size
:
1
.5rem
;
position
:
relative
;
}
input
:checked
+
.selectIndex
{
background-color
:
#ec1826
;
color
:
#ffffff
;
border
:
1px
solid
#ec1826
;
}
.submit-error
{
height
:
3rem
;
width
:
40%
;
background-color
:
#5579bb
;
color
:
#fff
;
line-height
:
3rem
;
}
.button-error
{
line-height
:
4rem
;
height
:
4rem
;
text-align
:
center
;
margin-top
:
.5rem
;
}
.error-text
{
position
:
absolute
;
top
:
0
;
left
:
0
;
height
:
100%
;
width
:
100%
;
background-color
:
rgba
(
0
,
0
,
0
,
.2
);
z-index
:
9
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
.error-flex
{
text-align
:
center
;
width
:
80%
;
background-color
:
#fff
;
.error-title
{
background-color
:
#5579bb
;
color
:
#ffffff
;
padding
:
1rem
0
;
}
.error-footer
{
height
:
4rem
;
.sure
,
.cancel
{
color
:
#ffffff
;
background-color
:
#5579bb
;
width
:
69%
;
margin-right
:
10px
;
height
:
3rem
;
}
}
}
}
.stuff-comment
{
margin-top
:
1rem
;
padding
:
0
1
.5rem
;
background-color
:
#fff
;
.comment-title
{
border-bottom
:
1px
solid
#dddddd
;
font-weight
:
500
;
padding-bottom
:
.8rem
;
margin-bottom
:
.8rem
;
position
:
relative
;
}
.
comment-title
:
:
after
{
content
:
''
;
position
:
absolute
;
top
:
7px
;
left
:
-8px
;
width
:
3px
;
height
:
15px
;
background-color
:
#e12724
;
}
[
col-10
],[
col-2
]
{
padding
:
0
;
}
.comment-item
{
.contact-img
{
border-radius
:
50%
;
width
:
50px
;
height
:
50px
;
text-align
:
center
;
margin-top
:
8px
;
}
.comment-info
{
color
:
#d88f27
;
font-size
:
1
.4rem
;
line-height
:
1
.8rem
;
font-weight
:
500
;
margin-bottom
:
5px
;
}
.commnet-content
{
padding
:
.1rem
0
;
font-size
:
1
.4rem
;
color
:
#333333
;
line-height
:
1
.4rem
;
}
.comment-time
{
font-size
:
1
.4rem
;
color
:
#888888
;
.repear
{
color
:
#3961b3
;
font-size
:
1
.2rem
;
cursor
:
pointer
;
margin-right
:
5px
;
}
}
}
.comment-item
+
.comment-item
{
border-top
:
1px
solid
#eee
;
margin-top
:
.5rem
;
}
}
}
src/pages/discover-pages/accept/accept.ts
0 → 100644
View file @
6403513f
import
{
Component
}
from
'@angular/core'
;
import
{
IonicPage
,
NavController
,
NavParams
}
from
'ionic-angular'
;
import
{
TabsService
}
from
"../../tabs/tabs.service"
;
import
{
CommonService
}
from
"../../../provide/common.service"
;
@
IonicPage
()
@
Component
({
selector
:
'page-accept'
,
templateUrl
:
'accept.html'
,
})
export
class
AcceptPage
{
item
;
answer
=
""
;
answerList
=
[];
constructor
(
public
navCtrl
:
NavController
,
public
navParams
:
NavParams
,
private
tabSer
:
TabsService
,
private
commonSer
:
CommonService
)
{
}
ionViewDidLoad
()
{
this
.
item
=
this
.
navParams
.
get
(
'item'
);
this
.
answerList
=
this
.
item
.
answers
;
}
//采纳回答
accept
(
answerId
){
const
data
=
{
answerId
:
answerId
}
this
.
tabSer
.
accept
(
data
).
subscribe
(
(
res
)
=>
{
}
)
}
}
src/pages/discover-pages/response/response.ts
View file @
6403513f
...
@@ -45,4 +45,16 @@ export class ResponsePage {
...
@@ -45,4 +45,16 @@ export class ResponsePage {
)
)
}
}
//采纳回答
accept
(
answerId
){
const
data
=
{
answerId
:
answerId
}
this
.
tabSer
.
accept
(
data
).
subscribe
(
(
res
)
=>
{
}
)
}
}
}
src/pages/home-pages/stuff-detail/stuff-detail.ts
View file @
6403513f
...
@@ -49,7 +49,7 @@ export class StuffDetailPage {
...
@@ -49,7 +49,7 @@ export class StuffDetailPage {
this
.
userId
=
value
.
userid
;
this
.
userId
=
value
.
userid
;
this
.
username
=
value
.
loginName
;
this
.
username
=
value
.
loginName
;
this
.
lookHandle
();
this
.
lookHandle
();
})
})
;
this
.
stuffId
=
this
.
navParams
.
get
(
'id'
);
this
.
stuffId
=
this
.
navParams
.
get
(
'id'
);
this
.
getStuff
();
this
.
getStuff
();
setTimeout
(()
=>
{
setTimeout
(()
=>
{
...
...
src/pages/tabs/discover/discover.ts
View file @
6403513f
...
@@ -10,6 +10,7 @@ import {AppGlobal} from "../../../service/http.service";
...
@@ -10,6 +10,7 @@ import {AppGlobal} from "../../../service/http.service";
import
{
CommonService
}
from
"../../../provide/common.service"
;
import
{
CommonService
}
from
"../../../provide/common.service"
;
import
{
SwiperComponent
}
from
"../../../components/swiper/swiper"
;
import
{
SwiperComponent
}
from
"../../../components/swiper/swiper"
;
import
{
timer
}
from
"rxjs/observable/timer"
;
import
{
timer
}
from
"rxjs/observable/timer"
;
import
{
Storage
}
from
"@ionic/storage"
;
declare
let
Swiper
:
any
;
declare
let
Swiper
:
any
;
...
@@ -71,22 +72,7 @@ export class DiscoverPage {
...
@@ -71,22 +72,7 @@ export class DiscoverPage {
"name"
:
"学习资料"
,
"name"
:
"学习资料"
,
"type"
:
4
,
"type"
:
4
,
"indexChildren"
:
'15'
"indexChildren"
:
'15'
},
}
{
"name"
:
"支部活动"
,
"type"
:
6
,
"indexChildren"
:
'16'
},
{
"name"
:
"党建联建"
,
"type"
:
7
,
"indexChildren"
:
'17'
},
{
"name"
:
"结对帮扶"
,
"type"
:
8
,
"indexChildren"
:
'18'
},
]
]
},
},
{
{
...
@@ -208,6 +194,7 @@ export class DiscoverPage {
...
@@ -208,6 +194,7 @@ export class DiscoverPage {
};
};
resourceType
=
1
;
//1 标题图片 2 轮播图 3 视频
resourceType
=
1
;
//1 标题图片 2 轮播图 3 视频
relatePlateType
;
//关联主题教育
relatePlateType
;
//关联主题教育
userId
;
//用户id
picture
:
string
=
AppGlobal
.
domain
+
'/wisdomgroup'
;
picture
:
string
=
AppGlobal
.
domain
+
'/wisdomgroup'
;
...
@@ -249,7 +236,7 @@ export class DiscoverPage {
...
@@ -249,7 +236,7 @@ export class DiscoverPage {
constructor
(
public
navCtrl
:
NavController
,
public
navParams
:
NavParams
,
constructor
(
public
navCtrl
:
NavController
,
public
navParams
:
NavParams
,
public
commonSer
:
CommonService
,
public
renderer
:
Renderer2
,
public
commonSer
:
CommonService
,
public
renderer
:
Renderer2
,
public
zone
:
NgZone
,
public
zone
:
NgZone
,
public
storage
:
Storage
,
public
tabsSer
:
TabsService
,
public
emitSer
:
EmitService
)
{
public
tabsSer
:
TabsService
,
public
emitSer
:
EmitService
)
{
// 接收发射过来的数据
// 接收发射过来的数据
this
.
emitSer
.
eventEmit
.
subscribe
((
value
:
any
)
=>
{
this
.
emitSer
.
eventEmit
.
subscribe
((
value
:
any
)
=>
{
...
@@ -260,6 +247,9 @@ export class DiscoverPage {
...
@@ -260,6 +247,9 @@ export class DiscoverPage {
}
}
ionViewDidLoad
()
{
ionViewDidLoad
()
{
this
.
storage
.
get
(
'userLoginInfo'
).
then
((
value
)
=>
{
this
.
userId
=
value
.
userid
;
});
this
.
initSwiper
();
this
.
initSwiper
();
this
.
getBanner
();
this
.
getBanner
();
this
.
slideList
.
length
=
7
;
this
.
slideList
.
length
=
7
;
...
@@ -525,7 +515,7 @@ export class DiscoverPage {
...
@@ -525,7 +515,7 @@ export class DiscoverPage {
const
data
=
{
const
data
=
{
pageNum
:
1
,
pageNum
:
1
,
pageSize
:
1000
,
pageSize
:
1000
,
privateFlag
:
1
,
privateFlag
:
0
,
};
};
this
.
tabsSer
.
findPersonQuestions
(
data
).
subscribe
(
this
.
tabsSer
.
findPersonQuestions
(
data
).
subscribe
(
(
res
)
=>
{
(
res
)
=>
{
...
@@ -586,8 +576,13 @@ export class DiscoverPage {
...
@@ -586,8 +576,13 @@ export class DiscoverPage {
//回答题目
//回答题目
goToResponse
(
item
)
{
goToResponse
(
item
)
{
console
.
log
(
item
);
if
(
item
.
userId
==
this
.
userId
){
this
.
navCtrl
.
push
(
'AcceptPage'
,
{
item
:
item
})
}
else
{
this
.
navCtrl
.
push
(
'ResponsePage'
,
{
item
:
item
})
this
.
navCtrl
.
push
(
'ResponsePage'
,
{
item
:
item
})
}
}
}
//消息提醒页面
//消息提醒页面
goToNotice
()
{
goToNotice
()
{
...
...
src/pages/tabs/mine/mine.ts
View file @
6403513f
...
@@ -78,8 +78,10 @@ export class MinePage {
...
@@ -78,8 +78,10 @@ export class MinePage {
};
};
this
.
mineSer
.
appCheckList
(
data
).
subscribe
(
this
.
mineSer
.
appCheckList
(
data
).
subscribe
(
(
res
)
=>
{
(
res
)
=>
{
if
(
res
.
data
){
this
.
checkList
=
res
.
data
.
list
;
this
.
checkList
=
res
.
data
.
list
;
}
}
}
)
)
}
}
...
...
src/pages/tabs/tabs.service.ts
View file @
6403513f
...
@@ -184,18 +184,23 @@ export class TabsService {
...
@@ -184,18 +184,23 @@ export class TabsService {
return
this
.
http
.
post
(
AppGlobal
.
domain
+
'/wisdomgroup/modules/personanswer/answer'
,
data
);
return
this
.
http
.
post
(
AppGlobal
.
domain
+
'/wisdomgroup/modules/personanswer/answer'
,
data
);
}
}
//采纳答案
accept
(
data
):
Observable
<
any
>
{
return
this
.
http
.
post
(
AppGlobal
.
domain
+
'/wisdomgroup/modules/personquestion/accept'
,
this
.
commonSer
.
toFormData
(
data
));
}
//发送短信验证码
//发送短信验证码
sendCode
(
data
):
Observable
<
any
>
{
sendCode
(
data
):
Observable
<
any
>
{
return
this
.
http
.
get
(
AppGlobal
.
domain
+
'/wisdomgroup/manager/sendCode?'
+
this
.
commonSer
.
toQuery
(
data
)
);
return
this
.
http
.
get
(
AppGlobal
.
domain
+
'/wisdomgroup/manager/sendCode?'
+
this
.
commonSer
.
toQuery
(
data
)
);
}
}
//校验验证码
//校验验证码
checkCode
(
data
):
Observable
<
any
>
{
checkCode
(
data
):
Observable
<
any
>
{
return
this
.
http
.
post
(
AppGlobal
.
domain
+
'/wisdomgroup/manager/checkCode'
,
data
);
return
this
.
http
.
post
(
AppGlobal
.
domain
+
'/wisdomgroup/manager/checkCode'
,
data
);
}
}
//修改密码
//修改密码
updatePassword
(
data
):
Observable
<
any
>
{
updatePassword
(
data
):
Observable
<
any
>
{
return
this
.
http
.
post
(
AppGlobal
.
domain
+
'/wisdomgroup/manager/updatePassword'
,
this
.
commonSer
.
toFormData
(
data
)
);
return
this
.
http
.
post
(
AppGlobal
.
domain
+
'/wisdomgroup/manager/updatePassword'
,
this
.
commonSer
.
toFormData
(
data
));
}
}
}
}
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