Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-3
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-3
Commits
91be194b
Commit
91be194b
authored
Jul 30, 2021
by
陈羽
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/销售线索4' into dev
parents
08cc9f0c
b05dbb6c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
16 deletions
+16
-16
index.vue
src/views/apps/customerApp/index.vue
+15
-14
syncHistory.vue
src/views/apps/customerApp/syncHistory.vue
+1
-2
No files found.
src/views/apps/customerApp/index.vue
View file @
91be194b
...
...
@@ -140,20 +140,21 @@ export default {
};
let
list
=
[].
concat
(
this
.
defaultTabList
);
console
.
log
(
list
);
getRequest
(
'/haoban-app-customer-web/tag/open-tag'
,
para
).
then
(
res
=>
{
this
.
loading
=
true
;
if
(
!!
res
.
data
.
result
)
{
list
[
0
].
children
[
4
]
=
{
tabId
:
'15'
,
tabName
:
'会员标签设置'
,
icon
:
''
};
}
this
.
$nextTick
(()
=>
{
this
.
tabListData
=
[].
concat
(
list
);
this
.
loading
=
false
;
});
});
getRequest
(
'/haoban-app-customer-web/tag/open-tag'
,
para
)
.
then
(
res
=>
{
this
.
loading
=
true
;
if
(
!!
res
.
data
.
result
)
{
list
[
0
].
children
[
4
]
=
{
tabId
:
'15'
,
tabName
:
'会员标签设置'
,
icon
:
''
};
}
this
.
$nextTick
(()
=>
{
this
.
tabListData
=
[].
concat
(
list
);
});
})
.
finally
(
_
=>
(
this
.
loading
=
false
));
},
getExpired
()
{
const
that
=
this
;
...
...
src/views/apps/customerApp/syncHistory.vue
View file @
91be194b
...
...
@@ -20,7 +20,7 @@
<el-option
:value=
"-1"
label=
"全部事件类型"
></el-option>
</el-select>
</div>
<div
class=
"content"
>
<div
class=
"
sync-history-
content"
>
<el-table
v-loading=
"loading"
ref=
"table"
:data=
"tableData"
tooltip-effect=
"dark"
style=
"width: 100%"
>
<el-table-column
label=
"事件类型"
prop=
"taskType"
min-width=
"120"
>
<template
slot-scope=
"
{ row }">
{{
row
.
taskType
|
taskType
}}
</
template
>
...
...
@@ -175,7 +175,6 @@ export default {
syncMemberLog
(
params
).
then
(
res
=>
{
this
.
memberSyncTotal
=
res
.
data
.
result
.
totalCount
;
this
.
memberSyncData
=
res
.
data
.
result
.
result
;
this
.
memberSyncData
=
[];
this
.
memberLoading
=
false
;
});
},
...
...
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