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
29524082
Commit
29524082
authored
May 28, 2020
by
anxixi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
活动相关需求
parent
6a820ffa
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
57 additions
and
8 deletions
+57
-8
public.js
src/assets/js/public.js
+10
-0
en.js
src/common/lang/en.js
+2
-1
zh.js
src/common/lang/zh.js
+2
-1
contentall.vue
src/views/conmanagementpage/contentall.vue
+2
-1
contentdetail.vue
src/views/conmanagementpage/contentdetail.vue
+2
-2
hotarticlepage.vue
src/views/conmanagementpage/hotarticlepage.vue
+18
-2
activitydel.vue
src/views/publishactivity/activitydel.vue
+8
-1
api.js
src/views/publishactivity/api/api.js
+13
-0
proactivity.vue
src/views/publishactivity/proactivity.vue
+0
-0
No files found.
src/assets/js/public.js
View file @
29524082
...
...
@@ -34,6 +34,16 @@ export default {
},
//时区转化
gettimeZone
(
date
,
timeZonetype
){
//2. 获取当前分钟
let
newdate
=
new
Date
(
date
);
var
min
=
newdate
.
getMinutes
();
//3. 设置当前时间+5分钟:把当前分钟数+5后的值重新设置为date对象的分钟数
newdate
.
setMinutes
(
min
+
480
-
timeZonetype
);
return
this
.
getDataTimeFormatFunc
(
newdate
,
0
);
},
//通用时间校验
getDataCheck
(
start
,
end
)
{
let
startTime
=
(
new
Date
(
Date
.
parse
((
this
.
getDataTimeFormatFunc
(
start
,
0
)).
replace
(
/-/g
,
"/"
))))
/
1000
;
...
...
src/common/lang/en.js
View file @
29524082
...
...
@@ -1965,7 +1965,8 @@ module.exports = {
plmodulename
:
'Please fill in the module name'
,
editsuccess
:
'Successfully modified'
,
pushsuccess
:
'Added successfully'
,
beijingtime
:
'beijingtime'
,
version
:
'Select version'
,
}
...
...
src/common/lang/zh.js
View file @
29524082
...
...
@@ -2062,7 +2062,8 @@ module.exports = {
plmodulename
:
'请填写模块名称'
,
editsuccess
:
'修改成功'
,
pushsuccess
:
'添加成功'
,
beijingtime
:
'北京时间'
,
version
:
'选择版本'
,
}
...
...
src/views/conmanagementpage/contentall.vue
View file @
29524082
...
...
@@ -113,7 +113,7 @@
<p
style=
"color: #9197B4;margin-top: 40px;"
v-if=
"!loading"
>
没有更多了
</p>
</div>
<div
style=
"width: 320px;"
>
<hotArticlepage
ref=
"hotstate"
></hotArticlepage>
<hotArticlepage
:isstate=
"false"
ref=
"hotstate"
></hotArticlepage>
</div>
</div>
</div>
...
...
@@ -317,6 +317,7 @@
},
//文章详情
gocontentdetail
(
row
){
globalMsg
.
$emit
(
'maiDianFunc'
,({
type
:
'report-article-list'
,
articleId
:
row
.
contentId
}));
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/contentdetail?id="
+
row
.
contentId
+
'&newnpen=true'
);
// this.$router.push({path:"/contentdetail",query:{id:row.contentId}});
},
...
...
src/views/conmanagementpage/contentdetail.vue
View file @
29524082
...
...
@@ -83,7 +83,7 @@
</div>
</div>
<div
class=
"paragraph"
>
<p>
{{
item
.
emp
Name
}}
</p>
<p>
{{
item
.
nick
Name
}}
</p>
<p
v-html=
"analyzeEmoji(item.commentsContent)"
>
{{
item
.
commentsContent
}}
</p>
<div
class=
"comments_content"
v-if=
"item.childFirstList&&item.childFirstList.length>0"
>
<p
v-for=
"(items,index) in item.childFirstList"
style=
"line-height: 28px;"
@
click=
"clkreply(item),childuser=items"
>
...
...
@@ -126,7 +126,7 @@
</div>
</div>
<div
style=
"width: 320px;"
>
<hotArticlepage
ref=
"hotstate"
></hotArticlepage>
<hotArticlepage
:isstate=
"true"
ref=
"hotstate"
></hotArticlepage>
</div>
</div>
...
...
src/views/conmanagementpage/hotarticlepage.vue
View file @
29524082
...
...
@@ -4,7 +4,7 @@
<div
class=
"content_right"
v-if=
"hotlist&&hotlist.length>0"
>
<p><span>
</span>
热门文章
</p>
<div
class=
"hto_content"
>
<div
style=
"cursor: pointer;width: 100%;"
v-for=
"(item,index) in hotlist"
:key=
"index"
@
click=
"gocontent(item)"
>
<div
style=
"cursor: pointer;width: 100%;"
v-for=
"(item,index) in hotlist"
:key=
"index"
@
click=
"gocontent(item
,true
)"
>
<p
class=
"imgInfo"
style=
"width: 80px;height: 56px;"
:style=
"
{backgroundImage:'url('+(item.contentCoverUrl?item.contentCoverUrl:item.contentUrl?item.contentUrl.split(',')[0]:'')+')'}">
<!--
<img
:src=
"item.contentCoverUrl?item.contentCoverUrl:item.contentUrl?item.contentUrl.split(',')[0]:''"
alt=
"图片"
>
-->
...
...
@@ -65,6 +65,9 @@
istopShow
:
false
,
}
},
props
:[
'isstate'
],
methods
:{
getselectHotContent
(
params
){
api
.
selectHotContent
(
params
).
then
(
response
=>
{
...
...
@@ -111,7 +114,20 @@
return
false
;
});
},
gocontent
(
row
){
gocontent
(
row
,
state
){
if
(
this
.
isstate
){
if
(
state
){
globalMsg
.
$emit
(
'maiDianFunc'
,({
type
:
'report-article-hot-detail'
,
articleId
:
row
.
contentId
}));
}
else
{
globalMsg
.
$emit
(
'maiDianFunc'
,({
type
:
'report-article-recommend-expert-detail'
,
articleId
:
row
.
contentId
}));
}
}
else
{
if
(
state
){
globalMsg
.
$emit
(
'maiDianFunc'
,({
type
:
'report-article-hot-list'
,
articleId
:
row
.
contentId
}));
}
else
{
globalMsg
.
$emit
(
'maiDianFunc'
,({
type
:
'report-article-recommend-expert-list'
,
articleId
:
row
.
contentId
}));
}
}
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/contentdetail?id="
+
row
.
contentId
+
'&newnpen=true'
);
// this.$router.push({path:"/contentdetail",query:{id:row.contentId}});
},
...
...
src/views/publishactivity/activitydel.vue
View file @
29524082
...
...
@@ -45,6 +45,9 @@
<div
style=
"padding: 30px 0;margin: 0 30px;"
>
<div
style=
"margin-top: 20px"
>
<el-form
:inline=
"true"
label-width=
"160px"
:model=
"addData"
class=
"contnetform"
>
<el-form-item
label=
"发布版本:"
style=
"width: 100%;"
>
<span>
{{
addData
.
versionType
==
'0'
?
$t
(
'Otherjson.domestic'
):
addData
.
versionType
==
'1'
?
$t
(
'Otherjson.overseas'
)
:
''
}}
</span>
</el-form-item>
<el-form-item
label=
"活动模板:"
style=
"width: 100%;"
>
<span>
{{
addData
.
channelType
==
'2'
?
'项目收集'
:
addData
.
channelType
==
'3'
?
'线下沙龙'
:
addData
.
channelType
==
'4'
?
'线上活动'
:
''
}}
</span>
</el-form-item>
...
...
@@ -65,8 +68,12 @@
<el-form-item
label=
"活动关键字:"
style=
"width: 100%;"
>
<span
v-for=
"item in addData.channelLabelList"
><i
style=
"margin-right: 15px"
>
{{
item
}}
</i></span>
</el-form-item>
<el-form-item
v-if=
"addData.versionType == 1"
label=
"时区:"
style=
"width: 100%;"
>
<span>
{{
addData
.
timeZoneStr
}}
</span>
</el-form-item>
<el-form-item
label=
"所属区域:"
style=
"width: 100%;"
>
<span>
{{
addData
.
channelProvince
}}
<span
v-if=
"addData.channelCity"
>
-
{{
addData
.
channelCity
}}
</span></span>
<p
v-if=
"addData.channelNation"
>
{{
addData
.
channelNation
}}
</p>
<p
v-else
><span>
{{
addData
.
channelProvince
}}
<span
v-if=
"addData.channelCity"
>
-
{{
addData
.
channelCity
}}
</span></span></p>
</el-form-item>
<el-form-item
v-if=
"addData.channelType == '3'||addData.channelType == '4'"
label=
"活动地址:"
style=
"width: 100%;"
>
<span>
{{
addData
.
channelAddress
}}
</span>
...
...
src/views/publishactivity/api/api.js
View file @
29524082
...
...
@@ -50,4 +50,16 @@ export default {
exportRecord
(
params
)
{
return
api
.
fetchLoadingPostex
(
'/base/activity/exportApplyList'
,
params
);
},
//时区
getTimeZoneList
(
)
{
return
api
.
fetchGet
(
'/base/time/getTimeZoneList'
);
},
//时区转化
calcTimeOfBeijing
(
params
)
{
return
api
.
fetchPost
(
'/base/time/calcTimeOfBeijing'
,
Qs
.
stringify
(
params
));
},
selectNationList
(){
return
api
.
fetchGet
(
'/business/geo/selectNationList'
);
},
}
\ No newline at end of file
src/views/publishactivity/proactivity.vue
View file @
29524082
This diff is collapsed.
Click to expand it.
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