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
d0fbef53
Commit
d0fbef53
authored
Nov 04, 2020
by
zhangyanni
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
a9b21d67
a5e35a08
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
120 additions
and
57 deletions
+120
-57
common.scss
public/css/common.scss
+4
-3
index.css
public/css/index.css
+3
-0
PageBottom.vue
src/components/index/PageBottom.vue
+2
-2
PageTopindex.vue
src/components/index/PageTopindex.vue
+25
-11
mbByCodeCmpt.vue
src/components/login/mbByCodeCmpt.vue
+9
-4
mbByPwdCmpt.vue
src/components/login/mbByPwdCmpt.vue
+10
-6
main.js
src/main.js
+2
-2
redenvelopes.vue
src/views/assistantpage/redenvelopes.vue
+10
-5
contentdetail.vue
src/views/conmanagementpage/contentdetail.vue
+1
-1
successfulcase.vue
src/views/cooperationcaseview/successfulcase.vue
+1
-1
eventdetail.vue
src/views/findeventpage/eventdetail.vue
+3
-1
eventpage.vue
src/views/findeventpage/eventpage.vue
+2
-1
myevent.vue
src/views/findeventpage/myevent.vue
+3
-3
index.vue
src/views/index/pages/index.vue
+1
-1
industrypage.vue
src/views/industryreportspage/industrypage.vue
+9
-2
dialogintegralbar.vue
src/views/integralpage/dialogintegralbar.vue
+15
-0
mobileLoginCmpt.vue
src/views/loginregister/pages/mobileLoginCmpt.vue
+8
-2
commentdetail.vue
src/views/topicpage/commentdetail.vue
+3
-3
discussall.vue
src/views/topicpage/discussall.vue
+1
-1
discussdialog.vue
src/views/topicpage/discussdialog.vue
+1
-1
topicdetail.vue
src/views/topicpage/topicdetail.vue
+6
-6
vue.config.js
vue.config.js
+1
-1
No files found.
public/css/common.scss
View file @
d0fbef53
...
...
@@ -1918,11 +1918,12 @@ i {
.foutdiv
{
min-height
:
600px
;
background
:
#ffffff
;
width
:
1
200px
;
margin
:
0
auto
;
width
:
1
00%
;
}
.divlayoutchild
{
margin-top
:
25px
;
margin
:
25px
auto
;
width
:
1200px
;
>
div
{
display
:
-
webkit-flex
;
/*新版本语法:chrome 21+*/
display
:
-
webkit-box
;
/*老版本语法:Safari,iOS,Android browser,old Webkit browser*/
...
...
public/css/index.css
View file @
d0fbef53
...
...
@@ -6502,6 +6502,9 @@
.el-loading-mask.is-fullscreen
{
position
:
fixed
}
.el-loading-parent--hidden
{
overflow
:
auto
!important
;
}
.el-loading-mask.is-fullscreen
.el-loading-spinner
{
margin-top
:
-25px
...
...
src/components/index/PageBottom.vue
View file @
d0fbef53
...
...
@@ -179,8 +179,8 @@
}
.bottomInfo
{
padding
:
30px
120px
;
max-width
:
1436
px
;
padding
:
30px
0
;
width
:
1200
px
;
margin
:
0
auto
;
}
.bottomCopyright
{
...
...
src/components/index/PageTopindex.vue
View file @
d0fbef53
...
...
@@ -156,6 +156,13 @@
</el-drawer>
</div>
<el-dialog
:visible
.
sync=
"expertVisible"
width=
"500px"
:append-to-body=
"true"
:close-on-click-modal=
"false"
>
<div
v-if=
"expertVisible"
class=
"loginform"
style=
"width: 320px;margin: 0 auto;text-align: center;"
>
<loginbar
:tocurrent=
"true"
></loginbar>
</div>
</el-dialog>
<wxexpertVisible
ref=
"wxlogin"
@
dataEvent=
"successlogin"
></wxexpertVisible>
</div>
</
template
>
...
...
@@ -165,6 +172,7 @@
import
api
from
"../../views/loginregister/api/api"
;
import
$
from
'jquery'
;
import
wxexpertVisible
from
"../../views/index/pages/wxlogin"
;
import
loginbar
from
'../../views/loginregister/pages/mobileLoginCmpt'
//非必要
export
default
{
name
:
"PageTopindex"
,
...
...
@@ -199,13 +207,14 @@
direction
:
'rtl'
,
positions
:
false
,
keyword_search
:
false
,
expertVisible
:
false
,
hrefweb
:
"https://open.weixin.qq.com/connect/qrconnect?appid=wxf7c7984d24495e1d&redirect_uri="
+
encodeURIComponent
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
'#/pcauth'
)
+
"&response_type=code&scope=snsapi_login&state=#wechat_redirect"
,
}
},
props
:[
'tabpath'
],
components
:
{
wxexpertVisible
},
components
:
{
wxexpertVisible
,
loginbar
},
methods
:
{
//微信授权
wxopenlogin
(){
...
...
@@ -261,14 +270,16 @@
},
//登录
handleLogin
(){
if
(
this
.
$i18n
.
locale
==
"zh-CN"
)
this
.
$router
.
push
(
"/mobileLoginCmpt"
);
else
this
.
$router
.
push
(
'/emailLoginCmpt'
);
this
.
expertVisible
=
true
;
// if (this.$i18n.locale == "zh-CN") this.$router.push("/mobileLoginCmpt");
// else this.$router.push('/emailLoginCmpt');
},
//注册
handleRegister
(){
if
(
this
.
$i18n
.
locale
==
"zh-CN"
)
this
.
$router
.
push
(
"/mobileRegisterCmpt"
);
else
this
.
$router
.
push
(
'/emailRegisterCmpt'
);
this
.
expertVisible
=
true
;
// if (this.$i18n.locale == "zh-CN") this.$router.push("/mobileRegisterCmpt");
// else this.$router.push('/emailRegisterCmpt');
},
//抽屉 去哪里
handleTo
(
type
){
...
...
@@ -327,6 +338,10 @@
}
},
tabstate
(
path
){
if
(
path
==
'/topictype'
){
this
.
index_hover
=
4
;
return
}
for
(
let
i
in
this
.
indextab
){
if
(
path
==
this
.
indextab
[
i
].
path
||
path
==
this
.
indextab
[
i
].
pathchild
){
this
.
index_hover
=
this
.
indextab
[
i
].
id
...
...
@@ -357,10 +372,10 @@
width
:
100%
;
background
:
#FFFFFF
;
>
.topTitle
{
padding
:
15px
120px
;
padding
:
15px
0
;
text-align
:
left
;
position
:
relative
;
width
:
1
436
px
;
width
:
1
200
px
;
margin
:
0
auto
;
.topleft
{
>
p
{
...
...
@@ -406,7 +421,7 @@
.topright
{
line-height
:
30px
;
position
:
absolute
;
right
:
12
0px
;
right
:
0px
;
top
:
16px
;
color
:
#1A1A1E
;
}
...
...
@@ -442,11 +457,10 @@
.content_tab
{
background
:
#1E1E2D
;
>
div
{
width
:
1
436
px
;
width
:
1
200
px
;
margin
:
0
auto
;
justify-content
:
space-around
;
color
:
#FFFFFF
;
padding
:
0
120px
;
>
p
{
line-height
:
50px
;
padding
:
0
10px
;
...
...
@@ -511,7 +525,7 @@
-o-animation
:
fadeInOut
.5s
;
>
div
{
padding
:
0
120px
;
width
:
1436
px
;
min-width
:
1200
px
;
margin
:
0
auto
;
position
:
relative
;
}
...
...
src/components/login/mbByCodeCmpt.vue
View file @
d0fbef53
...
...
@@ -79,6 +79,7 @@
outSideParams
:
window
.
location
.
href
.
split
(
"?"
)?
window
.
location
.
href
.
split
(
"?"
)[
1
]:
null
}
},
props
:[
'tocurrent'
],
methods
:{
timeOutReturn
(){
...
...
@@ -148,10 +149,14 @@
if
(
!
res
.
result
){
this
.
$router
.
push
(
"/setPassword"
);
}
else
{
if
(
this
.
publicFun
.
isgetUserRoleFunc
(
1
))
this
.
$router
.
push
(
"/sys.user"
);
else
{
if
(
this
.
publicFun
.
isgetUserRoleFunc
(
8
)
||
this
.
publicFun
.
isgetUserRoleFunc
(
4
)
||
this
.
publicFun
.
isgetUserRoleFunc
(
7
))
this
.
$router
.
push
({
path
:
"/seeprojectlist"
,
query
:{
remind
:
true
}});
else
this
.
$router
.
push
(
"/seeprojectlist"
);
if
(
this
.
tocurrent
){
globalMsg
.
$emit
(
'islogin'
);
}
else
{
if
(
this
.
publicFun
.
isgetUserRoleFunc
(
1
))
this
.
$router
.
push
(
"/sys.user"
);
else
{
if
(
this
.
publicFun
.
isgetUserRoleFunc
(
8
)
||
this
.
publicFun
.
isgetUserRoleFunc
(
4
)
||
this
.
publicFun
.
isgetUserRoleFunc
(
7
))
this
.
$router
.
push
({
path
:
"/seeprojectlist"
,
query
:{
remind
:
true
}});
else
this
.
$router
.
push
(
"/seeprojectlist"
);
}
}
this
.
timeOutReturn
();
}
...
...
src/components/login/mbByPwdCmpt.vue
View file @
d0fbef53
...
...
@@ -51,6 +51,7 @@
outSideParams
:
window
.
location
.
href
.
split
(
"?"
)?
window
.
location
.
href
.
split
(
"?"
)[
1
]:
null
}
},
props
:[
'tocurrent'
],
methods
:{
timeOutReturn
(){
...
...
@@ -165,13 +166,16 @@
}
this
.
publicFun
.
setUserInfoCookieType
(
that
.
Base64
.
encode
(
JSON
.
stringify
(
data
)));
this
.
hasSetPassword
();
if
(
this
.
publicFun
.
isgetUserRoleFunc
(
1
))
this
.
$router
.
push
(
"/sys.user"
);
else
{
if
(
this
.
publicFun
.
isgetUserRoleFunc
(
8
)
||
this
.
publicFun
.
isgetUserRoleFunc
(
4
)
||
this
.
publicFun
.
isgetUserRoleFunc
(
7
))
this
.
$router
.
push
({
path
:
"/seeprojectlist"
,
query
:{
remind
:
true
}});
else
this
.
$router
.
push
(
"/seeprojectlist"
);
}
that
.
timeOutReturn
()
if
(
this
.
tocurrent
){
globalMsg
.
$emit
(
'islogin'
);
}
else
{
if
(
this
.
publicFun
.
isgetUserRoleFunc
(
1
))
this
.
$router
.
push
(
"/sys.user"
);
else
{
if
(
this
.
publicFun
.
isgetUserRoleFunc
(
8
)
||
this
.
publicFun
.
isgetUserRoleFunc
(
4
)
||
this
.
publicFun
.
isgetUserRoleFunc
(
7
))
this
.
$router
.
push
({
path
:
"/seeprojectlist"
,
query
:{
remind
:
true
}});
else
this
.
$router
.
push
(
"/seeprojectlist"
);
}
}
},
hasSetPassword
(){
...
...
src/main.js
View file @
d0fbef53
...
...
@@ -37,8 +37,8 @@ let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Androi
// }
if
(
publicFun
.
judgeBrandIsWechatOrHtml
()
==
1
){
require
(
'../public/css/pc.scss'
);
document
.
getElementsByTagName
(
"html"
)[
0
].
style
.
minWidth
=
"1
4
00px"
;
document
.
getElementsByTagName
(
"body"
)[
0
].
style
.
minWidth
=
"1
4
00px"
;
document
.
getElementsByTagName
(
"html"
)[
0
].
style
.
minWidth
=
"1
2
00px"
;
document
.
getElementsByTagName
(
"body"
)[
0
].
style
.
minWidth
=
"1
2
00px"
;
document
.
getElementsByTagName
(
"html"
)[
0
].
style
.
fontSize
=
"14px"
;
document
.
getElementsByTagName
(
"body"
)[
0
].
style
.
fontSize
=
"14px"
;
}
else
{
...
...
src/views/assistantpage/redenvelopes.vue
View file @
d0fbef53
...
...
@@ -34,7 +34,7 @@
<el-col
:span=
"12"
>
<el-input
style=
"width: 240px;margin-left: 20px;"
v-model=
"search.paramWords"
:placeholder=
"$t('commonTitle.searchOne')"
></el-input>
<el-button
type=
"primary"
style=
"width: 140px;margin-left: 20px"
@
click=
"
getDiscussStarsAxios
"
>
{{
$t
(
'operationjson.search'
)
}}
</el-button>
<el-button
type=
"primary"
style=
"width: 140px;margin-left: 20px"
@
click=
"
sousearch
"
>
{{
$t
(
'operationjson.search'
)
}}
</el-button>
</el-col>
</el-row>
<div
v-if=
"activeName == 'second'"
style=
"margin-top: 20px;"
>
...
...
@@ -87,7 +87,7 @@
</el-table-column>
<el-table-column
prop=
"starCreatedTime"
label=
"评级时间"
align=
"center"
width=
"120"
>
</el-table-column>
<el-table-column
prop=
"starRateReason"
label=
"评级理由"
align=
"center"
width=
"
1
20"
>
<el-table-column
prop=
"starRateReason"
label=
"评级理由"
align=
"center"
width=
"
2
20"
>
</el-table-column>
<el-table-column
label=
"状态"
align=
"center"
>
<
template
slot-scope=
"scope"
>
...
...
@@ -272,7 +272,7 @@
},
//确定随机金额
setamount
(){
this
.
$confirm
(
'确定要给 '
+
(
this
.
isamountlist
?
this
.
amountdata
.
emp
Name
:(
this
.
enticationlist
.
length
+
'人'
))
+
' 发放 '
+
this
.
amount
+
' 元红包么?'
,
{
this
.
$confirm
(
'确定要给 '
+
(
this
.
isamountlist
?
this
.
amountdata
.
nick
Name
:(
this
.
enticationlist
.
length
+
'人'
))
+
' 发放 '
+
this
.
amount
+
' 元红包么?'
,
{
cancelButtonText
:
'取消'
,
confirmButtonText
:
'确定'
,
type
:
''
,
...
...
@@ -316,6 +316,10 @@
this
.
numberData
=
val
;
this
.
getDiscussStarsAxios
();
},
sousearch
(){
this
.
cur_page
=
1
;
this
.
getDiscussStarsAxios
();
},
getDiscussStarsAxios
(){
let
params
=
{
pagination
:
{
...
...
@@ -331,6 +335,7 @@
if
(
response
.
code
==
0
)
{
this
.
discusslist
=
response
.
result
.
records
;
this
.
totalListResult
=
response
.
result
.
total
;
this
.
getDiscussAuthenticationCountAxios
();
}
else
{
this
.
$message
.
error
(
response
.
msgCode
);
}
...
...
@@ -417,7 +422,7 @@
type
:
''
,
customClass
:
'deleteConfirm'
}).
then
(()
=>
{
this
.
sendStarPacket
(
row
?
true
:
false
,
amount
,
this
.
amountdata
)
this
.
sendStarPacket
(
row
?
true
:
false
,
amount
,
row
)
}).
catch
(()
=>
{
this
.
expertVisible
=
false
;
});
...
...
@@ -476,7 +481,7 @@
},
mounted
()
{
this
.
getDiscussStarsAxios
();
this
.
getDiscussAuthenticationCountAxios
();
},
}
</
script
>
...
...
src/views/conmanagementpage/contentdetail.vue
View file @
d0fbef53
...
...
@@ -277,7 +277,7 @@
this
.
getselectContentById
(
true
);
}
if
(
params
.
addOrSubtractHot
){
this
.
$refs
.
childintegral
.
getintegralCode
(
'ITV005'
,
row
?
row
.
id
:
params
.
contentId
,
row
?
4
:
3
);
this
.
$refs
.
childintegral
.
getintegralCode
(
'ITV005'
,
row
?
row
.
id
:
params
.
contentId
,
row
?
4
:
3
,
true
);
}
}
else
{
this
.
$message
.
error
(
response
.
msg
);
...
...
src/views/cooperationcaseview/successfulcase.vue
View file @
d0fbef53
...
...
@@ -5,7 +5,7 @@
<p
style=
"margin-top: -150px;font-size: 34px;color: #ffffff"
>
{{
$t
(
'topNav.cooperationcase'
)
}}
</p>
<p
style=
"margin-top: 20px;font-size: 18px;color: #C8CBE0"
>
{{
$t
(
'Otherjson.caseson'
)
}}
{{
$t
(
'Otherjson.dynamics'
)
}}
</p>
</div>
<div
:class=
"showsd?'divclasschild':'divclass'"
>
<div
:class=
"showsd?'divclasschild':'divclass'"
style=
"width: 1200px;margin: 0 auto"
>
<div>
<div
v-for=
"(item,index) in datajson"
:key=
"index"
@
click=
"!showsd?$router.push(
{path:'/casedetails',query:{entid:item.id}}):$router.push({path:'/casedetailschild',query:{entid:item.id}})">
<img
:src=
"item.images"
alt=
"图片"
>
...
...
src/views/findeventpage/eventdetail.vue
View file @
d0fbef53
...
...
@@ -389,7 +389,9 @@
.divclasschild
{
margin
:
25px
120px
0
;
width
:
1200px
;
margin
:
0
auto
;
padding
:
25px
0
;
height
:
100%
;
position
:
relative
;
>
div
:nth-child
(
1
)
{
...
...
src/views/findeventpage/eventpage.vue
View file @
d0fbef53
...
...
@@ -316,7 +316,8 @@
<
style
scoped
lang=
"scss"
>
.divclasschild
{
margin
:
25px
120px
0
;
width
:
1200px
;
margin
:
25px
auto
;
}
.condition_top
{
...
...
src/views/findeventpage/myevent.vue
View file @
d0fbef53
...
...
@@ -88,7 +88,7 @@
if
(
row
.
baseLive
.
liveState
!=
0
){
if
(
this
.
userInfo
&&
this
.
userInfo
.
empId
==
row
.
createdBy
){
if
(
row
.
baseLive
.
liveState
==
1
||
row
.
baseLive
.
liveBack
==
0
){
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive
"
);
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive
?url="
+
liveUrl
);
}
}
else
{
if
(
row
.
baseLive
.
liveState
==
2
&&
row
.
baseLive
.
liveBack
==
0
){
...
...
@@ -96,7 +96,7 @@
this
.
$refs
.
login
.
isexpertVisible
();
return
}
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive
"
);
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive
?url="
+
liveUrl
);
}
else
{
if
(
row
.
baseLive
.
livePowers
==
0
&&
row
.
activityState
==
2
&&
row
.
isJoin
==
2
){
if
(
!
this
.
publicFun
.
getUserInfoCookieType
()){
...
...
@@ -114,7 +114,7 @@
this
.
$refs
.
login
.
isexpertVisible
();
return
}
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive
"
);
window
.
open
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
"#/eventlive
?url="
+
liveUrl
);
}
}
}
...
...
src/views/index/pages/index.vue
View file @
d0fbef53
...
...
@@ -161,7 +161,7 @@
<p
v-if=
"item.readCount"
>
{{
item
.
readCountStr
}}
{{
$t
(
'activityInfo.viewCount'
)
}}
</p>
</div>
</div>
<div
style=
"text-align: center;margin-top: 2
0
px;"
>
<div
style=
"text-align: center;margin-top: 2
5
px;"
>
<span
v-if=
"userInfo&&userInfo.empId!=item.createdBy||!userInfo"
>
<span
style=
"color: #0ABB87;padding: 6px 20px;border: 1px solid #0ABB87;border-radius: 20px;"
v-if=
"item.isJoin==1&&item.activityState != 3"
>
{{
$t
(
'activityInfo.hasApply'
)
}}
</span>
<span
v-if=
"item.activityState == 2&&item.isJoin==2"
><el-button
type=
"primary"
@
click=
"handleApply(item)"
round
plain
size=
"mini"
style=
"width: 90px;font-size: 14px;"
><i
style=
"font-weight: bold"
>
{{
$t
(
'activityInfo.freeApply'
)
}}
</i></el-button></span>
...
...
src/views/industryreportspage/industrypage.vue
View file @
d0fbef53
...
...
@@ -3,8 +3,8 @@
<div
style=
"bottom:100px;"
class=
"hendtop"
@
click=
"handleScrollTop"
v-if=
"positions"
>
<i
style=
"font-size: 24px;color: #9197B4;"
class=
"iconfont icon-dingbu"
></i>
</div>
<div
style=
"height: 200px;position: relative;"
>
<img
:src=
"$i18n.locale=='zh-CN'?require('../../assets/img/industryzh.png'):require('../../assets/img/industryen.png')"
style=
"width: 100%;height: 200px;"
>
<div
class=
"backimg"
:style=
"
{backgroundImage:'url('+($i18n.locale=='zh-CN'?require('../../assets/img/industryzh.png'):require('../../assets/img/industryen.png'))+')'}"
>
</div>
<div
class=
"divlayoutchild"
>
<div>
...
...
@@ -402,6 +402,13 @@
width
:
50px
;
}
}
.backimg
{
width
:
100%
;
height
:
200px
;
position
:
relative
;
background-size
:
100%
200px
;
background-repeat
:
no-repeat
;
}
.contentlist_li
{
/*cursor: pointer;*/
border-bottom
:
1px
solid
#E9EAF3
;
...
...
src/views/integralpage/dialogintegralbar.vue
View file @
d0fbef53
...
...
@@ -68,6 +68,21 @@
})
}
},
//文章积分签到
getintegralContent
(
datatype
,
id
,
state
)
{
api
.
integralCode
(
datatype
).
then
((
res
)
=>
{
if
(
res
.
code
==
0
)
{
if
(
res
.
result
!=
0
){
this
.
visible
=
true
;
this
.
integral
=
res
.
result
;
}
}
else
{
this
.
$message
.
error
(
res
.
msg
);
}
}).
catch
((
err
)
=>
{
this
.
$message
.
error
(
err
);
})
},
//积分列表首次进入
getgiveEmpRandomIntegral
(
state
){
api
.
giveEmpRandomIntegral
({
isFristGift
:
state
}).
then
(
response
=>
{
...
...
src/views/loginregister/pages/mobileLoginCmpt.vue
View file @
d0fbef53
...
...
@@ -3,12 +3,16 @@
<p>
{{
$t
(
"login.title"
)
}}
</p>
<el-tabs
v-model=
"activeName"
>
<el-tab-pane
:label=
"$t('login.phonePwdLogin')"
name=
"first"
>
<mbByPwdCmpt></mbByPwdCmpt>
<mbByPwdCmpt
:tocurrent=
"tocurrent"
></mbByPwdCmpt>
</el-tab-pane>
<el-tab-pane
:label=
"$t('login.phoneCodeLogin')"
name=
"second"
>
<mbByCodeCmpt></mbByCodeCmpt>
<mbByCodeCmpt
:tocurrent=
"tocurrent"
></mbByCodeCmpt>
</el-tab-pane>
</el-tabs>
<div
v-if=
"$i18n.locale=='zh-CN'&&tocurrent"
style=
"margin-top: -20px;text-align: center;"
>
<el-divider>
其他登录方式
</el-divider>
<p><a
:href=
"hrefweb"
><i
style=
"color: #00C800;font-size: 28px;"
class=
"iconfont icon-gongzhonghao"
></i></a></p>
</div>
</div>
</
template
>
...
...
@@ -21,9 +25,11 @@
mbByPwdCmpt
,
mbByCodeCmpt
},
props
:[
'tocurrent'
],
data
()
{
return
{
activeName
:
"first"
,
hrefweb
:
"https://open.weixin.qq.com/connect/qrconnect?appid=wxf7c7984d24495e1d&redirect_uri="
+
encodeURIComponent
(
this
.
publicFun
.
getCurrentHrefEnv
()
+
'#/pcauth'
)
+
"&response_type=code&scope=snsapi_login&state=#wechat_redirect"
,
}
},
methods
:
{
...
...
src/views/topicpage/commentdetail.vue
View file @
d0fbef53
...
...
@@ -378,9 +378,9 @@
<el-form
label-position=
"right"
label-width=
"10px"
:model=
"expertData"
style=
"margin-top: 20px;"
>
<el-form-item
label=
""
>
<el-radio-group
v-model=
"expertData.starRate"
>
<el-radio
label=
"
0
"
><i
class=
"iconfont icon-xingxing"
style=
"color: #FF5D5D;"
></i></el-radio>
<el-radio
style=
"margin:0 80px 0 50px;"
label=
"
1
"
><i
v-for=
"item in 2"
class=
"iconfont icon-xingxing"
style=
"color: #FF5D5D;"
></i></el-radio>
<el-radio
label=
"
2
"
><i
v-for=
"item in 3"
class=
"iconfont icon-xingxing"
style=
"color: #FF5D5D;"
></i></el-radio>
<el-radio
label=
"
1
"
><i
class=
"iconfont icon-xingxing"
style=
"color: #FF5D5D;"
></i></el-radio>
<el-radio
style=
"margin:0 80px 0 50px;"
label=
"
2
"
><i
v-for=
"item in 2"
class=
"iconfont icon-xingxing"
style=
"color: #FF5D5D;"
></i></el-radio>
<el-radio
label=
"
3
"
><i
v-for=
"item in 3"
class=
"iconfont icon-xingxing"
style=
"color: #FF5D5D;"
></i></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
label=
""
>
...
...
src/views/topicpage/discussall.vue
View file @
d0fbef53
...
...
@@ -56,7 +56,7 @@
</p>
<div
style=
"padding-left: 15px;font-size: 12px;width: calc(100% - 100px);"
>
<p
class=
"gendisplay"
>
<span
class=
"ellipsisFont1"
style=
"color:#1A1A1E;font-size: 14px;font-weight: bold;max-width: calc(100% -
5
0px);height: 18px;overflow: hidden;"
>
#
{{
itemchild
.
topicTitle
}}
#
</span>
<span
class=
"ellipsisFont1"
style=
"color:#1A1A1E;font-size: 14px;font-weight: bold;max-width: calc(100% -
1
0px);height: 18px;overflow: hidden;"
>
#
{{
itemchild
.
topicTitle
}}
#
</span>
<i
v-if=
"itemchild.isOpenReward == 1"
class=
"iconfont icon-hongbao-"
style=
"color: #FF5D5D;font-size: 17px;"
></i>
</p>
<div
style=
"line-height: 24px;margin-top: 5px;"
>
...
...
src/views/topicpage/discussdialog.vue
View file @
d0fbef53
...
...
@@ -78,8 +78,8 @@
</div>
</div>
<el-row
style=
"padding-top: 20px;text-align: center"
>
<el-button
type=
"primary"
@
click=
"pushdiscuss"
:disabled=
"btnpush"
>
确定
</el-button>
<el-button
@
click=
"closeSensor"
>
取 消
</el-button>
<el-button
type=
"primary"
@
click=
"pushdiscuss"
:disabled=
"btnpush"
>
确定
</el-button>
</el-row>
</el-dialog>
</div>
...
...
src/views/topicpage/topicdetail.vue
View file @
d0fbef53
...
...
@@ -126,7 +126,7 @@
<el-tab-pane
label=
"精华"
name=
"second"
></el-tab-pane>
</el-tabs>
</div>
<div
v-if=
"
contentList.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&&discussTopList.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>
...
...
@@ -552,9 +552,9 @@
<el-form
label-position=
"right"
label-width=
"10px"
:model=
"expertData"
style=
"margin-top: 20px;"
>
<el-form-item
label=
""
>
<el-radio-group
v-model=
"expertData.starRate"
>
<el-radio
label=
"
0
"
><i
class=
"iconfont icon-xingxing"
style=
"color: #FF5D5D;"
></i></el-radio>
<el-radio
style=
"margin:0 80px 0 50px;"
label=
"
1
"
><i
v-for=
"item in 2"
class=
"iconfont icon-xingxing"
style=
"color: #FF5D5D;"
></i></el-radio>
<el-radio
label=
"
2
"
><i
v-for=
"item in 3"
class=
"iconfont icon-xingxing"
style=
"color: #FF5D5D;"
></i></el-radio>
<el-radio
label=
"
1
"
><i
class=
"iconfont icon-xingxing"
style=
"color: #FF5D5D;"
></i></el-radio>
<el-radio
style=
"margin:0 80px 0 50px;"
label=
"
2
"
><i
v-for=
"item in 2"
class=
"iconfont icon-xingxing"
style=
"color: #FF5D5D;"
></i></el-radio>
<el-radio
label=
"
3
"
><i
v-for=
"item in 3"
class=
"iconfont icon-xingxing"
style=
"color: #FF5D5D;"
></i></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
label=
""
>
...
...
@@ -989,11 +989,11 @@
api
.
selectNormalDiscussList
(
params
).
then
(
response
=>
{
if
(
response
.
code
==
0
)
{
response
.
result
.
records
.
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
.
discussContentlin
=
this
.
publicFun
.
getTitlewith
(
item
.
pcState
==
0
?(
item
.
discussContent
&&
item
.
discussContent
.
length
>
250
?
item
.
discussContent
.
slice
(
0
,
250
):
item
.
discussContent
?
item
.
discussContent
:
''
):(
item
.
simpleContent
&&
item
.
simpleContent
.
length
>
250
?
item
.
simpleContent
.
slice
(
0
,
250
):
item
.
simpleContent
?
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
.
alltext
=
item
.
pcState
==
0
?(
item
.
discussContent
&&
item
.
discussContent
.
length
>
140
?
true
:
false
):(
item
.
simpleContent
&&
item
.
simpleContent
.
length
>
140
?
true
:
false
);
//讨论全文是否展开
item
.
visibledian
=
false
;
//讨论右上角操作
item
.
wordarea
=
''
;
//评论文字
item
.
commentsState
=
true
;
//公开私密
...
...
vue.config.js
View file @
d0fbef53
...
...
@@ -158,7 +158,7 @@ module.exports = {
disableHostCheck
:
true
,
proxy
:
{
'/'
:
{
target
:
'http://1
27.0.0.1:8673'
,
//172.25.20.12 172.25.20.210
//http://3qc7pu.natappfree.cc//http://101.201.78.24:8673http://mqp67k.natappfree.cc// http://172.25.20.28:8673 http://101.201.78.24:8673// http://127.0.0.1:8673 http://101.201.78.24:8673
target
:
'http://1
01.201.78.24:8673'
,
//172.25.22.249
//http://3qc7pu.natappfree.cc//http://101.201.78.24:8673http://mqp67k.natappfree.cc// http://172.25.20.28:8673 http://101.201.78.24:8673// http://127.0.0.1:8673 http://101.201.78.24:8673
ws
:
false
,
changeOrigin
:
true
,
pathRewrite
:
{
...
...
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