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

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

@@ -12,9 +12,10 @@
 <template th:replace="components/header"></template>
 
 <!-- 商品详情 -->
-<div id="productDetail">
+<div id="productDetail" v-show="showProduct">
     <input type="hidden" th:value="${productId}" id="productId">
     <input type="hidden" th:value="${product?.stock}" id="productStock">
+    <input type="hidden" th:value="${product?.visibility}" id="productVisibility">
     <div class="wrap">
         <div class="productBox clear">
             <div class="imageBox" id="imgShown">

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

@@ -51,7 +51,7 @@
                                  <div class="hotList recommend">
                                     <div class="clear mfw" :class="page.isPageMore ? 'max' : ''">
                                         <a  class="img01" :href="page.floorContent.adsLink1" ><img :src="page.floorContent.pcAdsImage1"/></a>
-                                        <a class="productItem" :href="'/product-'+pros.productId+'.html'" v-for="(pros,index) in page.floorImageList" >
+                                        <a class="productItem" :href="pros.link" v-for="(pros,index) in page.floorImageList" >
                                             <img :src="pros.image ? pros.image : '/img/base/placeholder.png'" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
                                             <div class="name" target="_blank">{{pros.name}}</div>
@@ -99,7 +99,7 @@
                                     <div class="clear mfw" :class="page.isPageMore ? 'max' : ''">
                                         <a :href="page.floorContent.adsLink1" class="img01"><img  :src="page.floorContent.pcAdsImage1" alt=""> </a>
                                         <a :href="page.floorContent.adsLink2" class="img02"><img  :src="page.floorContent.pcAdsImage2" alt=""> </a>
-                                        <a class="productItem "  v-for="(pros,index) in page.floorImageList">
+                                        <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
                                             <div class="name" target="_blank">{{pros.name}}</div>
@@ -147,7 +147,7 @@
                                     <div class="type clear mfw" :class="page.isPageMore ? 'max' : ''">
                                         <a class='imgbaner' :href="page.floorContent.adsLink1"><img :src="page.floorContent.pcAdsImage1"></a>
                                         <a class="img01" :href="page.floorContent.adsLink2"><img :src="page.floorContent.pcAdsImage2"/></a>
-                                        <a class="productItem" v-for="(pros,index) in page.floorImageList">
+                                        <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
                                             <div class="name" target="_blank">{{pros.name}}</div>
@@ -196,7 +196,7 @@
                                         <a class='imgbaner'><img src="http://m.360buyimg.com/babel/jfs/t1/154859/31/6073/29706/5fb1d2c4E73af2908/9054ba7e4d595637.jpg.webp"></a>
                                         <a class="img01"><img src="https://img-b.caimei365.com/group1/M00/03/11/Cmgy61_S3bGAKnQdAAEL2eOO3HU338.png"/></a>
                                         <a class="img02"><img src="https://img-b.caimei365.com/group1/M00/03/11/Cmgy61_S3WSAC5igAAIpbsQkSoo172.png"/></a>
-                                        <a class="productItem" v-for="(pros,index) in page.floorImageList">
+                                        <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
                                             <div class="name" target="_blank">{{pros.name}}</div>
@@ -243,7 +243,7 @@
                                 <div class="hotList">
                                     <div class="type clear mfw" :class="page.isPageMore ? 'max' : ''">
                                         <a class='imgbaner' :href="page.floorContent.adsLink1"><img :src="page.floorContent.pcAdsImage1"></a>
-                                        <a class="productItem" v-for="(pros,index) in page.floorImageList">
+                                        <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
                                             <div class="name" target="_blank">{{pros.name}}</div>
@@ -289,7 +289,7 @@
                             <div class="floorCon">
                                 <div class="hotList">
                                     <div class="clear mfw" :class="page.isPageMore ? 'max' : ''">
-                                        <a class="productItem" v-for="(pros,index) in page.floorImageList">
+                                        <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
                                             <div class="name" target="_blank">{{pros.name}}</div>
@@ -336,7 +336,7 @@
                             <div class="floorCon">
                                 <div class="hotList">
                                     <div class="clear mfw" :class="page.isPageMore ? 'max' : ''">
-                                        <a class="productItem" v-for="(pros,index) in page.floorImageList">
+                                        <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
                                             <div class="name" target="_blank">{{pros.name}}</div>
@@ -382,7 +382,7 @@
                             <div class="floorCon">
                                 <div class="hotList swiper-container" id="recommendBox">
                                     <div class="clear mfw swiper-wrapper" :class="page.isPageMore ? 'max' : ''">
-                                        <a class="productItem" v-for="(pros,index) in page.floorImageList">
+                                        <a class="productItem" :href="pros.link"  v-for="(pros,index) in page.floorImageList">
                                             <img src="/img/base/placeholder.png" :data-original="pros.image" :alt="pros.name">
                                             <span class="brand" v-if="pros.listType == 2">{{ pros.label }}</span>
                                             <div class="name" target="_blank">{{pros.name}}</div>