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
10d03c24
Commit
10d03c24
authored
Mar 15, 2021
by
anxixi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
活动详情改版问题修改
parent
60c311b7
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
158 additions
and
98 deletions
+158
-98
pc.scss
public/css/pc.scss
+12
-0
category.vue
src/views/categorypage/category.vue
+30
-25
contentall.vue
src/views/conmanagementpage/contentall.vue
+4
-4
newEventdetail.vue
src/views/findeventpage/newEventdetail.vue
+25
-15
index.vue
src/views/index/pages/index.vue
+1
-0
introductionbar.vue
src/views/peoplehomepage/introductionbar.vue
+8
-8
tabNewsbar.vue
src/views/peoplehomepage/tabNewsbar.vue
+1
-1
proactivity.vue
src/views/publishactivity/proactivity.vue
+2
-2
commentdetail.vue
src/views/topicpage/commentdetail.vue
+4
-0
discussdialog.vue
src/views/topicpage/discussdialog.vue
+3
-3
topicall.vue
src/views/topicpage/topicall.vue
+4
-4
topicdetail.vue
src/views/topicpage/topicdetail.vue
+64
-36
No files found.
public/css/pc.scss
View file @
10d03c24
...
...
@@ -950,6 +950,18 @@
}
}
.el-cascader-panel
.el-checkbox
{
width
:
100%
;
height
:
100%
;
z-index
:
10
;
position
:
absolute
;
/* margin-right: 10px; */
/* right: 10px; */
}
.el-cascader-node__label
{
margin-left
:
10px
;
}
...
...
src/views/categorypage/category.vue
View file @
10d03c24
...
...
@@ -262,7 +262,8 @@
components
:{
pageScreen
},
methods
:
{
closeSensor
(){
this
.
$refs
[
'formData'
].
resetFields
();
this
.
isotherContent
=
false
;
},
tagging
(
row
){
if
(
row
.
categoryCode
){
...
...
@@ -307,31 +308,35 @@
}
},
setamount
(){
let
projectLabelDTOList
=
[];
for
(
let
i
in
this
.
formData
.
linprojectLabelDTOList
){
if
(
this
.
formData
.
linprojectLabelDTOList
[
i
]
==
'LT08'
){
projectLabelDTOList
.
push
({
labelCode
:
this
.
formData
.
linprojectLabelDTOList
[
i
],
otherContent
:
this
.
formData
.
otherContent
});
}
else
{
projectLabelDTOList
.
push
({
labelCode
:
this
.
formData
.
linprojectLabelDTOList
[
i
]});
}
}
this
.
formData
.
projectLabelDTOList
=
projectLabelDTOList
;
let
params
=
this
.
formData
;
api
.
addOrUpdateProjectCategory
(
params
).
then
(
response
=>
{
if
(
response
.
code
==
0
)
{
this
.
expertVisible
=
false
;
this
.
formData
=
{
linprojectLabelDTOList
:[],
};
this
.
getselectCoreProjectList
();
}
else
{
this
.
$message
.
error
(
response
.
msgCode
);
this
.
$refs
.
formData
.
validate
((
valid
)
=>
{
if
(
valid
)
{
let
projectLabelDTOList
=
[];
for
(
let
i
in
this
.
formData
.
linprojectLabelDTOList
){
if
(
this
.
formData
.
linprojectLabelDTOList
[
i
]
==
'LT08'
){
projectLabelDTOList
.
push
({
labelCode
:
this
.
formData
.
linprojectLabelDTOList
[
i
],
otherContent
:
this
.
formData
.
otherContent
});
}
else
{
projectLabelDTOList
.
push
({
labelCode
:
this
.
formData
.
linprojectLabelDTOList
[
i
]});
}
}
this
.
formData
.
projectLabelDTOList
=
projectLabelDTOList
;
let
params
=
this
.
formData
;
api
.
addOrUpdateProjectCategory
(
params
).
then
(
response
=>
{
if
(
response
.
code
==
0
)
{
this
.
expertVisible
=
false
;
this
.
formData
=
{
linprojectLabelDTOList
:[],
};
this
.
getselectCoreProjectList
();
}
else
{
this
.
$message
.
error
(
response
.
msgCode
);
}
})
.
catch
(
error
=>
{
console
.
log
(
"提交出错"
);
return
false
;
});
}
})
.
catch
(
error
=>
{
console
.
log
(
"提交出错"
);
return
false
;
});
});
},
//技术领域
screenData
(
a
,
b
){
...
...
src/views/conmanagementpage/contentall.vue
View file @
10d03c24
...
...
@@ -14,9 +14,9 @@
<i
slot=
"reference"
style=
"font-size: 24px;color: #9197B4;"
class=
"iconfont icon-erweima"
></i>
</el-popover>
</div>
<div
style=
"height: 200px;position: relative;"
>
<img
src=
"../../assets/img/Bitmap1.jpg"
alt=
"图片"
style=
"width: 100%;height: 200px;"
>
</div
>
<!--
<div
style=
"height: 200px;position: relative;"
>
--
>
<!--
<img
src=
"../../assets/img/Bitmap1.jpg"
alt=
"图片"
style=
"width: 100%;height: 200px;"
>
--
>
<!--
</div>
--
>
<div
class=
"divlayoutchild"
>
<div>
<div>
...
...
@@ -308,7 +308,7 @@
},
menu
(){
let
scroll
=
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
;
if
(
scroll
>
2
80
){
if
(
scroll
>
80
){
this
.
positions
=
true
;
globalMsg
.
$emit
(
'topShow'
,
false
);
globalMsg
.
$emit
(
'topShowpage'
,
true
);
...
...
src/views/findeventpage/newEventdetail.vue
View file @
10d03c24
...
...
@@ -13,10 +13,10 @@
{{
eventdata
.
channelTitle
}}
</p>
<div
class=
"information_1"
>
<span>
浏览
{{
eventdata
.
readCountStr
}}
</span>
<span
>
{{
eventdata
.
channelLabelList
?
eventdata
.
channelLabelList
[
0
]
:
''
}}
</span>
<span
v-if=
"eventdata.hasLive == 1"
>
直播
</span>
<span
v-if=
"eventdata.drawTime"
>
距活动还有
<i
style=
"color: #FFA801;"
>
{{
eventdata
.
drawTime
}}
</i>
{{
eventdata
.
timeType
==
1
?
'分钟'
:
eventdata
.
timeType
==
2
?
'小时'
:
eventdata
.
timeType
==
3
?
'天'
:
''
}}
</span>
<span
class=
"readCount"
>
浏览
{{
eventdata
.
readCountStr
}}
</span>
<span
class=
"baseData"
>
{{
eventdata
.
baseDataList
?
eventdata
.
baseDataList
[
0
].
dataName
:
''
}}
</span>
<span
class=
"hasLive"
v-if=
"eventdata.hasLive == 1"
>
直播
</span>
<span
class=
"drawTime"
v-if=
"eventdata.drawTime"
>
距活动还有
<i
style=
"color: #FFA801;"
>
{{
eventdata
.
drawTime
}}
</i>
{{
eventdata
.
timeType
==
1
?
'分钟'
:
eventdata
.
timeType
==
2
?
'小时'
:
eventdata
.
timeType
==
3
?
'天'
:
''
}}
</span>
</div>
<div
class=
"gendisplay information_2"
>
<div>
...
...
@@ -81,7 +81,7 @@
{{
item
.
empTitle
}}
</i>
</p>
<div
v-if=
"
item.empId != userInfo.empId
"
>
<div
v-if=
"
$i18n.locale=='zh-CN'
"
>
<popoverBardbar
v-if=
"item.isFriend == 2&&item.empId"
:row=
"item"
></popoverBardbar>
<btnbar
v-if=
"item.isFriend != 2&&item.empId"
@
loginState=
"loginState"
@
successState=
"successState"
:row=
"item"
:index=
"index"
:btnType=
"1"
:eventId=
"$route.query.id"
></btnbar>
</div>
...
...
@@ -115,21 +115,21 @@
</div>
<div
class=
"participate_user gendisplay"
>
<div
v-for=
"(item,index) in participateList"
>
<span
class=
"userImg"
>
<span
@
click=
"tohome(item.empId)"
class=
"userImg"
>
<img
class=
"userinfo_img"
:src=
"item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')"
alt=
""
>
<img
class=
"userImg_vip"
v-if=
"item.isProfessor == 1"
src=
"../../assets/img/proFeedBack/vip.png"
alt=
""
>
<img
class=
"userImg_vip"
v-if=
"item.isModerator == 1&&item.isProfessor == 0"
src=
"../../assets/img/mobile/moderator.png"
alt=
""
>
</span>
<p
class=
"ellipsisFont1"
>
{{
item
.
empName
}}
</p>
<p
@
click=
"tohome(item.empId)"
class=
"ellipsisFont1"
>
{{
item
.
empName
}}
</p>
<p
class=
"ellipsisFont1"
>
{{
item
.
empTitle
}}
</p>
<div
v-if=
"item.empId != userInfo.empId"
>
<div
v-if=
"item.empId != userInfo.empId
&&$i18n.locale=='zh-CN'
"
>
<popoverBardbar
:iseventlive=
"true"
v-if=
"item.isFriend == 2"
:row=
"item"
></popoverBardbar>
<btnbar
v-else
@
loginState=
"loginState"
@
successState=
"participateSuccess"
:row=
"item"
:index=
"index"
:btnType=
"1"
:eventId=
"$route.query.id"
></btnbar>
</div>
</div>
</div>
</div>
<div
class=
"p_tabs"
v-if=
"resourcesList.length != 0"
>
<div
class=
"p_tabs"
v-if=
"resourcesList.length != 0
&&eventdata.channelType != 2&&$i18n.locale=='zh-CN'
"
>
<div
class=
"gendisplay p_tabs_title"
>
<p>
<span>
为您推荐
<i></i></span>
...
...
@@ -188,7 +188,7 @@
<span>
分享此活动给朋友/朋友圈
</span>
</div>
</div>
<div
class=
"right_tabs"
>
<div
class=
"right_tabs"
v-if=
"(resourcesList.length != 0||recommendList.length != 0)&&eventdata.channelType != 2&&$i18n.locale=='zh-CN'"
>
<div
class=
"gendisplay right_tabs_title"
>
<p>
<span
style=
"font-size: 16px;"
>
{{
resourcesList
.
length
==
0
?
'为您推荐'
:
'相关内容'
}}
<i></i></span>
...
...
@@ -213,7 +213,7 @@
<i
class=
"typeCovermark"
>
{{
item
.
resourceType
==
'RAT01'
?
'话题'
:
item
.
resourceType
==
'RAT02'
?
'活动'
:
item
.
resourceType
==
'RAT03'
?
'报告'
:
item
.
resourceType
==
'RAT04'
?
'文章'
:
'话题'
}}
</i>
</div>
<div>
<p
class=
"ellipsisFont1 mouseHover"
>
{{
item
.
resourceTitle
}}
</p>
<p
class=
"ellipsisFont1 mouseHover"
>
<i
v-if=
"item.hasLive"
style=
"font-size: 14px;color: #5D78FF;margin-right: 5px;"
class=
"iconfont icon-zhibo"
></i>
{{
item
.
resourceTitle
}}
</p>
<p
v-if=
"item.resourceType=='RAT01'"
>
参与数
{{
item
.
joinStr
}}
<i>
阅读
{{
item
.
browseStr
}}
</i></p>
<p
v-if=
"item.resourceType=='RAT02'"
>
{{
item
.
activityTimeStr
}}
</p>
<p
v-if=
"item.resourceType=='RAT03'"
>
{{
item
.
dataName
}}
<i>
下载量
{{
item
.
downloadStr
}}
</i></p>
...
...
@@ -434,6 +434,10 @@
this
.
$router
.
push
({
path
:
this
.
ismyevent
==
1
?
'/myeventsuccess'
:
"/eventsuccess"
,
query
:{
id
:
this
.
$route
.
query
.
id
,
type
:
this
.
eventdata
.
channelType
,
ismyevent
:
this
.
ismyevent
}})
},
handleApply
(
data
){
if
(
!
this
.
publicFun
.
getUserInfoCookieType
()){
this
.
$refs
.
login
.
isexpertVisible
();
return
}
// this.eventdata = data;
let
that
=
this
;
let
params
=
this
.
$route
.
query
.
id
?
this
.
$route
.
query
.
id
:
data
.
channelId
,
arrVal
=
[];
...
...
@@ -581,8 +585,14 @@
},
beforeDestroy
()
{
// 在组件生命周期结束的时候销毁。
window
.
removeEventListener
(
'scroll'
,
this
.
menu
);
globalMsg
.
$off
(
'loginsuccess'
);
},
mounted
()
{
globalMsg
.
$on
(
"loginsuccess"
,(
data
)
=>
{
this
.
userInfo
=
this
.
publicFun
.
getUserInfoCookieType
()
?
JSON
.
parse
(
this
.
Base64
.
decode
(
this
.
publicFun
.
getUserInfoCookieType
()))
:
null
;
this
.
getActivityDetails
();
});
globalMsg
.
$emit
(
'maidianfunc'
,({
type
:
'report-channel-read'
,
channelId
:
this
.
$route
.
query
.
id
}));
window
.
addEventListener
(
'scroll'
,
this
.
menu
);
this
.
getActivityDetails
();
this
.
activityGuestList
();
...
...
@@ -694,24 +704,24 @@
>
span
{
margin-right
:
15px
;
}
>
span
:nth-child
(
1
)
{
>
.readCount
{
color
:
#7A7A7A
;
}
>
span
:nth-child
(
2
)
{
>
.baseData
{
color
:
#5D78FF
;
font-size
:
12px
;
border
:
1px
solid
#5D78FF
;
padding
:
2px
5px
;
border-radius
:
2px
;
}
>
span
:nth-child
(
3
)
{
>
.hasLive
{
background
:
#FF5D5D
;
color
:
#ffffff
;
font-size
:
12px
;
padding
:
2
.5px
5px
;
border-radius
:
2px
;
}
>
span
:nth-child
(
4
)
{
>
.drawTime
{
color
:
#7A7A7A
;
>
i
{
color
:
#5D78FF
;
...
...
src/views/index/pages/index.vue
View file @
10d03c24
...
...
@@ -1580,6 +1580,7 @@
mounted
()
{
window
.
addEventListener
(
'scroll'
,
this
.
menu
);
globalMsg
.
$on
(
"loginout"
,(
data
)
=>
{
this
.
userInfo
=
this
.
publicFun
.
getUserInfoCookieType
()
?
JSON
.
parse
(
this
.
Base64
.
decode
(
this
.
publicFun
.
getUserInfoCookieType
()))
:
null
;
this
.
empInfo
=
this
.
publicFun
.
getUserInfoCookieType
()
?
JSON
.
parse
(
this
.
Base64
.
decode
(
this
.
publicFun
.
getUserInfoCookieType
()))
:
null
;
this
.
getIndexHotContentaxios
();
//热门信息
this
.
getIndexBaseActivity
();
//推荐活动
...
...
src/views/peoplehomepage/introductionbar.vue
View file @
10d03c24
<
template
>
<div>
<div
class=
"p_jobs p_tabs"
v-if=
"(workList&&workList.length == 0)&&(educationList&&educationList.length == 0)&&(dynamicList&&dynamicList.length == 0)"
>
<div>
<p
class=
"noIntegral"
>
<img
src=
"../../assets/img/mobile/noIntegral@2x.png"
alt=
""
>
<span>
暂无数据
</span>
</p>
</div>
</div>
<div
class=
"p_dynamic p_tabs"
v-if=
"dynamicList&&dynamicList.length!=0"
>
<div
class=
"gendisplay p_tabs_title"
>
<p>
...
...
@@ -116,14 +124,6 @@
</el-row>
</div>
</div>
<div
class=
"p_jobs p_tabs"
v-if=
"(workList == null || (workList&&workList.length == 0))&&(educationList == null || (educationList&&educationList.length == 0))"
>
<div>
<p
class=
"noIntegral"
>
<img
src=
"../../assets/img/mobile/noIntegral@2x.png"
alt=
""
>
<span>
暂无数据
</span>
</p>
</div>
</div>
<div
class=
"p_jobs p_tabs"
v-if=
"workList != null || (workList&&workList.length != 0)"
>
<div
class=
"gendisplay p_tabs_title"
>
<p>
...
...
src/views/peoplehomepage/tabNewsbar.vue
View file @
10d03c24
...
...
@@ -32,7 +32,7 @@
<div
v-if=
"item.messageType == 1"
>
<p
v-if=
"item.baseChannel"
>
<i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
通过
<i
@
click=
"toevent(item)"
>
{{
item
.
baseChannel
.
channelTitle
}}
</i>
直播
活动想与您交换名片,
<i
@
click=
"toevent(item)"
>
{{
item
.
baseChannel
.
channelTitle
}}
</i>
活动想与您交换名片,
<i
@
click=
"tohome(item)"
>
查看TA的资料
</i>
</p>
<p
v-else
><i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
想与您交换名片,
<i
@
click=
"tohome(item)"
>
查看TA的资料
</i></p>
...
...
src/views/publishactivity/proactivity.vue
View file @
10d03c24
...
...
@@ -186,7 +186,7 @@
<el-form-item
:label=
"$t('pubactivities.maxnum')+':'"
prop=
"personMax"
style=
"width: 100%;"
>
<el-input
v-model=
"formData.personMax"
@
input=
"formData.personMax=formData.personMax.slice(0,5)"
type=
"number"
:placeholder=
"$t('pubactivities.plmaxnum')"
style=
"width: 450px;height: 40px"
></el-input>
</el-form-item>
<el-form-item
label=
"报名默认文案:"
prop=
"personMax"
style=
"width: 100%;"
>
<el-form-item
v-if=
"formData.versionType == 0&&$i18n.locale=='zh-CN'"
label=
"报名默认文案:"
prop=
"personMax"
style=
"width: 100%;"
>
<p
style=
"color: #1A1A1E;"
>
报名显示按钮,需要配置中英
</p>
<span>
中文:
</span>
<el-input
v-model=
"formData.viewDesc"
maxlength=
"6"
placeholder=
"免费报名"
style=
"width: 200px;margin-right: 45px;"
></el-input>
...
...
@@ -247,7 +247,7 @@
</el-table-column>
</el-table>
</div>
<el-form-item
label=
"相关内容:"
style=
"width: 100%;"
>
<el-form-item
v-if=
"formData.versionType == 0&&$i18n.locale=='zh-CN'"
label=
"相关内容:"
style=
"width: 100%;"
>
<el-button
type=
"primary"
plain
@
click=
"resourcesVisible = true"
>
添加内容
</el-button>
</el-form-item>
<div
style=
"margin: 0 30px 30px 180px;"
>
...
...
src/views/topicpage/commentdetail.vue
View file @
10d03c24
...
...
@@ -44,6 +44,7 @@
:src=
"commentdataimg"
:preview-src-list=
"getSrcList(commentdata.discussUrl.split(','),index)"
>
</el-image>
来自:
<i
@
click=
"totopic"
style=
"color: red;cursor: pointer;"
>
{{
contentdata
.
topicTitle
}}
</i>
<!-- 讨论分享、评论、点赞操作-->
<div
class=
"gendisplay operating"
>
<p>
...
...
@@ -490,6 +491,9 @@
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"/peoplehome?id="
+
id
);
}
},
totopic
(){
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"/topicDetails?id="
+
this
.
contentdata
.
topicId
+
'&newopen=true'
);
},
load
()
{
if
(
this
.
topicdatacur_page
<
this
.
pages
){
this
.
topicdatacur_page
++
;
...
...
src/views/topicpage/discussdialog.vue
View file @
10d03c24
...
...
@@ -236,11 +236,11 @@
return
;
}
let
textlength
=
this
.
publicFun
.
unique
(
this
.
publicFun
.
getTextInRichtext
(
this
.
discussContent
));
if
(
textlength
&&
textlength
.
length
<
10
){
if
(
textlength
&&
textlength
.
length
>
10
){
this
.
btnpush
=
false
;
}
else
{
this
.
btnpush
=
true
;
return
;
}
else
{
this
.
btnpush
=
false
;
}
let
params
=
{
discussContent
:
this
.
discussContent
,
...
...
src/views/topicpage/topicall.vue
View file @
10d03c24
...
...
@@ -153,11 +153,11 @@
<el-radio
v-model=
"announceData.isEnable"
:label=
"1"
>
是
</el-radio>
<el-radio
v-model=
"announceData.isEnable"
:label=
"2"
>
否
</el-radio>
</el-form-item>
<el-form-item
label=
"
说明文案
:"
>
<el-input
maxlength=
"50"
v-model=
"announceData.noticeContent"
placeholder=
"请输入
说明文案
"
></el-input>
<el-form-item
label=
"
公告内容
:"
>
<el-input
maxlength=
"50"
v-model=
"announceData.noticeContent"
placeholder=
"请输入
公告内容
"
></el-input>
</el-form-item>
<el-form-item
label=
"
文案
链接地址:"
>
<el-input
maxlength=
"50"
v-model=
"announceData.noticeUrl"
placeholder=
"请输入
文案
链接地址"
></el-input>
<el-form-item
label=
"
公告
链接地址:"
>
<el-input
maxlength=
"50"
v-model=
"announceData.noticeUrl"
placeholder=
"请输入
公告
链接地址"
></el-input>
</el-form-item>
<el-form-item
label=
"配置公告的话题:"
>
<div
class=
"gendisplay"
>
...
...
src/views/topicpage/topicdetail.vue
View file @
10d03c24
...
...
@@ -126,22 +126,22 @@
<el-tab-pane
label=
"精华"
name=
"second"
></el-tab-pane>
</el-tabs>
</div>
<div
v-if=
"
(discussTopList&&discussTopList.length>=1&&NormalDiscussstate == 0)||(contentdata.baseTopicSetting&&contentdata.baseTopicSetting.showDesc == 1)
"
style=
"background: #ffffff;border-radius: 3px;padding:15px 17px;margin-top: 15px;"
>
<div
v-if=
"contentdata.baseTopic
Setting&&contentdata.baseTopicSetting.showDesc == 1"
@
click=
"tourldetail(contentdata.baseTopicSetting
)"
style=
"margin: 5px 0;"
>
<div
v-if=
"
contentdata.baseTopicNotice&&contentdata.baseTopicNotice.isEnable == 1
"
style=
"background: #ffffff;border-radius: 3px;padding:15px 17px;margin-top: 15px;"
>
<div
v-if=
"contentdata.baseTopic
Notice&&contentdata.baseTopicNotice.isEnable == 1"
@
click=
"tourldetail(contentdata.baseTopicNotice
)"
style=
"margin: 5px 0;"
>
<p
style=
"line-height: 28px;color: #1A1A1E;margin-right: 10px;cursor: pointer;"
>
<span
style=
"background: #FF5D5D;color: #ffffff;padding: 2px 3px;font-size: 12px;border-radius: 3px;margin-right: 10px;"
>
公告
</span>
<i
@
click=
""
>
contentdata.baseTopicSetting.descContent
</i>
<i
@
click=
""
>
{{
contentdata
.
baseTopicNotice
.
noticeContent
}}
</i>
</p>
</div>
<div
class=
"gendisplay"
v-for=
"(item,index) in discussTopList"
:key=
"index"
@
click=
"tocommentdetail(item)"
style=
"margin: 5px 0;"
>
<p
class=
"ellipsisFont1"
style=
"width: calc(100% - 42px);line-height: 28px;color: #1A1A1E;margin-right: 10px;cursor: pointer;height: 28px;overflow: hidden;"
>
<span
style=
"background: #FF5D5D;color: #ffffff;padding: 2px 3px;font-size: 12px;border-radius: 3px;margin-right: 10px;"
>
置顶
</span
>
<i
v-html=
"item.pcState==0?item.discussContent:item.simpleContent"
></i
>
</p
>
<p
style=
"width: 42px;line-height: 28px;color: #AAAAAA;"
>
{{
item
.
topTime
}}
</p
>
</div
>
<!--
<div
class=
"gendisplay"
v-for=
"(item,index) in discussTopList"
:key=
"index"
@
click=
"tocommentdetail(item)"
style=
"margin: 5px 0;"
>
--
>
<!--
<p
class=
"ellipsisFont1"
style=
"width: calc(100% - 42px);line-height: 28px;color: #1A1A1E;margin-right: 10px;cursor: pointer;height: 28px;overflow: hidden;"
>
--
>
<!--
<span
style=
"background: #FF5D5D;color: #ffffff;padding: 2px 3px;font-size: 12px;border-radius: 3px;margin-right: 10px;"
>
置顶
</span>
--
>
<!--
<i
v-html=
"item.pcState==0?item.discussContent:item.simpleContent"
></i>
--
>
<!--
</p>
--
>
<!--
<p
style=
"width: 42px;line-height: 28px;color: #AAAAAA;"
>
{{
item
.
topTime
}}
</p>
--
>
<!--
</div>
--
>
</div>
<div
v-if=
"(NormalDiscussstate==1&&contentList.length==0)||(NormalDiscussstate==0&&contentList.length==0
&&discussTopList.length==0
)"
style=
"text-align: center;height: 300px;padding-top: 80px;background: #ffffff;margin-top: 15px;border-radius: 3px;"
>
<div
v-if=
"(NormalDiscussstate==1&&contentList.length==0)||(NormalDiscussstate==0&&contentList.length==0)"
style=
"text-align: center;height: 300px;padding-top: 80px;background: #ffffff;margin-top: 15px;border-radius: 3px;"
>
<p><i
style=
"font-size: 58px;color: #C8CBE0;"
class=
"iconfont icon-hezi501"
></i></p>
<p
style=
"color:#C8CBE0;"
>
暂无数据
</p>
</div>
...
...
@@ -178,8 +178,8 @@
</div>
<div>
<div
style=
"margin: 15px 0;color:#1A1A1E;line-height: 24px;overflow: hidden;"
@
click=
"eventtopiccontent($event)"
>
<span
v-if=
"item.alltext"
v-html=
"item.pcState==1?(item.
discussContentlin+(item.discussContentlin
.length>140?'...':'')):publicFun.analyzeEmoji((item.discussContentlin+(item.discussContentlin.length>140?'...':'')))"
></span>
<span
v-else
v-html=
"item.pcState==1?item.
discussContentcons
t:publicFun.analyzeEmoji(item.discussContentconst)"
></span>
<span
v-if=
"item.alltext"
v-html=
"item.pcState==1?(item.
simpleContent+(item.simpleContent
.length>140?'...':'')):publicFun.analyzeEmoji((item.discussContentlin+(item.discussContentlin.length>140?'...':'')))"
></span>
<span
v-else
v-html=
"item.pcState==1?item.
simpleConten
t:publicFun.analyzeEmoji(item.discussContentconst)"
></span>
<i
v-if=
"publicFun.getTextInRichtext(item.discussContentconst).length>140"
@
click=
"item.alltext = !item.alltext"
...
...
@@ -816,7 +816,7 @@
globalMsg
.
$emit
(
'maidianfunc'
,({
type
:
'report-topic-discuss-read'
,
topicId
:
row
.
topicId
,
topicDiscussId
:
row
.
id
}));
},
tourldetail
(
val
){
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
val
.
desc
Url
);
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
val
.
notice
Url
);
},
//表情拼接
emojstate
(
val
,
state
){
...
...
@@ -1294,31 +1294,59 @@
if
(
res
.
result
.
discussTopList
){
this
.
discussTopList
=
res
.
result
.
discussTopList
;
}
if
(
res
.
result
.
discussTopList
){
res
.
result
.
discussTopList
.
forEach
((
item
)
=>
{
item
.
discussContentlin
=
this
.
publicFun
.
getTitlewith
(
item
.
pcState
==
0
?(
item
.
discussContent
.
length
>
250
?
item
.
discussContent
.
slice
(
0
,
250
):
item
.
discussContent
):(
item
.
simpleContent
.
length
>
250
?
item
.
simpleContent
.
slice
(
0
,
250
):
item
.
simpleContent
),
item
.
projectList
);
item
.
discussContentconst
=
this
.
publicFun
.
getTitlewith
(
item
.
discussContent
,
item
.
projectList
);
item
.
iscomment
=
false
;
//初始讨论下的评论输入
item
.
isemjovisible
=
false
;
//初始讨论下的评论表情
item
.
alltext
=
item
.
pcState
==
0
?(
item
.
discussContent
.
length
>
140
?
true
:
false
):(
item
.
simpleContent
.
length
>
140
?
true
:
false
);
//讨论全文是否展开
item
.
visibledian
=
false
;
//讨论右上角操作
item
.
wordarea
=
''
;
//评论文字
item
.
commentsState
=
true
;
//公开私密
item
.
commentList
.
forEach
((
itemchild
)
=>
{
itemchild
.
wordarea
=
''
;
//评论文字
itemchild
.
commentsState
=
true
;
//公开私密
itemchild
.
iscomment
=
false
;
//初始讨论下的评论输入
itemchild
.
isemjovisible
=
false
;
//初始讨论下的评论表情
itemchild
.
childFirstList
.
forEach
((
itemchilds
)
=>
{
itemchilds
.
wordarea
=
''
;
//评论文字
itemchilds
.
commentsState
=
true
;
//公开私密
itemchilds
.
iscomment
=
false
;
//初始讨论下的评论输入
itemchilds
.
isemjovisible
=
false
;
//初始讨论下的评论表情
});
});
});
for
(
let
i
in
res
.
result
.
discussTopList
){
this
.
contentList
.
push
(
res
.
result
.
discussTopList
[
i
]);
}
// this.discussTopList = res.result.discussTopList;
}
if
(
res
.
result
.
discussHotList
){
for
(
let
i
in
res
.
result
.
discussHotList
){
res
.
result
.
discussHotList
.
forEach
((
item
)
=>
{
item
.
discussContentlin
=
this
.
publicFun
.
getTitlewith
(
item
.
pcState
==
0
?(
item
.
discussContent
.
length
>
250
?
item
.
discussContent
.
slice
(
0
,
250
):
item
.
discussContent
):(
item
.
simpleContent
.
length
>
250
?
item
.
simpleContent
.
slice
(
0
,
250
):
item
.
simpleContent
),
item
.
projectList
);
item
.
discussContentconst
=
this
.
publicFun
.
getTitlewith
(
item
.
discussContent
,
item
.
projectList
);
item
.
isdiscussHotList
=
true
;
//热门
item
.
iscomment
=
false
;
//初始讨论下的评论输入
item
.
isemjovisible
=
false
;
//初始讨论下的评论表情
item
.
alltext
=
item
.
pcState
==
0
?(
item
.
discussContent
.
length
>
140
?
true
:
false
):(
item
.
simpleContent
.
length
>
140
?
true
:
false
);
//讨论全文是否展开
item
.
visibledian
=
false
;
//讨论右上角操作
item
.
wordarea
=
''
;
//评论文字
item
.
commentsState
=
true
;
//公开私密
item
.
commentList
.
forEach
((
itemchild
)
=>
{
itemchild
.
wordarea
=
''
;
//评论文字
itemchild
.
commentsState
=
true
;
//公开私密
itemchild
.
iscomment
=
false
;
//初始讨论下的评论输入
itemchild
.
isemjovisible
=
false
;
//初始讨论下的评论表情
itemchild
.
childFirstList
.
forEach
((
itemchilds
)
=>
{
itemchilds
.
wordarea
=
''
;
//评论文字
itemchilds
.
commentsState
=
true
;
//公开私密
itemchilds
.
iscomment
=
false
;
//初始讨论下的评论输入
itemchilds
.
isemjovisible
=
false
;
//初始讨论下的评论表情
});
res
.
result
.
discussHotList
.
forEach
((
item
)
=>
{
item
.
discussContentlin
=
this
.
publicFun
.
getTitlewith
(
item
.
pcState
==
0
?(
item
.
discussContent
.
length
>
250
?
item
.
discussContent
.
slice
(
0
,
250
):
item
.
discussContent
):(
item
.
simpleContent
.
length
>
250
?
item
.
simpleContent
.
slice
(
0
,
250
):
item
.
simpleContent
),
item
.
projectList
);
item
.
discussContentconst
=
this
.
publicFun
.
getTitlewith
(
item
.
discussContent
,
item
.
projectList
);
item
.
isdiscussHotList
=
true
;
//热门
item
.
iscomment
=
false
;
//初始讨论下的评论输入
item
.
isemjovisible
=
false
;
//初始讨论下的评论表情
item
.
alltext
=
item
.
pcState
==
0
?(
item
.
discussContent
.
length
>
140
?
true
:
false
):(
item
.
simpleContent
.
length
>
140
?
true
:
false
);
//讨论全文是否展开
item
.
visibledian
=
false
;
//讨论右上角操作
item
.
wordarea
=
''
;
//评论文字
item
.
commentsState
=
true
;
//公开私密
item
.
commentList
.
forEach
((
itemchild
)
=>
{
itemchild
.
wordarea
=
''
;
//评论文字
itemchild
.
commentsState
=
true
;
//公开私密
itemchild
.
iscomment
=
false
;
//初始讨论下的评论输入
itemchild
.
isemjovisible
=
false
;
//初始讨论下的评论表情
itemchild
.
childFirstList
.
forEach
((
itemchilds
)
=>
{
itemchilds
.
wordarea
=
''
;
//评论文字
itemchilds
.
commentsState
=
true
;
//公开私密
itemchilds
.
iscomment
=
false
;
//初始讨论下的评论输入
itemchilds
.
isemjovisible
=
false
;
//初始讨论下的评论表情
});
});
});
for
(
let
i
in
res
.
result
.
discussHotList
){
this
.
contentList
.
push
(
res
.
result
.
discussHotList
[
i
]);
}
}
...
...
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