...
|
...
|
@@ -26,7 +26,7 @@ const newContentCodes = { |
|
|
detail: 'cea0efae77f4e04c935beb1e87181247'
|
|
|
},
|
|
|
production: {
|
|
|
home: 'd9101626ba774147080596e482e5f697',
|
|
|
home: '4b24541678c9fe0ca12c8fd205a6d427',
|
|
|
ready: '89141506b9926010f28915a82b3db61d',
|
|
|
result: '3c3a94fd6c6e19508b6921acd7f6cbad',
|
|
|
detail: 'cea0efae77f4e04c935beb1e87181247'
|
...
|
...
|
@@ -198,7 +198,7 @@ class GroupService extends global.yoho.BaseModel { |
|
|
let result = {};
|
|
|
let tabCurrentIndex = tabIndex || 0;
|
|
|
|
|
|
result.index = await this.newIndex();
|
|
|
result.index = await this.newIndex() || [];
|
|
|
let filters = [];
|
|
|
|
|
|
result.index.forEach(item => {
|
...
|
...
|
@@ -211,11 +211,9 @@ class GroupService extends global.yoho.BaseModel { |
|
|
item.queryString = JSON.stringify(item.query);
|
|
|
});
|
|
|
|
|
|
let indexFilter = filters[tabCurrentIndex] || {};
|
|
|
let indexFilter = filters[tabCurrentIndex] || { query: [] };
|
|
|
let query = {};
|
|
|
|
|
|
console.log(filters);
|
|
|
console.log(indexFilter);
|
|
|
indexFilter.query.forEach(item => {
|
|
|
query = Object.assign(query, item);
|
|
|
});
|
...
|
...
|
@@ -228,10 +226,16 @@ class GroupService extends global.yoho.BaseModel { |
|
|
}
|
|
|
|
|
|
async goodsTab(query, result = {}) {
|
|
|
result.filterGroupList = await this.filterGroupList({
|
|
|
...query,
|
|
|
});
|
|
|
return result;
|
|
|
try {
|
|
|
result.filterGroupList = await this.filterGroupList({
|
|
|
...query,
|
|
|
});
|
|
|
return result;
|
|
|
} catch (e) {
|
|
|
return {
|
|
|
error: e
|
|
|
};
|
|
|
}
|
|
|
}
|
|
|
|
|
|
async groupListIndex(params, uid) {
|
...
|
...
|
|