fe / YOHOBUYWAP · Commits

Go to a project

Authored by biao
Commit 03c471408a16c35b1b0405e009d704abf9f6d039 2 parents 54f4555a bd073f7b

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

Inline Side-by-side
Showing 15 changed files with 123 additions and 141 deletions
@@ -52,14 +52,16 @@ class Call extends Factory @@ -52,14 +52,16 @@ class Call extends Factory
52 $keys['code'] = $_REQUEST['code']; 52 $keys['code'] = $_REQUEST['code'];
53 $keys['redirect_uri'] = $this->apiConfig['appCallbackUrl']; 53 $keys['redirect_uri'] = $this->apiConfig['appCallbackUrl'];
54 54
55 - try  
56 - {  
57 - $token = $this->oauth->getAccessToken('code', $keys);  
58 - }  
59 - catch (Exception $e)  
60 - {  
61 - // do nothing  
62 - } 55 + $token = $this->oauth->getAccessToken('code', $keys);
  56 +
  57 +// try
  58 +// {
  59 +// $token = $this->oauth->getAccessToken('code', $keys);
  60 +// }
  61 +// catch (Exception $e)
  62 +// {
  63 +// // do nothing
  64 +// }
63 } 65 }
64 66
65 return $token; 67 return $token;
@@ -990,7 +990,11 @@ var $loading, @@ -990,7 +990,11 @@ var $loading,
990 990
991 // 初始化 991 // 初始化
992 function init($container) { 992 function init($container) {
993 - var html = '<div class="loading-mask hide"><div class="loading"></div></div>'; 993 + var html = '<div class="loading-mask hide">' +
  994 + '<div class="loading">' +
  995 + '<div></div><div></div><div></div>' +
  996 + '</div>' +
  997 + '</div>';
994 998
995 hasInit = true; 999 hasInit = true;
996 if ($container === undefined) { 1000 if ($container === undefined) {
@@ -1970,6 +1974,7 @@ var $icon = $('.search-icon'); @@ -1970,6 +1974,7 @@ var $icon = $('.search-icon');
1970 var $form = $('#search-form'); 1974 var $form = $('#search-form');
1971 1975
1972 var $history = $('.history'); 1976 var $history = $('.history');
  1977 +var $historySearch = $('.history-search');
1973 1978
1974 var $clearHistory = $('#clear-history'); 1979 var $clearHistory = $('#clear-history');
1975 1980
@@ -1984,6 +1989,8 @@ chHammer.on('tap', function() { @@ -1984,6 +1989,8 @@ chHammer.on('tap', function() {
1984 localStorage.removeItem('historys'); 1989 localStorage.removeItem('historys');
1985 1990
1986 $history.html(''); 1991 $history.html('');
  1992 + $historySearch.hide();
  1993 + $clearHistory.hide();
1987 1994
1988 window.rePosFooter(); 1995 window.rePosFooter();
1989 }); 1996 });
@@ -2033,7 +2040,7 @@ $('#search').on('touchend', function() { @@ -2033,7 +2040,7 @@ $('#search').on('touchend', function() {
2033 2040
2034 $history.html(html); 2041 $history.html(html);
2035 $clearHistory.removeClass('hide'); 2042 $clearHistory.removeClass('hide');
2036 - 2043 + $historySearch.removeClass('hide');
2037 window.rePosFooter(); 2044 window.rePosFooter();
2038 } 2045 }
2039 } 2046 }
@@ -3299,7 +3306,7 @@ var winH = $(window).height(), @@ -3299,7 +3306,7 @@ var winH = $(window).height(),
3299 noResult = '<p class="no-result">未找到相关搜索结果</p>'; 3306 noResult = '<p class="no-result">未找到相关搜索结果</p>';
3300 3307
3301 //默认筛选条件 3308 //默认筛选条件
3302 -var defaultOpt = require("js/product/extract-url"); 3309 +var defaultOpt = require("js/product/query-param");
3303 3310
3304 var storeOpt = $.extend({}, defaultOpt); //存储默认筛选条件以便重置 3311 var storeOpt = $.extend({}, defaultOpt); //存储默认筛选条件以便重置
3305 3312
@@ -3844,49 +3851,21 @@ exports.hideFilter = hideFilter; @@ -3844,49 +3851,21 @@ exports.hideFilter = hideFilter;
3844 exports.resetFilter = resetFilter; 3851 exports.resetFilter = resetFilter;
3845 3852
3846 }); 3853 });
3847 -define("js/product/extract-url", [], function(require, exports, module){ 3854 +define("js/product/query-param", ["jquery"], function(require, exports, module){
3848 /** 3855 /**
3849 - * 提取URL中的参数 3856 + * 提取查询参数
3850 * @author: xuqi<qi.xu@yoho.cn> 3857 * @author: xuqi<qi.xu@yoho.cn>
3851 * @date: 2015/11/19 3858 * @date: 2015/11/19
3852 */ 3859 */
3853 3860
3854 -var opt = {};  
3855 -  
3856 -var paramStr = window.location.search.split('?')[1];  
3857 -  
3858 -var keyVal = paramStr ? paramStr.split('&') : [];  
3859 -  
3860 -var i, key, val;  
3861 -  
3862 -for (i = keyVal.length; i > 0; i--) {  
3863 - key = keyVal[i - 1].split('=');  
3864 -  
3865 - val = key[1];  
3866 - key = key[0]; 3861 +var $ = require("jquery"),
  3862 + opt = {};
3867 3863
3868 - //初始化默认参数  
3869 - opt[key] = val; 3864 +$('.query-param').each(function() {
  3865 + var $this = $(this);
3870 3866
3871 - //discount = p_d，同时需要两个参数  
3872 - if (key === 'discount' || key === 'p_d') {  
3873 - opt.discount = val;  
3874 - opt.p_d = val;  
3875 - }  
3876 -}  
3877 -  
3878 -if (typeof opt.gender === 'undefined') {  
3879 - switch (window.cookie('_Channel')) {  
3880 - case 'boys':  
3881 - opt.gender = '1,3';  
3882 - break;  
3883 - case 'girls':  
3884 - opt.gender = '2,3';  
3885 - break;  
3886 - default:  
3887 - opt.gender = '1,2,3';  
3888 - }  
3889 -} 3867 + opt[$this.data('attr')] = $this.val();
  3868 +});
3890 3869
3891 module.exports = opt; 3870 module.exports = opt;
3892 }); 3871 });
@@ -3938,7 +3917,7 @@ var winH = $(window).height(), @@ -3938,7 +3917,7 @@ var winH = $(window).height(),
3938 noResult = '<p class="no-result">未找到相关搜索结果</p>'; 3917 noResult = '<p class="no-result">未找到相关搜索结果</p>';
3939 3918
3940 //默认筛选条件 3919 //默认筛选条件
3941 -var defaultOpt = require("js/product/extract-url"); 3920 +var defaultOpt = require("js/product/query-param");
3942 3921
3943 var $listNav = $('#list-nav'), 3922 var $listNav = $('#list-nav'),
3944 3923
@@ -4324,7 +4303,7 @@ var $input = $('#search-input input'), @@ -4324,7 +4303,7 @@ var $input = $('#search-input input'),
4324 $clear = $('#search-input .clear-input'); 4303 $clear = $('#search-input .clear-input');
4325 4304
4326 //默认筛选条件 4305 //默认筛选条件
4327 -var defaultOpt = require("js/product/extract-url"); 4306 +var defaultOpt = require("js/product/query-param");
4328 4307
4329 var $listNav = $('#list-nav'), 4308 var $listNav = $('#list-nav'),
4330 4309
@@ -4771,10 +4750,8 @@ var goodsSwiper, @@ -4771,10 +4750,8 @@ var goodsSwiper,
4771 var goodsDiscountEl = document.getElementById('goodsDiscount'), 4750 var goodsDiscountEl = document.getElementById('goodsDiscount'),
4772 goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl); 4751 goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl);
4773 4752
4774 -var $cart = $('.cart-bar'),  
4775 - $goodsSubtitle = $('.goodsSubtitle'),  
4776 - divH,  
4777 - $goodsSubtitleSpan; 4753 +var $cart = $('.cart-bar');
  4754 +var UA = navigator.userAgent.toLowerCase().toString();
4778 4755
4779 require("js/product/detail/desc"); 4756 require("js/product/detail/desc");
4780 require("js/product/detail/comments-consults"); 4757 require("js/product/detail/comments-consults");
@@ -4811,13 +4788,13 @@ goodsSwiper = new Swiper('.banner-swiper', { @@ -4811,13 +4788,13 @@ goodsSwiper = new Swiper('.banner-swiper', {
4811 4788
4812 4789
4813 //初始化goods-discount 4790 //初始化goods-discount
4814 -if (0 === $('.goodsDiscount .discount-folder').children().length) { 4791 +if (0 === $discountFolder.children().length) {
4815 $discountFolder.css('display', 'none'); 4792 $discountFolder.css('display', 'none');
4816 $discountArrow.html(''); 4793 $discountArrow.html('');
4817 } 4794 }
4818 4795
4819 //goods-discount下拉按钮点击事件 4796 //goods-discount下拉按钮点击事件
4820 -if (goodsDiscountHammer) { 4797 +if (goodsDiscountHammer && $discountFolder.children().length > 0) {
4821 goodsDiscountHammer.on('tap', function(e) { 4798 goodsDiscountHammer.on('tap', function(e) {
4822 if ($discountFolder.is(':hidden')) { 4799 if ($discountFolder.is(':hidden')) {
4823 $discountArrow.removeClass('icon-down').addClass('icon-up').html('&#xe608;'); 4800 $discountArrow.removeClass('icon-down').addClass('icon-up').html('&#xe608;');
@@ -4826,7 +4803,6 @@ if (goodsDiscountHammer) { @@ -4826,7 +4803,6 @@ if (goodsDiscountHammer) {
4826 $discountArrow.removeClass('icon-up').addClass('icon-down').html('&#xe609;'); 4803 $discountArrow.removeClass('icon-up').addClass('icon-down').html('&#xe609;');
4827 $discountFolder.slideUp(); 4804 $discountFolder.slideUp();
4828 } 4805 }
4829 - return false;  
4830 }); 4806 });
4831 } 4807 }
4832 4808
@@ -4841,13 +4817,8 @@ $.ajax({ @@ -4841,13 +4817,8 @@ $.ajax({
4841 } 4817 }
4842 }); 4818 });
4843 4819
4844 -//限制goodsSubtitle为两行  
4845 -if ($goodsSubtitle[0]) {  
4846 - divH = $goodsSubtitle.height();  
4847 - $goodsSubtitleSpan = $goodsSubtitle.find('span');  
4848 - while ($goodsSubtitleSpan.outerHeight() > divH) {  
4849 - $goodsSubtitleSpan.text($goodsSubtitleSpan.text().replace(/(\s)*([a-zA-Z0-9]+|\W)(\.\.\.)?$/, '...'));  
4850 - } 4820 +if (UA.indexOf('mqqbrowser') > -1) {
  4821 + $('.detail > div').removeClass('column').addClass('oldbox');
4851 } 4822 }
4852 require("js/product/detail/like"); 4823 require("js/product/detail/like");
4853 4824
@@ -4960,17 +4931,14 @@ var $ = require("jquery"), @@ -4960,17 +4931,14 @@ var $ = require("jquery"),
4960 4931
4961 var commentsNum,consultsNum; 4932 var commentsNum,consultsNum;
4962 4933
4963 -var consultFooterEle = document.getElementById('consult-content-footer'), 4934 +var consultFooterEle = $('.consult-content-footer')[0],
4964 consultFooterHammer = consultFooterEle && new Hammer(consultFooterEle), 4935 consultFooterHammer = consultFooterEle && new Hammer(consultFooterEle),
4965 4936
4966 navtabEle = document.getElementById('nav-tab'), 4937 navtabEle = document.getElementById('nav-tab'),
4967 navtabHammer = navtabEle && new Hammer(navtabEle), 4938 navtabHammer = navtabEle && new Hammer(navtabEle),
4968 4939
4969 gotoConsultEle = document.getElementById('goto-consult'), 4940 gotoConsultEle = document.getElementById('goto-consult'),
4970 - gotoConsultHammer = gotoConsultEle && new Hammer(gotoConsultEle),  
4971 -  
4972 - $gotoConsult = $('#goto-consult');  
4973 - 4941 + gotoConsultHammer = gotoConsultEle && new Hammer(gotoConsultEle);
4974 4942
4975 4943
4976 (function() { 4944 (function() {
@@ -5022,33 +4990,21 @@ if (navtabHammer) { @@ -5022,33 +4990,21 @@ if (navtabHammer) {
5022 4990
5023 if (consultFooterHammer) { 4991 if (consultFooterHammer) {
5024 consultFooterHammer.on('tap', function() { 4992 consultFooterHammer.on('tap', function() {
5025 - location.href = $(consultFooterEle).find('a').attr('href'); 4993 + location.href = $(consultFooterEle).data('href');
5026 }); 4994 });
5027 } 4995 }
5028 4996
5029 if (gotoConsultHammer) { 4997 if (gotoConsultHammer) {
5030 gotoConsultHammer.on('tap', function() { 4998 gotoConsultHammer.on('tap', function() {
5031 - location.href = $(gotoConsultEle).find('a').attr('href'); 4999 + location.href = $(gotoConsultEle).data('href');
5032 }); 5000 });
5033 } 5001 }
5034 5002
5035 -function fixConsultBar() {  
5036 - if ($(window).scrollTop() > $('#yoho-header').outerHeight()) {  
5037 - $gotoConsult.css('position', 'fixed');  
5038 - $gotoConsult.css('top', '0');  
5039 - } else {  
5040 - $gotoConsult.css('position', 'static');  
5041 - } 5003 +//咨询页面固定header
  5004 +if ($('.goods-consults-page').length > 0) {
  5005 + $('#yoho-header').css('position', 'fixed').css('top', '0');
5042 } 5006 }
5043 5007
5044 -//滚动时顶部固定 我要咨询  
5045 -function scrollHandler() {  
5046 - fixConsultBar();  
5047 -}  
5048 -  
5049 -$(window).scroll(function() {  
5050 - window.requestAnimationFrame(scrollHandler);  
5051 -});  
5052 5008
5053 }); 5009 });
5054 define("js/product/recommend-for-you-product-desc", ["swiper","jquery","index"], function(require, exports, module){ 5010 define("js/product/recommend-for-you-product-desc", ["swiper","jquery","index"], function(require, exports, module){
@@ -5450,13 +5406,17 @@ function getOrders(option) { @@ -5450,13 +5406,17 @@ function getOrders(option) {
5450 5406
5451 if (opt.page === 1) { 5407 if (opt.page === 1) {
5452 $curContainer.html(data); 5408 $curContainer.html(data);
5453 - lazyLoad($curContainer.find('.lazy')); 5409 + lazyLoad($curContainer.find('.lazy'), {
  5410 + try_again_css: 'order-failure'
  5411 + });
5454 } else { 5412 } else {
5455 num = $curContainer.children('.order').length; 5413 num = $curContainer.children('.order').length;
5456 $curContainer.append(data); 5414 $curContainer.append(data);
5457 5415
5458 //lazyload 5416 //lazyload
5459 - lazyLoad($curContainer.children('.order:gt(' + (num - 1) + ')').find('.lazy')); 5417 + lazyLoad($curContainer.children('.order:gt(' + (num - 1) + ')').find('.lazy'), {
  5418 + try_again_css: 'order-failure'
  5419 + });
5460 } 5420 }
5461 5421
5462 window.rePosFooter(); //重新计算底部位置 5422 window.rePosFooter(); //重新计算底部位置
@@ -5470,7 +5430,9 @@ function getOrders(option) { @@ -5470,7 +5430,9 @@ function getOrders(option) {
5470 }); 5430 });
5471 } 5431 }
5472 5432
5473 -lazyLoad(); 5433 +lazyLoad({
  5434 + try_again_css: 'order-failure'
  5435 +});
5474 5436
5475 //初始化导航 5437 //初始化导航
5476 (function() { 5438 (function() {
@@ -5706,7 +5668,9 @@ var orderId = $('#order-detail').data('id'); @@ -5706,7 +5668,9 @@ var orderId = $('#order-detail').data('id');
5706 5668
5707 var optHammer; 5669 var optHammer;
5708 5670
5709 -lazyLoad(); 5671 +lazyLoad({
  5672 + try_again_css: 'order-failure'
  5673 +});
5710 5674
5711 //订单删除 5675 //订单删除
5712 optHammer = new Hammer(document.getElementsByClassName('opt')[0]); 5676 optHammer = new Hammer(document.getElementsByClassName('opt')[0]);
@@ -7700,7 +7664,7 @@ function callpay(orderCode) { @@ -7700,7 +7664,7 @@ function callpay(orderCode) {
7700 function isWXOpen() { 7664 function isWXOpen() {
7701 var ua = window.navigator.userAgent.toLowerCase(); 7665 var ua = window.navigator.userAgent.toLowerCase();
7702 7666
7703 - if (ua.match(/MicroMessenger/i) === 'micromessenger') { 7667 + if (ua.match(/MicroMessenger/i).toString() === 'micromessenger') {
7704 return true; 7668 return true;
7705 } else { 7669 } else {
7706 return false; 7670 return false;
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.
@@ -12,7 +12,6 @@ var diaLog = require('./dialog'); @@ -12,7 +12,6 @@ var diaLog = require('./dialog');
12 12
13 var $navLi = $('#fav-tab > li'), 13 var $navLi = $('#fav-tab > li'),
14 $favContainer = $('.fav-content > .fav-type'), 14 $favContainer = $('.fav-content > .fav-type'),
15 - $swiperList = '',  
16 swiperObj = {}, 15 swiperObj = {},
17 favTabHammer, 16 favTabHammer,
18 favContentHammer, 17 favContentHammer,
@@ -37,22 +36,30 @@ function showFavTab(index) { @@ -37,22 +36,30 @@ function showFavTab(index) {
37 } 36 }
38 37
39 //初始化swiper 38 //初始化swiper
40 -function initSwiper() { 39 +function initSwiper(data) {
41 var i, 40 var i,
42 - id; 41 + idStrReg = /container-(\d+)['"]{1}/gi,
  42 + idReg = /\d+/,
  43 + idArr = data.match(idStrReg),
  44 + idArrLen = idArr.length,
  45 + containerId;
43 46
44 - $swiperList = $('.swiper-container');  
45 - for (i = 0; i < $swiperList.length; i++) {  
46 - id = $swiperList.eq(i).attr('data-id'); 47 + //$swiperList = $('.swiper-container');
  48 + for (i = 0; i < idArrLen; i++) {
  49 +
  50 + /*id = $swiperList.eq(i).attr('data-id');
47 51
48 if (!!swiperObj[id]) { 52 if (!!swiperObj[id]) {
49 swiperObj[id].destroy(true, true); 53 swiperObj[id].destroy(true, true);
50 - }  
51 - swiperObj[id] = new Swiper('#swiper-container-' + id, { 54 + }*/
  55 +
  56 + containerId = idArr[i].match(idReg)[0];
  57 +
  58 + swiperObj[containerId] = new Swiper('#swiper-container-' + containerId, {
52 slidesPerView: 'auto', 59 slidesPerView: 'auto',
53 grabCursor: true, 60 grabCursor: true,
54 slideElement: 'li', 61 slideElement: 'li',
55 - wrapperClass: 'swiper-wrapper-' + id, 62 + wrapperClass: 'swiper-wrapper-' + containerId,
56 lazyLoading: true, 63 lazyLoading: true,
57 watchSlidesVisibility: true 64 watchSlidesVisibility: true
58 }); 65 });
@@ -93,7 +100,7 @@ function loadData($parent, url, page) { @@ -93,7 +100,7 @@ function loadData($parent, url, page) {
93 $parent.append(data); 100 $parent.append(data);
94 $parent.closest('.fav-type').find('.fav-content-loading').remove(); 101 $parent.closest('.fav-type').find('.fav-content-loading').remove();
95 if (url === 'favBrand') { 102 if (url === 'favBrand') {
96 - initSwiper();//如果是收藏品牌需要初始化swiper 103 + initSwiper(data);//如果是收藏品牌需要初始化swiper
97 104
98 brandLockId = false;//请求成功后解锁品牌收藏page++ 105 brandLockId = false;//请求成功后解锁品牌收藏page++
99 } else { 106 } else {
@@ -39,7 +39,7 @@ $('#upload-img').uploadifive({ @@ -39,7 +39,7 @@ $('#upload-img').uploadifive({
39 fileType: 'image*/*', 39 fileType: 'image*/*',
40 uploadScript: '/home/suggestimgUpload', 40 uploadScript: '/home/suggestimgUpload',
41 fileObjName: 'fileData', 41 fileObjName: 'fileData',
42 - fileSizeLimit: 1024, 42 + fileSizeLimit: 300,
43 height: '100%', 43 height: '100%',
44 width: '100%', 44 width: '100%',
45 multi: false, 45 multi: false,
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 width: 23%; 51 width: 23%;
52 position: absolute; 52 position: absolute;
53 left: 0; 53 left: 0;
54 - top: 50%; 54 + top: 50%;
55 @include transform(translateY(-50%)) 55 @include transform(translateY(-50%))
56 } 56 }
57 .material-desc { 57 .material-desc {
@@ -109,6 +109,13 @@ @@ -109,6 +109,13 @@
109 width: pxToRem(581px); 109 width: pxToRem(581px);
110 height:auto; 110 height:auto;
111 } 111 }
  112 +
  113 + a {
  114 + color: #2f91f6;
  115 + text-decoration: underline;
  116 +
  117 + }
  118 +
112 } 119 }
113 margin-top: pxToRem(30px); 120 margin-top: pxToRem(30px);
114 margin-bottom: pxToRem(30px); 121 margin-bottom: pxToRem(30px);
@@ -10,6 +10,12 @@ @@ -10,6 +10,12 @@
10 bottom: 70px; 10 bottom: 70px;
11 z-index: 10; 11 z-index: 10;
12 12
  13 + a {
  14 + display: block;
  15 + width: 100%;
  16 + height: 100%;
  17 + }
  18 +
13 .iconfont { 19 .iconfont {
14 color: #fff; 20 color: #fff;
15 font-size: 18px; 21 font-size: 18px;
@@ -26,4 +32,4 @@ @@ -26,4 +32,4 @@
26 right: 0; 32 right: 0;
27 color: #fff; 33 color: #fff;
28 } 34 }
29 -}  
  35 +}
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 {{/isLogin}} 13 {{/isLogin}}
14 {{^isLogin}} 14 {{^isLogin}}
15 <div class="user-info"> 15 <div class="user-info">
16 - <a class="login-btn" href="/signin.html?refer=/home"> 16 + <a class="login-btn" href="{{signinUrl}}">
17 登录/注册 17 登录/注册
18 </a> 18 </a>
19 </div> 19 </div>
@@ -48,6 +48,7 @@ class HomeController extends AbstractAction @@ -48,6 +48,7 @@ class HomeController extends AbstractAction
48 'showDownloadApp' => true, 48 'showDownloadApp' => true,
49 'pageFooter' => true, 49 'pageFooter' => true,
50 'cartUrl' => Helpers::url('/cart/index/index', null), 50 'cartUrl' => Helpers::url('/cart/index/index', null),
  51 + 'signinUrl' => Helpers::url('/signin.html', array('refer' => Helpers::url('/home')) ),
51 ); 52 );
52 $uid = $this->getUid(true); 53 $uid = $this->getUid(true);
53 if ($uid) { 54 if ($uid) {
@@ -157,8 +157,8 @@ class DetailModel @@ -157,8 +157,8 @@ class DetailModel
157 157
158 // 商品信息 158 // 商品信息
159 if (!empty($baseInfo['goodsList'])) { 159 if (!empty($baseInfo['goodsList'])) {
160 - $colorGroup = array();  
161 - $sizeGroup = array(); 160 +// $colorGroup = array();
  161 +// $sizeGroup = array();
162 $goodsList = array(); 162 $goodsList = array();
163 $goodsGroup = array(); 163 $goodsGroup = array();
164 $colorId = 0; 164 $colorId = 0;
@@ -168,49 +168,44 @@ class DetailModel @@ -168,49 +168,44 @@ class DetailModel
168 if (isset($value['goodsImagesList'])) { 168 if (isset($value['goodsImagesList'])) {
169 foreach ($value['goodsImagesList'] as $goods) { 169 foreach ($value['goodsImagesList'] as $goods) {
170 $goodsList[$goods['goodsId']] = $colorId; 170 $goodsList[$goods['goodsId']] = $colorId;
171 - $goodsGroup[$colorId][] = array( 171 + $goodsGroup[] = array(
172 'goodsId' => $goods['goodsId'], 172 'goodsId' => $goods['goodsId'],
173 'img' => $goods['imageUrl'], 173 'img' => $goods['imageUrl'],
174 ); 174 );
175 - $colorGroup[$colorId] = array(  
176 - 'colorId' => $colorId,  
177 - 'colorName' => $value['colorName'],  
178 - 'colorImage' => Helpers::getImageUrl($value['colorImage'], 60, 60),  
179 - ); 175 +// $colorGroup[$colorId] = array(
  176 +// 'colorId' => $colorId,
  177 +// 'colorName' => $value['colorName'],
  178 +// 'colorImage' => Helpers::getImageUrl($value['colorImage'], 60, 60),
  179 +// );
180 } 180 }
181 } 181 }
182 182
183 - // 商品的尺码列表  
184 - if (isset($value['goodsSizeBoList'])) {  
185 - foreach ($value['goodsSizeBoList'] as $size) {  
186 - $sizeGroup[$colorId] = array(  
187 - 'sizeName' => $size['sizeName'],  
188 - 'sizeSku' => $size['goodsSizeSkuId'],  
189 - 'sizeStorage' => $size['goodsSizeStorageNum'],  
190 - );  
191 - }  
192 - } 183 +// // 商品的尺码列表
  184 +// if (isset($value['goodsSizeBoList'])) {
  185 +// foreach ($value['goodsSizeBoList'] as $size) {
  186 +// $sizeGroup[$colorId] = array(
  187 +// 'sizeName' => $size['sizeName'],
  188 +// 'sizeSku' => $size['goodsSizeSkuId'],
  189 +// 'sizeStorage' => $size['goodsSizeStorageNum'],
  190 +// );
  191 +// }
  192 +// }
193 } 193 }
194 -  
195 - // 商品图  
196 - $goodsId = intval($goodsId);  
197 - if (isset($goodsList[$goodsId])) {  
198 - $colorId = $goodsList[$goodsId];  
199 - // 多个  
200 - if (isset($goodsGroup[$colorId][1])) {  
201 - foreach ($goodsGroup[$colorId] as $value) {  
202 - $result['bannerTop']['list'][] = array(  
203 - 'img' => Helpers::getImageUrl($value['img'], 450, 600)  
204 - );  
205 - }  
206 - }  
207 - // 单个  
208 - elseif (isset($goodsGroup[$colorId][0])) {  
209 - $result['bannerTop'] = array(  
210 - 'img' => Helpers::getImageUrl($goodsGroup[$colorId][0]['img'], 450, 600) 194 +
  195 + // 商品图: 多个
  196 + if (isset($goodsGroup[1])) {
  197 + foreach ($goodsGroup as $value) {
  198 + $result['bannerTop']['list'][] = array(
  199 + 'img' => Helpers::getImageUrl($value['img'], 450, 600)
211 ); 200 );
212 } 201 }
213 } 202 }
  203 + // 商品图: 单个
  204 + elseif (isset($goodsGroup[0])) {
  205 + $result['bannerTop'] = array(
  206 + 'img' => Helpers::getImageUrl($goodsGroup[0]['img'], 450, 600)
  207 + );
  208 + }
214 } 209 }
215 210
216 // 悬浮的购物车信息 211 // 悬浮的购物车信息
@@ -229,9 +229,9 @@ class LoginController extends AbstractAction @@ -229,9 +229,9 @@ class LoginController extends AbstractAction
229 public function sinacallbackAction() 229 public function sinacallbackAction()
230 { 230 {
231 $sina = Factory::create('sinaweibo'); 231 $sina = Factory::create('sinaweibo');
232 - $access = $sina->getAccessToken(); 232 + $access = $sina->getAccessToken();
233 /* 获取用户的详细信息 */ 233 /* 获取用户的详细信息 */
234 - $partnerInfo = $sina->getUserInfo($access); 234 + $partnerInfo = $sina->getUserInfo($access);
235 235
236 $result = array(); 236 $result = array();
237 if ($partnerInfo && is_array($partnerInfo)) { 237 if ($partnerInfo && is_array($partnerInfo)) {