Merge branch 'feature/group-home-correct' into 'release/6.9.2'

Feature/group home correct



See merge request !1749

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

 {
 {
   "name": "yohobuywap-node",
   "name": "yohobuywap-node",
-  "version": "6.9.2-7",
+  "version": "6.9.2-8",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {