Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop
Showing
8 changed files
with
293 additions
and
121 deletions
@@ -42,4 +42,30 @@ class IndexData | @@ -42,4 +42,30 @@ class IndexData | ||
42 | $params['client_secret'] = Sign::getSign($params); | 42 | $params['client_secret'] = Sign::getSign($params); |
43 | return Yohobuy::get(Yohobuy::SERVICE_URL . self::URL_OPERATIONS_RESOURCE_GET, $params); | 43 | return Yohobuy::get(Yohobuy::SERVICE_URL . self::URL_OPERATIONS_RESOURCE_GET, $params); |
44 | } | 44 | } |
45 | + | ||
46 | + /** | ||
47 | + * 邮箱订阅 | ||
48 | + * | ||
49 | + * @param string $email | ||
50 | + * @param string $uid | ||
51 | + * @return array | ||
52 | + */ | ||
53 | + public static function emailSubscriber($email, $uid = 0) | ||
54 | + { | ||
55 | + //TODO 走老接口 | ||
56 | + // 构建必传参数 | ||
57 | + $param = Yohobuy::param(); | ||
58 | + $param['page'] = 1; | ||
59 | + $param['open_key'] = '12345'; | ||
60 | + $param['method'] = 'open.subscriber.subscriber'; | ||
61 | + $param['email'] = $email; | ||
62 | + $param['uid'] = $uid; | ||
63 | + $param['client_secret'] = Sign::getSign($param); | ||
64 | + unset($param['app_version']); | ||
65 | + unset($param['client_type']); | ||
66 | + unset($param['os_version']); | ||
67 | + unset($param['screen_size']); | ||
68 | + unset($param['v']); | ||
69 | + return Yohobuy::get(Yohobuy::API_URL, $param); | ||
70 | + } | ||
45 | } | 71 | } |
@@ -26,6 +26,11 @@ var $chosePanel = $('#chose-panel'), | @@ -26,6 +26,11 @@ var $chosePanel = $('#chose-panel'), | ||
26 | hasChooseSize, | 26 | hasChooseSize, |
27 | $curSizeBlock, | 27 | $curSizeBlock, |
28 | $sizeRowList, | 28 | $sizeRowList, |
29 | + $curColorBlock, | ||
30 | + $colorRowList, | ||
31 | + $curSizeRow, | ||
32 | + $curColorRow, | ||
33 | + rowIndex, | ||
29 | cbFn, | 34 | cbFn, |
30 | $allChoseItems, | 35 | $allChoseItems, |
31 | queryString, | 36 | queryString, |
@@ -41,7 +46,13 @@ function init() { | @@ -41,7 +46,13 @@ function init() { | ||
41 | $imgsThumb = $('.chose-panel').find('.thumb'); | 46 | $imgsThumb = $('.chose-panel').find('.thumb'); |
42 | $allChoseItems = $('.chose-items'); | 47 | $allChoseItems = $('.chose-items'); |
43 | $sizeRowList = $('.size-list ul'); | 48 | $sizeRowList = $('.size-list ul'); |
49 | + $colorRowList = $('.color-list ul'); | ||
44 | $leftNum = $('#left-num'); | 50 | $leftNum = $('#left-num'); |
51 | + $curSizeRow = $sizeRowList.eq(0); | ||
52 | + $curColorRow = $colorRowList.eq(0); | ||
53 | + rowIndex = 0; | ||
54 | + curColorIndex = 0; | ||
55 | + curSizeIndex = 0; | ||
45 | } | 56 | } |
46 | 57 | ||
47 | function checkColorSizeNum() { | 58 | function checkColorSizeNum() { |
@@ -107,36 +118,23 @@ function updateConformButtonClassAndText() { | @@ -107,36 +118,23 @@ function updateConformButtonClassAndText() { | ||
107 | } | 118 | } |
108 | } | 119 | } |
109 | 120 | ||
110 | -//重置颜色块的库存为0的样式 | ||
111 | -function resetColorZeroStock($siblingBlock) { | ||
112 | - var numArray, | ||
113 | - i; | 121 | +//显示剩余件数 |
122 | +function displayGoodNum(curGoodNum) { | ||
114 | 123 | ||
115 | - if (!hasChooseSize) { | ||
116 | - $siblingBlock.find('ul>li').each(function() { | ||
117 | - if (0 === $(this).data('num')) { | ||
118 | - $(this).addClass('zero-stock'); | 124 | + //数量大于0 |
125 | + if (curGoodNum > 0) { | ||
126 | + if ($soonSoldOut.length > 0) { | ||
127 | + $allChoseItems.find('.num .left-num').html('即将售罄'); | ||
119 | } else { | 128 | } else { |
120 | - $(this).removeClass('zero-stock'); | 129 | + $allChoseItems.find('.num .left-num').html('剩余' + curGoodNum + '件'); |
121 | } | 130 | } |
122 | - }); | ||
123 | 131 | ||
124 | - } else { | ||
125 | - numArray = ($curSizeBlock.data('numstr') + '').split('/'); | ||
126 | - for (i = 0; i < numArray.length; i++) { | ||
127 | - if ('0' === numArray[i]) { | ||
128 | - $siblingBlock.find('.block').eq(i).addClass('zero-stock'); | ||
129 | - } else { | ||
130 | - $siblingBlock.find('.block').eq(i).removeClass('zero-stock'); | ||
131 | - } | ||
132 | - } | ||
133 | - } | ||
134 | -} | 132 | + $leftNum.val(curGoodNum); |
135 | 133 | ||
136 | -// 选择了颜色切换商品图片 | ||
137 | -function changeGoodImgWhenClickColor() { | ||
138 | - if (hasChooseColor && curColorIndex >= 0) { | ||
139 | - $imgsThumb.addClass('hide').eq(curColorIndex).removeClass('hide'); | 134 | + //数量小于0 |
135 | + } else { | ||
136 | + $allChoseItems.find('.num .left-num').html(''); | ||
137 | + $leftNum.val(0); | ||
140 | } | 138 | } |
141 | } | 139 | } |
142 | 140 | ||
@@ -157,35 +155,37 @@ $yohoPage.on('touchstart', '.color-list .block', function() { | @@ -157,35 +155,37 @@ $yohoPage.on('touchstart', '.color-list .block', function() { | ||
157 | var $this = $(this), | 155 | var $this = $(this), |
158 | index, | 156 | index, |
159 | curSizeBlock, | 157 | curSizeBlock, |
160 | - $preSiblingBlock, | ||
161 | - $curSizeRow, | ||
162 | - numArray, | ||
163 | - i, | ||
164 | curGoodNum; | 158 | curGoodNum; |
165 | 159 | ||
166 | - var $siblingBlock = $this.closest('.block-list').siblings(':first'); | ||
167 | - | ||
168 | $this.siblings('.chosed').removeClass('chosed'); | 160 | $this.siblings('.chosed').removeClass('chosed'); |
169 | index = $this.index(); | 161 | index = $this.index(); |
170 | 162 | ||
171 | - $preSiblingBlock = $siblingBlock.find('.chosed'); | ||
172 | - $curSizeRow = $sizeRowList.eq(index); | ||
173 | - | ||
174 | // 当前颜色已经是选中状态,再点击时 | 163 | // 当前颜色已经是选中状态,再点击时 |
175 | if ($this.hasClass('chosed')) { | 164 | if ($this.hasClass('chosed')) { |
176 | 165 | ||
177 | - //颜色原来已经是勾选时,要清空剩余件数的提示 | 166 | + //清空剩余件数的提示 |
178 | $allChoseItems.find('.num .left-num').html(''); | 167 | $allChoseItems.find('.num .left-num').html(''); |
179 | $leftNum.val(0); | 168 | $leftNum.val(0); |
180 | hasChooseColor = false; | 169 | hasChooseColor = false; |
181 | 170 | ||
182 | - $this.removeClass('zero-stock'); | ||
183 | - if ($curSizeBlock) { | ||
184 | - numArray = ($curSizeBlock.data('numstr') + '').split('/'); | ||
185 | - for (i = 0; i < numArray.length; i++) { | ||
186 | - if ('0' === numArray[i]) { | ||
187 | - $('.color-list .block').eq(i).addClass('zero-stock'); | ||
188 | - } | 171 | + //当前尺码行隐藏 |
172 | + $sizeRowList.eq(curSizeIndex).removeClass('show').addClass('hide'); | ||
173 | + | ||
174 | + //目标尺码行显示 | ||
175 | + $sizeRowList.eq(0).removeClass('hide').addClass('show'); | ||
176 | + | ||
177 | + curSizeIndex = 0; | ||
178 | + | ||
179 | + //如果尺码已经是选择状态 | ||
180 | + if (curColorIndex) { | ||
181 | + | ||
182 | + // 之前选中的尺码去掉勾选样式,新尺码块勾选 | ||
183 | + if ($curSizeBlock && $curSizeBlock.length > 0) { | ||
184 | + $curSizeBlock.removeClass('chosed'); | ||
185 | + curSizeBlock = $sizeRowList.eq(0).children().get(curColorIndex - 1); | ||
186 | + $curSizeBlock = $(curSizeBlock); | ||
187 | + curGoodNum = $curSizeBlock.data('num'); | ||
188 | + $curSizeBlock.addClass('chosed'); | ||
189 | } | 189 | } |
190 | } | 190 | } |
191 | 191 | ||
@@ -193,106 +193,115 @@ $yohoPage.on('touchstart', '.color-list .block', function() { | @@ -193,106 +193,115 @@ $yohoPage.on('touchstart', '.color-list .block', function() { | ||
193 | } else { | 193 | } else { |
194 | hasChooseColor = true; | 194 | hasChooseColor = true; |
195 | 195 | ||
196 | - //把当前选中颜色对应的尺码那一行显示出来 | ||
197 | - $sizeRowList.addClass('hide'); | ||
198 | - $curSizeRow.removeClass('hide').addClass('show'); | 196 | + //如果尺码已经是选择状态 |
197 | + if (curColorIndex) { | ||
198 | + | ||
199 | + // 之前选中的尺码去掉勾选样式,新尺码块勾选 | ||
200 | + if ($curSizeBlock && $curSizeBlock.length > 0) { | ||
201 | + $curSizeBlock.removeClass('chosed'); | ||
199 | 202 | ||
200 | - // 之前选中的尺码去掉勾选样式 | ||
201 | - if ($preSiblingBlock.length > 0) { | ||
202 | - $preSiblingBlock.removeClass('chosed'); | ||
203 | - curSizeBlock = $curSizeRow.children().get(curSizeIndex); | 203 | + //curSizeBlock = $sizeRowList.eq(curSizeIndex + 1).children().get(curColorIndex - 1); |
204 | + curSizeBlock = $sizeRowList.eq(index + 1).children().get(curColorIndex - 1); | ||
204 | $curSizeBlock = $(curSizeBlock); | 205 | $curSizeBlock = $(curSizeBlock); |
206 | + curGoodNum = $curSizeBlock.data('num'); | ||
207 | + $curSizeBlock.addClass('chosed'); | ||
205 | } | 208 | } |
206 | 209 | ||
207 | - // 当前选中颜色对应的尺码行,其对应的尺码加上勾选样式 (前提是要判断下这个尺码是否存在) | ||
208 | - if (curSizeBlock) { | ||
209 | - curGoodNum = $(curSizeBlock).data('num'); | ||
210 | - $(curSizeBlock).addClass('chosed'); | ||
211 | - | ||
212 | - //如果当前有尺码被选中,且数量等于0,则颜色块添加数量为0的样式 | ||
213 | - if (curGoodNum > 0) { | ||
214 | - if ($soonSoldOut.length > 0) { | ||
215 | - $allChoseItems.find('.num .left-num').html('即将售罄'); | ||
216 | - } else { | ||
217 | - $allChoseItems.find('.num .left-num').html('剩余' + curGoodNum + '件'); | ||
218 | } | 210 | } |
219 | 211 | ||
220 | - $leftNum.val(curGoodNum); | ||
221 | - } else { | ||
222 | - $allChoseItems.find('.num .left-num').html(''); | ||
223 | - $leftNum.val(0); | ||
224 | - } | ||
225 | - } | 212 | + // 显示剩余数量 |
213 | + displayGoodNum(curGoodNum); | ||
214 | + | ||
215 | + // 尺码行当前行隐藏 | ||
216 | + $sizeRowList.eq(curSizeIndex).removeClass('show').addClass('hide'); | ||
217 | + | ||
218 | + //尺码对应行显示 | ||
219 | + $sizeRowList.eq(index + 1).removeClass('hide').addClass('show'); | ||
220 | + | ||
221 | + curSizeIndex = index + 1; | ||
222 | + $curColorBlock = $this; | ||
223 | + | ||
224 | + // 修改颜色时修改商品图片 | ||
225 | + $imgsThumb.addClass('hide').eq(index).removeClass('hide'); | ||
226 | } | 226 | } |
227 | 227 | ||
228 | // 当前颜色块 切换勾选样式 | 228 | // 当前颜色块 切换勾选样式 |
229 | $this.toggleClass('chosed'); | 229 | $this.toggleClass('chosed'); |
230 | - curColorIndex = index; | ||
231 | $('#good-num').val(1); | 230 | $('#good-num').val(1); |
232 | 231 | ||
233 | - // 修改颜色时修改商品图片 | ||
234 | - changeGoodImgWhenClickColor(); | ||
235 | - | ||
236 | // 设置按钮的样式和文字 | 232 | // 设置按钮的样式和文字 |
237 | updateConformButtonClassAndText(); | 233 | updateConformButtonClassAndText(); |
238 | }).on('touchstart', '.size-list .block', function() { | 234 | }).on('touchstart', '.size-list .block', function() { |
239 | var $this = $(this), | 235 | var $this = $(this), |
240 | index, | 236 | index, |
241 | - $curSizeRow, | 237 | + curColorBlock, |
242 | curGoodNum; | 238 | curGoodNum; |
243 | 239 | ||
244 | - var $siblingBlock = $this.closest('.block-list').siblings(':first'); | ||
245 | - | ||
246 | $this.siblings('.chosed').removeClass('chosed'); | 240 | $this.siblings('.chosed').removeClass('chosed'); |
247 | index = $this.index(); | 241 | index = $this.index(); |
248 | - $curSizeRow = $sizeRowList.eq(index); | ||
249 | 242 | ||
250 | // 当前尺码已经是选中状态,再点击时 | 243 | // 当前尺码已经是选中状态,再点击时 |
251 | if ($this.hasClass('chosed')) { | 244 | if ($this.hasClass('chosed')) { |
252 | 245 | ||
253 | - //尺码原来已经是勾选时,要清空剩余件数的提示 | 246 | + //清空剩余件数的提示 |
254 | $allChoseItems.find('.num .left-num').html(''); | 247 | $allChoseItems.find('.num .left-num').html(''); |
255 | - $('#left-num').val(0); | 248 | + $leftNum.val(0); |
256 | hasChooseSize = false; | 249 | hasChooseSize = false; |
257 | - curSizeIndex = null; | ||
258 | - $curSizeBlock = null; | 250 | + |
251 | + //当前颜色行隐藏 | ||
252 | + $colorRowList.eq(curColorIndex).removeClass('show').addClass('hide'); | ||
253 | + | ||
254 | + //目标颜色行显示 | ||
255 | + $colorRowList.eq(0).removeClass('hide').addClass('show'); | ||
256 | + | ||
257 | + curColorIndex = 0; | ||
258 | + | ||
259 | + //如果颜色已经是选择状态 | ||
260 | + if (curSizeIndex) { | ||
261 | + | ||
262 | + // 之前选中的颜色去掉勾选样式,新颜色块勾选 | ||
263 | + if ($curColorBlock && $curColorBlock.length > 0) { | ||
264 | + $curColorBlock.removeClass('chosed'); | ||
265 | + curColorBlock = $colorRowList.eq(0).children().get(curSizeIndex - 1); | ||
266 | + $curColorBlock = $(curColorBlock); | ||
267 | + curGoodNum = $curColorBlock.data('num'); | ||
268 | + $curColorBlock.addClass('chosed'); | ||
269 | + } | ||
270 | + } | ||
259 | 271 | ||
260 | // 当前尺码不是选中状态,选中时 | 272 | // 当前尺码不是选中状态,选中时 |
261 | } else { | 273 | } else { |
262 | hasChooseSize = true; | 274 | hasChooseSize = true; |
263 | - curGoodNum = $this.data('num'); | ||
264 | 275 | ||
265 | - // 之前选中的尺码去掉勾选样式 | ||
266 | - if ($curSizeBlock) { | ||
267 | - $curSizeBlock.removeClass('chosed'); | ||
268 | - } | 276 | + //如果颜色已经是选择状态 |
277 | + if (curSizeIndex) { | ||
269 | 278 | ||
270 | - // 如果当前有尺码被选中,且数量等于0, 否则显示剩余件数 | ||
271 | - if (curGoodNum > 0 && hasChooseColor) { | ||
272 | - if ($soonSoldOut.length > 0) { | ||
273 | - $allChoseItems.find('.num .left-num').html('即将售罄'); | ||
274 | - } else { | ||
275 | - $allChoseItems.find('.num .left-num').html('剩余' + curGoodNum + '件'); | 279 | + // 之前选中的颜色去掉勾选样式,新颜色块勾选 |
280 | + if ($curColorBlock && $curColorBlock.length > 0) { | ||
281 | + $curColorBlock.removeClass('chosed'); | ||
282 | + curColorBlock = $colorRowList.eq(index + 1).children().get(curSizeIndex - 1); | ||
283 | + $curColorBlock = $(curColorBlock); | ||
284 | + curGoodNum = $curColorBlock.data('num'); | ||
285 | + $curColorBlock.addClass('chosed'); | ||
276 | } | 286 | } |
277 | - $('#left-num').val(curGoodNum); | ||
278 | - } else { | ||
279 | - $allChoseItems.find('.num .left-num').html(''); | ||
280 | - $('#left-num').val(0); | ||
281 | } | 287 | } |
282 | 288 | ||
283 | - if (curGoodNum === 0 && hasChooseColor) { | ||
284 | - $this.addClass('zero-stock'); | ||
285 | - } | ||
286 | - curSizeIndex = index; | 289 | + // 显示剩余数量 |
290 | + displayGoodNum(curGoodNum); | ||
291 | + | ||
292 | + // 颜色当前行隐藏 | ||
293 | + $colorRowList.eq(curColorIndex).removeClass('show').addClass('hide'); | ||
294 | + | ||
295 | + //颜色对应行显示 | ||
296 | + $colorRowList.eq(index + 1).removeClass('hide').addClass('show'); | ||
297 | + | ||
298 | + curColorIndex = index + 1; | ||
287 | $curSizeBlock = $this; | 299 | $curSizeBlock = $this; |
288 | } | 300 | } |
289 | 301 | ||
290 | $this.toggleClass('chosed'); | 302 | $this.toggleClass('chosed'); |
291 | $('#good-num').val(1); | 303 | $('#good-num').val(1); |
292 | 304 | ||
293 | - // 重置颜色块的样式 | ||
294 | - resetColorZeroStock($siblingBlock); | ||
295 | - | ||
296 | // 设置按钮的样式和文字 | 305 | // 设置按钮的样式和文字 |
297 | updateConformButtonClassAndText(); | 306 | updateConformButtonClassAndText(); |
298 | }); | 307 | }); |
@@ -215,6 +215,7 @@ | @@ -215,6 +215,7 @@ | ||
215 | background-size:100% 100%; | 215 | background-size:100% 100%; |
216 | position: relative; | 216 | position: relative; |
217 | top: .36rem; | 217 | top: .36rem; |
218 | + margin-right: pxToRem(12px); | ||
218 | } | 219 | } |
219 | &.highlight { | 220 | &.highlight { |
220 | background: #eee; | 221 | background: #eee; |
@@ -19,13 +19,22 @@ | @@ -19,13 +19,22 @@ | ||
19 | <div class="chose-items"> | 19 | <div class="chose-items"> |
20 | <div class="color-list block-list"> | 20 | <div class="color-list block-list"> |
21 | <span>颜色</span> | 21 | <span>颜色</span> |
22 | - <ul class="clearfix" data-type="color"> | 22 | + <!--<ul class="clearfix" data-type="color"> |
23 | {{# colors}} | 23 | {{# colors}} |
24 | <li class="block {{#if chosed}}chosed{{/if}} {{#unless colorNum}}zero-stock{{/unless}}" data-num="{{colorNum}}" data-id="{{id}}" data-numstr="{{sizeNumStr}}" data-skcid="{{skcId}}"> | 24 | <li class="block {{#if chosed}}chosed{{/if}} {{#unless colorNum}}zero-stock{{/unless}}" data-num="{{colorNum}}" data-id="{{id}}" data-numstr="{{sizeNumStr}}" data-skcid="{{skcId}}"> |
25 | {{name}} | 25 | {{name}} |
26 | </li> | 26 | </li> |
27 | {{/ colors}} | 27 | {{/ colors}} |
28 | + </ul>--> | ||
29 | + {{# colors}} | ||
30 | + <ul class="size-row clearfix {{#unless @first}}hide{{/if}}"> | ||
31 | + {{# color}} | ||
32 | + <li class="block {{#if chosed}}chosed{{/if}} {{#unless colorNum}}zero-stock{{/unless}}" data-num="{{colorNum}}" data-id="{{id}}" data-numstr="{{sizeNumStr}}" data-skcid="{{skcId}}"> | ||
33 | + {{name}} | ||
34 | + </li> | ||
35 | + {{/ color}} | ||
28 | </ul> | 36 | </ul> |
37 | + {{/ colors}} | ||
29 | </div> | 38 | </div> |
30 | <div class="size-list block-list"> | 39 | <div class="size-list block-list"> |
31 | <span>尺码</span> | 40 | <span>尺码</span> |
@@ -69,5 +78,5 @@ | @@ -69,5 +78,5 @@ | ||
69 | </div> | 78 | </div> |
70 | </div> | 79 | </div> |
71 | </div> | 80 | </div> |
72 | -{{/cartInfo}} | 81 | + {{/cartInfo}} |
73 | <input id="promotionId" type="hidden" value="{{promotionId}}"> | 82 | <input id="promotionId" type="hidden" value="{{promotionId}}"> |
@@ -6,9 +6,9 @@ | @@ -6,9 +6,9 @@ | ||
6 | <div class="sale-group-big clearfix"> | 6 | <div class="sale-group-big clearfix"> |
7 | {{#brandSale}} | 7 | {{#brandSale}} |
8 | {{#big}} | 8 | {{#big}} |
9 | - <a class="item pull-left {{#if @first}}first{{/if}} {{#if @last}}last{{/if}}" href="{{link}}"> | 9 | + <a class="item pull-left" href="{{link}}"> |
10 | <div class="pic"> | 10 | <div class="pic"> |
11 | - <img class="" src="{{img}}"> | 11 | + <img src="{{img}}"> |
12 | <div class="time">{{time}}</div> | 12 | <div class="time">{{time}}</div> |
13 | </div> | 13 | </div> |
14 | <div class="detail"> | 14 | <div class="detail"> |
@@ -24,6 +24,17 @@ | @@ -24,6 +24,17 @@ | ||
24 | </div> | 24 | </div> |
25 | </a> | 25 | </a> |
26 | {{/big}} | 26 | {{/big}} |
27 | + </div> | ||
28 | + <div class="sale-group clearfix"> | ||
29 | + {{#normal}} | ||
30 | + <a class="item pull-left" href="{{link}}"> | ||
31 | + <img class="pic" src="{{img}}"> | ||
32 | + <div class="detail"> | ||
33 | + <div class="title">{{title}}</div> | ||
34 | + <div class="time">{{time}}</div> | ||
35 | + </div> | ||
36 | + </a> | ||
37 | + {{/normal}} | ||
27 | {{/brandSale}} | 38 | {{/brandSale}} |
28 | </div> | 39 | </div> |
29 | 40 |
@@ -55,20 +55,13 @@ | @@ -55,20 +55,13 @@ | ||
55 | } | 55 | } |
56 | 56 | ||
57 | .brand-sale { | 57 | .brand-sale { |
58 | - | ||
59 | .sale-group-big { | 58 | .sale-group-big { |
60 | - .item { | ||
61 | - width: 377px; | ||
62 | - margin-right: 10px; | ||
63 | - | ||
64 | - &.first, | ||
65 | - &.last { | ||
66 | - width: 376px; | ||
67 | - } | 59 | + width: 1150px + 8px; |
68 | 60 | ||
69 | - &.last { | ||
70 | - margin-right: 0; | ||
71 | - } | 61 | + .item { |
62 | + width: 378px; | ||
63 | + margin-right: 8px; | ||
64 | + margin-bottom: 10px; | ||
72 | } | 65 | } |
73 | 66 | ||
74 | .pic { | 67 | .pic { |
@@ -95,7 +88,7 @@ | @@ -95,7 +88,7 @@ | ||
95 | } | 88 | } |
96 | 89 | ||
97 | .brand { | 90 | .brand { |
98 | - margin: 24px 10px; | 91 | + margin: 24px 10px 0; |
99 | } | 92 | } |
100 | 93 | ||
101 | .text { | 94 | .text { |
@@ -112,7 +105,36 @@ | @@ -112,7 +105,36 @@ | ||
112 | font-size: 40px; | 105 | font-size: 40px; |
113 | } | 106 | } |
114 | } | 107 | } |
108 | + } | ||
109 | + | ||
110 | + .sale-group { | ||
111 | + width: 1150px + 8px; | ||
112 | + | ||
113 | + .item { | ||
114 | + width: 185px; | ||
115 | + margin-right: 8px; | ||
116 | + margin-bottom: 10px; | ||
117 | + } | ||
118 | + | ||
119 | + .pic { | ||
120 | + width: 100%; | ||
121 | + display: block; | ||
122 | + } | ||
115 | 123 | ||
124 | + .detail { | ||
125 | + padding: 14px 10px; | ||
126 | + background: #f5f5f5; | ||
127 | + text-align: center; | ||
128 | + line-height: 20px; | ||
129 | + } | ||
130 | + | ||
131 | + .title { | ||
132 | + font-size: 12px; | ||
133 | + } | ||
134 | + | ||
135 | + .time { | ||
136 | + font-size: 14px; | ||
137 | + } | ||
116 | } | 138 | } |
117 | } | 139 | } |
118 | } | 140 | } |
@@ -6,6 +6,7 @@ use Plugin\Cache; | @@ -6,6 +6,7 @@ use Plugin\Cache; | ||
6 | use Configs\CacheConfig; | 6 | use Configs\CacheConfig; |
7 | use Api\Yohobuy; | 7 | use Api\Yohobuy; |
8 | use Plugin\Images; | 8 | use Plugin\Images; |
9 | +use Plugin\Helpers; | ||
9 | 10 | ||
10 | class CommonController extends WebAction | 11 | class CommonController extends WebAction |
11 | { | 12 | { |
@@ -118,4 +119,24 @@ class CommonController extends WebAction | @@ -118,4 +119,24 @@ class CommonController extends WebAction | ||
118 | } | 119 | } |
119 | return $this->helpJsonCallbackResult($callback, $data['code'], $data['message'], $banner); | 120 | return $this->helpJsonCallbackResult($callback, $data['code'], $data['message'], $banner); |
120 | } | 121 | } |
122 | + | ||
123 | + /** | ||
124 | + * 获取邮件订阅 | ||
125 | + * | ||
126 | + * @return jsonp | ||
127 | + */ | ||
128 | + public function emailsubscriberAction() | ||
129 | + { | ||
130 | + $callback = $this->get('callback', ''); | ||
131 | + $email = $this->get('email', ''); | ||
132 | + $uid = intval($this->get('uid', '0')); | ||
133 | + $data = array(); | ||
134 | + //验证邮件 | ||
135 | + if(Helpers::verifyEmail($email)) { | ||
136 | + $data = IndexData::emailSubscriber($email, $uid); | ||
137 | + return $this->helpJsonCallbackResult($callback, $data['code'], $data['message'], $data['data']); | ||
138 | + } else { | ||
139 | + return $this->helpJsonCallbackResult($callback, 403, '订阅失败', ''); | ||
140 | + } | ||
141 | + } | ||
121 | } | 142 | } |
@@ -54,7 +54,7 @@ class Sale1Controller extends WebAction | @@ -54,7 +54,7 @@ class Sale1Controller extends WebAction | ||
54 | 'brandSale' => array( | 54 | 'brandSale' => array( |
55 | 'big' => array( | 55 | 'big' => array( |
56 | array( | 56 | array( |
57 | - 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/376/h/400', | 57 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/378/h/400', |
58 | 'link' => 'http://www.yohobuy.com', | 58 | 'link' => 'http://www.yohobuy.com', |
59 | 'time' => '低于1小时', | 59 | 'time' => '低于1小时', |
60 | 'brand' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/22/09/0168ae2421d5283414ff5b873fa4a1c16a.jpg?imageView/1/w/185/h/62', | 60 | 'brand' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/22/09/0168ae2421d5283414ff5b873fa4a1c16a.jpg?imageView/1/w/185/h/62', |
@@ -62,7 +62,7 @@ class Sale1Controller extends WebAction | @@ -62,7 +62,7 @@ class Sale1Controller extends WebAction | ||
62 | 'discount' => '70%', | 62 | 'discount' => '70%', |
63 | ), | 63 | ), |
64 | array( | 64 | array( |
65 | - 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/376/h/400', | 65 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/378/h/400', |
66 | 'link' => 'http://www.yohobuy.com', | 66 | 'link' => 'http://www.yohobuy.com', |
67 | 'time' => '低于1小时', | 67 | 'time' => '低于1小时', |
68 | 'brand' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/22/09/0168ae2421d5283414ff5b873fa4a1c16a.jpg?imageView/1/w/185/h/62', | 68 | 'brand' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/22/09/0168ae2421d5283414ff5b873fa4a1c16a.jpg?imageView/1/w/185/h/62', |
@@ -70,7 +70,7 @@ class Sale1Controller extends WebAction | @@ -70,7 +70,7 @@ class Sale1Controller extends WebAction | ||
70 | 'discount' => '70%', | 70 | 'discount' => '70%', |
71 | ), | 71 | ), |
72 | array( | 72 | array( |
73 | - 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/376/h/400', | 73 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/378/h/400', |
74 | 'link' => 'http://www.yohobuy.com', | 74 | 'link' => 'http://www.yohobuy.com', |
75 | 'time' => '低于1小时', | 75 | 'time' => '低于1小时', |
76 | 'brand' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/22/09/0168ae2421d5283414ff5b873fa4a1c16a.jpg?imageView/1/w/185/h/62', | 76 | 'brand' => 'http://img11.static.yhbimg.com/yhb-img01/2015/12/22/09/0168ae2421d5283414ff5b873fa4a1c16a.jpg?imageView/1/w/185/h/62', |
@@ -78,7 +78,80 @@ class Sale1Controller extends WebAction | @@ -78,7 +78,80 @@ class Sale1Controller extends WebAction | ||
78 | 'discount' => '70%', | 78 | 'discount' => '70%', |
79 | ) | 79 | ) |
80 | ), | 80 | ), |
81 | - 'normal' => array() | 81 | + 'normal' => array( |
82 | + array( | ||
83 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/185/h/180', | ||
84 | + 'link' => 'http://www.yohobuy.com', | ||
85 | + 'time' => '低于1小时', | ||
86 | + 'title' => '2015春夏海量大促!' | ||
87 | + ), | ||
88 | + array( | ||
89 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/185/h/180', | ||
90 | + 'link' => 'http://www.yohobuy.com', | ||
91 | + 'time' => '低于1小时', | ||
92 | + 'title' => '2015春夏海量大促!' | ||
93 | + ), | ||
94 | + array( | ||
95 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/185/h/180', | ||
96 | + 'link' => 'http://www.yohobuy.com', | ||
97 | + 'time' => '低于1小时', | ||
98 | + 'title' => '2015春夏海量大促!' | ||
99 | + ), | ||
100 | + array( | ||
101 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/185/h/180', | ||
102 | + 'link' => 'http://www.yohobuy.com', | ||
103 | + 'time' => '低于1小时', | ||
104 | + 'title' => '2015春夏海量大促!' | ||
105 | + ), | ||
106 | + array( | ||
107 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/185/h/180', | ||
108 | + 'link' => 'http://www.yohobuy.com', | ||
109 | + 'time' => '低于1小时', | ||
110 | + 'title' => '2015春夏海量大促!' | ||
111 | + ), | ||
112 | + array( | ||
113 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/185/h/180', | ||
114 | + 'link' => 'http://www.yohobuy.com', | ||
115 | + 'time' => '低于1小时', | ||
116 | + 'title' => '2015春夏海量大促!' | ||
117 | + ), | ||
118 | + array( | ||
119 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/185/h/180', | ||
120 | + 'link' => 'http://www.yohobuy.com', | ||
121 | + 'time' => '低于1小时', | ||
122 | + 'title' => '2015春夏海量大促!' | ||
123 | + ), | ||
124 | + array( | ||
125 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/185/h/180', | ||
126 | + 'link' => 'http://www.yohobuy.com', | ||
127 | + 'time' => '低于1小时', | ||
128 | + 'title' => '2015春夏海量大促!' | ||
129 | + ), | ||
130 | + array( | ||
131 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/185/h/180', | ||
132 | + 'link' => 'http://www.yohobuy.com', | ||
133 | + 'time' => '低于1小时', | ||
134 | + 'title' => '2015春夏海量大促!' | ||
135 | + ), | ||
136 | + array( | ||
137 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/185/h/180', | ||
138 | + 'link' => 'http://www.yohobuy.com', | ||
139 | + 'time' => '低于1小时', | ||
140 | + 'title' => '2015春夏海量大促!' | ||
141 | + ), | ||
142 | + array( | ||
143 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/185/h/180', | ||
144 | + 'link' => 'http://www.yohobuy.com', | ||
145 | + 'time' => '低于1小时', | ||
146 | + 'title' => '2015春夏海量大促!' | ||
147 | + ), | ||
148 | + array( | ||
149 | + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/03/31/07/02c9f302b6a633d7fac1a08655633a45d3.jpg?imageView/1/w/185/h/180', | ||
150 | + 'link' => 'http://www.yohobuy.com', | ||
151 | + 'time' => '低于1小时', | ||
152 | + 'title' => '2015春夏海量大促!' | ||
153 | + ) | ||
154 | + ) | ||
82 | ) | 155 | ) |
83 | ); | 156 | ); |
84 | $this->setWebNavHeader(); | 157 | $this->setWebNavHeader(); |
-
Please register or login to post a comment