fe / yohobuywap-node · Commits

Go to a project

Authored by weiqingting
Commit c21c867ee6cfc3fa9ba022f69a7715266a088eee 1 parent ff2105e7

Merge branch 'feature_student' into release/4.9.1.0 

# Conflicts:
#	apps/product/models/detail.js
#	config/common.js
#	public/scss/common/_good.css
Inline Side-by-side
Showing 2 changed files with 10 additions and 3 deletions
@@ -98,7 +98,7 @@ const getPlatForm = (req) => { @@ -98,7 +98,7 @@ const getPlatForm = (req) => {
98 yoho.isiOS = /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(userAgent); 98 yoho.isiOS = /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(userAgent);
99 yoho.isAndroid = /Android/i.test(userAgent); 99 yoho.isAndroid = /Android/i.test(userAgent);
100 yoho.isApp = /YohoBuy/i.test(req.get('User-Agent')) || (req.query.app_version && req.query.client_type); 100 yoho.isApp = /YohoBuy/i.test(req.get('User-Agent')) || (req.query.app_version && req.query.client_type);
101 - yoho.app_version = req.query.app_version || ''; 101 + yoho.app_version = req.get('User-Agent').match(/app_version=([^;]+)/i)||req.query.app_version || '';
102 if (yoho.app_version) { 102 if (yoho.app_version) {
103 arrs = yoho.app_version.split('.'); 103 arrs = yoho.app_version.split('.');
104 if (arrs.length > 2) { 104 if (arrs.length > 2) {
@@ -126,6 +126,7 @@ const getPlatForm = (req) => { @@ -126,6 +126,7 @@ const getPlatForm = (req) => {
126 let data = yield getUser(yoho.uid); 126 let data = yield getUser(yoho.uid);
127 127
128 yoho.isStudent = data.data && data.data.vip_info && data.data.vip_info.is_student ? true : false; 128 yoho.isStudent = data.data && data.data.vip_info && data.data.vip_info.is_student ? true : false;
  129 +
129 // yoho.isStudent = false; 130 // yoho.isStudent = false;
130 return yoho; 131 return yoho;
131 })(); 132 })();
@@ -38,26 +38,32 @@ @@ -38,26 +38,32 @@
38 <div class="coupon-floor" coupon-id="{{couponID}}"> 38 <div class="coupon-floor" coupon-id="{{couponID}}">
39 <div class="floor-main" style="background-image: url({{image image.src 0 0}});"> 39 <div class="floor-main" style="background-image: url({{image image.src 0 0}});">
40 <a href='{{image.url}}' class="main-left"></a> 40 <a href='{{image.url}}' class="main-left"></a>
41 - <a href='{{image.url}}' class="main-right-use" >  
42 {{#isEqual status 1}} 41 {{#isEqual status 1}}
  42 + <div class="main-right-use" >
43 <span class="on-receive on-lingqu no-bg"> 43 <span class="on-receive on-lingqu no-bg">
44 <p>点击</p> 44 <p>点击</p>
45 <p>领取</p> 45 <p>领取</p>
46 </span> 46 </span>
  47 + </div>
47 {{/isEqual}} 48 {{/isEqual}}
48 {{#isEqual status 2}} 49 {{#isEqual status 2}}
  50 + <a href='{{image.url}}' class="main-right-use" >
49 <span class="zero"></span> 51 <span class="zero"></span>
  52 + </a>
50 {{/isEqual}} 53 {{/isEqual}}
51 {{#isEqual status 3}} 54 {{#isEqual status 3}}
  55 + <a href='{{image.url}}' class="main-right-use" >
52 <span class="received"></span> 56 <span class="received"></span>
  57 + </a>
53 {{/isEqual}} 58 {{/isEqual}}
54 {{#isEqual status 4}} 59 {{#isEqual status 4}}
  60 + <a href='{{image.url}}' class="main-right-use" >
55 <span class="on-receive no-bg" > 61 <span class="on-receive no-bg" >
56 <p>已经</p> 62 <p>已经</p>
57 <p>过期</p> 63 <p>过期</p>
58 </span> 64 </span>
  65 + </a>
59 {{/isEqual}} 66 {{/isEqual}}
60 - </a>  
61 </div> 67 </div>
62 </div> 68 </div>
63 {{/each}} 69 {{/each}}