Merge branch 'feature/students' into release/4.9.1.0
Showing
3 changed files
with
15 additions
and
1 deletions
@@ -4,12 +4,18 @@ | @@ -4,12 +4,18 @@ | ||
4 | </div> | 4 | </div> |
5 | {{#if students}} | 5 | {{#if students}} |
6 | <div class="float-layer students-layer"> | 6 | <div class="float-layer students-layer"> |
7 | + {{#if oldApp}} | ||
8 | + <div class="float-layer-left"> | ||
9 | + <p>请升级最新APP版本,完成认证</p> | ||
10 | + </div> | ||
11 | + {{^}} | ||
7 | <div class="float-layer-left"> | 12 | <div class="float-layer-left"> |
8 | <p>快来认证吧,认证通过即可享受专属优惠!</p> | 13 | <p>快来认证吧,认证通过即可享受专属优惠!</p> |
9 | </div> | 14 | </div> |
10 | <a href="{{students}}" class="students-btn"> | 15 | <a href="{{students}}" class="students-btn"> |
11 | 立即认证 | 16 | 立即认证 |
12 | </a> | 17 | </a> |
18 | + {{/if}} | ||
13 | </div> | 19 | </div> |
14 | {{/if}} | 20 | {{/if}} |
15 | {{> layout/footer}} | 21 | {{> layout/footer}} |
@@ -36,12 +36,15 @@ | @@ -36,12 +36,15 @@ | ||
36 | {{#if students}} | 36 | {{#if students}} |
37 | <span class="sale-price {{^price}}no-price{{/price}}">¥{{studentPrice}}</span> | 37 | <span class="sale-price {{^price}}no-price{{/price}}">¥{{studentPrice}}</span> |
38 | <span class="students-price-tag">学生价</span> | 38 | <span class="students-price-tag">学生价</span> |
39 | + {{#salePrice}} | ||
40 | + <span class="market-price">¥{{.}}</span> | ||
41 | + {{/salePrice}} | ||
39 | {{^}} | 42 | {{^}} |
40 | <span class="sale-price {{^price}}no-price{{/price}}">¥{{salePrice}}</span> | 43 | <span class="sale-price {{^price}}no-price{{/price}}">¥{{salePrice}}</span> |
41 | - {{/if}} | ||
42 | {{#price}} | 44 | {{#price}} |
43 | <span class="market-price">¥{{.}}</span> | 45 | <span class="market-price">¥{{.}}</span> |
44 | {{/price}} | 46 | {{/price}} |
47 | + {{/if}} | ||
45 | </div> | 48 | </div> |
46 | </div> | 49 | </div> |
47 | </div> | 50 | </div> |
@@ -255,6 +255,11 @@ class SearchController extends AbstractAction | @@ -255,6 +255,11 @@ class SearchController extends AbstractAction | ||
255 | } | 255 | } |
256 | $data['showDownloadApp'] = false; | 256 | $data['showDownloadApp'] = false; |
257 | } | 257 | } |
258 | + //判断app版本是否低于4.9.1,用于显示下方的提示 | ||
259 | + $appVersion = str_replace('.', '', $this->get('app_version')); | ||
260 | + if (intval(substr($appVersion, 0, 3)) < 491) { | ||
261 | + $data['oldApp'] = true; | ||
262 | + } | ||
258 | 263 | ||
259 | $this->_view->display('list', $data); | 264 | $this->_view->display('list', $data); |
260 | } | 265 | } |
-
Please register or login to post a comment