代码优化

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

@@ -17,7 +17,22 @@ var supplierHome = new Vue({
         addhtml:'<span class="tag">美博会</span>'
     },
     computed: {
-
+        floorData: function() {
+            return [
+                {
+                    type: 1,
+                    title: '主推商品',
+                    productList: this.mainProducts,
+                    showEmpty: false
+                },
+                {
+                    type: 2,
+                    title: '供应商产品',
+                    productList: this.productLists,
+                    showEmpty: true
+                }
+            ]
+        }
     },
     filters: {
         NumFormat:function(value) {

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

@@ -110,86 +110,45 @@
                             <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
                             <p class="name" v-html="p.name" v-else></p>
                             <div class="price">
+                                <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
-                                    <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                    <template v-if="p.priceFlag==1">
-                                        <div class="price_text_tag">
-                                            <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
-                                            <template v-if="p.svipProductFlag === 1">
-                                                <div class="svip-tag">
-                                                    <div class="svip-icon">SVIP</div>
-                                                </div>
-                                            </template>
-                                            <template v-else>
-                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                                            </template>
-                                        </div>
-                                        <div class="main_price_unde">￥价格未公开</div>
-                                    </template>
-                                    <template v-else>
-                                        <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.shopId==GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
-                                           <div class="price_text_tag">
-                                                <p class="couponTag"v-if="p.couponsLogo">优惠券</p>
-                                                <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
-                                                <template v-if="p.svipProductFlag === 1">
-                                                    <div class="svip-tag">
-                                                        <div class="svip-icon" :class="{ btr: showVipPriceTag(p) }">SVIP</div>
-                                                        <!-- !价格未公开 && ((个人机构 + SVIP) || 资质机构 ) 可查看价格 -->
-                                                        <template v-if="showVipPriceTag(p)">
-                                                            <div class="svip-price">
-                                                                <span v-html="p.svipPriceTag"></span>
-                                                            </div>
-                                                        </template>
+                                    <div class="price_text_tag">
+                                        <p class="couponTag"v-if="p.couponsLogo">优惠券</p>
+                                        <template v-if="p.svipProductFlag === 1">
+                                            <div class="svip-tag">
+                                                <div class="svip-icon">SVIP</div>
+                                                <template v-if="showVipPriceTag(p)">
+                                                    <div class="svip-price">
+                                                        <span v-html="p.svipPriceTag"></span>
                                                     </div>
                                                 </template>
-                                                <template v-else>
-                                                    <p class="listTag" v-if="p.actStatus==1">
-                                                        {{p.promotions.name}}
-                                                        <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
-                                                    </p>
-                                                </template>
-                                            </div>
-                                            <div class="main_price_show"
-                                                :class="{none: PromotionsFormat(p.promotions) || (p.svipProductFlag === 1 && showVipPriceTag(p))}">
-                                                <span>￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}</span>
                                             </div>
                                         </template>
-                                        <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
-                                             <div class="price_text_tag">
-                                                <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                                <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
-                                                <template v-if="p.svipProductFlag === 1">
-                                                    <div class="svip-tag">
-                                                        <div class="svip-icon">SVIP</div>
-                                                    </div>
-                                                </template>
-                                                <template v-else>
-                                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                                                </template>
-                                            </div>
-                                            <div class="main_price_unde">￥会员可见</div>
-                                        </template>
                                         <template v-else>
-                                         <div class="price_text_tag">
-                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                            <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
-                                            <template v-if="p.svipProductFlag === 1">
-                                                <div class="svip-tag">
-                                                    <div class="svip-icon">SVIP</div>
-                                                </div>
-                                            </template>
-                                            <template v-else>
-                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                                            </template>
-                                        </div>
-                                        <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
+                                            <p class="listTag" v-if="p.actStatus==1">
+                                                {{p.promotions.name}}
+                                                <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
+                                            </p>
                                         </template>
+                                    </div>
+                                    <!--价格未公开-->
+                                    <div class="main_price_unde" v-if="p.priceFlag==1">￥价格未公开</div>
+                                    <!--机构价格-->
+                                    <template v-else-if="GLOBAL_USER_IDENTITY === 2 || (p.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && p.shopId === GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
+                                        <div class="main_price_show"
+                                            :class="{none: PromotionsFormat(p.promotions) || showVipPriceTag(p)}">
+                                            <span>￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}</span>
+                                        </div>
                                     </template>
+                                    <!--会员可见-->
+                                    <div class="main_price_unde" v-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">￥会员可见</div>
+                                    <!--其他-->
+                                    <div class="price_grade" v-else><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                 </template>
+                                <!--
                                 <template v-else>
-                                     <div class="price_text_tag ">
+                                     <div class="price_text_tag">
                                          <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                         <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
                                          <template v-if="p.svipProductFlag === 1">
                                              <div class="svip-tag">
                                                  <div class="svip-icon">SVIP</div>
@@ -201,6 +160,7 @@
                                       </div>
                                       <div class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                 </template>
+                                -->
                             </div>
                         </a>
                     </li>

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

@@ -115,7 +115,7 @@
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <!-- 商品价格 -->
                                         <div class="main_price_text">
-                                        <!-- 正常商品 -->
+                                            <!-- 正常商品 -->
                                             <template v-if="pros.product.productCategory == 1">
                                                 <div class="price_text_tag">
                                                     <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>

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

@@ -113,30 +113,27 @@
                     <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
                     <p class="name" v-html="p.name" v-else></p>
                     <div class="price">
-                        <div class="price_text_tag clear">
-                            <!--优惠券-->
-                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                            <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
-                            <template v-if="p.svipProductFlag === 1">
-                                <div class="svip-tag">
-                                    <div class="svip-icon">SVIP</div>
-                                    <!-- !价格未公开 && ((个人机构 + SVIP) || 资质机构 ) 可查看价格 -->
-                                    <template v-if="showVipPriceTag(p)">
-                                        <div class="svip-price">
-                                            <span v-html="p.svipPriceTag"></span>
-                                        </div>
-                                    </template>
-                                </div>
-                            </template>
-                            <template v-else>
-                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}
-                                    <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
-                                </p>
-                            </template>
-                        </div>
                         <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                        <!--0公开价格 1不公开价格 2仅对会员机构公开-->
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                            <div class="price_text_tag clear">
+                                <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                <template v-if="p.svipProductFlag === 1">
+                                    <div class="svip-tag">
+                                        <div class="svip-icon">SVIP</div>
+                                        <template v-if="showVipPriceTag(p)">
+                                            <div class="svip-price">
+                                                <span v-html="p.svipPriceTag"></span>
+                                            </div>
+                                        </template>
+                                    </div>
+                                </template>
+                                <template v-else>
+                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}
+                                        <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
+                                    </p>
+                                </template>
+                            </div>
+                            <!--0公开价格 1不公开价格 2仅对会员机构公开-->
                             <div class="main_price_unde" v-if="p.priceFlag==1">￥价格未公开</div>
                             <!-- 资质机构 || (价格全部机构可见 && 普通机构) || (供应商 && 商品为供应商下的商品) || 超级会员用户 -->
                             <template v-else-if="GLOBAL_USER_IDENTITY === 2 || (p.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && p.shopId === GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
@@ -151,9 +148,9 @@
                             <div class="price_grade" v-else><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                         </template>
                         <template v-else>
-                            <div class="price_text_tag ">
+                            <div class="price_text_tag">
                                 <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                <template v-if="true">
+                                <template v-if="p.svipProductFlag === 1">
                                     <div class="svip-tag">
                                         <div class="svip-icon">SVIP</div>
                                     </div>

src/main/resources/templates/supplier/index.html

@@ -53,162 +53,76 @@
         </div>
         <div class="tabCon">
             <div class="item productBox">
-                <div v-if="mainProducts.length>0" class="part">
-                    <div class="title">主推商品</div>
-                    <!--主推商品列表-->
-                    <ul class="productList clear mfw">
-                        <li class="productItem " v-for="p in mainProducts">
-                            <a class="image" :href="'/product-'+p.productId+'.html'">
-                                <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
-                                <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
-                                <p class="name" v-html="p.name" v-else></p>
-                                <div class="price">
-                                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
-                                        <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                        <div class="price_text_tag">
-                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                            <template v-if="p.svipProductFlag === 1">
-                                                <div class="svip-tag">
-                                                    <div class="svip-icon">SVIP</div>
-                                                    <div class="svip-price" v-if="showVipPriceTag(p)">
-                                                        <span>￥</span><span v-html="p.svipPriceTag"></span>
+                <template v-for="(floor,index) in floorData">
+                    <div v-if="(floor.type === 1 && floor.productList.length > 0) || floor.type === 2" class="part">
+                        <div class="title" v-html="floor.title" :id="floor.type === 2 ? 'supProduct' : ''"></div>
+                        <!--主推商品列表-->
+                        <ul class="productList clear mfw" v-if="floor.type === 2 && floor.productList.length > 0">
+                            <li class="productItem " v-for="p in floor.productList">
+                                <a class="image" :href="'/product-'+p.productId+'.html'">
+                                    <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
+                                    <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
+                                    <p class="name" v-html="p.name" v-else></p>
+                                    <div class="price">
+                                        <!--已登录-->
+                                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID > 0">
+                                            <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
+                                            <div class="price_text_tag">
+                                                <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                                <template v-if="p.svipProductFlag === 1">
+                                                    <div class="svip-tag">
+                                                        <div class="svip-icon">SVIP</div>
+                                                        <div class="svip-price" v-if="showVipPriceTag(p)">
+                                                            <span>￥</span><span v-html="p.svipPriceTag"></span>
+                                                        </div>
                                                     </div>
-                                                </div>
-                                            </template>
-                                            <template v-else>
-                                                <p class="listTag" v-if="p.actStatus==1">
-                                                    {{p.promotions.name}}
-                                                    <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
-                                                </p>
-                                            </template>
-                                        </div>
-                                        <div class="main_price_unde" v-if="p.priceFlag==1">￥价格未公开</div>
-                                        <!--机构价格-->
-                                        <template v-else-if="GLOBAL_USER_IDENTITY === 2 || (p.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && p.shopId === GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
-                                            <div class="main_price_show" :class="{none: PromotionsFormat(p.promotions) || showVipPriceTag(p)}">
-                                                ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
+                                                </template>
+                                                <template v-else>
+                                                    <p class="listTag" v-if="p.actStatus==1">
+                                                        {{p.promotions.name}}
+                                                        <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
+                                                    </p>
+                                                </template>
                                             </div>
-                                        </template>
-                                        <!--机构价仅会员可见 && 用户是普通机构-->
-                                        <div class="main_price_unde" v-else-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">￥会员可见</div>
-                                        <!--供应商除自己的商品外，也显示价格等级-->
-                                        <div class="price_grade" v-else><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
-                                    </template>
-                                    <template v-else>
-                                        <div class="price_text_tag ">
-                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                            <template v-if="p.svipProductFlag === 1">
-                                                <div class="svip-tag">
-                                                    <div class="svip-icon">SVIP</div>
+                                            <div class="main_price_unde" v-if="p.priceFlag == 1">￥价格未公开</div>
+                                            <!--机构价格-->
+                                            <template v-else-if="GLOBAL_USER_IDENTITY === 2 || (p.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && p.shopId === GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
+                                                <div class="main_price_show" :class="{none: PromotionsFormat(p.promotions) || showVipPriceTag(p)}">
+                                                    ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
                                                 </div>
                                             </template>
-                                            <template v-else>
-                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                                            </template>
-                                        </div>
-                                        <div class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
-                                    </template>
-                                </div>
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-                <div class="part">
-                    <div class="title" id="supProduct">供应商产品</div>
-                    <!--主推商品列表-->
-                    <ul v-if="productLists.length>0" class="productList clear mfw">
-                        <li class="productItem " v-for="p in productLists">
-                            <a class="image" :href="'/product-'+p.productId+'.html'">
-                                <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
-                                <p class="name" v-html="addhtml + p.name" v-if="p.beautyActFlag==1"></p>
-                                <p class="name" v-html="p.name" v-else></p>
-                                <div class="price">
-                                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
-                                        <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                        <template v-if="p.priceFlag==1">
-                                            <div class="price_text_tag">
-                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                                            </div>
-                                            <div class="main_price_unde">￥价格未公开</div>
+                                            <!--机构价仅会员可见 && 用户是普通机构-->
+                                            <div class="main_price_unde" v-else-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">￥会员可见</div>
+                                            <!--供应商除自己的商品外，也显示价格等级-->
+                                            <div class="price_grade" v-else><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                         </template>
+                                        <!--未登录-->
                                         <template v-else>
-                                            <template v-if="GLOBAL_USER_IDENTITY === 2 || (p.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && p.shopId === GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
-                                                <div class="price_text_tag">
-                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                                    <template v-if="p.svipProductFlag === 1">
-                                                        <div class="svip-tag">
-                                                            <div class="svip-icon">SVIP</div>
-                                                            <div class="svip-price" v-if="showVipPriceTag(p)">
-                                                                <span>￥</span><span v-html="p.svipPriceTag"></span>
-                                                            </div>
-                                                        </div>
-                                                    </template>
-                                                    <template v-else>
-                                                        <p class="listTag" v-if="p.actStatus==1">
-                                                            {{p.promotions.name}}
-                                                            <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
-                                                        </p>
-                                                    </template>
-                                                </div>
-                                                <div class="main_price_show" :class="PromotionsFormat(p.promotions) ? 'none' : ''">
-                                                    ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
-                                                </div>
-                                            </template>
-                                            <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
-                                                <div class="price_text_tag">
-                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                                    <template v-if="p.svipProductFlag === 1">
-                                                        <div class="svip-tag">
-                                                            <div class="svip-icon">SVIP</div>
-                                                        </div>
-                                                    </template>
-                                                    <template v-else>
-                                                        <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                                                    </template>
-                                                </div>
-                                                <div class="main_price_unde">￥会员可见</div>
-                                            </template>
-                                            <template v-else>
-                                                <div class="price_text_tag">
-                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                                    <template v-if="p.svipProductFlag === 1">
-                                                        <div class="svip-tag">
-                                                            <div class="svip-icon">SVIP</div>
-                                                        </div>
-                                                    </template>
-                                                    <template v-else>
-                                                        <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                                                    </template>
-                                                </div>
-                                                <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
-                                            </template>
+                                            <div class="price_text_tag ">
+                                                <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                                <template v-if="p.svipProductFlag === 1">
+                                                    <div class="svip-tag">
+                                                        <div class="svip-icon">SVIP</div>
+                                                    </div>
+                                                </template>
+                                                <template v-else>
+                                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                </template>
+                                            </div>
+                                            <div class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                         </template>
-                                    </template>
-                                    <template v-else>
-                                        <div class="price_text_tag ">
-                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                            <template v-if="p.svipProductFlag === 1">
-                                                <div class="svip-tag">
-                                                    <div class="svip-icon">SVIP</div>
-                                                </div>
-                                            </template>
-                                            <template v-else>
-                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
-                                            </template>
-                                        </div>
-                                        <div class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
-                                    </template>
-                                </div>
-                            </a>
-                        </li>
-                    </ul>
-                    <div v-else class="empty">
-                        <img src="/img/order/icon-dianpu.svg">
-                        <div class="msg">
-                            <p>该供应商暂未发布商品，去<a href="/">商城</a>，逛逛吧~</p>
+                                    </div>
+                                </a>
+                            </li>
+                        </ul>
+                        <div v-else class="empty">
+                            <img src="/img/order/icon-dianpu.svg">
+                            <div class="msg">
+                                <p>该供应商暂未发布商品，去<a href="/">商城</a>，逛逛吧~</p>
+                            </div>
                         </div>
                     </div>
-                </div>
+                </template>
             </div>
             <div class="item infoBox">
                 <div class="part">