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

src/main/resources/templates/index.html

@@ -81,17 +81,20 @@
                                             </template>
                                             <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
                                                 <em>￥会员可见</em>
+                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                                 <div class="btnBox">
                                                     <a href="/upgrade.html" class="btn">升级会员查看价格</a>
                                                 </div>
                                             </template>
                                             <template v-else>
                                                 <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                             </template>
                                         </template>
                                     </template>
                                     <template v-else>
                                         <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                        <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                         <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">登录查看价格</a></div>
                                     </template>
                                 </div>

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

@@ -85,12 +85,12 @@
                             </div>
                             <!-- 促销活动 -->
                             <div v-if="priceObj.actStatus==1 && promotions" class="priceTag">
-                                <i v-if="promotions.type==1 && promotions.mode==1" @click="toggleThisLadder($event)" class="tag icon mIcon" v-text="promotions.name+'：¥'+toFloat(promotions.touchPrice)"></i>
-                                <i v-else class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="promotions?promotions.name:''"></i>
+                                <i v-if="promotions.type==1 && promotions.mode==1 &&priceObj.priceFlag!=1" @click="toggleThisLadder($event)" class="tag icon mIcon" v-text="promotions.name+'：¥'+toFloat(promotions.touchPrice)"></i>
+                                <i v-else class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="promotions.name"></i>
                                 <div class="promotion mFixed">
                                     <div>
                                         <p class="t">
-                                            <em v-if="promotions.type==1 && promotions.mode==1">{{promotions.name+'：¥'+toFloat(promotions.touchPrice)}}</em>
+                                            <em v-if="promotions.type==1 && promotions.mode==1">{{priceObj.priceFlag==1?'价格未公开':(promotions.name+'：¥'+toFloat(promotions.touchPrice))}}</em>
                                             <em v-if="promotions.mode==2">{{promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 减 ¥'+toFloat(promotions.reducedPrice)}}</em>
                                             <em v-if="promotions.mode==3">{{promotions.name+'，满 ¥'+toFloat(promotions.touchPrice)+' 赠送商品'}}</em>
                                         </p>

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

@@ -124,17 +124,20 @@
                                 </template>
                                 <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
                                     <em>￥会员可见</em>
+                                    <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                     <div class="btnBox">
                                         <a href="/upgrade.html" class="btn">升级会员查看价格</a>
                                     </div>
                                 </template>
                                 <template v-else>
                                     <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                    <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                 </template>
                             </template>
                         </template>
                         <template v-else>
                             <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                            <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                             <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">登录查看价格</a></div>
                         </template>
                     </div>

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

@@ -58,17 +58,20 @@
                                 </template>
                                 <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
                                     <em>￥会员可见</em>
+                                    <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                     <div class="btnBox">
                                         <a href="/upgrade.html" class="btn">升级会员查看价格</a>
                                     </div>
                                 </template>
                                 <template v-else>
                                     <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                    <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                 </template>
                             </template>
                         </template>
                         <template v-else>
                             <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                            <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                             <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">登录查看价格</a></div>
                         </template>
                     </div>

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

@@ -72,17 +72,20 @@
                                             </template>
                                             <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
                                                 <em>￥会员可见</em>
+                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                                 <div class="btnBox">
                                                     <a href="/upgrade.html" class="btn">升级会员查看价格</a>
                                                 </div>
                                             </template>
                                             <template v-else>
                                                 <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                             </template>
                                         </template>
                                     </template>
                                     <template v-else>
                                         <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                        <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                         <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">登录查看价格</a></div>
                                     </template>
                                 </div>
@@ -119,17 +122,20 @@
                                             </template>
                                             <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
                                                 <em>￥会员可见</em>
+                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                                 <div class="btnBox">
                                                     <a href="/upgrade.html" class="btn">升级会员查看价格</a>
                                                 </div>
                                             </template>
                                             <template v-else>
                                                 <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                             </template>
                                         </template>
                                     </template>
                                     <template v-else>
                                         <em>￥<i :class="'icon mIcon i'+p.priceGrade"></i></em>
+                                        <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                         <div class="btnBox"><a href="javascript:void(0)" class="btn add toLogin">登录查看价格</a></div>
                                     </template>
                                 </div>