Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-4
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
office
haoban-4
Commits
a670f514
Commit
a670f514
authored
Sep 14, 2020
by
无尘
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修改标签
parent
3901b4dc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
7 deletions
+12
-7
clerk-tag.vue
src/views/apps/customer-app/clerk-tag.vue
+10
-6
new-auth-merchant.vue
src/views/business/new-auth-merchant.vue
+2
-1
No files found.
src/views/apps/customer-app/clerk-tag.vue
View file @
a670f514
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
* @Author: 无尘
* @Author: 无尘
* @Date: 2020-08-28 16:51:22
* @Date: 2020-08-28 16:51:22
* @LastEditors: 无尘
* @LastEditors: 无尘
* @LastEditTime: 2020-09-14 1
2:09:39
* @LastEditTime: 2020-09-14 1
4:34:40
-->
-->
<
template
>
<
template
>
...
@@ -21,13 +21,17 @@
...
@@ -21,13 +21,17 @@
<div
class=
"flex flex-space-between"
>
<div
class=
"flex flex-space-between"
>
<div><el-input
placeholder=
"请输入标签名称"
maxlength=
"50"
v-model=
"searchVal"
style=
"width: 298px;"
prefix-icon=
"el-icon-search"
@
keyup
.
native=
"value => toInput(value, searchVal)"
clearable
@
clear=
"clearInput"
></el-input></div>
<div><el-input
placeholder=
"请输入标签名称"
maxlength=
"50"
v-model=
"searchVal"
style=
"width: 298px;"
prefix-icon=
"el-icon-search"
@
keyup
.
native=
"value => toInput(value, searchVal)"
clearable
@
clear=
"clearInput"
></el-input></div>
<div>
<div>
<el-tooltip
class=
"item"
effect=
"dark"
placement=
"top-start"
>
<el-tooltip
v-if=
"licenseData.count
<
licenseData
.
limit
"
class=
"item"
effect=
"dark"
placement=
"top-start"
>
<div
slot=
"content"
>
<div
slot=
"content"
>
<span
v-if=
"licenseData.count
<
licenseData
.
limit
"
>
当前标签数量/购买license:
{{
licenseData
.
count
}}
/
{{
licenseData
.
limit
}}
</span>
<span>
当前标签数量/购买license:
{{
licenseData
.
count
}}
/
{{
licenseData
.
limit
}}
</span>
<span
v-else
>
当前标签数量已达license,请先删除不使用的标签或扩容license
</span>
</div>
</div>
<el-button
v-if=
"licenseData.count
<
licenseData
.
limit
"
type=
"primary"
@
click=
"toAddTag"
>
新建标签
</el-button>
<el-button
type=
"primary"
@
click=
"toAddTag"
>
新建标签
</el-button>
<div
v-else
class=
"el-button el-tooltip item is-disabled"
>
新建标签
</div>
</el-tooltip>
<el-tooltip
v-else
class=
"item"
effect=
"dark"
placement=
"top-start"
>
<div
slot=
"content"
>
<span
>
当前标签数量已达license,请先删除不使用的标签或扩容license
</span>
</div>
<div
class=
"el-button el-tooltip item is-disabled"
>
新建标签
</div>
</el-tooltip>
</el-tooltip>
</div>
</div>
</div>
</div>
...
...
src/views/business/new-auth-merchant.vue
View file @
a670f514
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
* @Author: 无尘
* @Author: 无尘
* @Date: 2019-03-20 14:36:37
* @Date: 2019-03-20 14:36:37
* @LastEditors: 无尘
* @LastEditors: 无尘
* @LastEditTime: 2020-09-1
1 17:13:00
* @LastEditTime: 2020-09-1
4 14:14:04
-->
-->
<
template
>
<
template
>
<div
class=
"my-customer-wrap common-set-wrap"
>
<div
class=
"my-customer-wrap common-set-wrap"
>
...
@@ -487,6 +487,7 @@ export default {
...
@@ -487,6 +487,7 @@ export default {
height
:
32px
;
height
:
32px
;
line-height
:
32px
;
line-height
:
32px
;
vertical-align
:
top
;
vertical-align
:
top
;
border-color
:
#c4c6cf
;
}
}
.select-search-input
{
.select-search-input
{
display
:
inline-block
;
display
:
inline-block
;
...
...
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