修改商品详情 搜索列表问题

src/main/resources/static/js/base.js

@@ -7,18 +7,21 @@ var GLOBAL_USER_IDENTITY = 0;//2-会员机构；3-供应商；4-普通机构
 var GLOBAL_SHOP_ID = 0;  // 供应商Id
 var GLOBAL_VIP_FLAG = 0; // 超级会员标记
 var GLOBAL_CLUB_TYPE = 0; // 会员类型 1 医美机构  2 胜美机构
+var IDENTITY = 0; // 用户标记
 if(localStorage.getItem('userInfo')){
     globalUserData = JSON.parse(localStorage.getItem('userInfo'));
     GLOBAL_TOKEN = globalUserData.token;
     GLOBAL_USER_ID = globalUserData.userId*1;
     GLOBAL_USER_IDENTITY = globalUserData.userIdentity*1;
+    IDENTITY = globalUserData.userIdentity*1;
     GLOBAL_VIP_FLAG = globalUserData.vipFlag;
     GLOBAL_SHOP_ID = globalUserData.shopId*1;
     GLOBAL_CLUB_TYPE = globalUserData.firstClubType ? globalUserData.firstClubType : null;
     if (GLOBAL_USER_ID === 5261 || GLOBAL_USER_ID === 10947 || GLOBAL_USER_ID === 11579) {
         GLOBAL_USER_IDENTITY = 1;
+        IDENTITY = 1;
     }else if(GLOBAL_CLUB_TYPE == 1){
-        GLOBAL_USER_IDENTITY = 5;
+        IDENTITY = 5;
     }
 } else {
     var pathname = window.location.pathname;

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

@@ -235,7 +235,8 @@ var productDetail = new Vue({
                         _self.promotions = response.data.promotions;
                         _self.promotionsId = response.data.promotions.id;
                     }
-                    if(_self.userId == 0 || _self.priceObj.userIdentity == 2 || _self.priceObj.userIdentity == 4){
+                    console.log('userIdentity',_self.priceObj.userIdentity)
+                    if(_self.userId === 0 || GLOBAL_USER_IDENTITY === 2 || GLOBAL_USER_IDENTITY === 4){
                         _self.isShowSupportingList = true;
                     }
                 }

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

@@ -45,7 +45,8 @@ var productList = new Vue({
         isActiviChecked:false,
         isNewsChecked:false,
         isShowAllBrands:false,
-        isAllcheckedBrand:false
+        isAllcheckedBrand:false,
+        isListEmpty:false,
     },
     filters: {
         NumFormat:function(value) {
@@ -120,7 +121,7 @@ var productList = new Vue({
             var _self = this;
             ProductApi.GetProductSearchList({
                 keyword: this.params.keyword,
-                identity: GLOBAL_USER_IDENTITY,
+                identity: IDENTITY,
                 pageSize: this.params.size,
                 pageNum: this.params.num,
                 sortField: this.params.sortField,
@@ -146,11 +147,16 @@ var productList = new Vue({
                     }else{
                         _self.listData = _self.listData.concat(resultData);
                     }
-                    console.log(_self.listData)
+                    if( _self.listData.length>0){
+                        _self.isListEmpty = false;
+                    }else{
+                        _self.isListEmpty = true;
+                    }
                     _self.listLoading = false;
                     _self.requestFlag = true;
                 }else {
-                    CAIMEI.Alert(res.msg, '确定');
+                    _self.listLoading = false;
+                    _self.isListEmpty = true;
                 }
             });
         },
@@ -253,7 +259,7 @@ var productList = new Vue({
         //     var _self = this;
         //     $.getJSON(spiServer+"/search/query/product/"+ path ,{
         //         id: categoryId,
-        //         identity: GLOBAL_USER_IDENTITY,
+        //         identity: IDENTITY,
         //         pageSize: this.params.size,
         //         pageNum: this.params.num,
         //         sortField: this.params.sortField,

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

@@ -106,7 +106,7 @@ var supplierHome = new Vue({
             SupplierApi.GetShopProductMain(
                 {
                     shopId: _self.params.id,
-                    identity: GLOBAL_USER_IDENTITY
+                    identity: IDENTITY
                 },
                 function (res) {
                     if (res.code === 0 && res.data) {
@@ -140,7 +140,7 @@ var supplierHome = new Vue({
                     keyword: _self.params.keyword,
                     pageSize: _self.params.size,
                     pageNum: _self.params.num,
-                    identity: GLOBAL_USER_IDENTITY,
+                    identity: IDENTITY,
                     id:_self.params.id
                 },
                 function (res) {

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

@@ -58,7 +58,7 @@
             </div>
         </div>
         <div class="wrap">
-            <div class="pageFloor" v-for="floor in recommends">
+            <div class="pageFloor" v-for="floor in recommends.floorList">
                 <div class="title" v-text="floor.title"></div>
                 <ul class="content clear">
                     <li v-for="item in floor.floorData">

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

@@ -296,6 +296,14 @@
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                             <!--0公开价格 1不公开价格 2仅对会员机构公开-->
                                             <div class="main_price_unde" v-if="pros.priceFlag==1">￥价格未公开</div>
+                                            <!--机构价仅会员可见 && 用户是普通机构-->
+                                            <div class="main_price_unde" v-else-if="pros.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">
+                                                ￥会员可见
+                                            </div>
+                                            <!--机构价仅会员可见 && 用户是普通机构-->
+                                            <div class="main_price_unde" v-else-if="pros.priceFlag==3 && (GLOBAL_CLUB_TYPE !=1)">
+                                                ￥仅医美机构可见
+                                            </div>
                                             <!-- 资质机构 || (价格全部机构可见 && 普通机构) || (供应商 && 商品为供应商下的商品) || 超级会员用户 -->
                                             <template
                                                     v-else-if="GLOBAL_USER_IDENTITY === 2 || (pros.priceFlag === 0 && GLOBAL_USER_IDENTITY === 4) || (GLOBAL_USER_IDENTITY === 3 && pros.shopId === GLOBAL_SHOP_ID) || GLOBAL_VIP_FLAG === 1">
@@ -305,10 +313,6 @@
                                                     pros.price ) | NumFormat }}
                                                 </div>
                                             </template>
-                                            <!--机构价仅会员可见 && 用户是普通机构-->
-                                            <div class="main_price_unde" v-else-if="pros.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">
-                                                ￥会员可见
-                                            </div>
                                             <!--供应商除自己的商品外，也显示价格等级-->
                                             <div class="price_grade" v-else><span class="bold">￥</span><i
                                                     :class="'icon mIcon i'+pros.priceGrade"></i></div>
@@ -447,7 +451,7 @@
             </div>
             <div class="tabCon">
                 <div class="item" v-if="tabsIndex == 0">
-                    <template v-if="(GLOBAL_USER_ID>0 && GLOBAL_USER_IDENTITY == 2) || (GLOBAL_USER_ID>0 && GLOBAL_USER_IDENTITY == 3)">
+                    <template v-if="GLOBAL_USER_ID>0 && ( GLOBAL_USER_IDENTITY === 2 || GLOBAL_USER_IDENTITY === 3)">
                         <template v-if="isNoneDisabled">
                             <p>暂无商品信息</p>
                         </template>

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

@@ -18,230 +18,183 @@
         <span>搜索结果</span>
         <span>&gt;</span> <a href="javascript:void(0);" @click="toPagination(1)" v-text="params.keyword"></a>
     </div>
-
-    <!--    <template v-if="isPC && listData && listData.length>0">-->
-    <!--        &lt;!&ndash; 面包屑 &ndash;&gt;-->
-    <!--        <div v-if="searchFlag" class="crumbs">-->
-    <!--            <span>搜索结果</span>-->
-    <!--            <span>&gt;</span> <a href="javascript:void(0);" @click="toPagination(1)" v-text="params.keyword"></a>-->
-    <!--        </div>-->
-    <!--        <div v-else class="crumbs">-->
-    <!--            <a href="/">首页</a>-->
-    <!--            <template v-if="params.bid && params.bid>0">-->
-    <!--                <template v-if="params.sid && params.sid>0">-->
-    <!--                    <span>&gt;</span> <a :href="'/product/list.html?category='+params.bid+'-0-0'" v-text="bigType"></a>-->
-    <!--                    <template v-if="params.tid && params.tid>0">-->
-    <!--                        <span>&gt;</span> <a :href="'/product/list.html?category='+params.bid+'-'+params.sid+'-0'" v-text="smallType"></a>-->
-    <!--                        <span>&gt;</span> <span v-text="tinyType"></span>-->
-    <!--                    </template>-->
-    <!--                    <template v-else>-->
-    <!--                        <span>&gt;</span> <span v-text="smallType"></span>-->
-    <!--                    </template>-->
-    <!--                </template>-->
-    <!--                <template v-else>-->
-    <!--                    <span>&gt;</span> <span v-text="bigType"></span>-->
-    <!--                </template>-->
-    <!--            </template>-->
-    <!--        </div>-->
-    <!--        &lt;!&ndash;分类&ndash;&gt;-->
-    <!--        <div v-if="(!searchFlag)" id="listClassify" class="classifyBox">-->
-    <!--            <div class="clsTab">-->
-    <!--                <template v-for="(big,i) in classify">-->
-    <!--                    <a :class="{'on': params.bid==big.bigTypeID}" v-if="big.validFlag==1" href="javascript:void(0);" v-text="big.name"></a>-->
-    <!--                </template>-->
-    <!--            </div>-->
-    <!--            <div class="clsCon">-->
-    <!--                <div class="tabItem" v-for="big in classify" :bid="big.bigTypeID" style="display: none;">-->
-    <!--                    <div class="line" :class="{'on': params.sid==small.smallTypeID}" v-for="small in big.smalltypeList" v-if="small.validFlag==1">-->
-    <!--                        <div class="lft" :class="{'on': params.sid==small.smallTypeID}">-->
-    <!--                            <a :href="'/product/list.html?category='+big.bigTypeID+'-'+small.smallTypeID+'-0'" v-text="small.name"></a>-->
-    <!--                        </div>-->
-    <!--                        <div class="rgt">-->
-    <!--                            <template v-for="tiny in small.tinytypeList">-->
-    <!--                                <a v-if="tiny.validFlag==1" :class="{'on': params.tid==tiny.tinyTypeID}" :href="'/product/list.html?category='+big.bigTypeID+'-'+small.smallTypeID+'-'+tiny.tinyTypeID" v-text="tiny.name"></a>-->
-    <!--                            </template>-->
-    <!--                        </div>-->
-    <!--                    </div>-->
-    <!--                </div>-->
-    <!--            </div>-->
-    <!--        </div>-->
-    <!--    </template>-->
-    <!--loading-->
     <div v-if="listLoading" class="loading">
         <img src="/img/base/loading.gif">
     </div>
-    <!--数据为空-->
-    <div v-else-if="!listLoading && (!listData || listData.length==0)" class="empty">
-        <img src="/img/common/empty.png">
-        <div class="msg">
-            <p>暂未找到你搜索的商品，去<a href="/">商城</a>，逛逛吧~</p>
-        </div>
-    </div>
     <template v-else>
-        <!--品牌选择-->
-        <template v-if="isPC">
-            <div class="product-brand clear">
-                <div class="product-brand-name" :class="isShowAllBrands ? 'show' : ''">
-                    <p class="title">品牌</p>
-                </div>
-                <div class="product-brand-list" :class="isShowAllBrands ? 'show' : ''">
-                    <div class="brand-list" @click="choiceBrandAllHref" :class="hrefBrandId ? '' : 'checked'"><a href="javascript:void(0)">全部</a></div>
-                    <div class="brand-list" @click="choiceBrandHref(brand, index)" v-for="(brand,index) in brandLists"
-                         :key="index" :class="brand.isChecked ? 'checked' : ''">
-                        <a href="javascript:void(0)" :title="brand.name" v-html="brand.name"></a>
-                    </div>
-                </div>
-                <div class="product-brand-more" v-if="defaultBrandLists.length>8" :class="isShowAllBrands ? 'show' : ''"
-                     @click="showMoreItem">{{
-                    isShowAllBrands ? '收起' : '更多' }} <i class="icon mIcon"></i></div>
+        <!--数据为空-->
+        <div v-if="isListEmpty" class="empty">
+            <img src="/img/common/empty.png">
+            <div class="msg">
+                <p>暂未找到你搜索的商品，去<a href="/">商城</a>，逛逛吧~</p>
             </div>
-        </template>
+        </div>
         <template v-else>
-            <div class="product-brand-fiexd" v-if="isProductScreen">
+            <!--品牌选择-->
+            <template v-if="isPC">
                 <div class="product-brand clear">
-                    <div class="product-screen">
-                        <div class="sortBox-new" @click="hanldCheckedActivi">
-                            <span>促销商品</span>
-                            <span class="coll-checked" :class="[isActiviChecked ? 'checked': '']"></span>
-                        </div>
-                        <div class="sortBox-new" @click="hanldCheckedNews">
-                            <span>新品</span>
-                            <span class="coll-checked" :class="[isNewsChecked ? 'checked': '']"></span>
-                        </div>
-                    </div>
                     <div class="product-brand-name" :class="isShowAllBrands ? 'show' : ''">
                         <p class="title">品牌</p>
-                        <p v-if="!isPC" class="num">已选中<span>{{ checkedBrandLength }}</span>个品牌</p>
                     </div>
                     <div class="product-brand-list" :class="isShowAllBrands ? 'show' : ''">
-                        <div class="brand-list" @click="choiceBrandAll" :class="isAllcheckedBrand ? 'checked' : ''"><a href="javascript:void(0)">全部</a></div>
-                        <div class="brand-list" v-for="(brand,index) in brandLists" :key="index"
-                             @click="choiceBrand(brand, index)" :class="brand.isChecked ? 'checked' : ''">
+                        <div class="brand-list" @click="choiceBrandAllHref" :class="hrefBrandId ? '' : 'checked'"><a href="javascript:void(0)">全部</a></div>
+                        <div class="brand-list" @click="choiceBrandHref(brand, index)" v-for="(brand,index) in brandLists"
+                             :key="index" :class="brand.isChecked ? 'checked' : ''">
                             <a href="javascript:void(0)" :title="brand.name" v-html="brand.name"></a>
                         </div>
                     </div>
-                    <div class="product-brand-more" v-if="defaultBrandLists.length>8" :class="isShowAllBrands ? 'show' : ''" @click="showMoreItem">{{
-                        isShowAllBrands ? '收起' : '查看全部' }} <i
-                                class="icon mIcon"></i></div>
-                    <div class="product-screen-btn" @click="handleConfirmScreen">
-                        <div class="sub-button">确定</div>
-                    </div>
+                    <div class="product-brand-more" v-if="defaultBrandLists.length>8" :class="isShowAllBrands ? 'show' : ''"
+                         @click="showMoreItem">{{
+                        isShowAllBrands ? '收起' : '更多' }} <i class="icon mIcon"></i></div>
                 </div>
-            </div>
-        </template>
-        <!--排序-->
-        <div class="sortBox">
-            <ul class="mfc clear">
-                <li :class="{'on':params.sortField == ''}" @click="toSortList('',1)">综合</li>
-                <template>
-                    <li v-if="params.sortField == 'sales' && params.sortType == 1" class="down"
-                        @click="toSortList('sales',0)"><span>销量</span></li>
-                    <li v-else-if="params.sortField == 'sales' && params.sortType == 0" class="up"
-                        @click="toSortList('sales',1)"><span>销量</span></li>
-                    <li v-else @click="toSortList('sales',0)"><span>销量</span></li>
-                </template>
-                <template>
-                    <li v-if="params.sortField == 'favorite' && params.sortType == 1" class="down"
-                        @click="toSortList('favorite',0)"><span>人气</span></li>
-                    <li v-else-if="params.sortField == 'favorite' && params.sortType == 0" class="up"
-                        @click="toSortList('favorite',1)"><span>人气</span></li>
-                    <li v-else @click="toSortList('favorite',0)"><span>人气</span></li>
-                </template>
-                <template>
-                    <li v-if="params.sortField == 'price' && params.sortType == 1" class="down"
-                        @click="toSortList('price',0)"><span>价格</span></li>
-                    <li v-else-if="params.sortField == 'price' && params.sortType == 0" class="up"
-                        @click="toSortList('price',1)"><span>价格</span></li>
-                    <li v-else @click="toSortList('price',0)"><span>价格</span></li>
-                </template>
-                <template v-if="!isPC">
-                    <li class="screen" @click="showIsProductScreen">
-                        <span>筛选</span>
-                        <i class="mIcon"></i>
-                    </li>
-                </template>
-            </ul>
-            <div class="sortBox-checked" v-if="isPC">
-                <div class="sortBox-new" @click="hanldCheckedActiviHref">
-                    <span class="coll-checked" :class="[isActiviChecked ? 'checked': '']"></span>
-                    <span>促销商品</span>
+            </template>
+            <template v-else>
+                <div class="product-brand-fiexd" v-if="isProductScreen">
+                    <div class="product-brand clear">
+                        <div class="product-screen">
+                            <div class="sortBox-new" @click="hanldCheckedActivi">
+                                <span>促销商品</span>
+                                <span class="coll-checked" :class="[isActiviChecked ? 'checked': '']"></span>
+                            </div>
+                            <div class="sortBox-new" @click="hanldCheckedNews">
+                                <span>新品</span>
+                                <span class="coll-checked" :class="[isNewsChecked ? 'checked': '']"></span>
+                            </div>
+                        </div>
+                        <div class="product-brand-name" :class="isShowAllBrands ? 'show' : ''">
+                            <p class="title">品牌</p>
+                            <p v-if="!isPC" class="num">已选中<span>{{ checkedBrandLength }}</span>个品牌</p>
+                        </div>
+                        <div class="product-brand-list" :class="isShowAllBrands ? 'show' : ''">
+                            <div class="brand-list" @click="choiceBrandAll" :class="isAllcheckedBrand ? 'checked' : ''"><a href="javascript:void(0)">全部</a></div>
+                            <div class="brand-list" v-for="(brand,index) in brandLists" :key="index"
+                                 @click="choiceBrand(brand, index)" :class="brand.isChecked ? 'checked' : ''">
+                                <a href="javascript:void(0)" :title="brand.name" v-html="brand.name"></a>
+                            </div>
+                        </div>
+                        <div class="product-brand-more" v-if="defaultBrandLists.length>8" :class="isShowAllBrands ? 'show' : ''" @click="showMoreItem">{{
+                            isShowAllBrands ? '收起' : '查看全部' }} <i
+                                    class="icon mIcon"></i></div>
+                        <div class="product-screen-btn" @click="handleConfirmScreen">
+                            <div class="sub-button">确定</div>
+                        </div>
+                    </div>
                 </div>
-                <div class="sortBox-new" @click="hanldCheckedNewsHref">
-                    <span class="coll-checked" :class="[isNewsChecked ? 'checked': '']"></span>
-                    <span>新品</span>
+            </template>
+            <!--排序-->
+            <div class="sortBox">
+                <ul class="mfc clear">
+                    <li :class="{'on':params.sortField == ''}" @click="toSortList('',1)">综合</li>
+                    <template>
+                        <li v-if="params.sortField == 'sales' && params.sortType == 1" class="down"
+                            @click="toSortList('sales',0)"><span>销量</span></li>
+                        <li v-else-if="params.sortField == 'sales' && params.sortType == 0" class="up"
+                            @click="toSortList('sales',1)"><span>销量</span></li>
+                        <li v-else @click="toSortList('sales',0)"><span>销量</span></li>
+                    </template>
+                    <template>
+                        <li v-if="params.sortField == 'favorite' && params.sortType == 1" class="down"
+                            @click="toSortList('favorite',0)"><span>人气</span></li>
+                        <li v-else-if="params.sortField == 'favorite' && params.sortType == 0" class="up"
+                            @click="toSortList('favorite',1)"><span>人气</span></li>
+                        <li v-else @click="toSortList('favorite',0)"><span>人气</span></li>
+                    </template>
+                    <template>
+                        <li v-if="params.sortField == 'price' && params.sortType == 1" class="down"
+                            @click="toSortList('price',0)"><span>价格</span></li>
+                        <li v-else-if="params.sortField == 'price' && params.sortType == 0" class="up"
+                            @click="toSortList('price',1)"><span>价格</span></li>
+                        <li v-else @click="toSortList('price',0)"><span>价格</span></li>
+                    </template>
+                    <template v-if="!isPC">
+                        <li class="screen" @click="showIsProductScreen">
+                            <span>筛选</span>
+                            <i class="mIcon"></i>
+                        </li>
+                    </template>
+                </ul>
+                <div class="sortBox-checked" v-if="isPC">
+                    <div class="sortBox-new" @click="hanldCheckedActiviHref">
+                        <span class="coll-checked" :class="[isActiviChecked ? 'checked': '']"></span>
+                        <span>促销商品</span>
+                    </div>
+                    <div class="sortBox-new" @click="hanldCheckedNewsHref">
+                        <span class="coll-checked" :class="[isNewsChecked ? 'checked': '']"></span>
+                        <span>新品</span>
+                    </div>
                 </div>
             </div>
-        </div>
-        <!--商品列表-->
-        <ul class="productList clear mfw">
-            <li class="productItem " v-for="p in listData">
-                <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">
-                        <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                        <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>
+            <!--商品列表-->
+            <ul class="productList clear mfw">
+                <li class="productItem " v-for="p in listData">
+                    <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">
+                            <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
+                            <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>
+                                <!--机构价仅会员可见 && 用户是普通机构-->
+                                <div class="main_price_unde" v-else-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">
+                                    ￥会员可见
+                                </div>
+                                <!--机构价仅会员可见 && 用户是普通机构-->
+                                <div class="main_price_unde" v-else-if="p.priceFlag==3 && (GLOBAL_CLUB_TYPE !=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) || (p.svipProductFlag === 1 && showVipPriceTag(p))}">
+                                        ￥{{ (PromotionsFormat(p.promotions) || showVipPriceTag(p) ? p.originalPrice :
+                                        p.price ) | NumFormat }}
                                     </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>
-                            <!--机构价仅会员可见 && 用户是普通机构-->
-                            <div class="main_price_unde" v-else-if="p.priceFlag==2 && GLOBAL_USER_IDENTITY === 4">
-                                ￥会员可见
-                            </div>
-                            <!--机构价仅会员可见 && 用户是普通机构-->
-                            <div class="main_price_unde" v-else-if="p.priceFlag==3 && (GLOBAL_CLUB_TYPE !=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) || (p.svipProductFlag === 1 && showVipPriceTag(p))}">
-                                    ￥{{ (PromotionsFormat(p.promotions) || showVipPriceTag(p) ? p.originalPrice :
-                                    p.price ) | NumFormat }}
+                                <!--供应商除自己的商品外，也显示价格等级-->
+                                <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>
+                                    </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_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>
-                                </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>
+                    </a>
+                </li>
+            </ul>
+        </template>
     </template>
     <!--分页-->
     <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>