Authored by 陈轩

FIX

1 /* eslint-disable camelcase */ 1 /* eslint-disable camelcase */
2 'use strict'; 2 'use strict';
  3 +const url = require('url');
3 const _ = require('lodash'); 4 const _ = require('lodash');
4 const API = global.yoho.API; 5 const API = global.yoho.API;
5 const serviceAPI = global.yoho.ServiceAPI; 6 const serviceAPI = global.yoho.ServiceAPI;
@@ -102,6 +103,9 @@ exports.getGoods = cate => { @@ -102,6 +103,9 @@ exports.getGoods = cate => {
102 103
103 productList.forEach(product=> { 104 productList.forEach(product=> {
104 let skn = product.productSkn; 105 let skn = product.productSkn;
  106 + let imgSrc = url.parse(product.defaultImages);
  107 +
  108 + product.defaultImages = ['//', imgSrc.hostname, imgSrc.pathname].join('');
105 109
106 product.url = helpers.appUrlFormat(product.url, 'go.productDetail', { 110 product.url = helpers.appUrlFormat(product.url, 'go.productDetail', {
107 product_skn: skn 111 product_skn: skn
@@ -94,13 +94,7 @@ @@ -94,13 +94,7 @@
94 <textarea class="vip-msg-content"></textarea> 94 <textarea class="vip-msg-content"></textarea>
95 <button class="vip-msg-send" type="button">写好啦!</button> 95 <button class="vip-msg-send" type="button">写好啦!</button>
96 </div> 96 </div>
97 - <p class="label">  
98 - <strong>写留言去抽奖!</strong>  
99 - <br>  
100 - <strong>100%中奖机会</strong>  
101 - <br><br>  
102 - 潮/酷/屌炸天为你而造~告诉我们你的想法可再次参与抽奖,100%中奖哦。  
103 - </p> 97 + <img class="txt" src="{{imgSrc 'img/activity/vip_day/leava-msg.png'}}" alt="">
104 </div> 98 </div>
105 <div class="vip-day-msg-input"></div> 99 <div class="vip-day-msg-input"></div>
106 </div> 100 </div>
@@ -32,6 +32,7 @@ function appJump(where, option) { @@ -32,6 +32,7 @@ function appJump(where, option) {
32 32
33 33
34 var page = { 34 var page = {
  35 + rollTimer: null,
35 init: function() { 36 init: function() {
36 this.domInit(); 37 this.domInit();
37 this.bindEvents(); 38 this.bindEvents();
@@ -178,6 +179,7 @@ var page = { @@ -178,6 +179,7 @@ var page = {
178 return; 179 return;
179 } 180 }
180 181
  182 + window.clearTimeout(this.rollTimer);
181 var $frag = $('<ul></ul>'), 183 var $frag = $('<ul></ul>'),
182 $fragClone; 184 $fragClone;
183 185
@@ -192,6 +194,7 @@ var page = { @@ -192,6 +194,7 @@ var page = {
192 $fragClone = $frag.clone(); 194 $fragClone = $frag.clone();
193 195
194 $msgRoll 196 $msgRoll
  197 + .html('')
195 .append($frag, $frag.clone()); 198 .append($frag, $frag.clone());
196 199
197 // .css({ visibility: 'visible' }); 200 // .css({ visibility: 'visible' });
@@ -206,7 +209,7 @@ var page = { @@ -206,7 +209,7 @@ var page = {
206 209
207 function rolling() { 210 function rolling() {
208 211
209 - $msgRoll.animate({ 212 + $msgRoll.delay(2000).animate({
210 scrollTop: '+='.concat(oneMsgH) 213 scrollTop: '+='.concat(oneMsgH)
211 }, 400, function() { 214 }, 400, function() {
212 var curT = $msgRoll[0].scrollTop; 215 var curT = $msgRoll[0].scrollTop;
@@ -215,7 +218,7 @@ var page = { @@ -215,7 +218,7 @@ var page = {
215 $msgRoll[0].scrollTop = curT - $frag[0].getBoundingClientRect().height; 218 $msgRoll[0].scrollTop = curT - $frag[0].getBoundingClientRect().height;
216 } 219 }
217 220
218 - setTimeout(rolling, 1000); 221 + self.rollTimer = setTimeout(rolling, 2000);
219 }); 222 });
220 } 223 }
221 224
@@ -16,6 +16,7 @@ var ClassName = { @@ -16,6 +16,7 @@ var ClassName = {
16 }; 16 };
17 var Modal = function(elem, config) { 17 var Modal = function(elem, config) {
18 this.$element = $(elem); 18 this.$element = $(elem);
  19 + this.$body = $(document.body);
19 this._backdrop = null; 20 this._backdrop = null;
20 this._config = $.extend( 21 this._config = $.extend(
21 {}, 22 {},
@@ -36,6 +37,7 @@ Modal.prototype.show = function(relatedTarget) { @@ -36,6 +37,7 @@ Modal.prototype.show = function(relatedTarget) {
36 if (this._isShown) { 37 if (this._isShown) {
37 return this; 38 return this;
38 } 39 }
  40 + this.$body.toggleClass('ymodal-open', true);
39 this.$element.trigger('show.yoho.modal', relatedTarget); 41 this.$element.trigger('show.yoho.modal', relatedTarget);
40 42
41 this.$element.on('click.dismiss.yoho.modal', Selector.DATA_DISMISS, $.proxy(this.hide, this)); 43 this.$element.on('click.dismiss.yoho.modal', Selector.DATA_DISMISS, $.proxy(this.hide, this));
@@ -57,6 +59,7 @@ Modal.prototype.hide = function(e) { @@ -57,6 +59,7 @@ Modal.prototype.hide = function(e) {
57 this.$element 59 this.$element
58 .off('click.dismiss.yoho.modal') 60 .off('click.dismiss.yoho.modal')
59 .hide(); 61 .hide();
  62 + this.$body.removeClass('ymodal-open');
60 this.backdrop(); 63 this.backdrop();
61 this.$element.trigger('hiden.yoho.modal'); 64 this.$element.trigger('hiden.yoho.modal');
62 }; 65 };
@@ -339,14 +339,13 @@ @@ -339,14 +339,13 @@
339 float: left; 339 float: left;
340 width: 400px; 340 width: 400px;
341 margin-right: 35px; 341 margin-right: 35px;
342 - color: block;  
343 padding: 5px; 342 padding: 5px;
344 background-color: #e9e9ea; 343 background-color: #e9e9ea;
345 border-radius: 4px; 344 border-radius: 4px;
346 } 345 }
347 .vip-msg-content { 346 .vip-msg-content {
  347 + height: 90px;
348 display: block; 348 display: block;
349 - height: 128px;  
350 background-color: #e9e9ea; 349 background-color: #e9e9ea;
351 border: none; 350 border: none;
352 outline: none; 351 outline: none;
@@ -364,15 +363,10 @@ @@ -364,15 +363,10 @@
364 border-radius: 8px; 363 border-radius: 8px;
365 } 364 }
366 365
367 - .label {  
368 - padding-right: 40px;  
369 - overflow: hidden;  
370 - font-size: 19px;  
371 -  
372 - strong {  
373 - font-size: 27px;  
374 - color: #e95d3f;  
375 - } 366 + .txt {
  367 + float: left;
  368 + width: 195px;
  369 + height: 132px;
376 } 370 }
377 } 371 }
378 372
  1 +.ymodal-open {
  2 + overflow: hidden;
  3 +}
1 .ymodal { 4 .ymodal {
2 position: fixed; 5 position: fixed;
3 top: 0; 6 top: 0;