首页改版commmit

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

@@ -366,7 +366,7 @@ var homeData = new Vue({
             },{
                 title:'精彩活动',
                 content:'精彩活动描述词精彩活动描述词',
-                type:3,
+                type:4,
                 banner:'http://m.360buyimg.com/babel/jfs/t1/154859/31/6073/29706/5fb1d2c4E73af2908/9054ba7e4d595637.jpg.webp',
                 advertisement:'http://img14.360buyimg.com/babel/s1580x818_jfs/t1/84274/40/9866/66616/5d778b65Ea0ba5552/cec04ecdf62fd5fa.jpg!cc_1580x818.webp',
                 advertisement1:'https://img11.360buyimg.com/n7/jfs/t1/150437/9/259/119917/5f58ad4fE61a83e28/dd7b0602bcb249f0.jpg',
@@ -532,7 +532,7 @@ var homeData = new Vue({
             },{
                 title:'新品专区',
                 content:'新品专区描述词新品专区描述词',
-                type:4,
+                type:6,
                 banner:'http://m.360buyimg.com/babel/jfs/t1/154859/31/6073/29706/5fb1d2c4E73af2908/9054ba7e4d595637.jpg.webp',
                 advertisement:'http://img14.360buyimg.com/babel/s1580x818_jfs/t1/84274/40/9866/66616/5d778b65Ea0ba5552/cec04ecdf62fd5fa.jpg!cc_1580x818.webp',
                 advertisement1:'https://img11.360buyimg.com/n7/jfs/t1/150437/9/259/119917/5f58ad4fE61a83e28/dd7b0602bcb249f0.jpg',
@@ -698,7 +698,7 @@ var homeData = new Vue({
             },{
                 title:'品牌商品',
                 content:'品牌商品描述词品牌商品描述词',
-                type:5,
+                type:3,
                 banner:'https://m.360buyimg.com/babel/jfs/t1/133169/21/16170/33334/5fb1d2c9Eda5701a1/853ec7266b34a9d5.jpg.webp',
                 isPageMore:false,
                 listType:1,
@@ -851,7 +851,7 @@ var homeData = new Vue({
             },{
                 title:'葡萄酒专区',
                 content:'葡萄酒专区描述词葡萄酒专区葡萄酒专区葡萄酒专区描述词',
-                type:6,
+                type:5,
                 banner:'https://m.360buyimg.com/babel/jfs/t1/133169/21/16170/33334/5fb1d2c9Eda5701a1/853ec7266b34a9d5.jpg.webp',
                 isPageMore:false,
                 listType:2,
@@ -1001,9 +1001,9 @@ var homeData = new Vue({
                     }
                 ]
             },{
-                title:'推荐专区',
+                title:'推荐专区VV',
                 content:'推荐专区描述词推荐专区描述词',
-                type:7,
+                type:1,
                 advertisement:'http://img14.360buyimg.com/babel/s1580x818_jfs/t1/84274/40/9866/66616/5d778b65Ea0ba5552/cec04ecdf62fd5fa.jpg!cc_1580x818.webp',
                 isPageMore:false,
                 listType:1,

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

@@ -25,7 +25,7 @@
             {
                 title:'推荐专区',
                 content:'推荐专区描述词推荐专区描述词',
-                type:1,
+                type:2,
                 advertisement:'http://img14.360buyimg.com/babel/s1580x818_jfs/t1/84274/40/9866/66616/5d778b65Ea0ba5552/cec04ecdf62fd5fa.jpg!cc_1580x818.webp',
                 isPageMore:false,
                 listType:1,
@@ -193,7 +193,7 @@
             },{
                 title:'二手专区',
                 content:'二手专区描述词二手专区描述词',
-                type:2,
+                type:8,
                 advertisement:'https://img12.360buyimg.com/babel/s1580x818_jfs/t1/148743/39/16659/91464/5fc8e0adEa1488544/8749912b10d1460a.jpg!cc_1580x818.webp',
                 advertisement1:'https://img11.360buyimg.com/n7/jfs/t1/150437/9/259/119917/5f58ad4fE61a83e28/dd7b0602bcb249f0.jpg',
                 isPageMore:false,
@@ -358,7 +358,7 @@
             },{
                 title:'精彩活动',
                 content:'精彩活动描述词精彩活动描述词',
-                type:3,
+                type:4,
                 banner:'http://m.360buyimg.com/babel/jfs/t1/154859/31/6073/29706/5fb1d2c4E73af2908/9054ba7e4d595637.jpg.webp',
                 advertisement:'http://img14.360buyimg.com/babel/s1580x818_jfs/t1/84274/40/9866/66616/5d778b65Ea0ba5552/cec04ecdf62fd5fa.jpg!cc_1580x818.webp',
                 advertisement1:'https://img11.360buyimg.com/n7/jfs/t1/150437/9/259/119917/5f58ad4fE61a83e28/dd7b0602bcb249f0.jpg',
@@ -524,7 +524,7 @@
             },{
                 title:'新品专区',
                 content:'新品专区描述词新品专区描述词',
-                type:4,
+                type:6,
                 banner:'http://m.360buyimg.com/babel/jfs/t1/154859/31/6073/29706/5fb1d2c4E73af2908/9054ba7e4d595637.jpg.webp',
                 advertisement:'http://img14.360buyimg.com/babel/s1580x818_jfs/t1/84274/40/9866/66616/5d778b65Ea0ba5552/cec04ecdf62fd5fa.jpg!cc_1580x818.webp',
                 advertisement1:'https://img11.360buyimg.com/n7/jfs/t1/150437/9/259/119917/5f58ad4fE61a83e28/dd7b0602bcb249f0.jpg',
@@ -690,7 +690,7 @@
             },{
                 title:'品牌商品',
                 content:'品牌商品描述词品牌商品描述词',
-                type:5,
+                type:3,
                 banner:'https://m.360buyimg.com/babel/jfs/t1/133169/21/16170/33334/5fb1d2c9Eda5701a1/853ec7266b34a9d5.jpg.webp',
                 isPageMore:false,
                 listType:1,
@@ -843,7 +843,7 @@
             },{
                 title:'葡萄酒专区',
                 content:'葡萄酒专区描述词葡萄酒专区葡萄酒专区葡萄酒专区描述词',
-                type:6,
+                type:5,
                 banner:'https://m.360buyimg.com/babel/jfs/t1/133169/21/16170/33334/5fb1d2c9Eda5701a1/853ec7266b34a9d5.jpg.webp',
                 isPageMore:false,
                 listType:2,
@@ -993,9 +993,9 @@
                     }
                 ]
             },{
-                title:'推荐专区',
+                title:'推荐专区VV',
                 content:'推荐专区描述词推荐专区描述词',
-                type:7,
+                type:1,
                 advertisement:'http://img14.360buyimg.com/babel/s1580x818_jfs/t1/84274/40/9866/66616/5d778b65Ea0ba5552/cec04ecdf62fd5fa.jpg!cc_1580x818.webp',
                 isPageMore:false,
                 listType:1,
@@ -1161,7 +1161,7 @@
                     },
                 ]
             }
-        ]
+        ],
     },
      filters: {
          NumFormat:function(value) {//处理金额

src/main/resources/templates/index.html

@@ -111,7 +111,6 @@
                     </div>
                     <template v-if="page.type == 1">
                         <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
-                            <a href="" class="page_main_item ad_02"><img :src="page.advertisement" alt=""></a>
                             <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                                 <img class="page_main_image" :src="pros.image" alt="">
                                 <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -131,17 +130,17 @@
                                         <template v-else>
                                             <!--可见价格-->
                                             <template v-if="(pros.priceFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.supplierId==GLOBAL_SHOP_ID)">
-                                                 <div class="main_price_text">
-                                                     <div class="price_text_tag">
-                                                         <p class="listTag" v-if="pros.actStatus==1">
-                                                             {{pros.promotions.name}}
-                                                             <span v-if="pros.priceFlag != 1">:￥{{pros.price | NumFormat}}</span>
-                                                         </p>
-                                                     </div>
-                                                     <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
-                                                         ￥{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat  }}
-                                                     </div>
-                                                 </div>
+                                                <div class="main_price_text">
+                                                    <div class="price_text_tag">
+                                                        <p class="listTag" v-if="pros.actStatus==1">
+                                                            {{pros.promotions.name}}
+                                                            <span v-if="pros.priceFlag != 1">:￥{{pros.price | NumFormat}}</span>
+                                                        </p>
+                                                    </div>
+                                                    <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
+                                                        ￥{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat  }}
+                                                    </div>
+                                                </div>
                                             </template>
                                             <!--仅会员机构可见-->
                                             <template v-else-if="pros.priceFlag==2 && pros.userIdentity==4">
@@ -169,14 +168,10 @@
                                 </div>
                             </a>
                         </div>
-                        <div class="section_page_more" v-if="!page.isPageMore">
-                            <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
-                         </div>
                     </template>
                     <template v-if="page.type == 2">
                         <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
-                            <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
-                            <a href="" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.advertisement1" alt=""> </a>
+                            <a href="" class="page_main_item ad_02"><img :src="page.advertisement" alt=""></a>
                             <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                                 <img class="page_main_image" :src="pros.image" alt="">
                                 <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -196,17 +191,17 @@
                                         <template v-else>
                                             <!--可见价格-->
                                             <template v-if="(pros.priceFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.supplierId==GLOBAL_SHOP_ID)">
-                                                <div class="main_price_text">
-                                                    <div class="price_text_tag">
-                                                        <p class="listTag" v-if="pros.actStatus==1">
-                                                            {{pros.promotions.name}}
-                                                            <span v-if="pros.priceFlag != 1">:￥{{pros.price | NumFormat}}</span>
-                                                        </p>
-                                                    </div>
-                                                    <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
-                                                        ￥{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat  }}
-                                                    </div>
-                                                </div>
+                                                 <div class="main_price_text">
+                                                     <div class="price_text_tag">
+                                                         <p class="listTag" v-if="pros.actStatus==1">
+                                                             {{pros.promotions.name}}
+                                                             <span v-if="pros.priceFlag != 1">:￥{{pros.price | NumFormat}}</span>
+                                                         </p>
+                                                     </div>
+                                                     <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
+                                                         ￥{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat  }}
+                                                     </div>
+                                                 </div>
                                             </template>
                                             <!--仅会员机构可见-->
                                             <template v-else-if="pros.priceFlag==2 && pros.userIdentity==4">
@@ -236,12 +231,11 @@
                         </div>
                         <div class="section_page_more" v-if="!page.isPageMore">
                             <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
-                        </div>
+                         </div>
                     </template>
                     <template v-if="page.type == 3">
                         <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? 'max' : ''">
                             <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
-                            <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
                             <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                                 <img class="page_main_image" :src="pros.image" alt="">
                                 <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -307,7 +301,6 @@
                         <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? 'max' : ''">
                             <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                             <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
-                            <a href="" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.advertisement1" alt=""> </a>
                             <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                                 <img class="page_main_image" :src="pros.image" alt="">
                                 <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -366,12 +359,11 @@
                             </a>
                         </div>
                         <div class="section_page_more" v-if="!page.isPageMore">
-                            <div class="more" @click="showMorePageFn(page)"><i class="icon mIcon"></i>查看更多</div>
+                            <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
                         </div>
                     </template>
                     <template v-if="page.type == 5">
-                        <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? 'max' : ''">
-                            <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
+                        <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                             <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                                 <img class="page_main_image" :src="pros.image" alt="">
                                 <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -429,12 +421,13 @@
                                 </div>
                             </a>
                         </div>
-                        <div class="section_page_more" v-if="!page.isPageMore">
-                            <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
-                        </div>
+                        <a href="" class="page_main_item ad_01 bottom"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                     </template>
                     <template v-if="page.type == 6">
-                        <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
+                        <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? 'max' : ''">
+                            <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
+                            <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
+                            <a href="" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.advertisement1" alt=""> </a>
                             <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                                 <img class="page_main_image" :src="pros.image" alt="">
                                 <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -492,10 +485,14 @@
                                 </div>
                             </a>
                         </div>
-                        <a href="" class="page_main_item ad_01 bottom"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
+                        <div class="section_page_more" v-if="!page.isPageMore">
+                            <div class="more" @click="showMorePageFn(page)"><i class="icon mIcon"></i>查看更多</div>
+                        </div>
                     </template>
-                    <template v-if="page.type == 7">
+                    <template v-if="page.type == 8">
                         <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
+                            <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
+                            <a href="" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.advertisement1" alt=""> </a>
                             <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                                 <img class="page_main_image" :src="pros.image" alt="">
                                 <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -553,6 +550,9 @@
                                 </div>
                             </a>
                         </div>
+                        <div class="section_page_more" v-if="!page.isPageMore">
+                            <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
+                        </div>
                     </template>
                 </div>
                 <div class="section_page">

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

@@ -20,12 +20,11 @@
             </div>
             <div class="section_page" v-for="(page,index) in pageList">
                 <div class="section_page_title">
-                    <h1>{{ page.title }}</h1>
+                    <h1 :data-id="index+1">{{ page.title }}</h1>
                     <p>{{ page.content }}</p>
                 </div>
                 <template v-if="page.type == 1">
                     <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
-                        <a href="" class="page_main_item ad_02"><img :src="page.advertisement" alt=""></a>
                         <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                             <img class="page_main_image" :src="pros.image" alt="">
                             <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -83,14 +82,10 @@
                             </div>
                         </a>
                     </div>
-                    <div class="section_page_more" v-if="!page.isPageMore">
-                        <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
-                    </div>
                 </template>
                 <template v-if="page.type == 2">
                     <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
-                        <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
-                        <a href="" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.advertisement1" alt=""> </a>
+                        <a href="" class="page_main_item ad_02"><img :src="page.advertisement" alt=""></a>
                         <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                             <img class="page_main_image" :src="pros.image" alt="">
                             <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -153,9 +148,8 @@
                     </div>
                 </template>
                 <template v-if="page.type == 3">
-                    <div class="section_page_main clear mfw type_03" :class="page.isPageMore ? 'max' : ''">
+                    <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? 'max' : ''">
                         <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
-                        <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
                         <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                             <img class="page_main_image" :src="pros.image" alt="">
                             <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -221,7 +215,6 @@
                     <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? 'max' : ''">
                         <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                         <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
-                        <a href="" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.advertisement1" alt=""> </a>
                         <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                             <img class="page_main_image" :src="pros.image" alt="">
                             <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -280,12 +273,11 @@
                         </a>
                     </div>
                     <div class="section_page_more" v-if="!page.isPageMore">
-                        <div class="more" @click="showMorePageFn(page)"><i class="icon mIcon"></i>查看更多</div>
+                        <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
                     </div>
                 </template>
                 <template v-if="page.type == 5">
-                    <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? 'max' : ''">
-                        <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
+                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
                         <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                             <img class="page_main_image" :src="pros.image" alt="">
                             <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -343,12 +335,13 @@
                             </div>
                         </a>
                     </div>
-                    <div class="section_page_more" v-if="!page.isPageMore">
-                        <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
-                    </div>
+                    <a href="" class="page_main_item ad_01 bottom"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
                 </template>
                 <template v-if="page.type == 6">
-                    <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
+                    <div class="section_page_main type_03 clear mfw" :class="page.isPageMore ? 'max' : ''">
+                        <a href="" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
+                        <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
+                        <a href="" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.advertisement1" alt=""> </a>
                         <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                             <img class="page_main_image" :src="pros.image" alt="">
                             <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -406,10 +399,14 @@
                             </div>
                         </a>
                     </div>
-                    <a href="" class="page_main_item ad_01 bottom"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
+                    <div class="section_page_more" v-if="!page.isPageMore">
+                        <div class="more" @click="showMorePageFn(page)"><i class="icon mIcon"></i>查看更多</div>
+                    </div>
                 </template>
-                <template v-if="page.type == 7">
+                <template v-if="page.type == 8">
                     <div class="section_page_main clear mfw" :class="page.isPageMore ? 'max' : ''">
+                        <a href="" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.advertisement" alt=""> </a>
+                        <a href="" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.advertisement1" alt=""> </a>
                         <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.productList">
                             <img class="page_main_image" :src="pros.image" alt="">
                             <div class="page_main_tag" v-if="page.listType == 2"><p>{{ pros.tags }}</p></div>
@@ -467,6 +464,9 @@
                             </div>
                         </a>
                     </div>
+                    <div class="section_page_more" v-if="!page.isPageMore">
+                        <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
+                    </div>
                 </template>
             </div>
         </div>