fe / YOHOBUYWAP · Commits

Go to a project

Authored by 徐祁xuqi
Commit b119cc5808a78394bf91b519208f63c91a3665fd 2 parents 6c8b449f 9ebebd70

Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5

Inline Side-by-side
Showing 8 changed files with 42 additions and 38 deletions
@@ -354,8 +354,8 @@ class Helpers @@ -354,8 +354,8 @@ class Helpers
354 $result['showTags'] = $showTag; 354 $result['showTags'] = $showTag;
355 $result['img'] = isset($articleData['src']) ? self::getImageUrl($articleData['src'], 640, 640) : ''; 355 $result['img'] = isset($articleData['src']) ? self::getImageUrl($articleData['src'], 640, 640) : '';
356 //逛详情页app跳转url处理 20160601 356 //逛详情页app跳转url处理 20160601
357 - $result['url'] = self::getUrlSafe($articleData['url']) . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":1,"url":"' . self::url('/info/index', array(), 'guang') . '","islogin":"N"}}';  
358 - //$result['url'] = $articleData['url']; //$isApp ? $articleData['url'] : self::url('/info/index', array('id' => $articleData['id']), 'guang'); 357 + $result['url'] = $isApp ? self::getUrlSafe($articleData['url']) . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":1,"url":"' .'http:'. self::url('/info/index', array(), 'guang') . '","islogin":"N"}}' : $articleData['url'];
  358 + //$result['url'] = $articleData['url']; // ? $articleData['url'] : self::url('/info/index', array('id' => $articleData['id']), 'guang');
359 359
360 if (strrpos($result['url'], 'feature.yoho.cn') || strrpos($result['url'], 'cdn.yoho.cn')) { 360 if (strrpos($result['url'], 'feature.yoho.cn') || strrpos($result['url'], 'cdn.yoho.cn')) {
361 $result['url'] = self::transHttpsUrl($result['url']); 361 $result['url'] = self::transHttpsUrl($result['url']);
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
@@ -206,26 +206,23 @@ @@ -206,26 +206,23 @@
206 visibility: hidden; 206 visibility: hidden;
207 207
208 .reason-box { 208 .reason-box {
209 - border-bottom: solid 1px #CCCCCC; 209 + border-bottom: 1px solid #ccc;
210 font: inherit; 210 font: inherit;
211 vertical-align: baseline; 211 vertical-align: baseline;
212 position: absolute; 212 position: absolute;
213 - left: 50%;  
214 - top: 50%;  
215 - margin-left: -270px;  
216 - margin-top: -290px;  
217 - width: 540px;  
218 - height:580px; 213 + bottom: 0;
  214 + width: 100%;
  215 + height: 380px;
219 color: #444; 216 color: #444;
220 background: #fff; 217 background: #fff;
221 - border-radius: 10px;  
222 padding-bottom: 20px; 218 padding-bottom: 20px;
223 219
  220 +
224 .box-head { 221 .box-head {
225 height: 60px; 222 height: 60px;
226 line-height: 60px; 223 line-height: 60px;
227 text-align: right; 224 text-align: right;
228 - font-size: 36px; 225 + font-size: 24px;
229 background: rgb(240, 240, 240); 226 background: rgb(240, 240, 240);
230 padding-right: 30px; 227 padding-right: 30px;
231 } 228 }
@@ -233,15 +230,17 @@ @@ -233,15 +230,17 @@
233 .box-main { 230 .box-main {
234 background: #FFFFFF; 231 background: #FFFFFF;
235 padding: 20px; 232 padding: 20px;
236 - height:480px; 233 + height:300px;
237 234
238 .active-mask { 235 .active-mask {
  236 + width: 500px;
  237 + height: 60px;
239 position: absolute; 238 position: absolute;
  239 + left: 50%;
240 top: 50%; 240 top: 50%;
241 - margin-top: -44px;  
242 - height: 88px; 241 + margin-top: -18px;
  242 + margin-left: -250px;
243 z-index: 8; 243 z-index: 8;
244 - width: 500px;  
245 background: rgba(255, 255, 255, 0.1); 244 background: rgba(255, 255, 255, 0.1);
246 border-bottom: 1px solid rgb(223,224,224); 245 border-bottom: 1px solid rgb(223,224,224);
247 border-top: 1px solid rgb(223,224,224); 246 border-top: 1px solid rgb(223,224,224);
@@ -252,18 +251,16 @@ @@ -252,18 +251,16 @@
252 text-align: center; 251 text-align: center;
253 background: #FFF; 252 background: #FFF;
254 color: rgba(0, 0, 0, .5); 253 color: rgba(0, 0, 0, .5);
255 - font-size: 38px; 254 + font-size: 28px;
256 } 255 }
257 256
258 .swiper-slide-active { 257 .swiper-slide-active {
259 padding-top: 0; 258 padding-top: 0;
260 font-style: normal; 259 font-style: normal;
261 - font-size: 38px;  
262 - color: rgb(0,0,0);  
263 - line-height: 78px; 260 + font-size: 32px;
  261 + color: rgb(0, 0, 0);
  262 + line-height: 58px;
264 } 263 }
265 -  
266 -  
267 } 264 }
268 } 265 }
269 } 266 }
@@ -12,19 +12,15 @@ @@ -12,19 +12,15 @@
12 visibility: hidden; 12 visibility: hidden;
13 13
14 .reason-box { 14 .reason-box {
15 - border-bottom: solid 1px #CCCCCC; 15 + border-bottom: 1px solid #ccc;
16 font: inherit; 16 font: inherit;
17 vertical-align: baseline; 17 vertical-align: baseline;
18 position: absolute; 18 position: absolute;
19 - left: 50%;  
20 - top: 50%;  
21 - margin-left: -270px;  
22 - margin-top: -290px;  
23 - width: 540px;  
24 - height:580px; 19 + bottom: 0;
  20 + width: 100%;
  21 + height: 380px;
25 color: #444; 22 color: #444;
26 background: #fff; 23 background: #fff;
27 - border-radius: 10px;  
28 padding-bottom: 20px; 24 padding-bottom: 20px;
29 25
30 .box-head { 26 .box-head {
@@ -39,15 +35,17 @@ @@ -39,15 +35,17 @@
39 .box-main { 35 .box-main {
40 background: #FFFFFF; 36 background: #FFFFFF;
41 padding: 20px; 37 padding: 20px;
42 - height:480px; 38 + height:300px;
43 39
44 .active-mask { 40 .active-mask {
  41 + width: 500px;
  42 + height: 60px;
45 position: absolute; 43 position: absolute;
  44 + left: 50%;
46 top: 50%; 45 top: 50%;
47 - margin-top: -44px;  
48 - height: 88px; 46 + margin-top: -18px;
  47 + margin-left: -250px;
49 z-index: 8; 48 z-index: 8;
50 - width: 500px;  
51 background: rgba(255, 255, 255, 0.1); 49 background: rgba(255, 255, 255, 0.1);
52 border-bottom: 1px solid rgb(223,224,224); 50 border-bottom: 1px solid rgb(223,224,224);
53 border-top: 1px solid rgb(223,224,224); 51 border-top: 1px solid rgb(223,224,224);
@@ -58,15 +56,15 @@ @@ -58,15 +56,15 @@
58 text-align: center; 56 text-align: center;
59 background: #FFF; 57 background: #FFF;
60 color: rgba(0, 0, 0, .5); 58 color: rgba(0, 0, 0, .5);
61 - font-size: 38px; 59 + font-size: 28px;
62 } 60 }
63 61
64 .swiper-slide-active { 62 .swiper-slide-active {
65 padding-top: 0; 63 padding-top: 0;
66 font-style: normal; 64 font-style: normal;
67 - font-size: 38px;  
68 - color: rgb(0,0,0);  
69 - line-height: 78px; 65 + font-size: 32px;
  66 + color: rgb(0, 0, 0);
  67 + line-height: 58px;
70 } 68 }
71 } 69 }
72 } 70 }
@@ -166,7 +166,16 @@ class PlusstarController extends AbstractAction @@ -166,7 +166,16 @@ class PlusstarController extends AbstractAction
166 166
167 // 相关文章 167 // 相关文章
168 foreach ($brandInfo['getArticleByBrand'] as $value) { 168 foreach ($brandInfo['getArticleByBrand'] as $value) {
169 - $result = Helpers::formatArticle($value, false, $isApp, false, $uid); 169 + $result = Helpers::formatArticle($value, false, false, false, $uid);
  170 +// $result = array(
  171 +// 'id' => $value['id'],
  172 +// 'url' => $value['id'],
  173 +// 'title' => $value['id'],
  174 +// 'pageView' => $value['id'],
  175 +// 'img' => $value['src'],
  176 +// 'text' => $value['intro'],
  177 +// 'publishTime' => $value['publish_time']
  178 +// );
170 if (!$isApp) { 179 if (!$isApp) {
171 $result['like'] = $value['like']; 180 $result['like'] = $value['like'];
172 } 181 }