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
b51c9fef
Commit
b51c9fef
authored
Jul 29, 2020
by
zhangyanni
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
7cf7fc1f
90c5ca43
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
9 deletions
+10
-9
en.js
src/common/lang/en.js
+5
-5
hotarticlepage.vue
src/views/conmanagementpage/hotarticlepage.vue
+2
-2
proactivity.vue
src/views/publishactivity/proactivity.vue
+3
-2
No files found.
src/common/lang/en.js
View file @
b51c9fef
...
@@ -1741,7 +1741,7 @@ module.exports = {
...
@@ -1741,7 +1741,7 @@ module.exports = {
projectData
:
"项目数据"
,
projectData
:
"项目数据"
,
projectRank
:
"项目排行"
,
projectRank
:
"项目排行"
,
requireRank
:
"需求排行"
,
requireRank
:
"需求排行"
,
visitNum
:
"
viewing c
ount"
,
visitNum
:
"
Viewing C
ount"
,
collectionNum
:
"收藏数"
,
collectionNum
:
"收藏数"
,
collucationNum
:
"沟通数"
,
collucationNum
:
"沟通数"
,
allPercent
:
"综合比重"
,
allPercent
:
"综合比重"
,
...
@@ -1962,8 +1962,8 @@ module.exports = {
...
@@ -1962,8 +1962,8 @@ module.exports = {
activitytips
:
'You have not completed your personal certification, please publish the Event after certification'
,
activitytips
:
'You have not completed your personal certification, please publish the Event after certification'
,
newfield
:
'New field'
,
newfield
:
'New field'
,
export
:
'Export'
,
export
:
'Export'
,
companyname
:
'
company n
ame'
,
companyname
:
'
Company N
ame'
,
registrationtime
:
'
registration t
ime'
,
registrationtime
:
'
Registration T
ime'
,
Activityreview
:
'Event review'
,
Activityreview
:
'Event review'
,
registerinformation
:
'register information'
,
registerinformation
:
'register information'
,
eventtem
:
'Event template'
,
eventtem
:
'Event template'
,
...
@@ -2074,7 +2074,7 @@ module.exports = {
...
@@ -2074,7 +2074,7 @@ module.exports = {
questions
:
'Enter at least 15 questions'
,
questions
:
'Enter at least 15 questions'
,
addexistingquestion
:
'Add an existing question'
,
addexistingquestion
:
'Add an existing question'
,
addquestion
:
'Add question'
,
addquestion
:
'Add question'
,
serialnumber
:
'
Serial n
umber'
,
serialnumber
:
'
N
umber'
,
topic
:
'Topic'
,
topic
:
'Topic'
,
operating
:
'Operating'
,
operating
:
'Operating'
,
add
:
'Add'
,
add
:
'Add'
,
...
@@ -2121,7 +2121,7 @@ module.exports = {
...
@@ -2121,7 +2121,7 @@ module.exports = {
participate
:
'Please use the WeChat scan function to scan the QR code belowParticipate in cash red envelope activities'
,
participate
:
'Please use the WeChat scan function to scan the QR code belowParticipate in cash red envelope activities'
,
registration
:
'Others share registration'
,
registration
:
'Others share registration'
,
directscan
:
'Direct scan'
,
directscan
:
'Direct scan'
,
statistics
:
'
s
tatistics'
,
statistics
:
'
S
tatistics'
,
},
},
//直播
//直播
...
...
src/views/conmanagementpage/hotarticlepage.vue
View file @
b51c9fef
...
@@ -53,11 +53,11 @@
...
@@ -53,11 +53,11 @@
<p><span>
</span>
精彩内容
<i
@
click=
"gocontentall"
style=
"position: absolute;right: 0px;top: 0px;font-size: 14px;font-weight: normal;cursor: pointer;"
>
查看更多 >
</i></p>
<p><span>
</span>
精彩内容
<i
@
click=
"gocontentall"
style=
"position: absolute;right: 0px;top: 0px;font-size: 14px;font-weight: normal;cursor: pointer;"
>
查看更多 >
</i></p>
<div
class=
"hto_content"
>
<div
class=
"hto_content"
>
<div
style=
"cursor: pointer;width: 100%;"
v-for=
"(item,index) in hotlist"
:key=
"index"
@
click=
"goindustry(item)"
>
<div
style=
"cursor: pointer;width: 100%;"
v-for=
"(item,index) in hotlist"
:key=
"index"
@
click=
"goindustry(item)"
>
<p
class=
"imgInfo"
style=
"width: 80px;height: 5
2px;overflow: hidden
;"
:style=
"
{backgroundImage:'url('+(item.contentCoverUrl?item.contentCoverUrl:item.contentUrl?item.contentUrl.split(',')[0]:'')+')'}">
<p
class=
"imgInfo"
style=
"width: 80px;height: 5
4px
;"
: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=
"图片"
>
-->
<!--
<img
:src=
"item.contentCoverUrl?item.contentCoverUrl:item.contentUrl?item.contentUrl.split(',')[0]:''"
alt=
"图片"
>
-->
</p>
</p>
<p
class=
"ellipsisFont2"
style=
"width: 225px;height: 5
4px
;"
>
{{
item
.
contentTitle
}}
</p>
<p
class=
"ellipsisFont2"
style=
"width: 225px;height: 5
0px;overflow: hidden
;"
>
{{
item
.
contentTitle
}}
</p>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
src/views/publishactivity/proactivity.vue
View file @
b51c9fef
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<el-input
v-model=
"formData.channelTitle"
maxlength=
"100"
:placeholder=
"$t('Otherjson.plactivitytitle')"
style=
"width: 450px;height: 40px"
></el-input>
<el-input
v-model=
"formData.channelTitle"
maxlength=
"100"
:placeholder=
"$t('Otherjson.plactivitytitle')"
style=
"width: 450px;height: 40px"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
v-if=
"$route.query.type == '5'"
:label=
"$t('pubactivities.summary')+':'"
prop=
"channelSummary"
style=
"width: 100%;"
>
<el-form-item
v-if=
"$route.query.type == '5'"
:label=
"$t('pubactivities.summary')+':'"
prop=
"channelSummary"
style=
"width: 100%;"
>
<el-input
v-model=
"formData.channelSummary"
type=
"textarea"
:rows=
"4"
maxlength=
"200"
:placeholder=
"$t('pubactivities.plsummary')"
style=
"width: 450px;
height: 40px
"
></el-input>
<el-input
v-model=
"formData.channelSummary"
type=
"textarea"
:rows=
"4"
maxlength=
"200"
:placeholder=
"$t('pubactivities.plsummary')"
style=
"width: 450px;"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('pubactivities.eventcover')+':'"
prop=
"channelPic"
ref=
"formimg"
style=
"width: 100%;"
>
<el-form-item
:label=
"$t('pubactivities.eventcover')+':'"
prop=
"channelPic"
ref=
"formimg"
style=
"width: 100%;"
>
<p
class=
"imgTitle"
>
{{
$t
(
'pubactivities.eventcoveren'
)
}}
</p>
<p
class=
"imgTitle"
>
{{
$t
(
'pubactivities.eventcoveren'
)
}}
</p>
...
@@ -416,7 +416,7 @@
...
@@ -416,7 +416,7 @@
<!--新增字段-->
<!--新增字段-->
<el-dialog
:title=
"editVisible?$t('pubactivities.editfield'):$t('pubactivities.newfield')"
:visible
.
sync=
"addVisible"
:append-to-body=
"true"
:close-on-click-modal=
"false"
@
close=
"closeSensor"
class=
"dialogWrap"
>
<el-dialog
:title=
"editVisible?$t('pubactivities.editfield'):$t('pubactivities.newfield')"
:visible
.
sync=
"addVisible"
:append-to-body=
"true"
:close-on-click-modal=
"false"
@
close=
"closeSensor"
class=
"dialogWrap"
>
<el-form
:inline=
"true"
label-width=
"210px"
:model=
"contactsform"
:rules=
"rules"
ref=
"contactsform"
>
<el-form
:inline=
"true"
label-width=
"210px"
:model=
"contactsform"
:rules=
"rules"
ref=
"contactsform"
>
<el-form-item
:label=
"$t('pubactivities.fieldName')+':'"
prop=
"fieldName"
>
<el-form-item
:label=
"$t('pubactivities.fieldName')+':'"
prop=
"fieldName"
ref=
"formfieldName"
>
<el-input
@
input=
"$forceUpdate()"
:disabled=
"contactsform.fieldType == 10"
style=
"width:370px;"
maxlength=
"36"
v-model=
"contactsform.fieldName"
:placeholder=
"$t('pubactivities.plfieldName')"
></el-input>
<el-input
@
input=
"$forceUpdate()"
:disabled=
"contactsform.fieldType == 10"
style=
"width:370px;"
maxlength=
"36"
v-model=
"contactsform.fieldName"
:placeholder=
"$t('pubactivities.plfieldName')"
></el-input>
<el-checkbox
:disabled=
"contactsform.fieldType == 9 || contactsform.fieldType == 10"
style=
"margin-left: 15px"
v-model=
"isCheck"
>
{{$t('pubactivities.required')}}
</el-checkbox>
<el-checkbox
:disabled=
"contactsform.fieldType == 9 || contactsform.fieldType == 10"
style=
"margin-left: 15px"
v-model=
"isCheck"
>
{{$t('pubactivities.required')}}
</el-checkbox>
</el-form-item>
</el-form-item>
...
@@ -988,6 +988,7 @@
...
@@ -988,6 +988,7 @@
this
.
valuelist
=
[{},{}];
this
.
valuelist
=
[{},{}];
}
else
if
(
val
==
10
){
}
else
if
(
val
==
10
){
this
.
contactsform
.
fieldName
=
this
.
$t
(
'releasejson.addbp'
);
this
.
contactsform
.
fieldName
=
this
.
$t
(
'releasejson.addbp'
);
this
.
$refs
.
formfieldName
.
clearValidate
();
this
.
isCheck
=
false
;
this
.
isCheck
=
false
;
}
else
if
(
val
==
9
){
}
else
if
(
val
==
9
){
this
.
isCheck
=
false
;
this
.
isCheck
=
false
;
...
...
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