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

src/main/resources/static/css/index/index_new.h5.css

@@ -177,6 +177,7 @@
         height: 61.6vw;
         background: #fff;
         margin-right: 2.4vw;
+        flex-shrink: 0;
     }
     .section_right .right_item_title{
         overflow: hidden;
@@ -347,3 +348,9 @@
      height: inherit;
  }
  .floorCon{width: 97vw;margin: auto}
+.section_page .page_main_price .price_text_tag.right-box{
+    float: right;
+    width: auto;
+    margin-top: 1vw;
+}
+

src/main/resources/static/css/product/instruement.css

@@ -104,7 +104,7 @@
     #recommendBox .swiper-pagination .swiper-pagination-bullet.swiper-pagination-bullet-active{width:3.8vw;opacity:1}
     .price {overflow: hidden;    width: 100%;box-sizing: border-box;padding: 0 3.2vw;}
     .productItem  .price .mIcon {display: inline-block;font-size: 0;height: 5vw;line-height: 5vw;vertical-align: text-bottom;}
-    .icon.hot:before{width: 5.3vw;height:4.5vw;background-position: -53.9vw -69.3vw;position: absolute;top: -2.7vw;right: -2.7vw;}
+    .mIcon.hot:before{width: 5.3vw;height:4.5vw;background-position: -53.9vw -69.3vw;position: absolute;top: -2.7vw;right: -2.7vw;}
     .priceTag .tag, .listTag{padding: .5vw 2vw;border: .27vw solid #ffe6dc;background: none;font-size: 2.8vw;float: left;height: 4.2vw;line-height: 4.2vw;}
     .brand{color: #9aa5b5;margin: 1vw 3.2vw;border: .27vw solid #e3ebf7;display: inline-block;padding: 0 1.3vw;border-radius: .54vw}
     .floorCon .hotList .imgbaner{width: 93.6vw !important;height: 24vw;margin:1.3vw auto 2.6vw;display: block}

src/main/resources/static/js/flea-market/list.js

@@ -124,10 +124,11 @@ var fleaMarketList = new Vue({
                                    }
                                }
                            }
+                            _this.requestFlag = false;
                          }else{
-                             CAIMEI.Alert(response.msg, '确定', false);
+                             CAIMEI.Alert(res.msg, '确定', false);
+                              _this.requestFlag = true;
                          }
-                    _this.requestFlag = true;
                 })
           },
            returnedTarget:function(){//对象合并 IE 兼容方法

src/main/resources/templates/flea-market/list.html

@@ -12,110 +12,106 @@
 
 <!-- 二手商品列表 -->
 <div id="fleaMarketList">
-    <div class="wrap">
-        <div class="ListImg">
-            <img src="/img/flea-market/banner.png" />
-        </div>
-        <template>
-            <ul class="secondTitle " v-if="isPC">
-                <li class="ClassA icon" @click="handle('1')" :class="[currentId == '1' ? 'active':'',currentId == '1' ? 'jqSelect':'']">
-                    {{ tabTitleName }}
-                </li>
-<!--                <li class="ClassA icon" @click="handle('2')" :class="[currentId == '2' ? 'active':'',currentId == '2' ? 'jqSelect':'']">-->
-<!--                    临期产品-->
-<!--                </li>-->
-                <li class="ClassA icon" @click="handle('3')" :class="[currentId == '3' ? 'active':'',currentId == '3' ? 'jqSelect':'']">
-                    其他
-                </li>
-                <div class="right-btn">
-                    <li class="intro">
-                        <a href="/flea-market/intro.html">二手市场介绍</a>
-                    <li/>
-                    <li class="fabu">
-                        <a href="/flea-market/form.html">我要发布</a>
-                    <li/>
-                </div>
+     <div v-if="requestFlag" class="loading">
+            <img src="/img/base/loading.gif">
+     </div>
+     <template v-else>
+        <div class="wrap">
+            <div class="ListImg">
+                <img src="/img/flea-market/banner.png" />
+            </div>
+            <template>
+                <ul class="secondTitle " v-if="isPC">
+                    <li class="ClassA icon" @click="handle('1')" :class="[currentId == '1' ? 'active':'',currentId == '1' ? 'jqSelect':'']">
+                        {{ tabTitleName }}
+                    </li>
+                    <li class="ClassA icon" @click="handle('3')" :class="[currentId == '3' ? 'active':'',currentId == '3' ? 'jqSelect':'']">
+                        其他
+                    </li>
+                    <div class="right-btn">
+                        <li class="intro">
+                            <a href="/flea-market/intro.html">二手市场介绍</a>
+                        <li/>
+                        <li class="fabu">
+                            <a href="/flea-market/form.html">我要发布</a>
+                        <li/>
+                    </div>
 
+                </ul>
+                <ul class="secondTitle" v-else>
+                    <li class="ClassA mIcon off" @click="handle('1')" :class="currentId == '1' ? 'active':''">
+                        {{ tabTitleName }}
+                        <span class="line" v-if="currentId == '1'"></span>
+                    </li>
+                    <li class="ClassA" @click="handle('3')" :class="[currentId == '3' ? 'active':'',currentId == '3' ? 'off':'']">
+                        其他
+                        <span class="line" v-if="currentId == '3'"></span>
+                    </li>
+                </ul>
+            </template>
+            <ul class="mainTab" v-if="mainflag">
+                <li v-for="(item,index) in tabList" @click='handleChild(item)' :class="currentID2 ==index?'addstyle':' '">{{item.name}}</li>
             </ul>
-            <ul class="secondTitle" v-else>
-                <li class="ClassA mIcon off" @click="handle('1')" :class="currentId == '1' ? 'active':''">
-                    {{ tabTitleName }}
-                    <span class="line" v-if="currentId == '1'"></span>
-                </li>
-<!--                <li class="ClassA" @click="handle('2')" :class="[currentId == '2' ? 'active':'',currentId == '2' ? 'off':'']">-->
-<!--                    临期产品-->
-<!--                    <span class="line" v-if="currentId == '2'"></span>-->
-<!--                </li>-->
-                <li class="ClassA" @click="handle('3')" :class="[currentId == '3' ? 'active':'',currentId == '3' ? 'off':'']">
-                    其他
-                    <span class="line" v-if="currentId == '3'"></span>
-                </li>
-            </ul>
-        </template>
-        <ul class="mainTab" v-if="mainflag">
-            <li v-for="(item,index) in tabList" @click='handleChild(item)' :class="currentID2 ==index?'addstyle':' '">{{item.name}}</li>
-        </ul>
-        <div class="shopList">
-            <div class="Listitem" v-if="isShow" v-for="(item, index) in tabchildList">
-                <a class="itemImg onhref" :href="'/flea-market-'+item.productID+'.html'">
-                    <img :src="item.imageList[0]" :class="item.sold==1?'activeImg':''" class="bigImg">
-                </a>
-                <div class="ItemInfo">
-                    <div class="tag">
-                        <span class="infotag news" v-if="item.sold==0&&item.newAdded==1">最新</span>
-                        <span class="infotag brand" v-if="item.brandName!=null&&item.brandName!=''&&item.brandID!=161">{{item.brandName}}</span>
-                        <span class="infotag sold" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0">已售</span>
-                        <span class="infotag other" v-if="item.brandID==161&&item.brandName!=''&&item.brandName!=null">{{item.brandName}}</span>
-                    </div>
-                    <a class="productname" :href="'/flea-market-'+item.productID+'.html'">
-                        {{item.name}}
+            <div class="shopList">
+                <div class="Listitem" v-if="isShow" v-for="(item, index) in tabchildList">
+                    <a class="itemImg onhref" :href="'/flea-market-'+item.productID+'.html'">
+                        <img :src="item.imageList[0]" :class="item.sold==1?'activeImg':''" class="bigImg">
                     </a>
-                    <div class="targetprice">
-                        <span v-if="item.detailTalkFlag ==2 && userID==null">价格详聊</span>
-                        <span v-else-if="userID==null" class="priceparam" @click="toLogin">登录查看价格></span>
-                        <span v-else-if="userID!=null && item.detailTalkFlag==2">价格详聊</span>
-                        <span v-else>￥{{item.price1Str}}</span>
-                    </div>
-                    <div class="shijian">
-                        <div>
-                            <i class="icon mIcon  liulanliang"></i> {{item.viewingNum}}
+                    <div class="ItemInfo">
+                        <div class="tag">
+                            <span class="infotag news" v-if="item.sold==0&&item.newAdded==1">最新</span>
+                            <span class="infotag brand" v-if="item.brandName!=null&&item.brandName!=''&&item.brandID!=161">{{item.brandName}}</span>
+                            <span class="infotag sold" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0">已售</span>
+                            <span class="infotag other" v-if="item.brandID==161&&item.brandName!=''&&item.brandName!=null">{{item.brandName}}</span>
                         </div>
-                        <div>
-                            <i class="icon mIcon  shijian"></i> {{item.onLineDateStr}}
+                        <a class="productname" :href="'/flea-market-'+item.productID+'.html'">
+                            {{item.name}}
+                        </a>
+                        <div class="targetprice">
+                            <span v-if="item.detailTalkFlag ==2 && userID==null">价格详聊</span>
+                            <span v-else-if="userID==null" class="priceparam" @click="toLogin">登录查看价格></span>
+                            <span v-else-if="userID!=null && item.detailTalkFlag==2">价格详聊</span>
+                            <span v-else>￥{{item.price1Str}}</span>
+                        </div>
+                        <div class="shijian">
+                            <div>
+                                <i class="icon mIcon  liulanliang"></i> {{item.viewingNum}}
+                            </div>
+                            <div>
+                                <i class="icon mIcon  shijian"></i> {{item.onLineDateStr}}
+                            </div>
+                        </div>
+                        <div class="dizhi">
+                            <i class="icon mIcon dizhi"></i>
+                            {{item.provinceCityDistrict}}
                         </div>
                     </div>
-                    <div class="dizhi">
-                        <i class="icon mIcon dizhi"></i>
-                        {{item.provinceCityDistrict}}
+                </div>
+                <div class="no-content" v-show="showflag" :class="showflag?'show':''">
+                    <img src="/img/flea-market/nologo.png" v-if="isPC" />
+                    <img src="/img/flea-market/kong_m.png" v-else />
+                    <div class="error-message">
+                        <p>此分类下面没有商品，换其它分类瞅瞅</p>
                     </div>
                 </div>
             </div>
-            <div class="no-content" v-show="showflag" :class="showflag?'show':''">
-                <img src="/img/flea-market/nologo.png" v-if="isPC" />
-                <img src="/img/flea-market/kong_m.png" v-else />
-                <div class="error-message">
-                    <p>此分类下面没有商品，换其它分类瞅瞅</p>
-                </div>
+            <div class="fabu" v-if="!isPC">
+                 <a class="intro" href="/flea-market/intro.html">
+                     <p>二手市场介绍</p>
+                 </a>
+                 <a class="form" href="/flea-market/form.html">
+                     <p>我要发布</p>
+                 </a>
             </div>
-        </div>
-        <div class="fabu" v-if="!isPC">
-             <a class="intro" href="/flea-market/intro.html">
-<!--                 <i class="icon mIcon"></i>-->
-                 <p>二手市场介绍</p>
-             </a>
-             <a class="form" href="/flea-market/form.html">
-<!--                 <i class="icon mIcon"></i>-->
-                 <p>我要发布</p>
-             </a>
-        </div>
-        <div v-if="(!isPC) && isScroll" class="scroll-load">
-            <div class="icon-load">
-                <img src="/img/base/icon-loading.gif" alt="">
-                <span>加载中~</span>
+            <div v-if="(!isPC) && isScroll" class="scroll-load">
+                <div class="icon-load">
+                    <img src="/img/base/icon-loading.gif" alt="">
+                    <span>加载中~</span>
+                </div>
             </div>
+            <div v-if="(!isPC) && !hasNextPage" class="noMore">----  没有更多了 ----</div>
         </div>
-        <div v-if="(!isPC) && !hasNextPage" class="noMore">----  没有更多了 ----</div>
-    </div>
+    </template>
     <div class="pageWrap clear" v-if="isPC">
         <a v-if="listQuery.pageNum>1" class="prev" @click="toPagination(listQuery.pageNum*1-1)" href="javascript:void(0);"></a>
         <template v-for="n in showPageBtn">

src/main/resources/templates/index.html

@@ -152,7 +152,7 @@
                                                         </div>
                                                     </template>
                                                     <template v-else>
-                                                        <div class="price_text_tag">
+                                                        <div class="price_text_tag right-box">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
@@ -175,12 +175,12 @@
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
-                                                <div class="price_text_tag">
+                                                <div class="price_text_tag right-box">
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
                                                     <em class="price_grade"><span class="bold">￥</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>
+                                                    <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
                                             <template v-else>
@@ -249,7 +249,7 @@
                                                         </div>
                                                     </template>
                                                     <template v-else>
-                                                        <div class="price_text_tag">
+                                                        <div class="price_text_tag right-box">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
@@ -272,12 +272,12 @@
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
-                                                <div class="price_text_tag">
+                                                <div class="price_text_tag right-box">
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
                                                     <em class="price_grade"><span class="bold">￥</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>
+                                                    <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
                                             <template v-else>
@@ -346,12 +346,12 @@
                                                         </div>
                                                     </template>
                                                     <template v-else>
-                                                        <div class="price_text_tag">
+                                                        <div class="price_text_tag right-box">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
                                                             <em class="price_grade"><span class="bold">￥</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>
+                                                            <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                     </template>
                                                 </template>
@@ -369,12 +369,12 @@
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
-                                                <div class="price_text_tag">
+                                                <div class="price_text_tag right-box">
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
                                                     <em class="price_grade"><span class="bold">￥</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>
+                                                    <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
                                             <template v-else>
@@ -447,12 +447,12 @@
                                                         </div>
                                                     </template>
                                                     <template v-else>
-                                                        <div class="price_text_tag">
+                                                        <div class="price_text_tag right-box">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
                                                             <em class="price_grade"><span class="bold">￥</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>
+                                                            <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                     </template>
                                                 </template>
@@ -470,12 +470,12 @@
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
-                                                <div class="price_text_tag">
+                                                <div class="price_text_tag right-box">
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span class="bold">￥</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>
+                                                    <em class="price_grade "><span class="bold">￥</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>
@@ -540,12 +540,12 @@
                                                         </div>
                                                     </template>
                                                     <template v-else>
-                                                        <div class="price_text_tag">
+                                                        <div class="price_text_tag right-box">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
                                                             <em class="price_grade"><span class="bold">￥</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>
+                                                            <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                     </template>
                                                 </template>
@@ -563,12 +563,12 @@
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
-                                                <div class="price_text_tag">
+                                                <div class="price_text_tag right-box">
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
                                                     <em class="price_grade"><span class="bold">￥</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>
+                                                    <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
                                             <template v-else>
@@ -629,12 +629,12 @@
                                                         </div>
                                                     </template>
                                                     <template v-else>
-                                                        <div class="price_text_tag">
+                                                        <div class="price_text_tag right-box">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
                                                             <em class="price_grade"><span class="bold">￥</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>
+                                                            <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                     </template>
                                                 </template>
@@ -652,12 +652,12 @@
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
-                                                <div class="price_text_tag">
+                                                <div class="price_text_tag right-box">
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
                                                     <em class="price_grade"><span class="bold">￥</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>
+                                                    <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
                                             <template v-else>
@@ -719,12 +719,12 @@
                                                         </div>
                                                     </template>
                                                     <template v-else>
-                                                        <div class="price_text_tag">
+                                                        <div class="price_text_tag right-box">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
                                                             <em class="price_grade"><span class="bold">￥</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>
+                                                            <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                     </template>
                                                 </template>
@@ -742,12 +742,12 @@
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
-                                                <div class="price_text_tag">
+                                                <div class="price_text_tag right-box">
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
                                                     <em class="price_grade"><span class="bold">￥</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>
+                                                    <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
                                             <template v-else>
@@ -807,12 +807,12 @@
                                                                 </div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class="price_text_tag">
+                                                                <div class="price_text_tag right-box">
                                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                                 </div>
                                                                 <div class="main_price_none">
                                                                     <em class="price_grade"><span class="bold">￥</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>
+                                                                    <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                                 </div>
                                                             </template>
                                                         </template>
@@ -830,11 +830,11 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag">
+                                                        <div class="price_text_tag right-box">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
-                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                            <em class="price_grade right-box"><span class="bold">￥</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>

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

@@ -20,13 +20,13 @@
                     <div class="wrap_tittle"> 大家都在搜<span class="line"></span></div>
                     <template v-if="isPC">
                         <div class="hot-search">
-                             <a class="hot-list" v-for="(item,index) in hotlist" :href="item.link"><i class="icon mIcon"  :class="item.isHot==1?'hot':''"></i>{{item.name}}</a>
+                             <a class="hot-list" v-for="(item,index) in hotlist" :href="item.link"><i class="icon"  :class="item.isHot==1?'hot':''"></i>{{item.name}}</a>
                         </div>
                     </template>
                     <template  v-else>
                         <div class="hot-search" :style="showflag?'height:auto':''">
                            <div class="left-box">
-                               <a class="hot-list" v-for="(item,index) in hotlist"  :href="item.link"><i class="icon mIcon hot"></i>{{item.name}}</a>
+                               <a class="hot-list" v-for="(item,index) in hotlist"  :href="item.link"><i class="mIcon" :class="item.isHot==1?'hot':''"></i>{{item.name}}</a>
                            </div>
                            <div class="right-box" @click="showNav">
                               <span class="mIcon" :class="showflag?'close':'open'"></span>
@@ -58,35 +58,41 @@
                                              <div class="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.product.price1TextFlag==1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class="main_price_unde">￥价格未公开</div>
-                                                    </template>
-                                                    <template v-else>
-                                                        <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="price_text_tag">
-                                                                <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.product.promotions) ? 'none' : ''">
-                                                            ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
-                                                        </div>
-                                                        </template>
-                                                        <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                    <template v-if="pros.product.productCategory==1">
+                                                        <template v-if="pros.product.price1TextFlag==1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                             </div>
-                                                            <div class="main_price_unde">￥会员可见</div>
+                                                            <div class="main_price_unde">￥价格未公开</div>
                                                         </template>
                                                         <template v-else>
-                                                            <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <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="price_text_tag">
+                                                                    <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.product.promotions) ? 'none' : ''">
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                            </div>
+                                                            </template>
+                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class="main_price_unde">￥会员可见</div>
+                                                            </template>
+                                                            <template v-else>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            </template>
                                                         </template>
                                                     </template>
+                                                    <template v-else>
+                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
@@ -117,35 +123,41 @@
                                              <div class="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.product.price1TextFlag==1">
-                                                       <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class="main_price_unde">￥价格未公开</div>
-                                                    </template>
-                                                    <template v-else>
-                                                        <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="price_text_tag">
-                                                                <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.product.promotions) ? 'none' : ''">
-                                                            ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
-                                                        </div>
-                                                        </template>
-                                                        <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                     <template v-if="pros.product.productCategory==1">
+                                                        <template v-if="pros.product.price1TextFlag==1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                             </div>
-                                                            <div class="main_price_unde">￥会员可见</div>
+                                                            <div class="main_price_unde">￥价格未公开</div>
                                                         </template>
                                                         <template v-else>
-                                                            <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <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="price_text_tag">
+                                                                    <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.product.promotions) ? 'none' : ''">
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                            </div>
+                                                            </template>
+                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class="main_price_unde">￥会员可见</div>
+                                                            </template>
+                                                            <template v-else>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            </template>
                                                         </template>
                                                     </template>
+                                                    <template v-else>
+                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
+                                                          <div class="main_price_show"  v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
@@ -176,35 +188,41 @@
                                             <div class="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.product.price1TextFlag==1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class="main_price_unde">￥价格未公开</div>
-                                                    </template>
-                                                    <template v-else>
-                                                        <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="price_text_tag">
-                                                                <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.product.promotions) ? 'none' : ''">
-                                                            ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
-                                                        </div>
-                                                        </template>
-                                                        <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                     <template v-if="pros.product.productCategory==1">
+                                                        <template v-if="pros.product.price1TextFlag==1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                             </div>
-                                                            <div class="main_price_unde">￥会员可见</div>
+                                                            <div class="main_price_unde">￥价格未公开</div>
                                                         </template>
                                                         <template v-else>
-                                                            <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <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="price_text_tag">
+                                                                    <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.product.promotions) ? 'none' : ''">
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                            </div>
+                                                            </template>
+                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class="main_price_unde">￥会员可见</div>
+                                                            </template>
+                                                            <template v-else>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            </template>
                                                         </template>
                                                     </template>
+                                                    <template v-else>
+                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
@@ -236,35 +254,41 @@
                                             <div class="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.product.price1TextFlag==1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class="main_price_unde">￥价格未公开</div>
-                                                    </template>
-                                                    <template v-else>
-                                                        <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)">
+                                                     <template v-if="pros.product.productCategory==1">
+                                                        <template v-if="pros.product.price1TextFlag==1">
                                                             <div class="price_text_tag">
-                                                                <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.product.promotions) ? 'none' : ''">
-                                                            ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
-                                                        </div>
-                                                        </template>
-                                                        <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
-                                                           <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                             </div>
-                                                            <div class="main_price_unde">￥会员可见</div>
+                                                            <div class="main_price_unde">￥价格未公开</div>
                                                         </template>
                                                         <template v-else>
-                                                            <em>￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <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="price_text_tag">
+                                                                    <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.product.promotions) ? 'none' : ''">
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                            </div>
+                                                            </template>
+                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class="main_price_unde">￥会员可见</div>
+                                                            </template>
+                                                            <template v-else>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            </template>
                                                         </template>
                                                     </template>
+                                                    <template v-else>
+                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
@@ -294,35 +318,41 @@
                                             <div class="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.product.price1TextFlag==1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class="main_price_unde">￥价格未公开</div>
-                                                    </template>
-                                                    <template v-else>
-                                                        <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="price_text_tag">
-                                                                <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.product.promotions) ? 'none' : ''">
-                                                            ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
-                                                        </div>
-                                                        </template>
-                                                        <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                     <template v-if="pros.product.productCategory==1">
+                                                        <template v-if="pros.product.price1TextFlag==1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                             </div>
-                                                            <div class="main_price_unde">￥会员可见</div>
+                                                            <div class="main_price_unde">￥价格未公开</div>
                                                         </template>
                                                         <template v-else>
-                                                            <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <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="price_text_tag">
+                                                                    <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.product.promotions) ? 'none' : ''">
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                            </div>
+                                                            </template>
+                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class="main_price_unde">￥会员可见</div>
+                                                            </template>
+                                                            <template v-else>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            </template>
                                                         </template>
                                                     </template>
+                                                    <template v-else>
+                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
@@ -351,35 +381,41 @@
                                             <div class="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.product.price1TextFlag==1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class="main_price_unde">￥价格未公开</div>
-                                                    </template>
-                                                    <template v-else>
-                                                        <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)">
+                                                     <template v-if="pros.product.productCategory==1">
+                                                        <template v-if="pros.product.price1TextFlag==1">
                                                             <div class="price_text_tag">
-                                                                <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.product.promotions) ? 'none' : ''">
-                                                            ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
-                                                        </div>
-                                                        </template>
-                                                        <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
-                                                            <div class="price_text_tag">
-                                                                <p class="listTag " v-if="pros.product.actStatus==1">{{pros.product.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 class="main_price_unde">￥价格未公开</div>
                                                         </template>
                                                         <template v-else>
-                                                            <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <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="price_text_tag">
+                                                                    <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.product.promotions) ? 'none' : ''">
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                            </div>
+                                                            </template>
+                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class="main_price_unde">￥会员可见</div>
+                                                            </template>
+                                                            <template v-else>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            </template>
                                                         </template>
                                                     </template>
+                                                    <template v-else>
+                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
@@ -409,35 +445,41 @@
                                             <div class="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.product.price1TextFlag==1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class="main_price_unde">￥价格未公开</div>
-                                                    </template>
-                                                    <template v-else>
-                                                        <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="price_text_tag">
-                                                                <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.product.promotions) ? 'none' : ''">
-                                                            ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
-                                                        </div>
-                                                        </template>
-                                                        <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                     <template v-if="pros.product.productCategory==1">
+                                                        <template v-if="pros.product.price1TextFlag==1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                             </div>
-                                                            <div class="main_price_unde">￥会员可见</div>
+                                                            <div class="main_price_unde">￥价格未公开</div>
                                                         </template>
                                                         <template v-else>
-                                                            <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <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="price_text_tag">
+                                                                    <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.product.promotions) ? 'none' : ''">
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                            </div>
+                                                            </template>
+                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class="main_price_unde">￥会员可见</div>
+                                                            </template>
+                                                            <template v-else>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            </template>
                                                         </template>
                                                     </template>
+                                                    <template v-else>
+                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
@@ -466,35 +508,41 @@
                                             <div class="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.product.price1TextFlag==1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag " v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class="main_price_unde">￥价格未公开</div>
-                                                    </template>
-                                                    <template v-else>
-                                                        <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="price_text_tag">
-                                                                <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.product.promotions) ? 'none' : ''">
-                                                            ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
-                                                        </div>
-                                                        </template>
-                                                        <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                     <template v-if="pros.product.productCategory==1">
+                                                        <template v-if="pros.product.price1TextFlag==1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                             </div>
-                                                            <div class="main_price_unde">￥会员可见</div>
+                                                            <div class="main_price_unde">￥价格未公开</div>
                                                         </template>
                                                         <template v-else>
-                                                            <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
-                                                            <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            <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="price_text_tag">
+                                                                    <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.product.promotions) ? 'none' : ''">
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                            </div>
+                                                            </template>
+                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                <div class="price_text_tag">
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                </div>
+                                                                <div class="main_price_unde">￥会员可见</div>
+                                                            </template>
+                                                            <template v-else>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
+                                                            </template>
                                                         </template>
                                                     </template>
+                                                    <template v-else>
+                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">