Merge branch 'master' of http://git.yoho.cn/fe/YOHOBUYWAP
Showing
16 changed files
with
16 additions
and
15 deletions
compile/m.yohobuy.com/1.3.27/readme.md
0 → 100644
static/dist/myohobuy/1.3.27/index-debug.js
0 → 100644
This diff could not be displayed because it is too large.
static/dist/myohobuy/1.3.27/index.css
0 → 100644
This diff could not be displayed because it is too large.
static/dist/myohobuy/1.3.27/index.js
0 → 100644
This diff could not be displayed because it is too large.
static/dist/myohobuy/1.3.27/lib.js
0 → 100644
This diff could not be displayed because it is too large.
| @@ -191,7 +191,7 @@ function reMarginFooter(fixedElement) { | @@ -191,7 +191,7 @@ function reMarginFooter(fixedElement) { | ||
| 191 | a.async = 1; | 191 | a.async = 1; |
| 192 | a.src = j; | 192 | a.src = j; |
| 193 | m.parentNode.insertBefore(a, m); | 193 | m.parentNode.insertBefore(a, m); |
| 194 | -})(window, document, 'script', ('https:' == document.location.protocol ? 'https' : 'http') + '://' + 'cdn.yoho.cn/yas-jssdk/1.0.15/yas.js', '_yas'); | 194 | +}(window, document, 'script', ('https:' === document.location.protocol ? 'https' : 'http') + '://' + 'cdn.yoho.cn/yas-jssdk/1.0.16/yas.js', '_yas')); |
| 195 | 195 | ||
| 196 | (function() { | 196 | (function() { |
| 197 | var uid = getUid(); | 197 | var uid = getUid(); |
| @@ -201,7 +201,7 @@ function reMarginFooter(fixedElement) { | @@ -201,7 +201,7 @@ function reMarginFooter(fixedElement) { | ||
| 201 | window._ozuid = uid;//暴露ozuid | 201 | window._ozuid = uid;//暴露ozuid |
| 202 | 202 | ||
| 203 | if (window._yas) { | 203 | if (window._yas) { |
| 204 | - window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', uid, '', ''); | 204 | + window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', uid, '', ''); |
| 205 | } | 205 | } |
| 206 | }()); | 206 | }()); |
| 207 | 207 | ||
| @@ -308,6 +308,3 @@ window.getShoppingKey = getShoppingKey; | @@ -308,6 +308,3 @@ window.getShoppingKey = getShoppingKey; | ||
| 308 | window.rePosFooter = rePosFooter; | 308 | window.rePosFooter = rePosFooter; |
| 309 | 309 | ||
| 310 | window.reMarginFooter = reMarginFooter; | 310 | window.reMarginFooter = reMarginFooter; |
| 311 | - | ||
| 312 | - | ||
| 313 | - |
| @@ -275,15 +275,15 @@ function search(opt) { | @@ -275,15 +275,15 @@ function search(opt) { | ||
| 275 | if (window._yas) { | 275 | if (window._yas) { |
| 276 | switch (navType) { | 276 | switch (navType) { |
| 277 | case 'newest': | 277 | case 'newest': |
| 278 | - window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid, | 278 | + window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid, |
| 279 | '', $('.new-goods .good-info .good-detail-img .good-thumb')); | 279 | '', $('.new-goods .good-info .good-detail-img .good-thumb')); |
| 280 | break; | 280 | break; |
| 281 | case 'price': | 281 | case 'price': |
| 282 | - window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid, | 282 | + window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid, |
| 283 | '', $('.price-goods .good-info .good-detail-img .good-thumb')); | 283 | '', $('.price-goods .good-info .good-detail-img .good-thumb')); |
| 284 | break; | 284 | break; |
| 285 | case 'discount': | 285 | case 'discount': |
| 286 | - window._yas(1 * new Date(), '1.0.15', 'yohobuy_m', window._ozuid, | 286 | + window._yas(1 * new Date(), '1.0.16', 'yohobuy_m', window._ozuid, |
| 287 | '', $('.discount-goods .good-info .good-detail-img .good-thumb')); | 287 | '', $('.discount-goods .good-info .good-detail-img .good-thumb')); |
| 288 | break; | 288 | break; |
| 289 | } | 289 | } |
| @@ -180,9 +180,11 @@ class InfoController extends AbstractAction | @@ -180,9 +180,11 @@ class InfoController extends AbstractAction | ||
| 180 | // 相关品牌 | 180 | // 相关品牌 |
| 181 | if (!empty($detail['getBrand'])) { | 181 | if (!empty($detail['getBrand'])) { |
| 182 | $data['relatedBrand'] = $detail['getBrand']; | 182 | $data['relatedBrand'] = $detail['getBrand']; |
| 183 | - foreach ($data['relatedBrand'] as &$value) { | ||
| 184 | - $value['thumb'] = strtr($value['thumb'], array('http://' => '//')); | 183 | + |
| 184 | + foreach ($data['relatedBrand'] as $key => $value) { | ||
| 185 | + $data['relatedBrand'][$key]['thumb'] = strtr($value['thumb'], array('http://' => '//')); | ||
| 185 | } | 186 | } |
| 187 | + | ||
| 186 | } | 188 | } |
| 187 | 189 | ||
| 188 | // 相关标签 | 190 | // 相关标签 |
| @@ -223,6 +225,7 @@ class InfoController extends AbstractAction | @@ -223,6 +225,7 @@ class InfoController extends AbstractAction | ||
| 223 | // 标识有微信分享 | 225 | // 标识有微信分享 |
| 224 | $data['hasWxShare'] = true; | 226 | $data['hasWxShare'] = true; |
| 225 | 227 | ||
| 228 | + | ||
| 226 | $this->_view->display('index', $data); | 229 | $this->_view->display('index', $data); |
| 227 | 230 | ||
| 228 | $detail = array(); | 231 | $detail = array(); |
| @@ -356,6 +359,7 @@ class InfoController extends AbstractAction | @@ -356,6 +359,7 @@ class InfoController extends AbstractAction | ||
| 356 | $data['relatedBrand'] = $detail['getBrand']; | 359 | $data['relatedBrand'] = $detail['getBrand']; |
| 357 | } | 360 | } |
| 358 | 361 | ||
| 362 | + | ||
| 359 | // 分享参数 | 363 | // 分享参数 |
| 360 | if (isset($detail['getArticle']['cover_image'])) { | 364 | if (isset($detail['getArticle']['cover_image'])) { |
| 361 | $data['shareLink'] = Helpers::url('/info/index', array('id' => $id), 'guang'); | 365 | $data['shareLink'] = Helpers::url('/info/index', array('id' => $id), 'guang'); |
| @@ -50,7 +50,7 @@ application.template.ext = ".phtml" | @@ -50,7 +50,7 @@ application.template.ext = ".phtml" | ||
| 50 | application.assets.path = ROOT_PATH "/assets" | 50 | application.assets.path = ROOT_PATH "/assets" |
| 51 | 51 | ||
| 52 | ; 应用的版本号 | 52 | ; 应用的版本号 |
| 53 | -application.version = "1.3.26" | 53 | +application.version = "1.3.27" |
| 54 | 54 | ||
| 55 | ; 网站SEO信息 | 55 | ; 网站SEO信息 |
| 56 | application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" | 56 | application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" |
| @@ -50,7 +50,7 @@ application.template.ext = ".phtml" | @@ -50,7 +50,7 @@ application.template.ext = ".phtml" | ||
| 50 | application.assets.path = ROOT_PATH "/assets" | 50 | application.assets.path = ROOT_PATH "/assets" |
| 51 | 51 | ||
| 52 | ; 应用的版本号 | 52 | ; 应用的版本号 |
| 53 | -application.version = "1.3.26" | 53 | +application.version = "1.3.27" |
| 54 | 54 | ||
| 55 | ; 网站SEO信息 | 55 | ; 网站SEO信息 |
| 56 | application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" | 56 | application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" |
| @@ -50,7 +50,7 @@ application.template.ext = ".phtml" | @@ -50,7 +50,7 @@ application.template.ext = ".phtml" | ||
| 50 | application.assets.path = ROOT_PATH "/assets" | 50 | application.assets.path = ROOT_PATH "/assets" |
| 51 | 51 | ||
| 52 | ; 应用的版本号 | 52 | ; 应用的版本号 |
| 53 | -application.version = "1.3.26" | 53 | +application.version = "1.3.27" |
| 54 | 54 | ||
| 55 | ; 网站SEO信息 | 55 | ; 网站SEO信息 |
| 56 | application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" | 56 | application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" |
| @@ -50,7 +50,7 @@ application.template.ext = ".phtml" | @@ -50,7 +50,7 @@ application.template.ext = ".phtml" | ||
| 50 | application.assets.path = ROOT_PATH "/assets" | 50 | application.assets.path = ROOT_PATH "/assets" |
| 51 | 51 | ||
| 52 | ; 应用的版本号 | 52 | ; 应用的版本号 |
| 53 | -application.version = "1.3.26" | 53 | +application.version = "1.3.27" |
| 54 | 54 | ||
| 55 | ; 网站SEO信息 | 55 | ; 网站SEO信息 |
| 56 | application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" | 56 | application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" |
-
Please register or login to post a comment