diff --git a/library/Api/Yohobuy.php b/library/Api/Yohobuy.php index 47061b4..4a5ec63 100644 --- a/library/Api/Yohobuy.php +++ b/library/Api/Yohobuy.php @@ -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 diff --git a/library/Plugin/DataProcess/ListProcess.php b/library/Plugin/DataProcess/ListProcess.php index d7e20c0..b380e9b 100644 --- a/library/Plugin/DataProcess/ListProcess.php +++ b/library/Plugin/DataProcess/ListProcess.php @@ -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); diff --git a/static/js/me/address-act.js b/static/js/me/address-act.js index 265aa64..70cb157 100644 --- a/static/js/me/address-act.js +++ b/static/js/me/address-act.js @@ -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()); diff --git a/static/sass/me/_suggest.scss b/static/sass/me/_suggest.scss index caad601..aaece61 100644 --- a/static/sass/me/_suggest.scss +++ b/static/sass/me/_suggest.scss @@ -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; diff --git a/template/m.yohobuy.com/actions/index/home/suggest.phtml b/template/m.yohobuy.com/actions/index/home/suggest.phtml index b514c06..94d6370 100644 --- a/template/m.yohobuy.com/actions/index/home/suggest.phtml +++ b/template/m.yohobuy.com/actions/index/home/suggest.phtml @@ -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 diff --git a/template/m.yohobuy.com/partials/home/favorite_product_list.phtml b/template/m.yohobuy.com/partials/home/favorite_product_list.phtml index 385e0fd..1c6aa62 100644 --- a/template/m.yohobuy.com/partials/home/favorite_product_list.phtml +++ b/template/m.yohobuy.com/partials/home/favorite_product_list.phtml @@ -15,7 +15,7 @@ {{# savePrice}} <div class="save-price save-price-number"> 比收藏时降价了<span>{{.}}</span> - <span class="del-fav"></span> + <span class="del-fav iconfont"></span> </div> {{/ savePrice}} diff --git a/yohobuy/m.yohobuy.com/application/models/Index/Home.php b/yohobuy/m.yohobuy.com/application/models/Index/Home.php index 1e13108..710f0ba 100644 --- a/yohobuy/m.yohobuy.com/application/models/Index/Home.php +++ b/yohobuy/m.yohobuy.com/application/models/Index/Home.php @@ -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);