Merge branch 'release/5.2' into gray

@@ -658,6 +658,10 @@ const getBrandIntro = (brandId, uid) => {
         uid: uid
     };
 
+    if (!brandId || brandId === '' || brandId === 'undefined') {
+        return Promise.resolve({});
+    }
+
     return api.get('', _.assign({
         method: 'app.brand.getBrandIntro',
         brand_id: brandId
@@ -902,6 +906,10 @@ const shopCouponsList = (params) => {
  * @return {[array]}
  */
 const brandCouponsList = (params) => {
+    if (!params.brand_id || params.brand_id === '' || params.brand_id === 'undefined') {
+        return Promise.resolve([]);
+    }
+
     return api.get('', Object.assign({
         method: 'app.brand.getBrandIntro'
     }, params)).then(result => {