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
e59e78eb
Commit
e59e78eb
authored
Jul 02, 2020
by
zhangyanni
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
e1da32d1
5f7a53a5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
common.scss
public/css/common.scss
+1
-1
eventpage.vue
src/views/findeventpage/eventpage.vue
+1
-1
signupbar.vue
src/views/findeventpage/signupbar.vue
+2
-0
index.vue
src/views/index/pages/index.vue
+0
-2
No files found.
public/css/common.scss
View file @
e59e78eb
...
...
@@ -1527,7 +1527,7 @@ i {
border
:
1px
solid
#DCDFF1
;
width
:
40px
;
height
:
40px
;
background-size
:
co
ver
;
background-size
:
co
ntain
;
background-repeat
:
no-repeat
;
background-position
:
center
;
}
...
...
src/views/findeventpage/eventpage.vue
View file @
e59e78eb
...
...
@@ -8,7 +8,7 @@
<div
class=
"content_list"
>
<div
v-for=
"(item,index) in contentList"
:key=
"index"
>
<p
class=
"content_img"
@
click=
"$router.push(
{path:'/eventdetail',query:{id:item.channelId,ismyevent:0}})">
<span
class=
"indeximgInfo"
style=
"border-radius: 0;"
:style=
"
{backgroundImage:'url('+(item.channelPic?item.channelPic:'')+')'}">
</span>
<span
class=
"indeximgInfo"
style=
"border-radius: 0;
background-size: cover;
"
:style=
"
{backgroundImage:'url('+(item.channelPic?item.channelPic:'')+')'}">
</span>
</p>
<p
class=
"ellipsisFont2"
style=
"height: 40px;"
@
click=
"$router.push(
{path:'/eventdetail',query:{id:item.channelId,ismyevent:0}})">
{{
item
.
channelTitle
}}
</p>
<p
class=
"ellipsisFont1"
@
click=
"$router.push(
{path:'/eventdetail',query:{id:item.channelId,ismyevent:0}})">
{{
$t
(
'activityInfo.timeZone'
)
}}
:
{{
item
.
versionType
==
0
?
$t
(
'pubactivities.beijingtime'
):
item
.
timeZoneName
}}
</p>
...
...
src/views/findeventpage/signupbar.vue
View file @
e59e78eb
...
...
@@ -1018,6 +1018,8 @@
this
.
secondStepInfoObj
=
query
;
}
else
{
globalMsg
.
$emit
(
'topisInit'
,
false
);
globalMsg
.
$emit
(
'sendIndex'
,
3
);
this
.
$router
.
replace
({
path
:
"/eventsuccess"
,
query
:{
id
:
this
.
$route
.
query
.
id
?
this
.
$route
.
query
.
id
:
this
.
detailInfo
.
channelId
,
type
:
this
.
detailInfo
.
channelType
,
ismyevent
:
0
}})
}
}
else
{
...
...
src/views/index/pages/index.vue
View file @
e59e78eb
...
...
@@ -846,8 +846,6 @@
globalMsg
.
$emit
(
'maiDianFunc'
,({
type
:
'report-article-index'
,
articleId
:
row
.
contentId
}));
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/articleDetail?id="
+
row
.
contentId
+
'&newnpen=true'
);
}
else
if
(
state
==
3
){
globalMsg
.
$emit
(
'topisInit'
,
false
);
globalMsg
.
$emit
(
'sendIndex'
,
3
);
this
.
$router
.
push
({
path
:
'/eventdetail'
,
query
:{
id
:
row
.
channelId
,
ismyevent
:
0
}})
globalMsg
.
$emit
(
'maiDianFunc'
,({
type
:
'report-channel-index-recommend'
,
channelId
:
row
.
channelId
}));
}
...
...
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