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
a13e7a8a
Commit
a13e7a8a
authored
Dec 10, 2020
by
zhangyanni
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
90ce3eb6
c9fc98e2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
8 deletions
+10
-8
PageBottom.vue
src/components/index/PageBottom.vue
+3
-3
networkSearch.vue
src/views/netWorkpage/networkSearch.vue
+3
-2
networkring.vue
src/views/netWorkpage/networkring.vue
+1
-0
tabNewsbar.vue
src/views/peoplehomepage/tabNewsbar.vue
+2
-2
tabTopicbar.vue
src/views/peoplehomepage/tabTopicbar.vue
+1
-1
No files found.
src/components/index/PageBottom.vue
View file @
a13e7a8a
...
...
@@ -15,9 +15,9 @@
<p
@
click=
"$router.push('/feedbackpage')"
>
{{
$t
(
"Otherjson.Feedback"
)
}}
</p>
</div>
<div
class=
"gendisplay"
style=
"text-align: left;margin-top: 20px;font-size: 12px;"
>
<div
style=
"width: 2
0
0px;margin-right: 50px;"
>
<p
style=
"height: 20px;line-height: 20px;"
><span
class=
"iconfont icon-envelope"
></span><span
style=
"margin-left: 15px;"
>
service@techbook.com.cn
</span></p>
<p
style=
"height: 20px;line-height: 20px;"
><span
class=
"iconfont icon-phone"
style=
"color: #69697A;"
></span><span
style=
"margin:10px 0 0 15px;word-break: break-all;display: inline-block;"
>
0316-6175185
</span></p>
<div
style=
"width: 2
3
0px;margin-right: 50px;"
>
<p
style=
"height: 20px;line-height: 20px;
width: 230px;
"
><span
class=
"iconfont icon-envelope"
></span><span
style=
"margin-left: 15px;"
>
service@techbook.com.cn
</span></p>
<p
style=
"height: 20px;line-height: 20px;
width: 230px;
"
><span
class=
"iconfont icon-phone"
style=
"color: #69697A;"
></span><span
style=
"margin:10px 0 0 15px;word-break: break-all;display: inline-block;"
>
0316-6175185
</span></p>
</div>
<div>
<div
class=
"gendisplay"
>
...
...
src/views/netWorkpage/networkSearch.vue
View file @
a13e7a8a
...
...
@@ -97,7 +97,7 @@
},
getuserSearch
(){
// let empInfo = this.publicFun.getUserInfoCookieType()?JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())):undefined;
let
keyword
=
this
.
searchkey
?
'&keyword='
+
this
.
searchkey
:
''
;
let
keyword
=
this
.
linsearchkey
?
'&keyword='
+
this
.
lin
searchkey
:
''
;
let
params
=
'pageIndex='
+
this
.
cur_page
+
'&pageSize='
+
this
.
numberData
;
api
.
userSearch
(
params
+
keyword
).
then
((
response
)
=>
{
if
(
response
.
code
==
0
){
...
...
@@ -126,8 +126,9 @@
searchDetail
(){
if
(
this
.
searchkey
.
length
>=
1
){
this
.
$router
.
push
({
path
:
"/networkSearch"
,
query
:{
key
:
this
.
Base64
.
encode
(
this
.
searchkey
)}});
this
.
publicFun
.
setUserInfoCookie
(
"searchkey"
,
this
.
Base64
.
encode
(
this
.
searchkey
));
this
.
cur_page
=
1
;
this
.
linsearchkey
=
this
.
searchkey
;
this
.
linsearchkey
=
this
.
Base64
.
decode
(
this
.
publicFun
.
getCookie
(
"searchkey"
))
;
this
.
getuserSearch
();
}
},
...
...
src/views/netWorkpage/networkring.vue
View file @
a13e7a8a
...
...
@@ -133,6 +133,7 @@
},
searchDetail
(){
if
(
this
.
searchkey
.
length
>=
1
){
this
.
publicFun
.
setUserInfoCookie
(
"searchkey"
,
this
.
Base64
.
encode
(
this
.
searchkey
));
this
.
$router
.
push
({
path
:
"/networkSearch"
,
query
:{
key
:
this
.
Base64
.
encode
(
this
.
searchkey
)}});
}
},
...
...
src/views/peoplehomepage/tabNewsbar.vue
View file @
a13e7a8a
...
...
@@ -47,7 +47,7 @@
我不同意添加
<i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
为联系人
</span>
<span
v-else
>
<i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
不同意
添加我
为联系人
<i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
不同意
您添加TA
为联系人
</span>
</p>
<p
v-if=
"item.messageType == 5"
><i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
赞了您的评论
</p>
...
...
@@ -56,7 +56,7 @@
我同意添加
<i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
为联系人
</span>
<span
v-else
>
<i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
同意
添加我
为联系人
<i
@
click=
"tohome(item)"
>
{{
item
.
empName
}}
</i>
同意
您添加TA
为联系人
</span>
</p>
</div>
...
...
src/views/peoplehomepage/tabTopicbar.vue
View file @
a13e7a8a
...
...
@@ -22,7 +22,7 @@
<span
class=
"ellipsisFont1"
style=
"max-width: calc(100% - 50px);margin-right: 15px;font-weight: bold;"
>
#
{{
item
.
topicTitle
}}
#
</span>
<i
v-if=
"item.isOpenReward == 1"
class=
"iconfont icon-hongbao-"
style=
"color: #FF5D5D;font-size: 20px;"
></i>
</p>
<p
class=
"ellipsisFont2"
style=
"color:#69697A;margin: 10px 0 10px;font-size: 14px;line-height: 22px;height: 44px;"
>
{{
item
.
topicDescription
}}
</p>
<p
class=
"ellipsisFont2"
style=
"color:#69697A;margin: 10px 0 10px;font-size: 14px;line-height: 22px;height: 44px;
width: 100%;overflow: hidden;
"
>
{{
item
.
topicDescription
}}
</p>
<div
class=
"gendisplay"
style=
"color: #AAAAAA;font-size: 12px;line-height: 28px;"
>
<span
v-if=
"item.isOpenReward!=1&&item.professorCount!=0"
class=
"ellipsisFont1"
style=
"margin-right: 20px;max-width: 200px;height: 28px;color:#5D78FF;"
>
专家入驻
{{
item
.
professorCount
}}
位
</span>
<span
v-if=
"item.isOpenReward==1||item.professorCount==0"
class=
"ellipsisFont1"
style=
"margin-right: 20px;max-width: 200px;height: 28px;"
>
发起方:
<i
style=
"color:#5D78FF;"
>
{{
item
.
topicInitiator
}}
</i></span>
...
...
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