fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by Rock Zhang
Commit 28623c19200761f2cbcc88ef3f30aad8c9458b07 2 parents 2cfc354c a68bfff5

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

Inline Side-by-side
Showing 9 changed files with 21 additions and 19 deletions
framework @ 75bbc3b0
1 -Subproject commit e9d066dd88a8e7e37103021c427a205a5cfcdcec 1 +Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
@@ -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());
@@ -261,7 +261,13 @@ @@ -261,7 +261,13 @@
261 height: pxToRem(200px); 261 height: pxToRem(200px);
262 line-height: pxToRem(200px); 262 line-height: pxToRem(200px);
263 color: #e0e0e0; 263 color: #e0e0e0;
  264 + font-size: 20px;
264 text-align: center; 265 text-align: center;
  266 + span{
  267 + display: inline-block;
  268 + font-size: 20px;
  269 + padding-right: 5px;
  270 + }
265 } 271 }
266 } 272 }
267 } 273 }
@@ -33,11 +33,8 @@ $basicBtnC:#eb0313; @@ -33,11 +33,8 @@ $basicBtnC:#eb0313;
33 line-height: pxToRem(36px); 33 line-height: pxToRem(36px);
34 &.table { 34 &.table {
35 width: 100%; 35 width: 100%;
36 - // .row {  
37 - // display: table-row;  
38 .column { 36 .column {
39 box-sizing: border-box; 37 box-sizing: border-box;
40 - display: table-cell;  
41 padding: pxToRem(20px) pxToRem(12px); 38 padding: pxToRem(20px) pxToRem(12px);
42 width: 50%; 39 width: 50%;
43 border-bottom: 1px solid #fff; 40 border-bottom: 1px solid #fff;
@@ -45,9 +42,6 @@ $basicBtnC:#eb0313; @@ -45,9 +42,6 @@ $basicBtnC:#eb0313;
45 font-size: pxToRem(24px); 42 font-size: pxToRem(24px);
46 background-color: $tableCellC; 43 background-color: $tableCellC;
47 float: left; 44 float: left;
48 - // &:nth-child(even) {  
49 - // border-right: none;  
50 - // }  
51 } 45 }
52 } 46 }
53 } 47 }
@@ -89,7 +83,6 @@ $basicBtnC:#eb0313; @@ -89,7 +83,6 @@ $basicBtnC:#eb0313;
89 left: pxToRem(108px); 83 left: pxToRem(108px);
90 top: pxToRem(40px); 84 top: pxToRem(40px);
91 height: pxToRem(35px); 85 height: pxToRem(35px);
92 - // width: pxToRem(70px);  
93 color: #fff; 86 color: #fff;
94 font-size: pxToRem(20px); 87 font-size: pxToRem(20px);
95 line-height: pxToRem(35px); 88 line-height: pxToRem(35px);
@@ -137,6 +130,12 @@ $basicBtnC:#eb0313; @@ -137,6 +130,12 @@ $basicBtnC:#eb0313;
137 background-color: #fff; 130 background-color: #fff;
138 // overflow: hidden; 131 // overflow: hidden;
139 } 132 }
  133 + .banner-top-single{
  134 + height:pxToRem(600px);
  135 + width: pxToRem(448px);
  136 + margin:pxToRem(30px) pxToRem(72px);
  137 + overflow: hidden;
  138 + }
140 .banner-top { 139 .banner-top {
141 // width: 100%; 140 // width: 100%;
142 min-height: 660rem / $pxConvertRem; 141 min-height: 660rem / $pxConvertRem;
@@ -163,14 +162,12 @@ $basicBtnC:#eb0313; @@ -163,14 +162,12 @@ $basicBtnC:#eb0313;
163 min-height: pxToRem(600px); 162 min-height: pxToRem(600px);
164 min-width: pxToRem(448px); 163 min-width: pxToRem(448px);
165 margin: pxToRem(30px) pxToRem(96px); 164 margin: pxToRem(30px) pxToRem(96px);
166 - // position: relative;  
167 overflow: hidden; 165 overflow: hidden;
168 ul { 166 ul {
169 position: relative; 167 position: relative;
170 height: 100%; 168 height: 100%;
171 li { 169 li {
172 float: left; 170 float: left;
173 - // height: 100%;  
174 } 171 }
175 } 172 }
176 } 173 }
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="tag-container"> 4 <div class="tag-container">
5 {{# tags}} 5 {{# tags}}
6 {{# is_new}} 6 {{# is_new}}
7 - <p class="good-tag new-tag">NEW</p> 7 + <p class="good-tag new-tag">NEW</p>
8 {{/ is_new}} 8 {{/ is_new}}
9 {{# is_advance}} 9 {{# is_advance}}
10 <p class="good-tag renew-tag">再到着</p> 10 <p class="good-tag renew-tag">再到着</p>
@@ -113,7 +113,6 @@ @@ -113,7 +113,6 @@
113 {{/ enterStore}} 113 {{/ enterStore}}
114 114
115 <div id="productDesc"> </div> 115 <div id="productDesc"> </div>
116 - <!-- {{> product/product-description}} -->  
117 {{> product/recommend-for-you}} 116 {{> product/recommend-for-you}}
118 117
119 {{#cartInfo}} 118 {{#cartInfo}}
@@ -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
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 </div> 44 </div>
45 45
46 <div class="answer"> 46 <div class="answer">
47 - <span class="iconfont">&#xe63c;</span> 47 + <span class="iconfont">&#xe63d;</span>
48 <p>{{answer}}</p> 48 <p>{{answer}}</p>
49 </div> 49 </div>
50 {{/ consults}} 50 {{/ consults}}
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 </div> 56 </div>
57 {{else}} 57 {{else}}
58 <div class="consult-content-main content-main no-item"> 58 <div class="consult-content-main content-main no-item">
59 - <span class="iconfont">&#xe63c;</span>暂无咨询 59 + <span class="iconfont">&#xe63d;</span>暂无咨询
60 </div> 60 </div>
61 <div class="consult-content-footer"> 61 <div class="consult-content-footer">
62 <a href="/product/detail/consultform"> 62 <a href="/product/detail/consultform">
@@ -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);