Merge branch 'release/5.0.0'

@@ -789,7 +789,8 @@ const getShopListData = (channel, params, uid) => {
                     goods: productProcess.processProductList(goodsList, {
                         newCoverSort: true,
                         showDiscount: false,
-                        gender: _getGender(channel)
+                        gender: _getGender(channel),
+                        query: params.query
                     }),
                     footPager: {tip: tip}
                 });

@@ -868,11 +868,12 @@ exports.handleSeniorFilterData = (data, params) => {
 };
 
 exports.handleFilterDataAll = (data, qs) => {
+    let destFilter = {};
     let params = _.cloneDeep(qs);
 
     _.unset(params, 'page'); // 去除筛选项page
 
-    let baseFilter = this.handleFilterData(data.filter, params, data.total);
+    let baseFilter = this.handleFilterData(_.get(data, 'filter', {}), params, data.total);
     let seniorFilter = this.handleSeniorFilterData({
         style: _.get(data, 'filter.style', []),
         standard: _.get(data, 'standard', [])
@@ -881,12 +882,9 @@ exports.handleFilterDataAll = (data, qs) => {
     let conditions = _.union(_.get(baseFilter, 'checkedConditions.conditions'),
         _.get(seniorFilter, 'checkedConditions.conditions'));
 
-    let destFilter = Object.assign({}, seniorFilter, baseFilter);
+    Object.assign(destFilter, seniorFilter, baseFilter);
 
-    if (!destFilter.checkedConditions) {
-        destFilter.checkedConditions = {};
-    }
-    destFilter.checkedConditions.conditions = conditions;
+    _.set(destFilter, 'checkedConditions.conditions', conditions);
 
     return destFilter;
 };