fe / YOHOBUYWAP · Commits

Go to a project

Authored by uedxwg
Commit 69502756e8d4f35b519dff89393ba5c00f753a92 2 parents 0f91eb26 9a8d90f7

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

Inline Side-by-side
Showing 7 changed files with 38 additions and 15 deletions
@@ -24,8 +24,8 @@ class Yohobuy @@ -24,8 +24,8 @@ class Yohobuy
24 // const YOHOBUY_URL = 'http://www.yohobuy.com/'; 24 // const YOHOBUY_URL = 'http://www.yohobuy.com/';
25 25
26 /* 测试环境 */ 26 /* 测试环境 */
27 - const API_URL = 'http://devapi.yoho.cn:58078/';  
28 - const SERVICE_URL = 'http://devservice.yoho.cn:58077/'; 27 + const API_URL = 'http://testapi.yoho.cn:28078/';
  28 + const SERVICE_URL = 'http://testservice.yoho.cn:28077/';
29 const YOHOBUY_URL = 'http://www.yohobuy.com/'; 29 const YOHOBUY_URL = 'http://www.yohobuy.com/';
30 const YOHOBUY_ORDER = 'http://192.168.102.205:8084/order/'; //我的订单 30 const YOHOBUY_ORDER = 'http://192.168.102.205:8084/order/'; //我的订单
31 const API_URL_MYCENTER = 'http://192.168.102.205:8081/users/'; // 我的个人中心接口URL 31 const API_URL_MYCENTER = 'http://192.168.102.205:8081/users/'; // 我的个人中心接口URL
@@ -313,7 +313,7 @@ class ListProcess @@ -313,7 +313,7 @@ class ListProcess
313 { 313 {
314 $fieldArr = array(); 314 $fieldArr = array();
315 foreach ($array as $k => $v) { 315 foreach ($array as $k => $v) {
316 - $fieldArr[$k] = $v[$field]; 316 + $fieldArr[$k] = isset($v[$field]) ? $v[$field] : '';
317 } 317 }
318 $sort = $desc == false ? SORT_ASC : SORT_DESC; 318 $sort = $desc == false ? SORT_ASC : SORT_DESC;
319 array_multisort($fieldArr, $sort, $array); 319 array_multisort($fieldArr, $sort, $array);
@@ -139,7 +139,7 @@ $.get('/home/locationList').then(function(html) { @@ -139,7 +139,7 @@ $.get('/home/locationList').then(function(html) {
139 addressHammer.on('tap', function(e) { 139 addressHammer.on('tap', function(e) {
140 var $this = $(e.target); 140 var $this = $(e.target);
141 141
142 - if (e.target.tagName !== 'li') { 142 + if (e.target.tagName.toLowerCase() !== 'li') {
143 $this = $this.parent('li'); 143 $this = $this.parent('li');
144 } 144 }
145 newArea.push($this.children('.caption').text()); 145 newArea.push($this.children('.caption').text());
@@ -31,7 +31,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -31,7 +31,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
31 31
32 //意见反馈主体 32 //意见反馈主体
33 .suggest-content { 33 .suggest-content {
34 - border-top: pxToRem(30px) solid #fff; 34 + border-top: 1px solid #e0e0e0;
35 35
36 .suggest-item { 36 .suggest-item {
37 width: 100%; 37 width: 100%;
@@ -76,6 +76,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -76,6 +76,7 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
76 &.suggest-active { 76 &.suggest-active {
77 > div { 77 > div {
78 width: 50%; 78 width: 50%;
  79 + height: 100%;
79 float: left; 80 float: left;
80 text-align: left; 81 text-align: left;
81 padding-left: pxToRem(128px); 82 padding-left: pxToRem(128px);
@@ -135,8 +136,29 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px); @@ -135,8 +136,29 @@ $suggest: sprite-map("me/suggest/*.png",$spacing: 5px);
135 line-height: pxToRem(88px); 136 line-height: pxToRem(88px);
136 text-align: center; 137 text-align: center;
137 font-size: pxToRem(30px); 138 font-size: pxToRem(30px);
138 - border-top: 1px solid #e0e0e0;  
139 - border-bottom: 1px solid #e0e0e0; 139 + //border-top: 1px solid #e0e0e0;
  140 + //border-bottom: 1px solid #e0e0e0;
  141 + border-top: pxToRem(30px) solid #f0f0f0;
  142 + border-bottom: pxToRem(30px) solid #f0f0f0;
  143 + position: relative;
  144 + &:after {
  145 + content: '';
  146 + width: 100%;
  147 + height: 1px;
  148 + border-top: 1px solid #e0e0e0;
  149 + position: absolute;
  150 + left: 0;
  151 + top: 0;
  152 + }
  153 + &:before {
  154 + content: '';
  155 + width: 100%;
  156 + height: 1px;
  157 + border-bottom: 1px solid #e0e0e0;
  158 + position: absolute;
  159 + left: 0;
  160 + bottom: 0;
  161 + }
140 162
141 a { 163 a {
142 color: #444; 164 color: #444;
@@ -6,6 +6,12 @@ @@ -6,6 +6,12 @@
6 我们希望了解您的意见和建议 6 我们希望了解您的意见和建议
7 </h2> 7 </h2>
8 8
  9 + <div class="create-new-suggest">
  10 + <a href="./suggestSub">
  11 + 反馈问题<span>（功能意见，界面意见）</span>
  12 + </a>
  13 + </div>
  14 +
9 <div class="suggest-content" id="suggest-content"> 15 <div class="suggest-content" id="suggest-content">
10 {{# suggestContent}} 16 {{# suggestContent}}
11 <div class="suggest-item" data-id="{{suggest_id}}"> 17 <div class="suggest-item" data-id="{{suggest_id}}">
@@ -46,11 +52,6 @@ @@ -46,11 +52,6 @@
46 52
47 {{/ suggestContent}} 53 {{/ suggestContent}}
48 </div> 54 </div>
49 - <div class="create-new-suggest">  
50 - <a href="./suggestSub">  
51 - 反馈问题<span>（功能意见，界面意见）</span>  
52 - </a>  
53 - </div>  
54 {{/ suggest}} 55 {{/ suggest}}
55 </div> 56 </div>
56 {{> layout/footer}} 57 {{> layout/footer}}
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 {{# savePrice}} 15 {{# savePrice}}
16 <div class="save-price save-price-number"> 16 <div class="save-price save-price-number">
17 比收藏时降价了<span>{{.}}</span> 17 比收藏时降价了<span>{{.}}</span>
18 - <span class="del-fav"></span> 18 + <span class="del-fav iconfont">&#xe621;</span>
19 </div> 19 </div>
20 {{/ savePrice}} 20 {{/ savePrice}}
21 21
@@ -142,10 +142,10 @@ class HomeModel @@ -142,10 +142,10 @@ class HomeModel
142 142
143 // 调用接口获取数据 143 // 调用接口获取数据
144 $banner = IndexData::getBannerStart($resource); 144 $banner = IndexData::getBannerStart($resource);
145 - if (isset($banner['code']) && $banner['code'] == 200) { 145 + if (isset($banner['code']) && $banner['code'] == 200 && $banner['data']['total'] > 0) {
146 $result = array(); 146 $result = array();
147 // 处理数据 147 // 处理数据
148 - foreach ($banner['data'] as $val) { 148 + foreach ($banner['data']['list'] as $val) {
149 foreach ($val['data'] as $single) { 149 foreach ($val['data'] as $single) {
150 $result['url'] = ($channel === 2) ? Helpers::url('/boys') : Helpers::url('/girls'); 150 $result['url'] = ($channel === 2) ? Helpers::url('/boys') : Helpers::url('/girls');
151 $result['img'] = Helpers::getImageUrl($single['src'], 640, 200); 151 $result['img'] = Helpers::getImageUrl($single['src'], 640, 200);