commit - m首页优化

src/main/resources/static/js/center.js

@@ -2,13 +2,16 @@ $(function(){
     jqMultipleShow("click", ".navList", ".tab", ".con");
     //GLOBAL_USER_IDENTITY: 2-会员机构；3-供应商；4-普通机构
     var pageFlag = window.location.pathname.split("/")[1];
-    if (pageFlag == "supplier" && (GLOBAL_USER_IDENTITY===2 || GLOBAL_USER_IDENTITY===4)) {
-        window.location.href = "/user/dashboard.html";
-    }else if (pageFlag == "user" && (GLOBAL_USER_IDENTITY === 1 || GLOBAL_USER_IDENTITY===3)) {
-        window.location.href = "/supplier/dashboard.html";
-    }else{
-        window.location.href = "/index.html";
-    }
+    // if (GLOBAL_USER_IDENTITY===2 || GLOBAL_USER_IDENTITY===4 ) {
+    //     console.log('跳机构个人中心=======>',GLOBAL_USER_IDENTITY);
+    //     window.location.href = "/user/dashboard.html";
+    // }else if (GLOBAL_USER_IDENTITY === 1 || GLOBAL_USER_IDENTITY===3) {
+    //     console.log('跳供应商个人中心=======>',GLOBAL_USER_IDENTITY);
+    //     window.location.href = "/supplier/dashboard.html";
+    // }else{
+    //     console.log('跳供应商个人中心=======>',GLOBAL_USER_IDENTITY);
+    //     window.location.href = "/index.html";
+    // }
 });
 
 

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

@@ -125,7 +125,7 @@ var homeData = new Vue({
         },
         GetHomeRightData: function(){
             var _self = this;
-            PublicApi.GetHomeRightData({ soure: 1 },function(response){
+            PublicApi.GetHomeRightData({ source: 1 },function(response){
                 if(response.code == 0){
                     var data = response.data;
                     _self.liveList = data.liveList;

src/main/resources/templates/index.html

@@ -70,7 +70,7 @@
                             </div>
                             <div class="right_item_main" v-for="(cmImage,index) in cmImageList">
                                 <a :href="cmImage.link" class="item_banner" v-if="index === 0" target="_blank" :title="cmImage.title">
-                                    <img :src="cmImage.image ? cmImage.image : '/img/base/placeholder.png'" alt="">
+                                    <img :src="cmImage.homePageImage ? cmImage.homePageImage : '/img/base/placeholder.png'" alt="">
                                     <div class="name" v-text="cmImage.title"></div>
                                 </a>
                                 <a :href="cmImage.link" class="item_text" v-if="index > 0" target="_blank" :title="cmImage.title">
@@ -86,7 +86,7 @@
                             </div>
                             <div class="right_item_main" v-for="(info,index) in infoList">
                                 <a :href="info.link" class="item_banner" v-if="index === 0" target="_blank" :title="info.title">
-                                    <img :src="info.guidanceImage ? info.guidanceImage : '/img/base/placeholder.png'" alt="">
+                                    <img :src="info.homePageImage ? info.homePageImage : '/img/base/placeholder.png'" alt="">
                                     <div class="name" v-text="info.title"></div>
                                 </a>
                                 <a :href="info.link" class="item_text" v-if="index > 0" target="_blank" :title="info.title">
@@ -115,50 +115,63 @@
                                     <div class="page_main_text">{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                            <!--正常商品, 二手商品-->
                                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                            <template v-if="pros.product.price1TextFlag==1">
-                                                <!--价格未公开-->
-                                                <div class="main_price_text">
-                                                    <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>
-                                            </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="main_price_text">
                                                         <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  }}
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
+                                                        <div class="main_price_unde">￥价格未公开</div>
                                                     </div>
                                                 </template>
-                                                <!--仅会员机构可见-->
-                                                <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
-                                                    <div class="main_price_text">
+                                                <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="main_price_text" v-if="pros.product.productCategory == 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>
+                                                        </div>
+                                                    </template>
+                                                    <!--仅会员机构可见-->
+                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                        <div class="main_price_text">
+                                                            <div class="price_text_tag">
+                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                            </div>
+                                                            <div class="main_price_unde">￥会员可见</div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
                                                         <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>
-                                                </template>
-                                                <template v-else>
-                                                    <div class="price_text_tag">
-                                                        <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>
-                                                    </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>
+                                                        </div>
+                                                    </template>
                                                 </template>
                                             </template>
+                                            <template v-else>
+                                                <div class="main_price_text" v-if="pros.product.detailTalkFlag == '2'">
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥价格祥聊</div>
+                                                </div>
+                                                <div class="main_price_text" v-else>
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                </div>
+                                            </template>
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
@@ -199,50 +212,63 @@
                                     <div class="page_main_text">{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                            <!--正常商品, 二手商品-->
                                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                            <template v-if="pros.product.price1TextFlag==1">
-                                                <!--价格未公开-->
-                                                <div class="main_price_text">
-                                                    <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>
-                                            </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="main_price_text">
                                                         <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  }}
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
+                                                        <div class="main_price_unde">￥价格未公开</div>
                                                     </div>
                                                 </template>
-                                                <!--仅会员机构可见-->
-                                                <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
-                                                    <div class="main_price_text">
+                                                <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="main_price_text" v-if="pros.product.productCategory == 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>
+                                                        </div>
+                                                    </template>
+                                                    <!--仅会员机构可见-->
+                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                        <div class="main_price_text">
+                                                            <div class="price_text_tag">
+                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                            </div>
+                                                            <div class="main_price_unde">￥会员可见</div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
                                                         <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>
-                                                </template>
-                                                <template v-else>
-                                                    <div class="price_text_tag">
-                                                        <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>
-                                                    </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>
+                                                        </div>
+                                                    </template>
                                                 </template>
                                             </template>
+                                            <template v-else>
+                                                <div class="main_price_text" v-if="pros.product.detailTalkFlag == '2'">
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥价格祥聊</div>
+                                                </div>
+                                                <div class="main_price_text" v-else>
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                </div>
+                                            </template>
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
@@ -283,50 +309,63 @@
                                     <div class="page_main_text">{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                            <!--正常商品, 二手商品-->
                                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                            <template v-if="pros.product.price1TextFlag==1">
-                                                <!--价格未公开-->
-                                                <div class="main_price_text">
-                                                    <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>
-                                            </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="main_price_text">
                                                         <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  }}
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
+                                                        <div class="main_price_unde">￥价格未公开</div>
                                                     </div>
                                                 </template>
-                                                <!--仅会员机构可见-->
-                                                <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
-                                                    <div class="main_price_text">
+                                                <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="main_price_text" v-if="pros.product.productCategory == 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>
+                                                        </div>
+                                                    </template>
+                                                    <!--仅会员机构可见-->
+                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                        <div class="main_price_text">
+                                                            <div class="price_text_tag">
+                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                            </div>
+                                                            <div class="main_price_unde">￥会员可见</div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
                                                         <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>
-                                                </template>
-                                                <template v-else>
-                                                    <div class="price_text_tag">
-                                                        <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>
-                                                    </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>
+                                                        </div>
+                                                    </template>
                                                 </template>
                                             </template>
+                                            <template v-else>
+                                                <div class="main_price_text" v-if="pros.product.detailTalkFlag == '2'">
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥价格祥聊</div>
+                                                </div>
+                                                <div class="main_price_text" v-else>
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                </div>
+                                            </template>
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
@@ -371,50 +410,63 @@
                                     <div class="page_main_text">{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                            <!--正常商品, 二手商品-->
                                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                            <template v-if="pros.product.price1TextFlag==1">
-                                                <!--价格未公开-->
-                                                <div class="main_price_text">
-                                                    <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>
-                                            </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="main_price_text">
                                                         <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  }}
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
+                                                        <div class="main_price_unde">￥价格未公开</div>
                                                     </div>
                                                 </template>
-                                                <!--仅会员机构可见-->
-                                                <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
-                                                    <div class="main_price_text">
+                                                <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="main_price_text" v-if="pros.product.productCategory == 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>
+                                                        </div>
+                                                    </template>
+                                                    <!--仅会员机构可见-->
+                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                        <div class="main_price_text">
+                                                            <div class="price_text_tag">
+                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                            </div>
+                                                            <div class="main_price_unde">￥会员可见</div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
                                                         <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>
-                                                </template>
-                                                <template v-else>
-                                                    <div class="price_text_tag">
-                                                        <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>
-                                                    </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>
+                                                        </div>
+                                                    </template>
                                                 </template>
                                             </template>
+                                            <template v-else>
+                                                <div class="main_price_text" v-if="pros.product.detailTalkFlag == '2'">
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥价格祥聊</div>
+                                                </div>
+                                                <div class="main_price_text" v-else>
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                </div>
+                                            </template>
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
@@ -451,50 +503,63 @@
                                     <div class="page_main_text">{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                            <!--正常商品, 二手商品-->
                                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                            <template v-if="pros.product.price1TextFlag==1">
-                                                <!--价格未公开-->
-                                                <div class="main_price_text">
-                                                    <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>
-                                            </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="main_price_text">
                                                         <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  }}
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
+                                                        <div class="main_price_unde">￥价格未公开</div>
                                                     </div>
                                                 </template>
-                                                <!--仅会员机构可见-->
-                                                <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
-                                                    <div class="main_price_text">
+                                                <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="main_price_text" v-if="pros.product.productCategory == 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>
+                                                        </div>
+                                                    </template>
+                                                    <!--仅会员机构可见-->
+                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                        <div class="main_price_text">
+                                                            <div class="price_text_tag">
+                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                            </div>
+                                                            <div class="main_price_unde">￥会员可见</div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
                                                         <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>
-                                                </template>
-                                                <template v-else>
-                                                    <div class="price_text_tag">
-                                                        <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>
-                                                    </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>
+                                                        </div>
+                                                    </template>
                                                 </template>
                                             </template>
+                                            <template v-else>
+                                                <div class="main_price_text" v-if="pros.product.detailTalkFlag == '2'">
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥价格祥聊</div>
+                                                </div>
+                                                <div class="main_price_text" v-else>
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                </div>
+                                            </template>
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
@@ -527,50 +592,63 @@
                                     <div class="page_main_text">{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                            <!--正常商品, 二手商品-->
                                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                            <template v-if="pros.product.price1TextFlag==1">
-                                                <!--价格未公开-->
-                                                <div class="main_price_text">
-                                                    <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>
-                                            </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="main_price_text">
                                                         <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  }}
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
+                                                        <div class="main_price_unde">￥价格未公开</div>
                                                     </div>
                                                 </template>
-                                                <!--仅会员机构可见-->
-                                                <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
-                                                    <div class="main_price_text">
+                                                <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="main_price_text" v-if="pros.product.productCategory == 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>
+                                                        </div>
+                                                    </template>
+                                                    <!--仅会员机构可见-->
+                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                        <div class="main_price_text">
+                                                            <div class="price_text_tag">
+                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                            </div>
+                                                            <div class="main_price_unde">￥会员可见</div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
                                                         <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>
-                                                </template>
-                                                <template v-else>
-                                                    <div class="price_text_tag">
-                                                        <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>
-                                                    </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>
+                                                        </div>
+                                                    </template>
                                                 </template>
                                             </template>
+                                            <template v-else>
+                                                <div class="main_price_text" v-if="pros.product.detailTalkFlag == '2'">
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥价格祥聊</div>
+                                                </div>
+                                                <div class="main_price_text" v-else>
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                </div>
+                                            </template>
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
@@ -604,50 +682,63 @@
                                     <div class="page_main_text">{{ pros.name }}</div>
                                     <div class="page_main_price" v-if="pros.listType == 1">
                                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                            <!--正常商品, 二手商品-->
                                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                            <template v-if="pros.product.price1TextFlag==1">
-                                                <!--价格未公开-->
-                                                <div class="main_price_text">
-                                                    <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>
-                                            </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="main_price_text">
                                                         <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  }}
+                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
+                                                        <div class="main_price_unde">￥价格未公开</div>
                                                     </div>
                                                 </template>
-                                                <!--仅会员机构可见-->
-                                                <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
-                                                    <div class="main_price_text">
+                                                <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="main_price_text" v-if="pros.product.productCategory == 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>
+                                                        </div>
+                                                    </template>
+                                                    <!--仅会员机构可见-->
+                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                        <div class="main_price_text">
+                                                            <div class="price_text_tag">
+                                                                <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                            </div>
+                                                            <div class="main_price_unde">￥会员可见</div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
                                                         <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>
-                                                </template>
-                                                <template v-else>
-                                                    <div class="price_text_tag">
-                                                        <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>
-                                                    </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>
+                                                        </div>
+                                                    </template>
                                                 </template>
                                             </template>
+                                            <template v-else>
+                                                <div class="main_price_text" v-if="pros.product.detailTalkFlag == '2'">
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥价格祥聊</div>
+                                                </div>
+                                                <div class="main_price_text" v-else>
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                </div>
+                                            </template>
                                         </template>
                                         <template v-else>
                                             <template v-if="pros.product.productCategory == 1">
@@ -679,41 +770,63 @@
                                             <div class="page_main_text" target="_blank">{{pros.name}}</div>
                                             <div class="page_main_price" v-if="pros.listType == 1">
                                                 <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                                    <!--正常商品, 二手商品-->
                                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
-                                                    <template v-if="pros.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  }}
+                                                    <template v-if="pros.product.productCategory==1">
+                                                        <template v-if="pros.product.price1TextFlag==1">
+                                                            <!--价格未公开-->
+                                                            <div class="main_price_text">
+                                                                <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>
                                                         </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>
-                                                            <div class="price_text_tag">
-                                                                <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>
-                                                            </div>
+                                                            <!--可见价格-->
+                                                            <template v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                                                                <div class="main_price_text" v-if="pros.product.productCategory == 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>
+                                                                </div>
+                                                            </template>
+                                                            <!--仅会员机构可见-->
+                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                <div class="main_price_text">
+                                                                    <div class="price_text_tag">
+                                                                        <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                    </div>
+                                                                    <div class="main_price_unde">￥会员可见</div>
+                                                                </div>
+                                                            </template>
+                                                            <template v-else>
+                                                                <div class="price_text_tag">
+                                                                    <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>
+                                                                </div>
+                                                            </template>
                                                         </template>
                                                     </template>
+                                                    <template v-else>
+                                                        <div class="main_price_text" v-if="pros.product.detailTalkFlag == '2'">
+                                                            <div class="price_text_tag"></div>
+                                                            <div class="main_price_show">￥价格祥聊</div>
+                                                        </div>
+                                                        <div class="main_price_text" v-else>
+                                                            <div class="price_text_tag"></div>
+                                                            <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                        </div>
+                                                    </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">