Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuy into develop/wap

@@ -43,7 +43,7 @@
         width: 100%;
         width: 100%;
         white-space: nowrap;
         white-space: nowrap;
         margin-top: pxToRem(20px);
         margin-top: pxToRem(20px);
-        color: gray;
+        color: #444;
     }
     }
 
 
     .price {
     .price {

@@ -375,7 +375,7 @@ class IndexController extends AbstractAction
 
 
         // 设置网站标题
         // 设置网站标题
         $this->setTitle('选择地址');
         $this->setTitle('选择地址');
-        $this->setNavHeader('选择地址', Helpers::url('/cart/index/orderEnsure'));
+        $this->setNavHeader('选择地址', Helpers::url('/cart/index/orderEnsure'), false);
 
 
         $uid = $this->getUid(true);
         $uid = $this->getUid(true);
         $address = UserModel::getAddressData($uid);
         $address = UserModel::getAddressData($uid);
@@ -397,7 +397,7 @@ class IndexController extends AbstractAction
 
 
         // 设置网站标题
         // 设置网站标题
         $this->setTitle('选择优惠券');
         $this->setTitle('选择优惠券');
-        $this->setNavHeader('选择优惠券', Helpers::url('/cart/index/orderEnsure'));
+        $this->setNavHeader('选择优惠券', Helpers::url('/cart/index/orderEnsure'), false);
 
 
         $this->_view->display('select-coupon', array(
         $this->_view->display('select-coupon', array(
             'selectCouponPage' => true,
             'selectCouponPage' => true,
@@ -410,8 +410,6 @@ class IndexController extends AbstractAction
      */
      */
     public function orderSubAction()
     public function orderSubAction()
     {
     {
-        $result = array();
-
         if ($this->isAjax()) {
         if ($this->isAjax()) {
             $uid = $this->getUid(true);
             $uid = $this->getUid(true);
             $addressId = $this->post('addressId', null);
             $addressId = $this->post('addressId', null);

@@ -18,7 +18,7 @@ class BrandController extends AbstractAction
     public function indexAction()
     public function indexAction()
     {
     {
         $this->setTitle('品牌一览');
         $this->setTitle('品牌一览');
-        $this->setNavHeader('品牌一览', '/boys?go=1&t=' . time());
+        $this->setNavHeader('品牌一览', '/boys?go=1&t=' . time(), false);
 
 
         /* 判断参数是否有效 */
         /* 判断参数是否有效 */
         $channel = null;
         $channel = null;

@@ -146,6 +146,10 @@ class InfoController extends AbstractAction
                         }
                         }
                     }
                     }
                 }
                 }
+                // 更多商品链接
+                elseif (isset($value['link'])) {
+                    $build['link'] = $value['link']['data'][0]['url'];
+                }
 
 
                 $data['detail']['content'][] = $build;
                 $data['detail']['content'][] = $build;
             }
             }
@@ -313,6 +317,10 @@ class InfoController extends AbstractAction
                         }
                         }
                     }
                     }
                 }
                 }
+                // 更多商品链接
+                elseif (isset($value['link'])) {
+                    $build['link'] = $value['link']['data'][0]['url'];
+                }
 
 
                 $data['detail']['content'][] = $build;
                 $data['detail']['content'][] = $build;
             }
             }
@@ -445,6 +453,10 @@ class InfoController extends AbstractAction
                         }
                         }
                     }
                     }
                 }
                 }
+                // 更多商品链接
+                elseif (isset($value['link'])) {
+                    $build['link'] = $value['link']['data'][0]['url'];
+                }
                 
                 
                 // 内容详情
                 // 内容详情
                 if (array() !== $build) {
                 if (array() !== $build) {