fe / yohobuywap-node · Commits

Go to a project

Authored by runner
Commit 22a24a5d18ceec8fb997fe02c452d6a0cb8d2164 2 parents 41b1c3a2 c0b2b8e3

Merge branch 'release/4.6' of http://git.yoho.cn/fe/yohobuywap-node into release/4.6

Inline Side-by-side
Showing 6 changed files with 13 additions and 59 deletions
@@ -14,15 +14,15 @@ const helpers = require(`${library}/helpers`); @@ -14,15 +14,15 @@ const helpers = require(`${library}/helpers`);
14 14
15 const headTab = [ 15 const headTab = [
16 { 16 {
17 - url: '/guang/star?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"\/guang\/star","param":{}}}', // eslint-disable-line 17 + url: '/guang/star?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http:\/\/guang.m.yohobuy.com\/guang\/star","param":{}}}', // eslint-disable-line
18 name: '全部' 18 name: '全部'
19 }, 19 },
20 { 20 {
21 - url: '/guang/star/special?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"\/guang\/star\/special","param":{}}}', // eslint-disable-line 21 + url: '/guang/star/special?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http:\/\/guang.m.yohobuy.com\/guang\/star\/special","param":{}}}', // eslint-disable-line
22 name: '星专题' 22 name: '星专题'
23 }, 23 },
24 { 24 {
25 - url: '/guang/star/collocation?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"\/guang\/star\/collocation","param":{}}}', // eslint-disable-line 25 + url: '/guang/star/collocation?openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"N","type":0,"updateflag":"N","url":"http:\/\/guang.m.yohobuy.com\/guang\/star\/collocation","param":{}}}', // eslint-disable-line
26 name: '星搭配' 26 name: '星搭配'
27 } 27 }
28 ]; 28 ];
@@ -153,8 +153,8 @@ exports.setFavorite = (req, res, next) => { @@ -153,8 +153,8 @@ exports.setFavorite = (req, res, next) => {
153 refer: req.get('Referer') || url 153 refer: req.get('Referer') || url
154 }); 154 });
155 } else { 155 } else {
156 - urlEncode = '\\/guang\\/star\\/collocation';  
157 - result.data = `${url}?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"${urlEncode}","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}`; // eslint-disable-line 156 + urlEncode = '\/guang\/star\/collocation';
  157 + result.data = `${url}?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"http:\/\/guang.m.yohobuy.com${urlEncode}","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}`; // eslint-disable-line
158 } 158 }
159 } 159 }
160 res.json(result); 160 res.json(result);
@@ -100,7 +100,7 @@ class Star { @@ -100,7 +100,7 @@ class Star {
100 // 首页明星头像数据处理 100 // 首页明星头像数据处理
101 if (list.tags) { 101 if (list.tags) {
102 _.forEach(list.tags, (data) => { 102 _.forEach(list.tags, (data) => {
103 - let url = `/guang/star/detail?tag=${data.tagName}&openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"\/guang\/star\/detail?tag=${data.tagName}","param":{}}}`; // eslint-disable-line 103 + let url = `/guang/star/detail?tag=${data.tagName}&openby:yohobuy＝{"action":"go.h5","params":{"id":"","share":"","shareparam":{},"islogin":"Y","type":0,"updateflag":"N","url":"http:\/\/guang.m.yohobuy.com\/guang\/star\/detail?tag=${data.tagName}","param":{}}}`; // eslint-disable-line
104 104
105 formatData.starAvatar.push({ 105 formatData.starAvatar.push({
106 url: url, 106 url: url,
@@ -67,52 +67,6 @@ @@ -67,52 +67,6 @@
67 </div> 67 </div>
68 </div> 68 </div>
69 </li> 69 </li>
70 - <li data-id="{{id}}">  
71 - <div class="star-avatar">  
72 - {{#if isSwiper}}  
73 - <div class="article-avatar-swiper">  
74 - <ul class="clearfix swiper-wrapper">  
75 - {{#each tags}}  
76 - <li class="swiper-slide">  
77 - <a href="{{avatarUrl}}">  
78 - <div data-avatar="{{image cover 100 100}}" class="rank-avatar" ></div>  
79 - <p class="name">{{tagName}}</p>  
80 - </a>  
81 - </li>  
82 - {{/each}}  
83 - </ul>  
84 - </div>  
85 - {{else}}  
86 - {{# tags}}  
87 - <a href="{{avatarUrl}}">  
88 - <div data-avatar="{{image cover 100 100}}" class="rank-avatar" ></div>  
89 - <p class="name">{{tagName}}</p>  
90 - </a>  
91 - {{/ tags}}  
92 - {{/if}}  
93 - </div>  
94 - <div class="star-article">  
95 - <i class="article-arrow"></i>  
96 - <a href="{{url}}"><h2 class="article-title">{{title}}</h2></a>  
97 - <div class="artice-cont">  
98 - <a href="{{url}}"><p>{{articeTxt}}</p></a>  
99 - <div class="artice-imgs-area">  
100 - <img src="{{image src 266 266}}" />  
101 -  
102 - {{!-- <ul class="artice-imgs">  
103 - {{#each articeImg}}  
104 - <li><img src="{{image . 640 640}}" /></li>  
105 - {{/each}}  
106 - </ul> --}}  
107 -  
108 - </div>  
109 - </div>  
110 - <div class="artice-o">  
111 - <span class="time"><i class="iconfont time-ico">&#xe603;</i>{{publishTime}}</span>  
112 - <span class="see"><i class="iconfont see-ico">&#xe602;</i>{{viewsNum}}</span>  
113 - </div>  
114 - </div>  
115 - </li>  
116 {{/each}} 70 {{/each}}
117 </ul> 71 </ul>
118 </div> 72 </div>
@@ -13,8 +13,8 @@ module.exports = { @@ -13,8 +13,8 @@ module.exports = {
13 port: 6001, 13 port: 6001,
14 siteUrl: '//m.yohobuy.com', 14 siteUrl: '//m.yohobuy.com',
15 domains: { 15 domains: {
16 - api: 'http://testapi.yoho.cn:28078/',  
17 - service: 'http://testservice.yoho.cn:28077/' 16 + api: 'http://devapi.yoho.cn:58078/',
  17 + service: 'http://devservice.yoho.cn:58077/'
18 }, 18 },
19 useOneapm: false, 19 useOneapm: false,
20 useCache: false, 20 useCache: false,
@@ -76,7 +76,7 @@ function setIndexAction() { @@ -76,7 +76,7 @@ function setIndexAction() {
76 76
77 // 下拉刷新，上拉加载 77 // 下拉刷新，上拉加载
78 starIScroll = new PullRefresh('.star-wrap', { 78 starIScroll = new PullRefresh('.star-wrap', {
79 - height: $(window).height() - commonHeaderTop - avatarHeight - parseInt(infoTop) * 2, 79 + height: $(window).height() - commonHeaderTop - avatarHeight - parseInt(infoTop, 10) * 2,
80 pullDown: function() { 80 pullDown: function() {
81 if (!stopLoading) { 81 if (!stopLoading) {
82 stopLoading = true; 82 stopLoading = true;
@@ -128,7 +128,7 @@ function setIndexAction() { @@ -128,7 +128,7 @@ function setIndexAction() {
128 starIScroll.iScroll.on('scrollEnd', function() { 128 starIScroll.iScroll.on('scrollEnd', function() {
129 // 上滑 129 // 上滑
130 if (this.directionY === 1) { 130 if (this.directionY === 1) {
131 - $headTab.slideUp(1000); 131 + $headTab.slideUp(600);
132 } 132 }
133 133
134 $loadingTip.slideUp(); 134 $loadingTip.slideUp();
@@ -69,9 +69,9 @@ if ($('#index_nav').length > 0) { @@ -69,9 +69,9 @@ if ($('#index_nav').length > 0) {
69 }).goto($('#index_nav').find('.active').index()); 69 }).goto($('#index_nav').find('.active').index());
70 } 70 }
71 71
72 -if ($('#list-nav').length > 0) { 72 +if ($('.outlet-category-nav').length > 0) {
73 iscroll({ 73 iscroll({
74 - el: '#list-nav' 74 + el: '.outlet-category-nav'
75 }).goto(0); 75 }).goto(0);
76 } 76 }
77 77
@@ -87,7 +87,7 @@ if ($('.back-ground-white').length > 10) { @@ -87,7 +87,7 @@ if ($('.back-ground-white').length > 10) {
87 $('.more-activity').click(function() { 87 $('.more-activity').click(function() {
88 $('.more-activity').hide(); 88 $('.more-activity').hide();
89 $('.back-ground-white').each(function(index, e) { 89 $('.back-ground-white').each(function(index, e) {
90 - if(index > 9) { 90 + if (index > 9) {
91 $(e).show(); 91 $(e).show();
92 } 92 }
93 }); 93 });