Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
techbook
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
front-end-dev
techbook
Commits
7af0cd1e
Commit
7af0cd1e
authored
Mar 18, 2021
by
zhangyanni
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
8c3617ad
4a11727d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
4 deletions
+9
-4
pc.scss
public/css/pc.scss
+5
-0
newEventdetail.vue
src/views/findeventpage/newEventdetail.vue
+3
-3
topicall.vue
src/views/topicpage/topicall.vue
+1
-1
No files found.
public/css/pc.scss
View file @
7af0cd1e
...
...
@@ -927,6 +927,11 @@
}
}
.eventTooltip
{
&
.el-tooltip__popper.is-light
{
border
:
1px
solid
#bec0cb
;
}
}
.boxShadowTip
.popper__arrow
{
display
:
none
!
important
;
}
...
...
src/views/findeventpage/newEventdetail.vue
View file @
7af0cd1e
...
...
@@ -87,8 +87,8 @@
<btnbar
v-else
@
loginState=
"loginState"
@
successState=
"successState"
:row=
"item"
:index=
"index"
:btnType=
"1"
:eventId=
"$route.query.id"
></btnbar>
</div>
</div>
<el-tooltip
v-if=
"item.empIntroduction"
placement=
"top-start"
effect=
"light"
>
<div
slot=
"content"
style=
"width: 200px;"
>
{{
item
.
empIntroduction
}}
</div>
<el-tooltip
v-if=
"item.empIntroduction"
p
opper-class=
"eventTooltip"
p
lacement=
"top-start"
effect=
"light"
>
<div
slot=
"content"
style=
"width: 200px;
line-height: 20px;
"
>
{{
item
.
empIntroduction
}}
</div>
<p
class=
"ellipsisFont1"
style=
"color:#1A1A1E;height: 20px;max-width: 90%;margin-top: 5px;"
>
{{
item
.
empIntroduction
}}
</p>
</el-tooltip>
...
...
@@ -176,7 +176,7 @@
<span
class=
"eventbtn"
v-if=
"eventdata.activityState==2&&!eventdata.isApply"
@
click=
"handleApply(eventdata)"
>
{{
eventdata
.
viewDesc
?
eventdata
.
viewDesc
:
$t
(
'activityInfo.freeApply'
)
}}
</span>
<span
class=
"eventbtn"
v-if=
"eventdata.channelType!=4&&eventdata.activityState==2&&eventdata.isApply"
>
{{
$t
(
"activityInfo.hasApply"
)
}}
</span>
<span
class=
"eventbtn"
v-if=
"eventdata.channelType==4&&eventdata.activityState==2&&eventdata.isApply"
@
click=
"handleToSuccess"
>
{{
$t
(
"commonTitle.vipLookTitle"
)
}}
</span>
<span
class=
"eventbtn"
v-if=
"eventdata.activityState>2"
>
{{
eventdata
.
activityState
==
4
?
$t
(
"activityInfo.hasFilled"
):
eventdata
.
activityState
==
3
?
$t
(
"activityInfo.applyEnd"
):
eventdata
.
activityState
==
5
?
$t
(
"activityInfo.activityEnd"
):
""
}}
</span>
<span
style=
"background: #909399;"
class=
"eventbtn"
v-if=
"eventdata.activityState>2"
>
{{
eventdata
.
activityState
==
4
?
$t
(
"activityInfo.hasFilled"
):
eventdata
.
activityState
==
3
?
$t
(
"activityInfo.applyEnd"
):
eventdata
.
activityState
==
5
?
$t
(
"activityInfo.activityEnd"
):
""
}}
</span>
<span
class=
"eventbtn"
v-if=
"eventdata.activityState==1"
>
{{
$t
(
"activityInfo.activityNoBegin"
)
}}
</span>
</span>
</div>
...
...
src/views/topicpage/topicall.vue
View file @
7af0cd1e
...
...
@@ -386,7 +386,7 @@
handAnnounceConfig
(){
api
.
getTopicNoticeById
().
then
(
response
=>
{
if
(
response
.
code
==
0
)
{
this
.
announceData
=
response
.
result
;
if
(
response
.
result
)
this
.
announceData
=
response
.
result
;
if
(
!
this
.
announceData
.
topicInfoList
)
this
.
announceData
.
topicInfoList
=
[];
this
.
announceVisible
=
true
;
this
.
getsimpleSearchTopic
();
...
...
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