Merge branch 'develop/wap' into beta/wap

@@ -46,7 +46,7 @@
     <div class="cart-content presell hide">
         <p class="presell-info">
             <span class="iconfont">&#xe61a;</span>
-            <span class="txt">预售商品全场包邮，到货后立即发货</span>
+            <span class="txt">由于商品上市期不同，先到的将先发货</span>
             <span class="txt">预售商品不参加活动，不可使用优惠券</span>
         </p>
         {{> cart/cart-content}}

@@ -126,6 +126,10 @@ class ClassModel
                 foreach ($data as $item) {
                     $id = $item['category_id'];
                     $result['first'][$id] = $item['category_name'];
+                    if (!isset($item['sub'])) {
+                        continue;
+                    }
+
                     foreach ($item['sub'] as $sub) {
                         $id = $sub['category_id'];
                         $result['second'][$id] = $sub['category_name'];