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
7576b30a
Commit
7576b30a
authored
Nov 21, 2018
by
xiaohai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix issue
parent
f18f9204
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
56 additions
and
37 deletions
+56
-37
nav.vue
src/components/nav/nav.vue
+8
-4
manualTagEdit.vue
src/view/manualTag/manualTagEdit.vue
+6
-2
manualTagLib.vue
src/view/manualTag/manualTagLib.vue
+2
-1
manualTagList.vue
src/view/manualTag/manualTagList.vue
+5
-3
memberGroupDetail.vue
src/view/memberGroup/memberGroupDetail.vue
+23
-21
memberGroupList.vue
src/view/memberGroup/memberGroupList.vue
+2
-1
myTagDetail.vue
src/view/myTag/myTagDetail.vue
+2
-1
myTagLib.vue
src/view/myTag/myTagLib.vue
+2
-1
myTagList.vue
src/view/myTag/myTagList.vue
+2
-1
platformTagLib.vue
src/view/platformTag/platformTagLib.vue
+2
-1
platformTagList.vue
src/view/platformTag/platformTagList.vue
+2
-1
No files found.
src/components/nav/nav.vue
View file @
7576b30a
...
...
@@ -4,7 +4,7 @@
<template
v-for=
"item in navpath"
>
<template
v-if=
"!!item.path"
>
<!--
<el-breadcrumb-item
:data-v=
"item.path"
:to=
"
{ path: item.path }">
{{
item
.
name
}}
</el-breadcrumb-item>
-->
<el-breadcrumb-item
:to=
"
{ path: item.path }" @click="changeRoute(item.path
)">
<span
class=
"el-breadcrumb__inner is-link"
@
click=
"changeRoute(item.path
)"
>
{{
item
.
name
}}
</span></el-breadcrumb-item>
<el-breadcrumb-item
:to=
"
{ path: item.path }" @click="changeRoute(item.path
, item.relocation)">
<span
class=
"el-breadcrumb__inner is-link"
@
click=
"changeRoute(item.path, item.relocation
)"
>
{{
item
.
name
}}
</span></el-breadcrumb-item>
</
template
>
<
template
v-else
>
<el-breadcrumb-item>
{{
item
.
name
}}
</el-breadcrumb-item>
...
...
@@ -52,10 +52,14 @@
},
methods
:
{
changeRoute
(
path
)
{
changeRoute
(
path
,
relocation
)
{
var
that
=
this
console
.
log
(
path
)
that
.
$router
.
push
(
path
)
console
.
log
(
path
,
relocation
);
if
(
relocation
)
{
window
.
location
.
href
=
path
;
}
else
{
that
.
$router
.
push
(
path
)
}
},
// get nav path
getNavPath
()
{
...
...
src/view/manualTag/manualTagEdit.vue
View file @
7576b30a
...
...
@@ -303,7 +303,8 @@
return
[
{
name
:
'首页'
,
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
,
relocation
:
true
},
{
name
:
'会员管理'
,
...
...
@@ -761,6 +762,7 @@
*/
tagItemImport
(
index
,
row
)
{
const
that
=
this
;
console
.
log
(
that
.
currentExcelData
,
"empty"
);
const
para
=
{
tagItemId
:
row
.
tagItemId
,
data
:
JSON
.
stringify
(
that
.
currentExcelData
)
...
...
@@ -1028,8 +1030,10 @@
margin-bottom
:
24px
;
.el-icon-edit
{
cursor
:
pointer
;
color
:
#1890ff
;
margin-left
:
8px
;
&:hover
{
color
:
#1890ff
;
}
}
}
...
...
src/view/manualTag/manualTagLib.vue
View file @
7576b30a
...
...
@@ -25,7 +25,8 @@
navpath
:
[
{
name
:
'首页'
,
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
,
relocation
:
true
},
{
name
:
'会员管理'
,
...
...
src/view/manualTag/manualTagList.vue
View file @
7576b30a
...
...
@@ -52,7 +52,7 @@
</el-table-column>
<el-table-column
label=
"操作"
width=
'3
08
'
>
width=
'3
20
'
>
<
template
slot-scope=
"scope"
>
<router-link
:to=
"
{path:'/myTagDetail',query:{tagId:scope.row.tagId,addFlag:scope.row.isAdd,form:'notMyTag',navSign: 'manualTag'}}" class="edit-btn el-button--text">详情
</router-link>
<router-link
:to=
"
{path:'/manualTagEdit',query:{tagId:scope.row.tagId}}" class="edit-btn el-button--text p-l-20">编辑
</router-link>
...
...
@@ -130,7 +130,8 @@
<el-input
v-if=
"scope.row.editAble"
size=
"small"
class=
"h5-el-input"
v-model=
"scope.row.inputValue"
type=
"text"
placeholder=
"请输入分类名称"
@
keyup
.
native=
"(value) => toEditInput(value,scope.$index,scope.row)"
></el-input>
</
template
>
</el-table-column>
<el-table-column
label=
"操作"
>
<el-table-column
label=
"操作"
>
<
template
slot-scope=
"scope"
>
<el-button
v-if=
"!scope.row.editAble"
type=
"text"
size=
"small"
:disabled=
"!scope.row.enterpriseId? true: false"
class=
""
@
click=
"toEditCate(scope.$index,scope.row)"
>
编辑
</el-button>
<!--
<el-popover
...
...
@@ -179,7 +180,8 @@
navpath
:
[
{
name
:
'首页'
,
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
,
relocation
:
true
},
{
name
:
'会员管理'
,
...
...
src/view/memberGroup/memberGroupDetail.vue
View file @
7576b30a
...
...
@@ -249,26 +249,6 @@
data
()
{
return
{
loading
:
false
,
// 面包屑参数
navpath
:
[
{
name
:
'首页'
,
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
},
{
name
:
'会员管理'
,
path
:
''
},
{
name
:
"会员分组"
,
path
:
'/memberGroupList'
},
{
name
:
'会员分组详情'
,
path
:
''
}
],
// 自定义字段列表是否显示
showUserDefined
:
false
,
memberFields
:
[],
// 所有自定义字段
...
...
@@ -312,7 +292,29 @@
this
.
loading
=
true
;
},
computed
:
{
// 面包屑参数
navpath
()
{
console
.
log
(
window
.
origin
,
"origin"
);
return
[
{
name
:
'首页'
,
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
,
relocation
:
true
},
{
name
:
'会员管理'
,
path
:
''
},
{
name
:
"会员分组"
,
path
:
'/memberGroupList'
},
{
name
:
'会员分组详情'
,
path
:
''
}
];
}
},
filters
:
{
...
...
src/view/memberGroup/memberGroupList.vue
View file @
7576b30a
...
...
@@ -193,7 +193,8 @@
navpath
:
[
{
name
:
'首页'
,
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
,
relocation
:
true
},
{
name
:
'会员管理'
,
...
...
src/view/myTag/myTagDetail.vue
View file @
7576b30a
...
...
@@ -761,7 +761,8 @@ import qs from 'qs';
return
[
{
name
:
'首页'
,
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
,
relocation
:
true
},
{
name
:
'会员管理'
,
...
...
src/view/myTag/myTagLib.vue
View file @
7576b30a
...
...
@@ -25,7 +25,8 @@
navpath
:
[
{
name
:
'首页'
,
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
,
relocation
:
true
},
{
name
:
'会员管理'
,
...
...
src/view/myTag/myTagList.vue
View file @
7576b30a
...
...
@@ -113,7 +113,8 @@
navpath
:
[
{
name
:
'首页'
,
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
,
relocation
:
true
},
{
name
:
'会员管理'
,
...
...
src/view/platformTag/platformTagLib.vue
View file @
7576b30a
...
...
@@ -65,7 +65,8 @@
navpath
:
[
{
name
:
'首页'
,
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
,
relocation
:
true
},
{
name
:
'会员管理'
,
...
...
src/view/platformTag/platformTagList.vue
View file @
7576b30a
...
...
@@ -98,7 +98,8 @@
navpath
:
[
{
name
:
'首页'
,
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
,
relocation
:
true
},
{
name
:
'会员管理'
,
...
...
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