Authored by 周少峰

Merge branch 'hotfix/shopDecorator'

@@ -361,7 +361,7 @@ exports.getShopDecorator = (data, params, shopId, base) => { @@ -361,7 +361,7 @@ exports.getShopDecorator = (data, params, shopId, base) => {
361 361
362 if (base) { 362 if (base) {
363 _.forEach(data.list, (value) => { 363 _.forEach(data.list, (value) => {
364 - let info = Fn.pipe(JSON.parse, _.partial(_handleSaleCategory, shopId))(value.resource_data); 364 + let info = Fn.pipe(JSON.parse, _.partial(_handleSaleCategory, shopId))(value.resource_data || '[]');
365 365
366 switch (value.resource_name) { 366 switch (value.resource_name) {
367 case 'signboard': 367 case 'signboard':
@@ -381,7 +381,7 @@ exports.getShopDecorator = (data, params, shopId, base) => { @@ -381,7 +381,7 @@ exports.getShopDecorator = (data, params, shopId, base) => {
381 }); 381 });
382 382
383 _.forEach(data.list, (value) => { 383 _.forEach(data.list, (value) => {
384 - let info = Fn.pipe(JSON.parse, _.partial(_handleSaleCategory, shopId))(value.resource_data); 384 + let info = Fn.pipe(JSON.parse, _.partial(_handleSaleCategory, shopId))(value.resource_data || '[]');
385 let tabBar; 385 let tabBar;
386 386
387 switch (value.resource_name) { 387 switch (value.resource_name) {