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
c6798b12
Commit
c6798b12
authored
Nov 21, 2018
by
xiaohai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix issue
parent
1f27c422
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
19 deletions
+36
-19
index.vue
src/components/uploadExcel/index.vue
+3
-2
manualTagEdit.vue
src/view/manualTag/manualTagEdit.vue
+31
-17
memberGroupList.vue
src/view/memberGroup/memberGroupList.vue
+2
-0
No files found.
src/components/uploadExcel/index.vue
View file @
c6798b12
...
...
@@ -83,8 +83,9 @@ export default {
},
handleUpload
()
{
var
that
=
this
console
.
log
(
this
.
excelData
,
this
.
excelData
.
header
,
this
.
currentIndex
)
if
(
!!
that
.
excelHeader
&&!!
that
.
excelHeader
.
length
)
{
console
.
log
(
that
.
excelBodyData
);
// if (!!that.excelHeader&&!!that.excelHeader.length) {
if
(
that
.
excelBodyData
.
length
>
0
)
{
that
.
$confirm
(
'目前操作没有结束,点击其他导入现有数据不会保存,
\
n 确认要离开吗?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
...
...
src/view/manualTag/manualTagEdit.vue
View file @
c6798b12
...
...
@@ -224,22 +224,6 @@
name
:
"manualTagEdit"
,
data
()
{
return
{
// 面包屑参数
navpath
:
[
{
name
:
'首页'
,
path
:
''
},
{
name
:
'会员标签'
,
path
:
''
},
{
name
:
'手工标签编辑'
,
path
:
''
},
],
// 编辑标签的时候,获取标签的 id
currentTagId
:
''
,
...
...
@@ -312,6 +296,34 @@
}
},
computed
:
{
// 面包屑参数
navpath
()
{
let
that
=
this
;
return
[
{
name
:
'首页'
,
path
:
`
${
window
.
origin
}
/report/#/memberSummary`
},
{
name
:
'会员管理'
,
path
:
''
},
{
name
:
'会员标签'
,
path
:
''
},
{
name
:
'手工标签列表'
,
path
:
''
},
{
name
:
that
.
$route
.
query
.
tagId
?
'手工标签编辑'
:
'新增手工标签'
,
path
:
''
}
];
}
},
methods
:
{
/**
* 清空已有标签危险提示
...
...
@@ -753,7 +765,8 @@
tagItemId
:
row
.
tagItemId
,
data
:
JSON
.
stringify
(
that
.
currentExcelData
)
}
that
.
currentExcelData
=
[];
// that.currentExcelData = [];
postRequest
(
'/memberTag/uploadHandTagItemImport'
,
para
)
.
then
((
res
)
=>
{
// console.log(res,res.data,res.data.errorCode)
...
...
@@ -1073,6 +1086,7 @@
}
.manualTagEdit-wrap__set
{
padding-top
:
24px
;
border-top
:
1px
solid
#DCDFE6
;
}
...
...
src/view/memberGroup/memberGroupList.vue
View file @
c6798b12
...
...
@@ -303,6 +303,7 @@
handleSizeChange
(
val
)
{
const
that
=
this
// console.log(`每页 ${val} 条`);
that
.
pageSize
=
val
;
that
.
getGroupList
()
},
...
...
@@ -312,6 +313,7 @@
handleCurrentChange
(
val
)
{
const
that
=
this
// console.log(`当前页: ${val}`);
that
.
currentPage
=
val
;
that
.
getGroupList
()
},
...
...
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