bugfix1-项目仪器

src/main/java/com/caimei/www/controller/RedirectController.java

@@ -55,11 +55,11 @@ public class RedirectController {
      */
     @GetMapping("/cmpage/info-2-{id}.html")
     public String toequipment(@PathVariable("id") Integer equipmentId) {
-        return "redirect:/equipment/"+equipmentId+".html";
+        return "redirect:/equipment-"+equipmentId+".html";
     }
     @GetMapping("/equipment/detail.html")
     public String toequipment2(@RequestParam("id") Integer equipmentId) {
-        return "redirect:/equipment/"+equipmentId+".html";
+        return "redirect:/equipment-"+equipmentId+".html";
     }
     /**
      * 直播页面【旧】

src/main/java/com/caimei/www/controller/unlimited/EquipmentController.java

@@ -46,7 +46,7 @@ public class EquipmentController extends BaseController {
     /**
      * 项目仪器详情页
      */
-    @GetMapping("/equipment/{id}.html")
+    @GetMapping("/equipment-{id}.html")
     public String home(final Model model, @PathVariable("id") Integer equipmentId) {
         PageContent detail = equipmentService.getEquipmentById(equipmentId);
         if(detail== null){

src/main/resources/static/js/base.js

@@ -346,8 +346,8 @@ $(function(){
     $('#topSearch').on("click", '.searchBtn', function(){
         var type = isPC ? $('#topSearch').find('[data-select]').attr("data-select")*1 : $('#topSearch').find('select').val()*1;
         var keyword = $.trim($('#topSearch').find('.keyword').val());
-        // 商品
-        if (keyword.length < 2) {
+        // 商品,文章
+        if (keyword.length < 2 && (type === 0 || type > 2)) {
             $.confirm({
                 useBootstrap: false,
                 boxWidth: (isPC?'300px':'70%'),

src/main/resources/static/js/index.js

@@ -321,17 +321,15 @@ var homeData = new Vue({
         $('#advertising').on('click','.close',function () {
             $(this).parents('.item').hide();
         });
-        // var isActivityStatus =  localStorage.getItem('isActivityStatus');
-        // //新加优惠券弹窗
-        // if(isActivityStatus){
-        //     var  lockTime = localStorage.getItem('lockTime');
-        //     var  eTime = this.diffTime(lockTime);
-        //     _this.showflag = eTime;
-        // }else{
-        //     setTimeout(function () {
-        //          _this.showflag = true;
-        //     },1000);
-        // }
+        var isActivityStatus =  localStorage.getItem('isActivityStatus');
+        //新加优惠券弹窗
+        if(isActivityStatus){
+            var  lockTime = localStorage.getItem('lockTime');
+            _this.popupFlag = this.diffTime(lockTime);
+        }else{
+            setTimeout(function () {
+                 _this.popupFlag = true;
+            },1000);
+        }
     }
 });
-

src/main/resources/templates/components/foot-link.html

@@ -3,7 +3,7 @@
 <script charset="utf-8" type="text/javascript" src="/lib/swiper.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/viewer.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/jquery-confirm.min.js"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/vue2.6.11.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/utils.service.js(v=${version})}"></script>

src/main/resources/templates/document/components/document-link.html

@@ -3,7 +3,7 @@
 <script charset="utf-8" type="text/javascript" src="/lib/swiper.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/viewer.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/jquery-confirm.min.js"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/vue2.6.11.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/locallhostAjax.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/utils.js(v=${version})}"></script>

src/main/resources/templates/equipment/list.html

@@ -28,7 +28,7 @@
     <div v-else class="equipmentList">
         <ul class="clear mfw">
             <li class="equipmentItem" v-for="ins in listData">
-                <a :href="'/equipment/'+ins.id+'.html" target="_blank">
+                <a :href="'/equipment-'+ins.id+'.html'" target="_blank">
                     <img src="/img/base/placeholder.png" :data-original="ins.image">
                     <span class="name" v-html="ins.name"></span>
                 </a>