chenchao / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit 46931aa56041ed94ea2bb493eed5b97c12817392 2 parents 4118c71e 6be723f5

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

Inline Side-by-side
Showing 9 changed files with 59 additions and 48 deletions
@@ -1096,13 +1096,13 @@ @@ -1096,13 +1096,13 @@
1096 'vipLevel' : { 1096 'vipLevel' : {
1097 'list' : [ 1097 'list' : [
1098 { 1098 {
1099 - 'text' : '¥284.00' 1099 + 'text' : '¥284.00',
  1100 + 'currentLevel':true
1100 }, 1101 },
1101 ... 1102 ...
1102 ] 1103 ]
1103 }, 1104 },
1104 'goodsDiscount' : { 1105 'goodsDiscount' : {
1105 - 'listLength' : 2,  
1106 'list' : [ 1106 'list' : [
1107 { 1107 {
1108 'text' : '【BACK TO SCHOOL】满￥499赠送Paul Franke帽子一个，多买多送！' 1108 'text' : '【BACK TO SCHOOL】满￥499赠送Paul Franke帽子一个，多买多送！'
@@ -1234,12 +1234,29 @@ @@ -1234,12 +1234,29 @@
1234 }, 1234 },
1235 1235
1236 'cartInfo' : { 1236 'cartInfo' : {
1237 - 'numInCart' : 3,  
1238 - 'goodsInstore' : 0,  
1239 - 'isCollect':true// 1237 + 'cartUrl':'购物车url',
  1238 + 'addToCartUrl':'添加购物车url',
  1239 + 'soldOut':'已售罄',
  1240 + 'notForSale':'非卖品'
  1241 + },
  1242 + 'introUrl' : '',
  1243 + 'id' : '',
  1244 + 'preferenceUrl' :''
  1245 + }
  1246 +### 咨询列表页面
  1247 + {
  1248 + 'link' : '咨询表单跳转url',
  1249 + 'consults':{
  1250 + 'list' : [
  1251 + {
  1252 + 'question':'',
  1253 + 'time':'',
  1254 + 'answer':''
  1255 + }
  1256 + ...
  1257 + ]
1240 } 1258 }
1241 } 1259 }
1242 -  
1243 ### 支付中心 1260 ### 支付中心
1244 1261
1245 { 1262 {
@@ -42,7 +42,7 @@ class ListProcess @@ -42,7 +42,7 @@ class ListProcess
42 $products = array(); 42 $products = array();
43 43
44 foreach ($data as $value) { 44 foreach ($data as $value) {
45 - $products[] = Helpers::formatProduct($value, true, true, true); 45 + $products[] = Helpers::formatProduct($value, true, true, true, 235, 314);
46 } 46 }
47 47
48 return $products; 48 return $products;
@@ -92,7 +92,7 @@ function callpay(orderCode) { @@ -92,7 +92,7 @@ function callpay(orderCode) {
92 function isWXOpen() { 92 function isWXOpen() {
93 var ua = window.navigator.userAgent.toLowerCase(); 93 var ua = window.navigator.userAgent.toLowerCase();
94 94
95 - if (ua.match(/MicroMessenger/i) === 'micromessenger') { 95 + if (ua.match(/MicroMessenger/i).toString() === 'micromessenger') {
96 return true; 96 return true;
97 } else { 97 } else {
98 return false; 98 return false;
@@ -16,6 +16,7 @@ var goodsDiscountEl = document.getElementById('goodsDiscount'), @@ -16,6 +16,7 @@ var goodsDiscountEl = document.getElementById('goodsDiscount'),
16 goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl); 16 goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl);
17 17
18 var $cart = $('.cart-bar'); 18 var $cart = $('.cart-bar');
  19 +var UA = navigator.userAgent.toLowerCase().toString();
19 20
20 require('./desc'); 21 require('./desc');
21 require('./comments-consults'); 22 require('./comments-consults');
@@ -81,4 +82,7 @@ $.ajax({ @@ -81,4 +82,7 @@ $.ajax({
81 } 82 }
82 }); 83 });
83 84
  85 +if (UA.indexOf('mqqbrowser') > -1) {
  86 + $('.detail > div').removeClass('column').addClass('oldbox');
  87 +}
84 require('./like'); 88 require('./like');
@@ -280,7 +280,7 @@ @@ -280,7 +280,7 @@
280 } 280 }
281 } 281 }
282 } 282 }
283 - 283 +
284 .comment-content-footer, 284 .comment-content-footer,
285 .consult-content-footer { 285 .consult-content-footer {
286 min-height: pxToRem(88px); 286 min-height: pxToRem(88px);
@@ -290,7 +290,7 @@ @@ -290,7 +290,7 @@
290 line-height: pxToRem(88px); 290 line-height: pxToRem(88px);
291 font-size: pxToRem(28px); 291 font-size: pxToRem(28px);
292 a { 292 a {
293 - color: #e0e0e0; 293 + color: #b0b0b0;
294 .iconfont { 294 .iconfont {
295 font-size: inherit; 295 font-size: inherit;
296 } 296 }
@@ -46,7 +46,7 @@ $basicBtnC:#eb0313; @@ -46,7 +46,7 @@ $basicBtnC:#eb0313;
46 .column { 46 .column {
47 box-sizing: border-box; 47 box-sizing: border-box;
48 //padding: pxToRem(20px) pxToRem(12px); 48 //padding: pxToRem(20px) pxToRem(12px);
49 - padding: 4% 3%; 49 + padding: pxToRem(6px) 3%;
50 width: 49.9%; 50 width: 49.9%;
51 border-bottom: pxToRem(4px) solid #fff; 51 border-bottom: pxToRem(4px) solid #fff;
52 border-right: pxToRem(4px) solid #fff; 52 border-right: pxToRem(4px) solid #fff;
@@ -64,6 +64,20 @@ $basicBtnC:#eb0313; @@ -64,6 +64,20 @@ $basicBtnC:#eb0313;
64 flex-basis: 49.9% 64 flex-basis: 49.9%
65 )) 65 ))
66 } 66 }
  67 + .oldbox{
  68 + padding: pxToRem(6px) 3%;
  69 + width: 49.9%;
  70 + background-color: $tableCellC;
  71 + box-sizing: border-box;
  72 + border-bottom: 1px solid #fff;
  73 + border-right: 1px solid #fff;
  74 + width: 49.9%;
  75 + height: 100%;
  76 + float: left;
  77 + text-overflow:ellipsis;
  78 + white-space:nowrap;
  79 + overflow:hidden;
  80 + }
67 } 81 }
68 } 82 }
69 } 83 }
@@ -11,10 +11,6 @@ @@ -11,10 +11,6 @@
11 background-size: cover; 11 background-size: cover;
12 } 12 }
13 .detail{ 13 .detail{
14 - // background-color: $tableCellC;  
15 - // &.table .inner-container{  
16 - // background-color: $tableCellC;  
17 - // }  
18 margin-bottom: 1px; 14 margin-bottom: 1px;
19 } 15 }
20 .desc-text { 16 .desc-text {
@@ -42,30 +38,21 @@ @@ -42,30 +38,21 @@
42 .detail { 38 .detail {
43 .material-item{ 39 .material-item{
44 margin: pxToRem(10px) 0; 40 margin: pxToRem(10px) 0;
45 - @include flexbox((  
46 - display: box,  
47 - box-align: center  
48 - ), $version: 1);  
49 - @include flexbox((  
50 - display: flex,  
51 - align-items: center  
52 - )); 41 + width: 100%;
  42 + height: auto;
  43 + overflow: hidden;
  44 + display: block;
  45 + position: relative;
53 46
54 img { 47 img {
55 margin: 0; 48 margin: 0;
56 } 49 }
57 .material-image { 50 .material-image {
58 width: 23%; 51 width: 23%;
59 - @include flexbox((  
60 - box-flex: 1.0,  
61 - display: box,  
62 - box-pack: center  
63 - ), $version: 1);  
64 - @include flexbox((  
65 - display: flex,  
66 - flex-basis: 23%,  
67 - justify-content: center  
68 - )); 52 + position: absolute;
  53 + left: 0;
  54 + top: 50%;
  55 + @include transform(translateY(-50%))
69 } 56 }
70 .material-desc { 57 .material-desc {
71 font-size: pxToRem(24px); 58 font-size: pxToRem(24px);
@@ -76,15 +63,8 @@ @@ -76,15 +63,8 @@
76 line-height: pxToRem(38px); 63 line-height: pxToRem(38px);
77 color: #4b4b4b; 64 color: #4b4b4b;
78 word-wrap: break-word; 65 word-wrap: break-word;
79 - width: 76.9;  
80 - @include flexbox((  
81 - box-flex: 1.0,  
82 - display: box  
83 - ), $version: 1);  
84 - @include flexbox((  
85 - display: flex,  
86 - flex-basis: 76.9%  
87 - )); 66 + width: 76.9%;
  67 + float: right;
88 } 68 }
89 &:last-child{ 69 &:last-child{
90 border-bottom: none; 70 border-bottom: none;
@@ -22,13 +22,9 @@ @@ -22,13 +22,9 @@
22 <p>{{answer}}</p> 22 <p>{{answer}}</p>
23 </div> 23 </div>
24 </div> 24 </div>
25 -  
26 {{/list}} 25 {{/list}}
27 </div> 26 </div>
28 {{/ consults}} 27 {{/ consults}}
29 28
30 - {{#if loadmore}}  
31 - <input id="loadMoreUrl" type="hidden" value="{{loadMoreUrl}}">  
32 - {{/if}}  
33 </div> 29 </div>
34 {{> layout/footer}} 30 {{> layout/footer}}
@@ -201,7 +201,7 @@ class UserModel @@ -201,7 +201,7 @@ class UserModel
201 $datas[] = $product; 201 $datas[] = $product;
202 } 202 }
203 !empty($datas) && $result['hasFavProduct'] = $datas; 203 !empty($datas) && $result['hasFavProduct'] = $datas;
204 - } else if ($page > 1 && isset($favProduct['code']) && $favProduct['code'] === 500) { 204 + } else if ($page > 1 && (!$favProduct || (isset($favProduct['code']) && $favProduct['code'] === 500))) {
205 $result['end'] = true; 205 $result['end'] = true;
206 } 206 }
207 207
@@ -259,7 +259,7 @@ class UserModel @@ -259,7 +259,7 @@ class UserModel
259 $datas[] = $brand; 259 $datas[] = $brand;
260 } 260 }
261 !empty($datas) && $result['hasFavBrand'] = $datas; 261 !empty($datas) && $result['hasFavBrand'] = $datas;
262 - } else if ($page > 1 && isset($favBrand['code']) && $favBrand['code'] === 500) { 262 + } else if ($page > 1 && (!$favBrand || (isset($favBrand['code']) && $favBrand['code'] === 500))) {
263 $result['end'] = true; 263 $result['end'] = true;
264 } 264 }
265 265