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) => {
yoho.isiOS = /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(userAgent);
yoho.isAndroid = /Android/i.test(userAgent);
yoho.isApp = /YohoBuy/i.test(req.get('User-Agent')) || (req.query.app_version && req.query.client_type);
yoho.app_version = req.query.app_version || '';
yoho.app_version = req.get('User-Agent').match(/app_version=([^;]+)/i)||req.query.app_version || '';
if (yoho.app_version) {
arrs = yoho.app_version.split('.');
if (arrs.length > 2) {
... ... @@ -126,6 +126,7 @@ const getPlatForm = (req) => {
let data = yield getUser(yoho.uid);
yoho.isStudent = data.data && data.data.vip_info && data.data.vip_info.is_student ? true : false;
// yoho.isStudent = false;
return yoho;
})();
... ...
... ... @@ -38,26 +38,32 @@
<div class="coupon-floor" coupon-id="{{couponID}}">
<div class="floor-main" style="background-image: url({{image image.src 0 0}});">
<a href='{{image.url}}' class="main-left"></a>
<a href='{{image.url}}' class="main-right-use" >
{{#isEqual status 1}}
<div class="main-right-use" >
<span class="on-receive on-lingqu no-bg">
<p>点击</p>
<p>领取</p>
</span>
</div>
{{/isEqual}}
{{#isEqual status 2}}
<a href='{{image.url}}' class="main-right-use" >
<span class="zero"></span>
</a>
{{/isEqual}}
{{#isEqual status 3}}
<a href='{{image.url}}' class="main-right-use" >
<span class="received"></span>
</a>
{{/isEqual}}
{{#isEqual status 4}}
<a href='{{image.url}}' class="main-right-use" >
<span class="on-receive no-bg" >
<p>已经</p>
<p>过期</p>
</span>
</a>
{{/isEqual}}
</a>
</div>
</div>
{{/each}}
... ...