user shop fav link

@@ -354,8 +354,7 @@ class Helpers
         $result['showTags'] = $showTag;
         $result['img'] = isset($articleData['src']) ? self::getImageUrl($articleData['src'], 640, 640) : '';
         //逛详情页app跳转url处理 20160601
-        $result['url'] = self::getUrlSafe($articleData['url']) . '&openby:yohobuy={"action":"go.h5","params":{"id":"' . $articleData['id'] . '","share":"/guang/api/v1/share/guang?id=' . $articleData['id'] . '","shareparam":{"id":"' . $articleData['id'] . '"},"islogin":"N","type":1,"url":"http://guang.m.yohobuy.com/info/index","param":{"id":"' . $articleData['id'] . '"}}}';
-//        $result['url'] = self::getUrlSafe($articleData['url']) . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":1,"url":"' .'https:'. self::url('/info/index', array(), 'guang') . '","islogin":"N"}}';
+        $result['url'] = self::getUrlSafe($articleData['url']) . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":1,"url":"' .'https:'. self::url('/info/index', array(), 'guang') . '","islogin":"N"}}';
         //$result['url'] = $articleData['url']; //$isApp ? $articleData['url'] : self::url('/info/index', array('id' => $articleData['id']), 'guang');
 
         if (strrpos($result['url'], 'feature.yoho.cn') || strrpos($result['url'], 'cdn.yoho.cn')) {

@@ -295,8 +295,11 @@ class UserModel
                     $brand['brandName'] = $val['brand_name'];
                     $brand['update'] = $val['new_product_num'];
                     $brand['discount'] = $val['product_discount_num'];
-                    $brand['link'] = Helpers::url('', array(), $val['brand_domain']);
-
+                    if ($val['brandOrShopType'] == 'brandOrShopType') {
+                        $brand['link'] = Helpers::url('/product/index/brand', array('shop_id' => $val['shop_id']));
+                    } else {
+                        $brand['link'] = Helpers::url('', array(), $val['brand_domain']);
+                    }
                     // 处理品牌产品
                     $product = array();
                     foreach ($val['new_product'] as $one) {