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

@@ -24,8 +24,8 @@ class Yohobuy
     // const YOHOBUY_URL = 'http://www.yohobuy.com/';
 
     /* 测试环境 */
-    const API_URL = 'http://devapi.yoho.cn:58078/';
-    const SERVICE_URL = 'http://devservice.yoho.cn:58077/';
+    const API_URL = 'http://testapi.yoho.cn:28078/';
+    const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
     const YOHOBUY_URL = 'http://www.yohobuy.com/';
     const YOHOBUY_ORDER = 'http://192.168.102.205:8084/order/';        //我的订单
     const API_URL_MYCENTER = 'http://192.168.102.205:8081/users/'; // 我的个人中心接口URL

@@ -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());

@@ -31,7 +31,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
 
     //意见反馈主体
     .suggest-content {
-        border-top: pxToRem(30px) solid #fff;
+        border-top: 1px solid #e0e0e0;
 
         .suggest-item {
             width: 100%;
@@ -76,6 +76,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
                 &.suggest-active {
                     > div {
                         width: 50%;
+                        height: 100%;
                         float: left;
                         text-align: left;
                         padding-left: pxToRem(128px);
@@ -135,8 +136,29 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
         line-height: pxToRem(88px);
         text-align: center;
         font-size: pxToRem(30px);
-        border-top: 1px solid #e0e0e0;
-        border-bottom: 1px solid #e0e0e0;
+        //border-top: 1px solid #e0e0e0;
+        //border-bottom: 1px solid #e0e0e0;
+        border-top: pxToRem(30px) solid #f0f0f0;
+        border-bottom: pxToRem(30px) solid #f0f0f0;
+        position: relative;
+        &:after {
+            content: '';
+            width: 100%;
+            height: 1px;
+            border-top: 1px solid #e0e0e0;
+            position: absolute;
+            left: 0;
+            top: 0;
+        }
+        &:before {
+            content: '';
+            width: 100%;
+            height: 1px;
+            border-bottom: 1px solid #e0e0e0;
+            position: absolute;
+            left: 0;
+            bottom: 0;
+        }
 
         a {
             color: #444;

@@ -6,6 +6,12 @@
         我们希望了解您的意见和建议
     </h2>
 
+    <div class="create-new-suggest">
+        <a href="./suggestSub">
+            反馈问题<span>（功能意见，界面意见）</span>
+        </a>
+    </div>
+
     <div class="suggest-content" id="suggest-content">
         {{# suggestContent}}
         <div class="suggest-item" data-id="{{suggest_id}}">
@@ -46,11 +52,6 @@
 
         {{/ suggestContent}}
     </div>
-    <div class="create-new-suggest">
-        <a href="./suggestSub">
-            反馈问题<span>（功能意见，界面意见）</span>
-        </a>
-    </div>
     {{/ suggest}}
 </div>
 {{> layout/footer}}
\ No newline at end of file

@@ -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}}
 

@@ -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);