Merge remote-tracking branch 'origin/developerB' into developerB

src/main/resources/static/js/product/produce-list.js

@@ -110,11 +110,13 @@ var productList = new Vue({
                 case 1:
                     this.smallName = '';
                     this.params.id = this.bigTypeID;
+                    this.smallTypeID='';
                     this.getproductList();
                     break;
                 case 2:
                     this.tinyName = '';
                     this.params.id = this.smallTypeID;
+                    this.tinyTypeID='';
                     this.getproductList();
                     break;
             }

src/main/resources/templates/product/instrument.html

@@ -508,7 +508,7 @@
                                              </div>
                                         </a>
                                     </div>
-                                   <div class="swiper-pagination mfc"> <span v-if="isPC" v-for="i in page.floorImageList.length/5"></span></div>
+                                   <div class="swiper-pagination mfc"> <span v-if="isPC" v-for="i in  Math.ceil(page.floorImageList.length / 5)"></span></div>
                                 </div>
                              </div>
                         </template>