Merge branch 'feature/students' into release/4.9.1.0

@@ -4,12 +4,18 @@
 </div>
 </div>
 {{#if students}}
 {{#if students}}
     <div class="float-layer students-layer">
     <div class="float-layer students-layer">
-        <div class="float-layer-left">
-            <p>快来认证吧，认证通过即可享受专属优惠！</p>
-        </div>
-        <a href="{{students}}" class="students-btn">
-            立即认证
-        </a>
+        {{#if oldApp}}
+            <div class="float-layer-left">
+                <p>请升级最新APP版本，完成认证</p>
+            </div>
+        {{^}}
+            <div class="float-layer-left">
+                <p>快来认证吧，认证通过即可享受专属优惠！</p>
+            </div>
+            <a href="{{students}}" class="students-btn">
+                立即认证
+            </a>
+        {{/if}}
     </div>
     </div>
 {{/if}}
 {{/if}}
 {{> layout/footer}}
 {{> layout/footer}}

@@ -34,14 +34,17 @@
             </div>
             </div>
             <div class="price {{#if students}}student-price{{/if}}">
             <div class="price {{#if students}}student-price{{/if}}">
                 {{#if students}}
                 {{#if students}}
-                <span class="sale-price {{^price}}no-price{{/price}}">¥{{studentPrice}}</span>
-                <span class="students-price-tag">学生价</span>
+                    <span class="sale-price {{^price}}no-price{{/price}}">¥{{studentPrice}}</span>
+                    <span class="students-price-tag">学生价</span>
+                    {{#salePrice}}
+                        <span class="market-price">¥{{.}}</span>
+                    {{/salePrice}}
                 {{^}}
                 {{^}}
-                <span class="sale-price {{^price}}no-price{{/price}}">¥{{salePrice}}</span>
+                    <span class="sale-price {{^price}}no-price{{/price}}">¥{{salePrice}}</span>
+                    {{#price}}
+                        <span class="market-price">¥{{.}}</span>
+                    {{/price}}
                 {{/if}}
                 {{/if}}
-                {{#price}}
-                    <span class="market-price">¥{{.}}</span>
-                {{/price}}
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>

@@ -255,6 +255,11 @@ class SearchController extends AbstractAction
             }
             }
             $data['showDownloadApp'] = false;
             $data['showDownloadApp'] = false;
         }
         }
+        //判断app版本是否低于4.9.1,用于显示下方的提示
+        $appVersion = str_replace('.', '', $this->get('app_version'));
+        if (intval(substr($appVersion, 0, 3)) < 491) {
+            $data['oldApp'] = true;
+        }
 
 
         $this->_view->display('list', $data);
         $this->_view->display('list', $data);
     }
     }