Merge branch 'feature/amend' into 'feature/valida'

报错修改



See merge request !465

@@ -241,7 +241,7 @@ const getPriceGiftList = (promotionIds, promotionType) => {
         method: 'app.Shopping.queryPromotionGifts',
         promotion_ids: promotionIds
     }).then((data) => {
-        return data.code === 200 ? cartProcess.procPriceGiftData(data.data, promotionType) : void 0;
+        return data.code === 200 ? cartProcess.procPriceGiftData(data.data, promotionType) : {};
     });
 };
 

@@ -201,7 +201,7 @@ const packageData = (id, isApp, isWeixin, channel, isShare) => {
 
         return Promise.all(promises).then(datas => {
 
-            let getArticleContent = {};
+            let getArticleContent = [];
 
             if (datas) {
                 if (datas[1]) {

@@ -123,6 +123,8 @@ const selectHotrank = (yhChannel, gender, sort, tabId, limit, page, notab) => {
             }
 
             return formData;
+        } else {
+            return {};
         }
 
     });