Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
memberTag-web
Overview
Overview
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
memberTag
memberTag-web
Commits
36ba085d
Commit
36ba085d
authored
Nov 30, 2018
by
xiaohai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
样式优化
parent
1da13c3b
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
16 additions
and
15 deletions
+16
-15
default.png
src/assets/group/default.png
+0
-0
member_img.png
src/assets/group/member_img.png
+0
-0
addTagView.vue
src/components/addTagView.vue
+1
-1
tagCategorySmall.vue
src/components/tagCategorySmall.vue
+2
-3
index.vue
src/view/index/index.vue
+1
-1
manualTagEdit.vue
src/view/manualTag/manualTagEdit.vue
+3
-3
index.vue
src/view/memberGroup/index.vue
+1
-1
memberGroupDetail.vue
src/view/memberGroup/memberGroupDetail.vue
+8
-6
No files found.
src/assets/group/default.png
deleted
100644 → 0
View file @
1da13c3b
6.85 KB
src/assets/group/member_img.png
0 → 100644
View file @
36ba085d
1.98 KB
src/components/addTagView.vue
View file @
36ba085d
...
...
@@ -65,7 +65,7 @@
ref=
"templateTable"
:data=
"temporaryData"
tooltip-effect=
"dark"
height=
"
51
0"
height=
"
48
0"
style=
"width: 100%"
@
select=
"selectRow"
@
select-all=
"handleSelectAll"
...
...
src/components/tagCategorySmall.vue
View file @
36ba085d
...
...
@@ -193,8 +193,8 @@
.common-wrap__currentTag__name
{
cursor
:
pointer
;
}
.common-wrap__childTag__name
{
}
.common-wrap__childTag__name
{
display
:
inline-block
;
padding
:
3px
5px
;
cursor
:
pointer
;
...
...
@@ -203,5 +203,4 @@
color
:
#303133
;
}
}
}
</
style
>
src/view/index/index.vue
View file @
36ba085d
...
...
@@ -281,7 +281,7 @@
.right-content
{
/*width: 100%;*/
padding
:
24px
;
min-height
:
calc
(
100%
-
2
24
px
);
min-height
:
calc
(
100%
-
2
40
px
);
.right-box
{
background
:
#fff
;
...
...
src/view/manualTag/manualTagEdit.vue
View file @
36ba085d
...
...
@@ -195,8 +195,7 @@
width=
"200"
trigger=
"hover"
>
<span>
勾选后,此前被该标签标记的会员将移除此标签,此标签标记会员以本次导入为准。
</span>
<!--
<a
slot=
"reference"
class=
"pointer"
:href=
"'#/memberGroupDetail?memberTagGroupId='+scope.row.memberTagGroupId"
>
{{
scope
.
row
.
groupName
}}
</a>
-->
<i
slot=
"reference"
class=
"el-icon-question"
></i>
<i
slot=
"reference"
class=
"iconfont icon-xinxixianshi"
></i>
</el-popover>
</
template
>
</el-table-column>
...
...
@@ -1074,12 +1073,13 @@
overflow
:
hidden
;
}
.
el-icon-question
{
.
icon-xinxixianshi
{
display
:
inline-block
;
vertical-align
:
middle
;
font-size
:
14px
;
color
:
#909399
;
cursor
:
pointer
;
line-height
:
1px
;
}
.w-447
{
...
...
src/view/memberGroup/index.vue
View file @
36ba085d
...
...
@@ -271,7 +271,7 @@
.right-content
{
/*width: 100%;*/
padding
:
24px
;
min-height
:
calc
(
100%
-
2
24
px
);
min-height
:
calc
(
100%
-
2
40
px
);
.right-box
{
background
:
#fff
;
...
...
src/view/memberGroup/memberGroupDetail.vue
View file @
36ba085d
...
...
@@ -51,7 +51,7 @@
@
show=
"showSingleInfo(scope.row.memberId)"
>
<div
class=
"pointer"
@
click=
"linkDetail(scope.row.memberId, scope.row.isWeixinMember)"
>
<div
class=
"singelinfo flex"
>
<div
class=
"singelinfo-img"
><img
width=
"100"
height=
"100"
:src=
"scope.row.thirdImgUrl ? scope.row.thirdImgUrl : require('../../assets/group/
default
.png')"
alt=
""
></div>
<div
class=
"singelinfo-img"
><img
width=
"100"
height=
"100"
:src=
"scope.row.thirdImgUrl ? scope.row.thirdImgUrl : require('../../assets/group/
member_img
.png')"
alt=
""
></div>
<div
class=
"singelinfo-content flex-1 pLeft10 pRight10"
>
<span
class=
"lheigth0"
>
{{
scope
.
row
.
memberName
}}
<span
:title=
"singleInfo.status == 0 ? '取消关注公众号' : singleInfo.status == 1 ? '已关注公众号' : '未关注公众号'"
class=
"channelicon fr"
...
...
@@ -80,8 +80,9 @@
<span
slot=
"reference"
>
<!--
<img
class=
"tablecontent-cellimg mr6"
width=
"60"
height=
"60"
:src=
"scope.row.thirdImgUrl ? scope.row.thirdImgUrl : './static/img/default.png'"
alt=
""
>
-->
<span
class=
"table-member__img inline-block middle border-box m-r-8"
>
<i
class=
"iconfont icon-huiyuanguanli"
v-if=
"!scope.row.thirdImgUrl"
></i>
<img
v-if=
"scope.row.thirdImgUrl"
:src=
"scope.row.thirdImgUrl"
/>
<!--
<i
class=
"iconfont icon-huiyuanguanli"
v-if=
"!scope.row.thirdImgUrl"
></i>
-->
<!--
<img
v-if=
"!scope.row.thirdImgUrl"
src=
"../../assets/group/member_img.png"
/>
-->
<img
:src=
"scope.row.thirdImgUrl ? scope.row.thirdImgUrl : require('../../assets/group/member_img.png')"
/>
</span><span>
{{
scope
.
row
.
memberName
}}
</span>
</span>
</el-popover>
...
...
@@ -604,7 +605,8 @@
padding-top
:
10px
;
}
.group-name
{
font-weight
:
bold
;
font-weight
:
500
;
font-size
:
16px
;
}
.real-time
{
padding
:
3px
4px
;
...
...
@@ -703,9 +705,9 @@
.table-member__img
{
width
:
40px
;
height
:
40px
;
line-height
:
40px
;
//
line-height
:
40px
;
text-align
:
center
;
background
:
#F3F6F9
;
//
background
:
#F3F6F9
;
img
{
display
:
inline-block
;
width
:
100%
;
...
...
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