Merge branch 'hotfix/bugfixed' into 'master'

Hotfix/bugfixed



See merge request !1112

@@ -284,8 +284,8 @@ class DetailModel extends global.yoho.BaseModel {
                     for (let i = 0; i < getArticleContent.length; i++) {
 
                         if (getArticleContent[i].text && textPosition === 1) {
-                            descriptionText = getArticleContent[i].text.data.text;
-                            result.getArticle.descriptionText = descriptionText.replace(/<\/?[^>]*>/g, '');
+                            descriptionText = _.get(getArticleContent[i], 'text.data.text');
+                            _.set(result, 'getArticle.descriptionText', descriptionText.replace(/<\/?[^>]*>/g, ''));
                             textPosition++;
                         }
                     }

@@ -347,7 +347,7 @@ module.exports = class extends global.yoho.BaseModel {
 
                 if (isApp) {
                     url = '?openby:yohobuy={"action":"go.brand","params":{"brand_id":"' + brandId + '","is_different":"' + isDifferent + '"}}'; // eslint-disable-line
-                    uid = parseInt(uid, 10);
+                    // uid = parseInt(uid, 10);
                 } else {
                     url = '//' + brandDomain + '.m.yohobuy.com';
                 }

@@ -442,7 +442,8 @@ const shop = {
         let data = {};
 
         cryptCouponId = parseInt(cryptCouponId, 10);
-        uid = parseInt(uid, 10);
+
+        // uid = parseInt(uid, 10);
 
         if (uid) {
             req.ctx(couponModel).receiveCoupon(

@@ -54,7 +54,7 @@
                     </div>
                 {{/ consults}}
             </div>
-            <a class="consult-content-footer tap-hightlight" href="{{consultsUrl}}">
+            <a class="consult-content-footer tap-hightlight" href="{{consultsUrl}}" rel="nofollow">
                 查看更多
                 <span class="iconfont">&#xe604;</span>
             </a>

@@ -112,7 +112,8 @@ class DetailProcess {
 
                     bannerList.push({
                         img: value.img,
-                        imgAlt: _.compact([origin.brand_info.brand_name_en, origin.brand_info.brand_name_cn,
+                        imgAlt: _.compact([_.get(origin, 'brand_info.brand_name_en'),
+                            _.get(origin, 'brand_info.brand_name_cn'),
                             (_.get(origin, 'gender', '1') === '1' ? '男' : '女'), origin.small_sort_name,
                             origin.product_name]).join('|')
                     });