Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuywap into release/4.4

@@ -255,6 +255,7 @@ class CartData
     {
     {
         $param = Yohobuy::param();
         $param = Yohobuy::param();
         $param['method'] = 'app.Shopping.payment';
         $param['method'] = 'app.Shopping.payment';
+        $param['enable_red_envelopes'] = 0;    //h5不使用红包
         $param['cart_type'] = $cartType;
         $param['cart_type'] = $cartType;
         $param['yoho_coin_mode'] = $isUseYohoCoin;
         $param['yoho_coin_mode'] = $isUseYohoCoin;
         $param['uid'] = $uid;
         $param['uid'] = $uid;

@@ -35,11 +35,11 @@ class SearchData
             case 'preview':
             case 'preview':
 //                return 'http://101.200.31.165/yohosearch/search.json';
 //                return 'http://101.200.31.165/yohosearch/search.json';
                 return 'http://192.168.10.64:8080/yohosearch/search.json';
                 return 'http://192.168.10.64:8080/yohosearch/search.json';
-            case 'test':
+            case 'testing':
                 return 'http://testing.yohoops.org/yohosearch/search.json';
                 return 'http://testing.yohoops.org/yohosearch/search.json';
             case 'developer':
             case 'developer':
             default:
             default:
-                return 'http://192.168.102.216:8087/yohosearch/search.json';
+                return 'http://192.168.102.216:8080/yohosearch/search.json';
         }
         }
     }
     }
 
 

@@ -60,7 +60,10 @@ class ShopProcess
         //搜索链接
         //搜索链接
         self::$shopData['url'] = Helpers::url('', array('shop_id' => self::$shopId), 'search');
         self::$shopData['url'] = Helpers::url('', array('shop_id' => self::$shopId), 'search');
         //人气单品的链接
         //人气单品的链接
-        self::$shopData['more_url'] = Helpers::url('', array('shop_id' => self::$shopId, 'order' => 's_n_d', 'title' => '人气'), 'search');
+        self::$shopData['more_url'] = Helpers::url('', array('shop_id' => self::$shopId, 'order' => 's_n_d', 'title' => '人气单品',), 'search');
+        if (self::$appVersion) {
+            self::$shopData['more_url'] .= '&yohobuy＝{"action":"go.list","params":{"shop_id":"'.self::$shopId.'","title":"人气单品"}}';
+        }
     }
     }
 
 
     /**
     /**
@@ -165,6 +168,9 @@ class ShopProcess
     {
     {
         self::$shopData['hotCategory']['name'] = '热门品类';
         self::$shopData['hotCategory']['name'] = '热门品类';
         foreach ($data as $cate) {
         foreach ($data as $cate) {
+            if ($cate['isShowInApp'] !== 'Y') {
+                continue;
+            }
             self::$shopData['hotCategory']['list'][] = array('url' => $cate['url'], 'img' => $cate['src']);
             self::$shopData['hotCategory']['list'][] = array('url' => $cate['url'], 'img' => $cate['src']);
         }
         }
         return $data;
         return $data;
@@ -178,7 +184,6 @@ class ShopProcess
     private static function hotProducts_APP($data)
     private static function hotProducts_APP($data)
     {
     {
         foreach ($data as $val) {
         foreach ($data as $val) {
-
             $goods = array(
             $goods = array(
                 'url' => Helpers::getUrlBySkc($val['productId'], $val['goodsId'], $val['cnAlphabet']),
                 'url' => Helpers::getUrlBySkc($val['productId'], $val['goodsId'], $val['cnAlphabet']),
                 'img' => Helpers::getImageUrl($val['src'], 235, 314),
                 'img' => Helpers::getImageUrl($val['src'], 235, 314),
@@ -187,7 +192,7 @@ class ShopProcess
                 'presentPrice' => '￥'.$val['salesPrice']
                 'presentPrice' => '￥'.$val['salesPrice']
             );
             );
             if (!empty(self::$appVersion)) {
             if (!empty(self::$appVersion)) {
-                $goods['url'] .= '?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":' . $productData['product_skn'] . '}}';
+                $goods['url'] .= '?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":' . $val['productSkn'] . '}}';
             }
             }
             self::$shopData['hotList'][] = $goods;
             self::$shopData['hotList'][] = $goods;
         }
         }

@@ -470,7 +470,7 @@
         &.more-jit {
         &.more-jit {
             padding-top: 0;
             padding-top: 0;
             padding-bottom: 0;
             padding-bottom: 0;
-            margin-bottom: 0;
+            margin-bottom: -0.5rem;
             border-bottom: none;
             border-bottom: none;
         }
         }
 
 

@@ -76,10 +76,10 @@
         </div>
         </div>
     </section>
     </section>
 
 
+    {{#if isJit}}
+    {{> me/order/jit-more}}
+    {{/if}}
     <section class="block goods-bottom">
     <section class="block goods-bottom">
-        {{#if isJit}}
-        {{> me/order/jit-more}}
-        {{/if}}
         {{#each goods}}
         {{#each goods}}
         {{> me/order/good}}
         {{> me/order/good}}
         {{/each}}
         {{/each}}

@@ -19,7 +19,7 @@
         {{#if brandList}}
         {{#if brandList}}
         <li class="buriedpoint">
         <li class="buriedpoint">
             {{#if brandList.url}}
             {{#if brandList.url}}
-                <a href="{{shopCategory.url}}">品牌一览</a>
+                <a href="{{brandList.url}}">品牌一览</a>
             {{^}}
             {{^}}
                 品牌一览
                 品牌一览
                 <div class="sub-group hide">
                 <div class="sub-group hide">

@@ -208,7 +208,6 @@ class SearchController extends AbstractAction
      */
      */
     public function searchAction()
     public function searchAction()
     {
     {
-        error_reporting(0);
         $data = array();
         $data = array();
 
 
         do {
         do {

@@ -440,7 +440,7 @@ class ListModel
                 if (!isset($val['shop_id'])) {
                 if (!isset($val['shop_id'])) {
                     continue;
                     continue;
                 }
                 }
-                $result[$key]['url'] = Helpers::url('/product/index/brand/', array('shop_id', $val['shop_id']));
+                $result[$key]['url'] = Helpers::url('/product/index/brand/', array('shop_id'=>$val['shop_id']));
                 $result[$key]['thumb'] = $val['brand_ico'];
                 $result[$key]['thumb'] = $val['brand_ico'];
                 $result[$key]['name'] = $val['brand_name'];
                 $result[$key]['name'] = $val['brand_name'];
             }
             }