Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into hotfix/apichange-bug

- Subproject commit e9d066dd88a8e7e37103021c427a205a5cfcdcec
+ Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2

@@ -313,7 +313,7 @@ class ListProcess
     {
         $fieldArr = array();
         foreach ($array as $k => $v) {
-            $fieldArr[$k] = $v[$field];
+            $fieldArr[$k] = isset($v[$field]) ? $v[$field] : '';
         }
         $sort = $desc == false ? SORT_ASC : SORT_DESC;
         array_multisort($fieldArr, $sort, $array);

@@ -139,7 +139,7 @@ $.get('/home/locationList').then(function(html) {
         addressHammer.on('tap', function(e) {
             var $this = $(e.target);
 
-            if (e.target.tagName !== 'li') {
+            if (e.target.tagName.toLowerCase() !== 'li') {
                 $this = $this.parent('li');
             }
             newArea.push($this.children('.caption').text());

@@ -261,7 +261,13 @@
                     height: pxToRem(200px);
                     line-height: pxToRem(200px);
                     color: #e0e0e0;
+                    font-size: 20px;
                     text-align: center;
+                    span{
+                        display: inline-block;
+                        font-size: 20px;
+                        padding-right: 5px;
+                    }
                 }
             }
         }

@@ -33,11 +33,8 @@ $basicBtnC:#eb0313;
             line-height: pxToRem(36px);
             &.table {
                 width: 100%;
-                // .row {
-                //     display: table-row;
                 .column {
                     box-sizing: border-box;
-                    display: table-cell;
                     padding: pxToRem(20px) pxToRem(12px);
                     width: 50%;
                     border-bottom: 1px solid #fff;
@@ -45,9 +42,6 @@ $basicBtnC:#eb0313;
                     font-size: pxToRem(24px);
                     background-color: $tableCellC;
                     float: left;
-                    // &:nth-child(even) {
-                    //     border-right: none;
-                    // }
                 }
             }
         }
@@ -89,7 +83,6 @@ $basicBtnC:#eb0313;
         left: pxToRem(108px);
         top: pxToRem(40px);
         height: pxToRem(35px);
-        // width: pxToRem(70px);
         color: #fff;
         font-size: pxToRem(20px);
         line-height: pxToRem(35px);
@@ -137,6 +130,12 @@ $basicBtnC:#eb0313;
         background-color: #fff;
         // overflow: hidden;
     }
+    .banner-top-single{
+        height:pxToRem(600px);
+        width: pxToRem(448px);
+        margin:pxToRem(30px) pxToRem(72px);
+        overflow: hidden;
+    }
     .banner-top {
         // width: 100%;
         min-height: 660rem / $pxConvertRem;
@@ -163,14 +162,12 @@ $basicBtnC:#eb0313;
         min-height: pxToRem(600px);
         min-width: pxToRem(448px);
         margin: pxToRem(30px) pxToRem(96px);
-        // position: relative;
         overflow: hidden;
         ul {
             position: relative;
             height: 100%;
             li {
                 float: left;
-                // height: 100%;
             }
         }
     }

@@ -4,7 +4,7 @@
         <div class="tag-container">
             {{# tags}}
                 {{# is_new}}
-	                <p class="good-tag new-tag">NEW</p>
+                    <p class="good-tag new-tag">NEW</p>
                 {{/ is_new}}
                 {{# is_advance}}
                     <p class="good-tag renew-tag">再到着</p>
@@ -113,7 +113,6 @@
     {{/ enterStore}}
 
     <div id="productDesc"> </div>
-    <!-- {{> product/product-description}} -->
     {{> product/recommend-for-you}}
 
     {{#cartInfo}}

@@ -15,7 +15,7 @@
 			{{# savePrice}}
 			<div class="save-price save-price-number">
 				比收藏时降价了<span>{{.}}</span>
-				<span class="del-fav"></span>
+                <span class="del-fav iconfont">&#xe621;</span>
 			</div>
 			{{/ savePrice}}
 

@@ -44,7 +44,7 @@
             </div>
 
             <div class="answer">
-                <span class="iconfont">&#xe63c;</span>
+                <span class="iconfont">&#xe63d;</span>
                 <p>{{answer}}</p>
             </div>
             {{/ consults}}
@@ -56,7 +56,7 @@
         </div>
         {{else}}
         <div class="consult-content-main content-main no-item">
-            <span class="iconfont">&#xe63c;</span>暂无咨询
+            <span class="iconfont">&#xe63d;</span>暂无咨询
         </div>
         <div class="consult-content-footer">
             <a href="/product/detail/consultform">

@@ -142,10 +142,10 @@ class HomeModel
 
         // 调用接口获取数据
         $banner = IndexData::getBannerStart($resource);
-        if (isset($banner['code']) && $banner['code'] == 200) {
+        if (isset($banner['code']) && $banner['code'] == 200 && $banner['data']['total'] > 0) {
             $result = array();
             // 处理数据
-            foreach ($banner['data'] as $val) {
+            foreach ($banner['data']['list'] as $val) {
                 foreach ($val['data'] as $single) {
                     $result['url'] = ($channel === 2) ? Helpers::url('/boys') : Helpers::url('/girls');
                     $result['img'] = Helpers::getImageUrl($single['src'], 640, 200);