fe / yohobuywap-node · Commits

Go to a project

Authored by 徐炜
Commit e31a7248f2e04b50fd9ac400cdaf327ad192fde6 2 parents e9af4b15 e5884e61

Merge branch 'release/4.9.1.0'

Inline Side-by-side
Showing 11 changed files with 13 additions and 8 deletions
@@ -97,6 +97,9 @@ const getPlatForm = (req) => { @@ -97,6 +97,9 @@ const getPlatForm = (req) => {
97 let isNewVersion = false; 97 let isNewVersion = false;
98 const isProduction = process.env.NODE_ENV === 'production'; 98 const isProduction = process.env.NODE_ENV === 'production';
99 99
  100 + // console.log(req.get('User-Agent'));
  101 + // console.log(req.query.uid);
  102 +
100 yoho.isiOS = /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(userAgent); 103 yoho.isiOS = /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(userAgent);
101 yoho.isAndroid = /Android/i.test(userAgent); 104 yoho.isAndroid = /Android/i.test(userAgent);
102 yoho.isApp = /YohoBuy/i.test(req.get('User-Agent')) || (req.query.app_version && req.query.client_type); 105 yoho.isApp = /YohoBuy/i.test(req.get('User-Agent')) || (req.query.app_version && req.query.client_type);
@@ -133,6 +136,7 @@ const getPlatForm = (req) => { @@ -133,6 +136,7 @@ const getPlatForm = (req) => {
133 yoho.isStudent = data.data && data.data.vip_info && data.data.vip_info.is_student ? true : false; 136 yoho.isStudent = data.data && data.data.vip_info && data.data.vip_info.is_student ? true : false;
134 137
135 // yoho.isStudent = false; 138 // yoho.isStudent = false;
  139 + // console.log(yoho);
136 return yoho; 140 return yoho;
137 })(); 141 })();
138 142
@@ -287,7 +291,7 @@ exports.register = (req, res, next) => { @@ -287,7 +291,7 @@ exports.register = (req, res, next) => {
287 } 291 }
288 Promise.all([verifiedStudentTotal(), getEducationLevelList()]).then((arr) => { 292 Promise.all([verifiedStudentTotal(), getEducationLevelList()]).then((arr) => {
289 if (req.__USER__.isStudent) { 293 if (req.__USER__.isStudent) {
290 - refer = '/activity/student';// 所有认证过的，都跳转学生首页 294 + refer = '/activity/student?uid='+req.__USER__.uid;// 所有认证过的，都跳转学生首页
291 295
292 296
293 res.redirect(helpers.urlFormat(refer)); 297 res.redirect(helpers.urlFormat(refer));
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 {{/activities}} 94 {{/activities}}
95 95
96 <section class='s-section clearfix'> 96 <section class='s-section clearfix'>
97 - <h1>学生专享商品<a class="more iconfont" href="//search.m.yohobuy.com/?students=1&title=学生专享商品&uid={{uid}}{{#isApp}}&app_version={{@root.app_version}}{{/isApp}}">&#xe618;</a></h1> 97 + <h1>学生专享商品<a class="more iconfont" href="//search.m.yohobuy.com/?students=1&title=学生专享商品&uid={{uid}}{{#isApp}}&app_version={{@root.app_version}}{{/isApp}}?openby:yohobuy={'action':'go.h5','params':{'islogin':'N','url':'{{@root.http}}//search.m.yohobuy.com/','param':{'students':'1','title':'学生专享商品','uid':'{{uid}}'}}}">&#xe618;</a></h1>
98 <div class='goods-list clearfix'> 98 <div class='goods-list clearfix'>
99 {{#each goods}} 99 {{#each goods}}
100 <div class="good-info"> 100 <div class="good-info">
@@ -127,7 +127,7 @@ @@ -127,7 +127,7 @@
127 <a href="{{url}}">{{product_name}}</a> 127 <a href="{{url}}">{{product_name}}</a>
128 </div> 128 </div>
129 <div class="price"> 129 <div class="price">
130 - <span class="sale-price">¥{{round student_price}} <a class='s-biaoqian'>学生价</a></span> 130 + <span class="sale-price">¥{{round student_price}} <i class='s-biaoqian'></i></span>
131 <p class="s-price-block"> 131 <p class="s-price-block">
132 <span class="market-price">¥{{round market_price}}</span> 132 <span class="market-price">¥{{round market_price}}</span>
133 </p> 133 </p>
@@ -136,7 +136,7 @@ @@ -136,7 +136,7 @@
136 </div> 136 </div>
137 {{/each}} 137 {{/each}}
138 </div> 138 </div>
139 - <a class='s-more' href='//search.m.yohobuy.com/?students=1&title=学生专享商品&uid={{uid}}{{#isApp}}&app_version={{@root.app_version}}{{/isApp}}'>查看更多</a> 139 + <a class='s-more' href="//search.m.yohobuy.com/?students=1&title=学生专享商品&uid={{uid}}{{#isApp}}&app_version={{@root.app_version}}{{/isApp}}?openby:yohobuy={'action':'go.h5','params':{'islogin':'N','url':'{{@root.http}}//search.m.yohobuy.com/','param':{'students':'1','title':'学生专享商品','uid':'{{uid}}'}}}">查看更多</a>
140 </section> 140 </section>
141 141
142 {{#loginUrl}} 142 {{#loginUrl}}
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 </section> 20 </section>
21 {{/if}} 21 {{/if}}
22 <section class='s-section clearfix'> 22 <section class='s-section clearfix'>
23 - <h1>学生专享商品<a class="more iconfont" href="//search.m.yohobuy.com/?students=1&title=学生专享商品&uid={{uid}}{{#isApp}}&app_version={{@root.app_version}}{{/isApp}}">&#xe618;</a></h1> 23 + <h1>学生专享商品<a class="more iconfont" href="//search.m.yohobuy.com/?students=1&title=学生专享商品&uid={{uid}}{{#isApp}}&app_version={{@root.app_version}}{{/isApp}}?openby:yohobuy={'action':'go.h5','params':{'islogin':'N','url':'{{@root.http}}//search.m.yohobuy.com/','param':{'students':'1','title':'学生专享商品','uid':'{{uid}}'}}}">&#xe618;</a></h1>
24 <div class='goods-list clearfix'> 24 <div class='goods-list clearfix'>
25 {{#each goods}} 25 {{#each goods}}
26 <div class="good-info"> 26 <div class="good-info">
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 <a href="{{url}}">{{product_name}}</a> 53 <a href="{{url}}">{{product_name}}</a>
54 </div> 54 </div>
55 <div class="price"> 55 <div class="price">
56 - <span class="sale-price">¥{{round student_price}} <i class='s-biaoqian'>学生价</i></span> 56 + <span class="sale-price">¥{{round student_price}} <i class='s-biaoqian'></i></span>
57 <p class="s-price-block"> 57 <p class="s-price-block">
58 <span class="market-price">¥{{round market_price}}</span> 58 <span class="market-price">¥{{round market_price}}</span>
59 </p> 59 </p>

1 KB | W: | H:

2.04 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

7.42 KB | W: | H:

7.36 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

48 KB | W: | H:

47.4 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

2.55 KB | W: | H:

2.52 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
@@ -63,7 +63,7 @@ ListData.prototype.getListData = function(page) { @@ -63,7 +63,7 @@ ListData.prototype.getListData = function(page) {
63 self.opt.stopLoading = false; 63 self.opt.stopLoading = false;
64 64
65 if (data === '') { 65 if (data === '') {
66 - if (self.opt.noResult) { 66 + if (self.opt.noResult && self.opt.page === 1) {
67 $('.no-result').show(); 67 $('.no-result').show();
68 } 68 }
69 self.opt.stopLoading = true; 69 self.opt.stopLoading = true;
@@ -374,7 +374,7 @@ @@ -374,7 +374,7 @@
374 background-repeat: no-repeat; 374 background-repeat: no-repeat;
375 background-size: contain; 375 background-size: contain;
376 width: 77px; 376 width: 77px;
377 - height: 26px; 377 + height: 28px;
378 line-height: 26px; 378 line-height: 26px;
379 position: absolute; 379 position: absolute;
380 right: -87px; 380 right: -87px;
@@ -191,6 +191,7 @@ @@ -191,6 +191,7 @@
191 191
192 .goods { 192 .goods {
193 background-color: #fff; 193 background-color: #fff;
  194 + padding: 0 14px;
194 } 195 }
195 } 196 }
196 } 197 }