Commit c8f77ecc by crushh

Merge branch 'feature/3月迭代' of http://git.gicdev.com/marketing-web/marketing into feature/3月迭代

parents a0581383 962ed5a6
......@@ -71,7 +71,7 @@ export default {
this.loading = true;
getCustomDetail(this.search)
.then(res => {
const { result, totalCount } = res.result;
const { result, totalCount } = res.result || {};
this.total = totalCount;
this.tableData = result;
})
......
......@@ -71,7 +71,7 @@ export default {
const activityId = this.$route.params.id;
const planId = this.$route.query.planId;
getActivityInfo({ activityId, planId }).then(res => {
this.activityInfo = res.result;
this.activityInfo = res.result || {};
this.$emit('flag', {
memberType: this.activityInfo.memberType,
analyseFlag: this.activityInfo.analyseFlag, //1开0关 开启活动分析开关
......
......@@ -83,7 +83,7 @@ export default {
this.loading = true;
getLogs(params)
.then(res => {
const { result, totalCount } = res.result;
const { result, totalCount } = res.result || {};
this.tableData = result;
this.total = totalCount;
})
......
......@@ -66,7 +66,7 @@ export default {
this.loading = true;
getLogs(params)
.then(res => {
const { result, totalCount } = res.result;
const { result, totalCount } = res.result || {};
this.tableData = result;
this.total = totalCount;
})
......
......@@ -105,7 +105,7 @@ export default {
methods: {
getTempList() {
tempPageStatistics(this.search).then(res => {
const { list, pageNum, total } = res.result;
const { list, pageNum, total } = res.result || {};
this.tempList = list;
this.search.pageNum = pageNum;
this.total = total;
......
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