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
fc2a7f24
Commit
fc2a7f24
authored
Aug 15, 2022
by
huaying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 客户分组,域名修改
parent
47d535b7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
7 deletions
+14
-7
index.html
index.html
+1
-1
batch-list.vue
src/components/tag/batch-list.vue
+1
-1
manual-tag-value-edit.vue
src/view/manualTag/manual-tag-value-edit.vue
+1
-1
group-list.vue
src/view/memberGroup/group-list.vue
+8
-4
memberGroupEdit.vue
src/view/memberGroup/memberGroupEdit.vue
+1
-0
memberGroupList.vue
src/view/memberGroup/memberGroupList.vue
+1
-0
member-tag.vue
src/view/platformTag/member-tag.vue
+1
-0
No files found.
index.html
View file @
fc2a7f24
...
...
@@ -21,7 +21,7 @@
(
function
()
{
var
src
=
'/component/static/import-component.js?timestrap='
+
new
Date
().
getTime
();
var
host
=
window
.
location
.
host
;
host
=
host
.
indexOf
(
'localhost'
)
>
-
1
||
host
.
indexOf
(
'192.168'
)
>
-
1
?
'
gicdev.demogic
.com'
:
host
;
host
=
host
.
indexOf
(
'localhost'
)
>
-
1
||
host
.
indexOf
(
'192.168'
)
>
-
1
?
'
www.gicdev
.com'
:
host
;
document
.
write
(
'<script src="//'
+
host
+
src
+
'"><
\
/script>'
)
})()
</script>
...
...
src/components/tag/batch-list.vue
View file @
fc2a7f24
...
...
@@ -141,7 +141,7 @@ export default {
if
(
res
.
errorCode
==
0
)
{
console
.
log
(
res
.
result
)
const
{
result
}
=
res
.
result
;
this
.
groupList
=
result
.
filter
(
el
=>
el
.
classifyName
!=
'未分类'
).
map
(
item
=>
({
this
.
groupList
=
result
.
filter
(
el
=>
el
.
classifyName
!=
'未分类'
&&
el
.
classifyName
!=
null
).
map
(
item
=>
({
...
item
,
edit
:
false
}));
...
...
src/view/manualTag/manual-tag-value-edit.vue
View file @
fc2a7f24
...
...
@@ -197,7 +197,7 @@ export default {
methods
:
{
// 导出标签值
importTagValue
()
{
// window.open(`http://
gicdev.demogic
.com/gic-member-tag-web/memberTag/exportMemberTag?requestProject=member-tag&tagId=${this.$route.query.tagId}&tagName=${this.$route.query.tagName}`);
// window.open(`http://
www.gicdev
.com/gic-member-tag-web/memberTag/exportMemberTag?requestProject=member-tag&tagId=${this.$route.query.tagId}&tagName=${this.$route.query.tagName}`);
// return
const
paras
=
{
tagId
:
this
.
$route
.
query
.
tagId
,
...
...
src/view/memberGroup/group-list.vue
View file @
fc2a7f24
...
...
@@ -23,7 +23,7 @@
</ul>
<p
v-if=
"searchTip"
class=
"searchTip"
>
没有找到和“
{{
listsParams
.
classifyName
}}
”相关的内容
</p>
<div
v-if=
"$getButtonLimit($buttonCode.memberTagAddCateGory) && activeType == 1"
class=
"add-category"
>
<el-button
@
click=
"editDialog.visible = true"
:limit-code=
"$buttonCode.memberTagAddCateGory"
type=
"primary"
class=
"ghost-btn add-group"
v-if=
"
lists.length > 1
"
>
新增分类
</el-button>
<el-button
@
click=
"editDialog.visible = true"
:limit-code=
"$buttonCode.memberTagAddCateGory"
type=
"primary"
class=
"ghost-btn add-group"
v-if=
"
addType
"
>
新增分类
</el-button>
</div>
<!--编辑分类-->
<el-dialog
:title=
"editDialog.list.memberTagGroupClassifyId ? '编辑分类' : '新增分类'"
:visible
.
sync=
"editDialog.visible"
width=
"600px"
top=
"30vh"
:close-on-click-modal=
"false"
@
close=
"closeEditGroup"
>
...
...
@@ -66,8 +66,8 @@ export default {
classifyName
:
''
,
list
:
{}
},
memberGroupLoading
:
false
memberGroupLoading
:
false
,
addType
:
true
};
},
...
...
@@ -215,9 +215,13 @@ export default {
const
{
result
,
totalPage
}
=
res
.
result
||
{};
if
(
this
.
listsParams
.
classifyName
==
''
)
{
this
.
searchTip
=
false
;
this
.
addType
=
true
;
}
else
if
(
this
.
listsParams
.
classifyName
!=
''
)
{
this
.
addType
=
false
;
if
(
result
.
length
<=
0
)
{
this
.
searchTip
=
true
;
}
else
{
this
.
searchTip
=
false
;
}
}
if
(
pageNum
==
1
)
{
...
...
@@ -251,7 +255,7 @@ export default {
}
else
if
(
newVal
==
3
)
{
this
.
$emit
(
'second-list'
,
'allLevel'
);
}
}
}
,
}
};
</
script
>
...
...
src/view/memberGroup/memberGroupEdit.vue
View file @
fc2a7f24
...
...
@@ -660,6 +660,7 @@ export default {
// 获取一个标签分类下面的标签数据
getTagsGroupList
()
{
const
tagType
=
this
.
activeTag
==
'system'
?
0
:
this
.
activeTag
==
'manual'
?
1
:
2
;
console
.
log
(
this
.
searchData
,
'this.searchData'
);
const
params
=
{
requestProject
:
'gic-member-tag-web'
,
search
:
this
.
searchData
||
null
,
// 模糊查询的标签名
...
...
src/view/memberGroup/memberGroupList.vue
View file @
fc2a7f24
...
...
@@ -1072,6 +1072,7 @@ export default {
return
false
;
}
else
{
this
.
operateNumber
=
val
;
console
.
log
(
val
,
'val'
);
this
.
batchVisiable
=
true
;
}
},
...
...
src/view/platformTag/member-tag.vue
View file @
fc2a7f24
...
...
@@ -605,6 +605,7 @@ export default {
},
async
loadMemberTagList
(
opt
)
{
console
.
log
(
opt
.
searchName
,
'opt.searchName'
);
const
tagType
=
this
.
activeTag
==
'active'
?
'2'
:
this
.
activeTag
==
'manual'
?
'1'
:
'0'
;
try
{
const
params
=
{
...
...
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