Commit 91be194b by 陈羽

Merge branch 'feature/销售线索4' into dev

parents 08cc9f0c b05dbb6c
......@@ -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;
......
......@@ -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;
});
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment