zhengjinyi пре 4 година
родитељ
комит
936f64ed4e

+ 1 - 1
src/main/resources/config/dev/application-dev.yml

@@ -54,7 +54,7 @@ logging:
 caimei:
   siteEnv: 0 #网站环境,(2:正式环境,1:测试环境,0:开发环境)
   # spiServer: https://spi-b.caimei365.com
-  spiServer: http://localhost:8008
+  spiServer: http://192.168.2.67:8008
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com
 

+ 11 - 5
src/main/resources/static/css/index/index_new.pc.css

@@ -2,6 +2,9 @@
 /**
  * PC端
  */
+#container{
+    min-height: 900px;
+}
 li{list-style:none;}
 /* 轮播 */
 #swiper-container{width:100%;height:510px;min-width:1184px;overflow:hidden;position:relative;float: left;}
@@ -170,8 +173,8 @@ li{list-style:none;}
 }
 .section_page .page_main_price .main_price_show{
     width: 100%;
-    height: 31px;
-    line-height: 31px;
+    height: 30px;
+    line-height: 30px;
     font-size: 14px;
     color: #f94b4b;
     text-align: left;
@@ -398,10 +401,10 @@ li{list-style:none;}
 }
 .section_right .item_banner .statu i{
     display: block;
-    width: 14px;
-    height: 14px;
+    width: 12px;
+    height: 12px;
     float: left;
-    margin: 4px 0 0 4px;
+    margin: 6px 0 0 6px;
 }
 .section_right .item_banner .statu .icon-wart{
     background: url("/img/live/icon-live.png");
@@ -446,6 +449,9 @@ li{list-style:none;}
     float: left;
     position: relative;
 }
+.section_right  .item_text .item_text_name.info{
+    width: 100%;
+}
 .section_right  .item_text .item_text_name:before{
     content: '';
     width: 4px;

+ 18 - 0
src/main/resources/static/js/common/serviceapi/utils.service.js

@@ -7,6 +7,24 @@ var PublicApi = {
         uploadimg: function (params, callback) {//供应商添加物流上传图片
             Http.uploadImage({ url:'/formData/MultiPictareaddData',data:params},callback)
         },
+        GetHomeData:function(params,callback){ //首页数据
+            Http.AjaxService({ url:'/home/data', type:'get', data:params, json:false})
+                .then(function(res){
+                    callback(res)
+                });
+        },
+        GetHomeBanner:function(params,callback){ //首页bnner
+            Http.AjaxService({ url:'/home/banner', type:'get', data:params, json:false})
+                .then(function(res){
+                    callback(res)
+                });
+        },
+        GetHomeRightData:function(params,callback){ //首页右侧模块
+            Http.AjaxService({ url:'/home/top/data', type:'get', data:params, json:false})
+                .then(function(res){
+                    callback(res)
+                });
+        },
         GetProductClassify:function(params,callback){ //获取分类
             Http.AjaxService({ url:'/product/classify', type:'get', data:params, json:false})
                 .then(function(res){

Разлика између датотеке није приказан због своје велике величине
+ 12 - 1232
src/main/resources/static/js/index.js


+ 244 - 196
src/main/resources/templates/index.html

@@ -12,7 +12,7 @@
 <!-- 引用头部 -->
 <template th:replace="components/header"></template>
 <!-- 首页 -->
-<div id="container" v-cloak>
+<div id="container" v-cloak="">
     <!--首页图片轮播-->
     <div id="swiper-container" class="swiper-container">
         <ul class="swiper-wrapper">
@@ -55,49 +55,48 @@
                             <a href="" target="_blank">更多></a>
                         </div>
                         <div class="right_item_main" v-for="(live,index) in liveList">
-                            <a href="" class="item_banner" v-if="index === 0" target="_blank">
-                                <img :src="live.banner" alt="">
-                                <div class="name">{{ live.title }}</div>
+                            <a :href="live.link" class="item_banner" v-if="index === 0" target="_blank" :title="live.liveTitle">
+                                <img :src="live.image ? live.image : '/img/base/placeholder.png'" alt="">
+                                <div class="name">{{ live.liveTitle }}</div>
                                 <div class="statu">
-                                    <i :class="live.status | statusTypeClass"></i>
-                                    <p>{{ live.status | statusType }}</p>
+                                    <i :class="live.liveStatus | statusTypeClass"></i>
+                                    <p>{{ live.liveStatus | statusType }}</p>
                                 </div>
                             </a>
-                            <a href="" class="item_text" v-if="index > 0" target="_blank">
-                                <p class="item_text_name">{{ live.title }}</p>
-                                <p class="item_text_time" v-if="isPC">{{ live.time }}</p>
+                            <a :href="live.link" class="item_text" v-if="index > 0" target="_blank" :title="live.liveTitle">
+                                <p class="item_text_name">{{ live.liveTitle }}</p>
+                                <p class="item_text_time" v-if="isPC">{{ live.beginTime }}</p>
                             </a>
                         </div>
                     </div>
                     <div class="section_right_item">
                         <div class="right_item_title">
-                            <p>热门文章</p>
-                            <a href="https://www.caimei365.com/info/center-3-1.html" target="_blank">更多></a>
+                            <p>最新活动</p>
+                            <a href="/promotions.html" target="_blank">更多></a>
                         </div>
-                        <div class="right_item_main" v-for="(live,index) in liveList">
-                            <a href="" class="item_banner" v-if="index === 0" target="_blank">
-                                <img :src="live.banner" alt="">
-                                <div class="name">{{ live.title }}</div>
+                        <div class="right_item_main" v-for="(cmImage,index) in cmImageList">
+                            <a :href="cmImage.link" class="item_banner" v-if="index === 0" target="_blank" :title="cmImage.title">
+                                <img :src="cmImage.image ? cmImage.image : '/img/base/placeholder.png'" alt="">
+                                <div class="name">{{ cmImage.title }}</div>
                             </a>
-                            <a href="" class="item_text" v-if="index > 0" target="_blank">
-                                <p class="item_text_name">{{ live.title }}</p>
-                                <p class="item_text_time" v-if="isPC">{{ live.time }}</p>
+                            <a href="" class="item_text" v-if="index > 0" target="_blank" :title="cmImage.title">
+                                <p class="item_text_name info">{{ cmImage.title }}</p>
                             </a>
                         </div>
                     </div>
                     <div class="section_right_item">
                         <div class="right_item_title">
-                            <p>最新活动</p>
-                            <a href="/promotions.html" target="_blank">更多></a>
+                            <p>热门文章</p>
+                            <a href="https://www.caimei365.com/info/center-3-1.html" target="_blank">更多></a>
                         </div>
-                        <div class="right_item_main" v-for="(live,index) in liveList">
-                            <a href="" class="item_banner" v-if="index === 0" target="_blank">
-                                <img :src="live.banner" alt="">
-                                <div class="name">{{ live.title }}</div>
+                        <div class="right_item_main" v-for="(info,index) in infoList">
+                            <a href="" class="item_banner" v-if="index === 0" target="_blank" :title="info.title">
+                                <img :src="info.guidanceImage ? info.guidanceImage : '/img/base/placeholder.png'" alt="">
+                                <div class="name">{{ info.title }}</div>
                             </a>
-                            <a href="" class="item_text" v-if="index > 0" target="_blank">
-                                <p class="item_text_name">{{ live.title }}</p>
-                                <p class="item_text_time" v-if="isPC">{{ live.time }}</p>
+                            <a href="" class="item_text" v-if="index > 0" target="_blank" :title="info.title">
+                                <p class="item_text_name ">{{ info.title }}</p>
+                                <p class="item_text_time" v-if="isPC">{{ info.createDate }}</p>
                             </a>
                         </div>
                     </div>
@@ -107,64 +106,71 @@
                 <div class="section_page" v-for="(page,index) in pageList">
                     <div class="section_page_title">
                         <h1 :data-id="index+1">{{ page.title }}</h1>
-                        <p>{{ page.content }}</p>
+                        <p>{{ page.detail }}</p>
                     </div>
-                    <template v-if="page.type == 1">
+                    <template v-if="page.floorContent.templateType == '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>
+                            <a :href="page.floorContent.adsLink1" class="page_main_item ad_02"><img :src="page.floorContent.pcAdsImage1" alt=""></a>
+                            <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList">
+                                <img class="page_main_image" :src="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
                                 <div class="page_main_text">{{ pros.name }}</div>
-                                <div class="page_main_price" v-if="page.listType == 1">
-                                    <template v-if="!GLOBAL_USER_ID && !GLOBAL_USER_ID>0">
+                                <div class="page_main_price" v-if="pros.listType == 1">
+                                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                         <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                        <template v-if="pros.priceFlag==1">
+                                        <template v-if="pros.product.price1TextFlag==1">
                                             <!--价格未公开-->
                                             <div class="main_price_text">
                                                 <div class="price_text_tag">
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_unde">¥价格未公开</div>
                                             </div>
                                         </template>
                                         <template v-else>
                                             <!--可见价格-->
-                                            <template v-if="(pros.priceFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.supplierId==GLOBAL_SHOP_ID)">
+                                            <template v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==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 class="listTag" v-if="pros.product.actStatus==1">
+                                                             {{pros.product.promotions.name}}
+                                                             <span v-if="pros.priceFlag != 1">:¥{{pros.product.retailPrice | NumFormat}}</span>
                                                          </p>
                                                      </div>
-                                                     <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
-                                                         ¥{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat  }}
+                                                     <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
+                                                         ¥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
                                                      </div>
                                                  </div>
                                             </template>
                                             <!--仅会员机构可见-->
-                                            <template v-else-if="pros.priceFlag==2 && pros.userIdentity==4">
+                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                 <div class="main_price_text">
                                                     <div class="price_text_tag">
-                                                        <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class="main_price_unde">¥会员可见</div>
                                                 </div>
                                             </template>
                                             <template v-else>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <div class="main_price_none">
-                                            <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                            <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
-                                        </div>
+                                        <template v-if="pros.product.productCategory == 1">
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
+                                            </div>
+                                        </template>
+                                        <template v-else>
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span>登录可见</em>
+                                            </div>
+                                        </template>
                                     </template>
                                 </div>
                             </a>
@@ -173,63 +179,70 @@
                             <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
                          </div>
                     </template>
-                    <template v-if="page.type == 2">
+                    <template v-if="page.floorContent.templateType == '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_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>
+                            <a :href="page.floorContent.adsLink1" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.floorContent.pcAdsImage1" alt=""> </a>
+                            <a :href="page.floorContent.adsLink2" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.floorContent.pcAdsImage2" alt=""> </a>
+                            <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList">
+                                <img class="page_main_image" :src="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
                                 <div class="page_main_text">{{ pros.name }}</div>
-                                <div class="page_main_price" v-if="page.listType == 1">
-                                    <template v-if="!GLOBAL_USER_ID && !GLOBAL_USER_ID>0">
+                                <div class="page_main_price" v-if="pros.listType == 1">
+                                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                         <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                        <template v-if="pros.priceFlag==1">
+                                        <template v-if="pros.product.price1TextFlag==1">
                                             <!--价格未公开-->
                                             <div class="main_price_text">
                                                 <div class="price_text_tag">
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_unde">¥价格未公开</div>
                                             </div>
                                         </template>
                                         <template v-else>
                                             <!--可见价格-->
-                                            <template v-if="(pros.priceFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.supplierId==GLOBAL_SHOP_ID)">
+                                            <template v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==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 class="listTag" v-if="pros.product.actStatus==1">
+                                                            {{pros.product.promotions.name}}
+                                                            <span v-if="pros.priceFlag != 1">:¥{{pros.product.retailPrice | NumFormat}}</span>
                                                         </p>
                                                     </div>
-                                                    <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
-                                                        ¥{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat  }}
+                                                    <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
+                                                        ¥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
                                                     </div>
                                                 </div>
                                             </template>
                                             <!--仅会员机构可见-->
-                                            <template v-else-if="pros.priceFlag==2 && pros.userIdentity==4">
+                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                 <div class="main_price_text">
                                                     <div class="price_text_tag">
-                                                        <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class="main_price_unde">¥会员可见</div>
                                                 </div>
                                             </template>
                                             <template v-else>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <div class="main_price_none">
-                                            <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                            <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
-                                        </div>
+                                        <template v-if="pros.product.productCategory == 1">
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
+                                            </div>
+                                        </template>
+                                        <template v-else>
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span>登录可见</em>
+                                            </div>
+                                        </template>
                                     </template>
                                 </div>
                             </a>
@@ -238,63 +251,70 @@
                             <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
                         </div>
                     </template>
-                    <template v-if="page.type == 3">
+                    <template v-if="page.floorContent.templateType == '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>
+                            <a :href="page.floorContent.adsLink1" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.floorContent.pcAdsImage1" alt=""></a>
+                            <a :href="page.floorContent.adsLink2" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.floorContent.pcAdsImage2" alt=""></a>
+                            <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList">
+                                <img class="page_main_image" :src="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
                                 <div class="page_main_text">{{ pros.name }}</div>
-                                <div class="page_main_price" v-if="page.listType == 1">
-                                    <template v-if="!GLOBAL_USER_ID && !GLOBAL_USER_ID>0">
+                                <div class="page_main_price" v-if="pros.listType == 1">
+                                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                         <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                        <template v-if="pros.priceFlag==1">
+                                        <template v-if="pros.product.price1TextFlag==1">
                                             <!--价格未公开-->
                                             <div class="main_price_text">
                                                 <div class="price_text_tag">
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_unde">¥价格未公开</div>
                                             </div>
                                         </template>
                                         <template v-else>
                                             <!--可见价格-->
-                                            <template v-if="(pros.priceFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.supplierId==GLOBAL_SHOP_ID)">
+                                            <template v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==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 class="listTag" v-if="pros.product.actStatus==1">
+                                                            {{pros.product.promotions.name}}
+                                                            <span v-if="pros.priceFlag != 1">:¥{{pros.product.retailPrice | NumFormat}}</span>
                                                         </p>
                                                     </div>
-                                                    <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
-                                                        ¥{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat  }}
+                                                    <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
+                                                        ¥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
                                                     </div>
                                                 </div>
                                             </template>
                                             <!--仅会员机构可见-->
-                                            <template v-else-if="pros.priceFlag==2 && pros.userIdentity==4">
+                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                 <div class="main_price_text">
                                                     <div class="price_text_tag">
-                                                        <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class="main_price_unde">¥会员可见</div>
                                                 </div>
                                             </template>
                                             <template v-else>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <div class="main_price_none">
-                                            <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                            <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
-                                        </div>
+                                        <template v-if="pros.product.productCategory == 1">
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
+                                            </div>
+                                        </template>
+                                        <template v-else>
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span>登录可见</em>
+                                            </div>
+                                        </template>
                                     </template>
                                 </div>
                             </a>
@@ -303,64 +323,71 @@
                             <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
                         </div>
                     </template>
-                    <template v-if="page.type == 4">
+                    <template v-if="page.floorContent.templateType == '4'">
                         <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>
+                            <a :href="page.floorContent.adsLink1" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.floorContent.pcAdsImage1" alt=""> </a>
+                            <a :href="page.floorContent.adsLink2" class="page_main_item ad_02"><img class="page_main_item_adv" :src="page.floorContent.pcAdsImage2" alt=""> </a>
+                            <a :href="page.floorContent.adsLink3" class="page_main_item ad_03"><img class="page_main_item_adv" :src="page.floorContent.pcAdsImage3" alt=""> </a>
+                            <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList">
+                                <img class="page_main_image" :src="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
                                 <div class="page_main_text">{{ pros.name }}</div>
-                                <div class="page_main_price" v-if="page.listType == 1">
-                                    <template v-if="!GLOBAL_USER_ID && !GLOBAL_USER_ID>0">
+                                <div class="page_main_price" v-if="pros.listType == 1">
+                                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                         <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                        <template v-if="pros.priceFlag==1">
+                                        <template v-if="pros.product.price1TextFlag==1">
                                             <!--价格未公开-->
                                             <div class="main_price_text">
                                                 <div class="price_text_tag">
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_unde">¥价格未公开</div>
                                             </div>
                                         </template>
                                         <template v-else>
                                             <!--可见价格-->
-                                            <template v-if="(pros.priceFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.supplierId==GLOBAL_SHOP_ID)">
+                                            <template v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==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 class="listTag" v-if="pros.product.actStatus==1">
+                                                            {{pros.product.promotions.name}}
+                                                            <span v-if="pros.priceFlag != 1">:¥{{pros.product.retailPrice | NumFormat}}</span>
                                                         </p>
                                                     </div>
-                                                    <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
-                                                        ¥{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat  }}
+                                                    <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
+                                                        ¥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
                                                     </div>
                                                 </div>
                                             </template>
                                             <!--仅会员机构可见-->
-                                            <template v-else-if="pros.priceFlag==2 && pros.userIdentity==4">
+                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                 <div class="main_price_text">
                                                     <div class="price_text_tag">
-                                                        <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class="main_price_unde">¥会员可见</div>
                                                 </div>
                                             </template>
                                             <template v-else>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <div class="main_price_none">
-                                            <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                            <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
-                                        </div>
+                                        <template v-if="pros.product.productCategory == 1">
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
+                                            </div>
+                                        </template>
+                                        <template v-else>
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span>登录可见</em>
+                                            </div>
+                                        </template>
                                     </template>
                                 </div>
                             </a>
@@ -369,62 +396,69 @@
                             <div class="more" @click="showMorePageFn(page)"><i class="icon mIcon"></i>查看更多</div>
                         </div>
                     </template>
-                    <template v-if="page.type == 5">
+                    <template v-if="page.floorContent.templateType == '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>
-                            <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>
+                            <a :href="page.floorContent.adsLink1" class="page_main_item ad_01"><img class="page_main_item_adv" :src="page.floorContent.pcAdsImage1" alt=""> </a>
+                            <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList">
+                                <img class="page_main_image" :src="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
                                 <div class="page_main_text">{{ pros.name }}</div>
-                                <div class="page_main_price" v-if="page.listType == 1">
-                                    <template v-if="!GLOBAL_USER_ID && !GLOBAL_USER_ID>0">
+                                <div class="page_main_price" v-if="pros.listType == 1">
+                                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                         <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                        <template v-if="pros.priceFlag==1">
+                                        <template v-if="pros.product.price1TextFlag==1">
                                             <!--价格未公开-->
                                             <div class="main_price_text">
                                                 <div class="price_text_tag">
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_unde">¥价格未公开</div>
                                             </div>
                                         </template>
                                         <template v-else>
                                             <!--可见价格-->
-                                            <template v-if="(pros.priceFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.supplierId==GLOBAL_SHOP_ID)">
+                                            <template v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==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 class="listTag" v-if="pros.product.actStatus==1">
+                                                            {{pros.product.promotions.name}}
+                                                            <span v-if="pros.priceFlag != 1">:¥{{pros.product.retailPrice | NumFormat}}</span>
                                                         </p>
                                                     </div>
-                                                    <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
-                                                        ¥{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat  }}
+                                                    <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
+                                                        ¥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
                                                     </div>
                                                 </div>
                                             </template>
                                             <!--仅会员机构可见-->
-                                            <template v-else-if="pros.priceFlag==2 && pros.userIdentity==4">
+                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                 <div class="main_price_text">
                                                     <div class="price_text_tag">
-                                                        <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class="main_price_unde">¥会员可见</div>
                                                 </div>
                                             </template>
                                             <template v-else>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <div class="main_price_none">
-                                            <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                            <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
-                                        </div>
+                                        <template v-if="pros.product.productCategory == 1">
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
+                                            </div>
+                                        </template>
+                                        <template v-else>
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span>登录可见</em>
+                                            </div>
+                                        </template>
                                     </template>
                                 </div>
                             </a>
@@ -433,122 +467,136 @@
                             <div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
                         </div>
                     </template>
-                    <template v-if="page.type == 6">
+                    <template v-if="page.floorContent.templateType == '6'">
                         <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>
+                            <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList">
+                                <img class="page_main_image" :src="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
                                 <div class="page_main_text">{{ pros.name }}</div>
-                                <div class="page_main_price" v-if="page.listType == 1">
-                                    <template v-if="!GLOBAL_USER_ID && !GLOBAL_USER_ID>0">
+                                <div class="page_main_price" v-if="pros.listType == 1">
+                                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                         <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                        <template v-if="pros.priceFlag==1">
+                                        <template v-if="pros.product.price1TextFlag==1">
                                             <!--价格未公开-->
                                             <div class="main_price_text">
                                                 <div class="price_text_tag">
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_unde">¥价格未公开</div>
                                             </div>
                                         </template>
                                         <template v-else>
                                             <!--可见价格-->
-                                            <template v-if="(pros.priceFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.supplierId==GLOBAL_SHOP_ID)">
+                                            <template v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==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 class="listTag" v-if="pros.product.actStatus==1">
+                                                            {{pros.product.promotions.name}}
+                                                            <span v-if="pros.priceFlag != 1">:¥{{pros.product.retailPrice | NumFormat}}</span>
                                                         </p>
                                                     </div>
-                                                    <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
-                                                        ¥{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat  }}
+                                                    <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
+                                                        ¥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
                                                     </div>
                                                 </div>
                                             </template>
                                             <!--仅会员机构可见-->
-                                            <template v-else-if="pros.priceFlag==2 && pros.userIdentity==4">
+                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                 <div class="main_price_text">
                                                     <div class="price_text_tag">
-                                                        <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class="main_price_unde">¥会员可见</div>
                                                 </div>
                                             </template>
                                             <template v-else>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <div class="main_price_none">
-                                            <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                            <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
-                                        </div>
+                                        <template v-if="pros.product.productCategory == 1">
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
+                                            </div>
+                                        </template>
+                                        <template v-else>
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span>登录可见</em>
+                                            </div>
+                                        </template>
                                     </template>
                                 </div>
                             </a>
                         </div>
-                        <a href="" class="page_main_item ad_01 bottom"><img class="page_main_item_adv" :src="page.banner" alt=""> </a>
+                        <a :href="page.floorContent.adsLink1" class="page_main_item ad_01 bottom"><img class="page_main_item_adv" :src="page.floorContent.pcAdsImage1" alt=""> </a>
                     </template>
-                    <template v-if="page.type == 7">
+                    <template v-if="page.floorContent.templateType == '7'">
                         <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>
+                            <a href="" class="page_main_item ad_04" v-for="(pros,index) in page.floorImageList">
+                                <img class="page_main_image" :src="pros.image ? pros.image : '/img/base/placeholder.png'" alt="">
+                                <div class="page_main_tag" v-if="pros.listType == 2"><p>{{ pros.label }}</p></div>
                                 <div class="page_main_text">{{ pros.name }}</div>
-                                <div class="page_main_price" v-if="page.listType == 1">
-                                    <template v-if="!GLOBAL_USER_ID && !GLOBAL_USER_ID>0">
+                                <div class="page_main_price" v-if="pros.listType == 1">
+                                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                         <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                        <template v-if="pros.priceFlag==1">
+                                        <template v-if="pros.product.price1TextFlag==1">
                                             <!--价格未公开-->
                                             <div class="main_price_text">
                                                 <div class="price_text_tag">
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_unde">¥价格未公开</div>
                                             </div>
                                         </template>
                                         <template v-else>
                                             <!--可见价格-->
-                                            <template v-if="(pros.priceFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.supplierId==GLOBAL_SHOP_ID)">
+                                            <template v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==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 class="listTag" v-if="pros.product.actStatus==1">
+                                                            {{pros.product.promotions.name}}
+                                                            <span v-if="pros.priceFlag != 1">:¥{{pros.product.retailPrice | NumFormat}}</span>
                                                         </p>
                                                     </div>
-                                                    <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
-                                                        ¥{{ (PromotionsFormat(pros.promotions) ? pros.originalPrice : pros.price ) | NumFormat  }}
+                                                    <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
+                                                        ¥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
                                                     </div>
                                                 </div>
                                             </template>
                                             <!--仅会员机构可见-->
-                                            <template v-else-if="pros.priceFlag==2 && pros.userIdentity==4">
+                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                 <div class="main_price_text">
                                                     <div class="price_text_tag">
-                                                        <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class="main_price_unde">¥会员可见</div>
                                                 </div>
                                             </template>
                                             <template v-else>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                    <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
                                         </template>
                                     </template>
                                     <template v-else>
-                                        <div class="main_price_none">
-                                            <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
-                                            <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
-                                        </div>
+                                        <template v-if="pros.product.productCategory == 1">
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
+                                            </div>
+                                        </template>
+                                        <template v-else>
+                                            <div class="main_price_none">
+                                                <em class="price_grade"><span>¥</span>登录可见</em>
+                                            </div>
+                                        </template>
                                     </template>
                                 </div>
                             </a>
@@ -561,10 +609,10 @@
                         <p>采美正品联盟 质量保证</p>
                     </div>
                     <div class="section_page_bottom">
-                        <a href="" class="page_main_li ad_01"><img class="page_main_item_adv" src="https://www.caimei365.com/img/common/goodsup.png" alt=""> </a>
-                        <a href="" class="page_main_li ad_02" v-for="(shop,index) in supplierList">
-                            <img class="page_main_logo" :src="shop.logo" alt="">
-                            <div class="page_main_name">{{ shop.name }}</div>
+                        <a href="" class="page_main_li ad_01"><img class="page_main_item_adv" :src="supplierImage" alt=""> </a>
+                        <a :href="shop.link" class="page_main_li ad_02" v-for="(shop,index) in supplierList">
+                            <img class="page_main_logo" :src="shop.image" alt="">
+                            <div class="page_main_name">{{ shop.supplierName }}</div>
                         </a>
                     </div>
                 </div>

Неке датотеке нису приказане због велике количине промена