Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
A
admin-base
Project
Project
Details
Activity
Releases
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
new-sing
admin-base
Commits
2edd3261
Commit
2edd3261
authored
Jan 07, 2019
by
chenfenglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化样式
parent
b1865021
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
36 additions
and
27 deletions
+36
-27
index.vue
src/components/achievement/index.vue
+0
-3
entrance.vue
src/components/notBuyClass/entrance.vue
+1
-1
index.vue
src/components/oldUser/index.vue
+4
-8
dialog.vue
src/components/qrcode/dialog.vue
+6
-3
autoReply.vue
src/components/weChat/autoReply.vue
+19
-10
autoReplyDialog.vue
src/components/weChat/autoReplyDialog.vue
+6
-2
No files found.
src/components/achievement/index.vue
View file @
2edd3261
...
@@ -152,9 +152,6 @@
...
@@ -152,9 +152,6 @@
this
.
searchFirstPage
();
this
.
searchFirstPage
();
},
},
methods
:
{
methods
:
{
a
(
a
,
b
){
return
a
-
b
},
handleClick
(
tab
)
{
handleClick
(
tab
)
{
let
_name
=
tab
.
name
let
_name
=
tab
.
name
if
(
_name
===
'first'
)
{
if
(
_name
===
'first'
)
{
...
...
src/components/notBuyClass/entrance.vue
View file @
2edd3261
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
goods_id
:
null
,
goods_id
:
null
,
activeName
:
'first'
,
activeName
:
'first'
,
searchFrom
:{
searchFrom
:{
key
:
'goods_receive_course
'
,
key
:
'goods_receive_course'
,
desc
:
'商品'
,
desc
:
'商品'
,
value
:
''
,
value
:
''
,
},
},
...
...
src/components/oldUser/index.vue
View file @
2edd3261
<
template
>
<
template
>
<div
class=
"user"
v-loading=
"loading"
>
<div
class=
"user"
>
<el-form
ref=
"searchFrom"
:model=
"searchFrom"
label-width=
"80px"
inline
>
<el-form
ref=
"searchFrom"
:model=
"searchFrom"
label-width=
"80px"
inline
>
<el-form-item
label=
"用户ID"
>
<el-form-item
label=
"用户ID"
>
<el-input
v-model=
"searchFrom.old_user_id"
></el-input>
<el-input
v-model=
"searchFrom.old_user_id"
></el-input>
...
@@ -57,18 +57,15 @@
...
@@ -57,18 +57,15 @@
data
(){
data
(){
return
{
return
{
searchFrom
:{
searchFrom
:{
nickName
:
''
,
mobile
:
''
,
mobile
:
''
,
level
:
''
,
old_user_id
:
""
,
userId
:
''
course_title
:
""
},
},
userList
:[],
userList
:[],
total
:
0
,
total
:
0
,
nowPage
:
1
,
nowPage
:
1
,
limit
:
10
,
limit
:
10
,
showDetail
:
false
,
showDetail
:
false
showId
:
''
,
loading
:
false
}
}
},
},
components
:{
components
:{
...
@@ -101,7 +98,6 @@
...
@@ -101,7 +98,6 @@
if
(
this
.
searchFrom
.
mobile
)
{
if
(
this
.
searchFrom
.
mobile
)
{
json
.
mobile
=
this
.
searchFrom
.
mobile
json
.
mobile
=
this
.
searchFrom
.
mobile
}
}
console
.
log
(
json
)
getOldListApi
(
json
).
then
(
res
=>
{
getOldListApi
(
json
).
then
(
res
=>
{
this
.
userList
=
res
.
list
;
this
.
userList
=
res
.
list
;
this
.
total
=
res
.
total
this
.
total
=
res
.
total
...
...
src/components/qrcode/dialog.vue
View file @
2edd3261
...
@@ -373,7 +373,7 @@
...
@@ -373,7 +373,7 @@
<
style
scoped
>
<
style
scoped
>
.shotcut
{
.shotcut
{
width
:
50px
;
width
:
1
50px
;
}
}
.clear-both
:after
{
.clear-both
:after
{
content
:
''
;
content
:
''
;
...
@@ -382,9 +382,12 @@
...
@@ -382,9 +382,12 @@
}
}
.news-media
{
.news-media
{
padding
:
10px
;
padding
:
10px
;
width
:
20
0px
;
width
:
15
0px
;
background-color
:
#fff
;
background-color
:
#fff
;
}
}
.news-media
.el-card
{
padding
:
10px
;
}
.news-media
img
{
.news-media
img
{
width
:
100%
;
width
:
100%
;
}
}
...
@@ -405,7 +408,7 @@
...
@@ -405,7 +408,7 @@
font-size
:
14px
;
font-size
:
14px
;
}
}
.single-cover
{
.single-cover
{
/*padding: 20px 15px 15px;*/
padding
:
20px
15px
15px
;
}
}
.muti-cover
{
.muti-cover
{
position
:
relative
;
position
:
relative
;
...
...
src/components/weChat/autoReply.vue
View file @
2edd3261
...
@@ -17,16 +17,22 @@
...
@@ -17,16 +17,22 @@
<el-form
label-position=
"top"
class=
"demo-table-expand"
>
<el-form
label-position=
"top"
class=
"demo-table-expand"
>
<el-form-item
label=
"回复内容"
>
<el-form-item
label=
"回复内容"
>
<div
v-for=
"(item, index) in props.row.desc"
>
<div
v-for=
"(item, index) in props.row.desc"
>
<span
style=
"width:120px;display: inline-block;text-align:right;margin:10px 0;"
>
回复
{{
index
+
1
}}
(
{{
item
.
type
|
type
}}
):
回复
{{
index
+
1
}}
(
{{
item
.
type
|
type
}}
):
</span>
<span
v-if=
"item.content && item.type==='text'"
>
<span
v-if=
"item.content && item.type==='text'"
>
<span
v-html=
"item.content.replace(/\/[\u4E00-\u9FA5]
{1,3}/gi, emotion)">
</span>
<span
v-html=
"item.content.replace(/\/[\u4E00-\u9FA5]
{1,3}/gi, emotion)">
</span>
</span>
</span>
<span
v-if=
"item.content && item.type==='image'"
>
回复
{{
index
+
1
}}
:
<img
class=
"img"
:src=
"item.content"
/></span>
<span
v-if=
"item.content && item.type==='image'"
>
<span
v-if=
"item.type==='image' && item.variable"
>
回复
{{
index
+
1
}}
:老师二维码
</span>
<!-- 回复
{{
index
+
1
}}
-->
<img
class=
"img"
:src=
"item.content"
style=
"vertical-align:text-top;"
/></span>
<span
v-if=
"item.type==='image' && item.variable"
>
<!-- 回复
{{
index
+
1
}}
: -->
老师二维码
</span>
<a
v-if=
"item.type === 'video'"
:href=
"item.content.down_url"
target=
"_blank"
>
{{
item
.
content
.
title
}}
</a>
<a
v-if=
"item.type === 'video'"
:href=
"item.content.down_url"
target=
"_blank"
>
{{
item
.
content
.
title
}}
</a>
<div
v-if=
"item.type==='news' && item.content && item.content.news_item"
class=
"news-media"
style=
"display: inline-block;width:
150px
;"
>
<div
v-if=
"item.type==='news' && item.content && item.content.news_item"
class=
"news-media"
style=
"display: inline-block;width:
200px;vertical-align:text-top
;"
>
<el-card
:body-style=
"
{ padding: '0px' }">
<el-card
:body-style=
"
{ padding: '0px' }">
<div
v-for=
"(child, childIndex) in item.content.news_item"
style=
"position: relative"
>
<div
v-for=
"(child, childIndex) in item.content.news_item"
style=
"position: relative
;
"
>
<div
v-if=
"item.content.news_item.length === 1"
class=
"single-cover"
>
<div
v-if=
"item.content.news_item.length === 1"
class=
"single-cover"
>
<div
class=
"title"
>
{{
child
.
title
}}
</div>
<div
class=
"title"
>
{{
child
.
title
}}
</div>
<img
:src=
"child.thumb_url"
style=
"width: 100%;margin-top: 20px;"
/>
<img
:src=
"child.thumb_url"
style=
"width: 100%;margin-top: 20px;"
/>
...
@@ -35,7 +41,7 @@
...
@@ -35,7 +41,7 @@
预览文章
预览文章
</a>
</a>
</div>
</div>
<div
v-else-if=
"item.content.news_item.length > 1"
class=
"clear-both bottomCover"
style=
"position: relative"
>
<div
v-else-if=
"item.content.news_item.length > 1"
class=
"clear-both bottomCover"
style=
"position: relative
;
"
>
<div
v-if=
"childIndex === 0"
class=
"muti-cover"
>
<div
v-if=
"childIndex === 0"
class=
"muti-cover"
>
<img
style=
"width: 100%;margin-top: 20px;"
:src=
"child.thumb_url"
/>
<img
style=
"width: 100%;margin-top: 20px;"
:src=
"child.thumb_url"
/>
<div
class=
"bottom-title"
>
{{
child
.
title
}}
</div>
<div
class=
"bottom-title"
>
{{
child
.
title
}}
</div>
...
@@ -51,7 +57,7 @@
...
@@ -51,7 +57,7 @@
</div>
</div>
</el-card>
</el-card>
</div>
</div>
<div
v-if=
"item.type === 'link'"
class=
"news-media"
style=
"display: inline-block;width:
150px
;"
>
<div
v-if=
"item.type === 'link'"
class=
"news-media"
style=
"display: inline-block;width:
200px;vertical-align:text-top
;"
>
<el-card
:body-style=
"
{ padding: '0px' }">
<el-card
:body-style=
"
{ padding: '0px' }">
<a
:href=
"item.url"
target=
"_blank"
style=
"position: relative; color: #333; text-decoration: none;"
>
<a
:href=
"item.url"
target=
"_blank"
style=
"position: relative; color: #333; text-decoration: none;"
>
<div
style=
"margin: 3px;line-height: 2"
class=
"ellip"
>
{{
item
.
title
}}
</div>
<div
style=
"margin: 3px;line-height: 2"
class=
"ellip"
>
{{
item
.
title
}}
</div>
...
@@ -62,7 +68,7 @@
...
@@ -62,7 +68,7 @@
</a>
</a>
</el-card>
</el-card>
</div>
</div>
<div
v-else-if=
"item.type === 'news-item'"
style=
"width:
150px;
"
>
<div
v-else-if=
"item.type === 'news-item'"
style=
"width:
200px;display: inline-block;vertical-align:text-top;"
class=
"news-media
"
>
<el-card
:body-style=
"
{ padding: '0px' }">
<el-card
:body-style=
"
{ padding: '0px' }">
<a
:href=
"item.url"
target=
"_blank"
style=
"position: relative; color: #333; text-decoration: none;"
>
<a
:href=
"item.url"
target=
"_blank"
style=
"position: relative; color: #333; text-decoration: none;"
>
<img
:src=
"item.thumb_url"
style=
"width: 100%; height: auto"
/>
<img
:src=
"item.thumb_url"
style=
"width: 100%; height: auto"
/>
...
@@ -246,15 +252,17 @@
...
@@ -246,15 +252,17 @@
margin: 10px 0;
margin: 10px 0;
}
}
.img {
.img {
width:
10%
;
width:
200px
;
}
}
.news-media {
.news-media {
padding: 10px;
width: 25%;
width: 25%;
}
}
.news-media img{
.news-media img{
width: 100%;
width: 100%;
}
}
.news-media .el-card{
padding: 10px;
}
.s-news img {
.s-news img {
width: 50px;
width: 50px;
float: right;
float: right;
...
@@ -272,7 +280,8 @@
...
@@ -272,7 +280,8 @@
font-size: 14px;
font-size: 14px;
}
}
.single-cover {
.single-cover {
/*padding: 20px 15px 15px;*/
padding: 15px 10px 10px;
line-height: 1.2;
}
}
.muti-cover {
.muti-cover {
position: relative;
position: relative;
...
...
src/components/weChat/autoReplyDialog.vue
View file @
2edd3261
...
@@ -877,7 +877,8 @@
...
@@ -877,7 +877,8 @@
margin: 30px 0;
margin: 30px 0;
width: 600px;
width: 600px;
img {
img {
width: 30%;
width: 150px;
padding: 10px;
}
}
}
}
.msg-text {
.msg-text {
...
@@ -996,6 +997,9 @@
...
@@ -996,6 +997,9 @@
.news-media {
.news-media {
padding: 10px;
padding: 10px;
width: 25%;
width: 25%;
}
.news-media .el-card{
padding: 10px;
}
}
.news-media img{
.news-media img{
width: 100%;
width: 100%;
...
@@ -1017,7 +1021,7 @@
...
@@ -1017,7 +1021,7 @@
font-size: 14px;
font-size: 14px;
}
}
.single-cover {
.single-cover {
/*padding: 20px 15px 15px;*/
padding: 15px 10px 10px;
}
}
.muti-cover {
.muti-cover {
position: relative;
position: relative;
...
...
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