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
8611ddb9
Commit
8611ddb9
authored
Jul 29, 2020
by
anxixi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
活动问题修改
parent
b7331749
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
45 additions
and
30 deletions
+45
-30
contentall.vue
src/views/conmanagementpage/contentall.vue
+1
-1
hotarticlepage.vue
src/views/conmanagementpage/hotarticlepage.vue
+5
-5
eventdetail.vue
src/views/findeventpage/eventdetail.vue
+1
-1
eventpage.vue
src/views/findeventpage/eventpage.vue
+1
-1
myevent.vue
src/views/findeventpage/myevent.vue
+28
-13
index.vue
src/views/index.vue
+1
-1
index.vue
src/views/index/pages/index.vue
+4
-4
industrypage.vue
src/views/industryreportspage/industrypage.vue
+1
-1
discussall.vue
src/views/topicpage/discussall.vue
+1
-1
topicbar.vue
src/views/topicpage/topicbar.vue
+1
-1
topicdetail.vue
src/views/topicpage/topicdetail.vue
+1
-1
No files found.
src/views/conmanagementpage/contentall.vue
View file @
8611ddb9
...
...
@@ -320,7 +320,7 @@
},
//文章详情
gocontentdetail
(
row
){
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-article-list'
,
articleId
:
row
.
contentId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-article-list'
,
articleId
:
row
.
contentId
}));
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/articleDetail?id="
+
row
.
contentId
+
'&newnpen=true'
);
// this.$router.push({path:"/contentdetail",query:{id:row.contentId}});
},
...
...
src/views/conmanagementpage/hotarticlepage.vue
View file @
8611ddb9
...
...
@@ -148,21 +148,21 @@
});
},
goindustry
(
row
){
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-article-report-right-list'
,
articleId
:
row
.
contentId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-article-report-right-list'
,
articleId
:
row
.
contentId
}));
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/articleDetail?id="
+
row
.
contentId
+
'&newnpen=true'
);
},
gocontent
(
row
,
state
){
if
(
this
.
isstate
){
if
(
state
){
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-article-hot-detail'
,
articleId
:
row
.
contentId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-article-hot-detail'
,
articleId
:
row
.
contentId
}));
}
else
{
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-article-recommend-expert-detail'
,
articleId
:
row
.
contentId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-article-recommend-expert-detail'
,
articleId
:
row
.
contentId
}));
}
}
else
{
if
(
state
){
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-article-hot-list'
,
articleId
:
row
.
contentId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-article-hot-list'
,
articleId
:
row
.
contentId
}));
}
else
{
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-article-recommend-expert-list'
,
articleId
:
row
.
contentId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-article-recommend-expert-list'
,
articleId
:
row
.
contentId
}));
}
}
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/articleDetail?id="
+
row
.
contentId
+
'&newnpen=true'
);
...
...
src/views/findeventpage/eventdetail.vue
View file @
8611ddb9
...
...
@@ -314,7 +314,7 @@
mounted
()
{
globalMsg
.
$emit
(
'topisInit'
,
false
);
globalMsg
.
$emit
(
'sendIndex'
,
3
);
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-channel-read'
,
channelId
:
this
.
$route
.
query
.
id
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-channel-read'
,
channelId
:
this
.
$route
.
query
.
id
}));
this
.
getActivityDetails
();
document
.
getElementsByTagName
(
"body"
)[
0
].
style
.
overflow
=
"auto"
;
api
.
selectBasicParams
().
then
(
response
=>
{
...
...
src/views/findeventpage/eventpage.vue
View file @
8611ddb9
...
...
@@ -113,7 +113,7 @@
},
//活动详情
toeventdetail
(
val
){
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-channel-list-click'
,
channelId
:
val
.
channelId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-channel-list-click'
,
channelId
:
val
.
channelId
}));
this
.
$router
.
push
({
path
:
'/eventdetail'
,
query
:{
id
:
val
.
channelId
,
ismyevent
:
0
}});
},
// 分页导航
...
...
src/views/findeventpage/myevent.vue
View file @
8611ddb9
...
...
@@ -28,7 +28,7 @@
<p
style=
"color: #1A1A1E;font-weight: bold;"
>
<span
:style=
"item.baseLive.liveState == 1?'background: #FE9F2C':'background: #5d78ff;'"
v-if=
"item.hasLive == 1"
@
click=
"openeventlive(item)"
style=
"display: inline-block;background: #5d78ff;padding: 0 10px 0 30px;color: #FFFFFF;font-size: 12px;position: relative;border-radius: 3px;"
>
<i
class=
"iconfont icon-zhibo"
style=
"font-size: 16px;position: absolute;left: 8px;top: 0px;"
></i>
{{
item
.
baseLive
.
liveState
==
0
?
$t
(
'activityInfo.liveTitle'
):
item
.
baseLive
.
liveState
==
1
?
$t
(
'activityInfo.living'
):
$t
(
'activityInfo.liveTitle'
)
}}
{{
item
.
baseLive
.
liveState
==
0
?
$t
(
'activityInfo.liveTitle'
):
item
.
baseLive
.
liveState
==
1
?
$t
(
'activityInfo.living'
):
item
.
baseLive
.
liveState
==
2
&&
item
.
baseLive
.
liveBack
==
0
?
$t
(
'activityInfo.liveBack'
):
$t
(
'activityInfo.liveTitle'
)
}}
</span>
<span
@
click=
"$router.push(
{path:'/myeventdetail',query:{id:item.channelId,ismyevent:1}})">
{{
item
.
channelTitle
}}
...
...
@@ -83,24 +83,39 @@
methods
:{
//打开直播
openeventlive
(
row
){
var
liveUrl
=
this
.
Base64
.
encode
(
row
.
baseLive
.
liveUrl
);
this
.
publicFun
.
setUserInfoCookie
(
"liveUrl"
,
row
.
baseLive
.
liveUrl
);
if
(
row
.
baseLive
.
liveState
!=
0
){
if
(
!
this
.
publicFun
.
getCookie
(
"userInfo"
)){
this
.
$refs
.
login
.
isexpertVisible
();
return
}
let
liveUrl
=
row
.
baseLive
.
liveUrl
.
substring
(
row
.
baseLive
.
liveUrl
.
lastIndexOf
(
'/'
)
+
1
);
if
(
this
.
userInfo
&&
this
.
userInfo
.
empId
==
row
.
createdBy
){
if
(
row
.
baseLive
.
liveState
==
1
||
row
.
baseLive
.
liveBack
==
0
){
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive
?id="
+
liveUrl
);
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive
"
);
}
}
else
{
if
(
row
.
baseLive
.
livePowers
==
0
&&
row
.
activityState
==
2
&&
row
.
isJoin
==
2
){
this
.
$message
.
error
(
this
.
$t
(
'activityInfo.applyFirst'
));
}
else
if
(
row
.
baseLive
.
livePowers
==
0
&&
row
.
activityState
==
5
&&
row
.
isJoin
==
2
){
this
.
$message
.
error
(
this
.
$t
(
'activityInfo.applyEndTitle'
));
if
(
row
.
baseLive
.
liveState
==
2
&&
row
.
baseLive
.
liveBack
==
0
){
if
(
!
this
.
publicFun
.
getCookie
(
"userInfo"
)){
this
.
$refs
.
login
.
isexpertVisible
();
return
}
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive"
);
}
else
{
if
(
row
.
baseLive
.
liveState
==
1
){
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive?id="
+
liveUrl
);
if
(
row
.
baseLive
.
livePowers
==
0
&&
row
.
activityState
==
2
&&!
row
.
isApply
){
if
(
!
this
.
publicFun
.
getCookie
(
"userInfo"
)){
this
.
$refs
.
login
.
isexpertVisible
();
return
}
this
.
$message
.
error
(
this
.
$t
(
'activityInfo.applyFirst'
));
}
else
if
(
row
.
baseLive
.
livePowers
==
0
&&
row
.
activityState
==
5
&&!
row
.
isApply
||
row
.
baseLive
.
livePowers
==
0
&&
row
.
activityState
==
3
&&!
row
.
isApply
){
if
(
row
.
baseLive
.
liveState
!=
2
){
this
.
$message
.
error
(
this
.
$t
(
'activityInfo.applyEndTitle'
));
}
}
else
{
if
(
row
.
baseLive
.
liveState
==
1
||
row
.
baseLive
.
liveState
==
2
&&
row
.
baseLive
.
liveBack
==
0
){
if
(
!
this
.
publicFun
.
getCookie
(
"userInfo"
)){
this
.
$refs
.
login
.
isexpertVisible
();
return
}
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive"
);
}
}
}
}
...
...
src/views/index.vue
View file @
8611ddb9
...
...
@@ -148,7 +148,7 @@
this
.
isInit
=
true
;
}
}
globalMsg
.
$on
(
"mai
DianF
unc"
,(
data
)
=>
{
globalMsg
.
$on
(
"mai
dianf
unc"
,(
data
)
=>
{
this
.
maiDianFunc
(
data
);
})
globalMsg
.
$on
(
"topShow"
,(
data
)
=>
{
...
...
src/views/index/pages/index.vue
View file @
8611ddb9
...
...
@@ -894,14 +894,14 @@
// globalMsg.$emit('topisInit', false);
// globalMsg.$emit('sendIndex', 5);
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/topicDetails?id="
+
row
.
topicId
+
'&newnpen=true'
);
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-topic-index-recommend'
,
topicId
:
row
.
topicId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-topic-index-recommend'
,
topicId
:
row
.
topicId
}));
// this.$router.push({path:"/topicdetail",query:{id:row.topicId}});
}
else
if
(
state
==
2
){
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-article-index'
,
articleId
:
row
.
contentId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-article-index'
,
articleId
:
row
.
contentId
}));
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/articleDetail?id="
+
row
.
contentId
+
'&newnpen=true'
);
}
else
if
(
state
==
3
){
this
.
$router
.
push
({
path
:
'/eventdetail'
,
query
:{
id
:
row
.
channelId
,
ismyevent
:
0
}})
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-channel-index-recommend'
,
channelId
:
row
.
channelId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-channel-index-recommend'
,
channelId
:
row
.
channelId
}));
}
},
...
...
@@ -1028,7 +1028,7 @@
this
.
$refs
.
login
.
isexpertVisible
();
return
}
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-report-file-read-index'
,
reportId
:
row
.
reportId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-report-file-read-index'
,
reportId
:
row
.
reportId
}));
api
.
getDownloadUrl
(
row
.
reportId
).
then
(
response
=>
{
if
(
response
.
code
==
0
)
{
const
elink
=
document
.
createElement
(
'a'
);
...
...
src/views/industryreportspage/industrypage.vue
View file @
8611ddb9
...
...
@@ -275,7 +275,7 @@
this
.
$refs
.
login
.
isexpertVisible
();
return
}
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-report-file-read'
,
reportId
:
row
.
reportId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-report-file-read'
,
reportId
:
row
.
reportId
}));
api
.
getDownloadUrl
(
row
.
reportId
).
then
(
response
=>
{
if
(
response
.
code
==
0
)
{
const
elink
=
document
.
createElement
(
'a'
);
...
...
src/views/topicpage/discussall.vue
View file @
8611ddb9
...
...
@@ -80,7 +80,7 @@
todetail
(
row
){
// this.$router.push({path:"/topicDetails",query:{id:row.topicId}});
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/topicDetails?id="
+
row
.
topicId
+
'&newnpen=true'
);
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-topic-list-index'
,
topicId
:
row
.
topicId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-topic-list-index'
,
topicId
:
row
.
topicId
}));
},
load
()
{
...
...
src/views/topicpage/topicbar.vue
View file @
8611ddb9
...
...
@@ -47,7 +47,7 @@
todetail
(
row
){
// this.$router.push({path:"/topicdetail",query:{id:row.topicId}});
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/topicDetails?id="
+
row
.
topicId
+
'&newnpen=true'
);
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-topic-list-right-list'
,
topicId
:
row
.
topicId
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-topic-list-right-list'
,
topicId
:
row
.
topicId
}));
},
topics
(){
// this.$router.push({path:'/discussall'})
...
...
src/views/topicpage/topicdetail.vue
View file @
8611ddb9
...
...
@@ -587,7 +587,7 @@
//讨论详情
tocommentdetail
(
row
){
this
.
$router
.
push
({
path
:
'/discussdetail'
,
query
:{
id
:
row
.
topicId
,
disId
:
row
.
id
}});
globalMsg
.
$emit
(
'mai
DianF
unc'
,({
type
:
'report-topic-discuss-read'
,
topicId
:
row
.
topicId
,
topicDiscussId
:
row
.
id
}));
globalMsg
.
$emit
(
'mai
dianf
unc'
,({
type
:
'report-topic-discuss-read'
,
topicId
:
row
.
topicId
,
topicDiscussId
:
row
.
id
}));
},
//表情拼接
emojstate
(
val
,
state
){
...
...
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