价格

src/main/resources/templates/index.html

@@ -75,11 +75,11 @@
                                             </div>
                                         </template>
                                         <template v-else>
-                                            <template v-if="p.priceFlag==0 && p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                            <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
                                                 <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                                 <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                             </template>
-                                            <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
+                                            <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                                 <em>￥会员可见</em>
                                                 <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                                 <div class="btnBox">

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

@@ -54,8 +54,8 @@
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                             <em v-if="priceObj.priceFlag==1">￥价格未公开</em>
-                            <em v-else-if="priceObj.priceFlag==2 && priceObj.userIdentity!=2">￥会员可见</em>
-                            <template v-else-if="priceObj.priceFlag==0 || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID)">
+                            <em v-else-if="priceObj.priceFlag==2 && priceObj.userIdentity==4">￥会员可见</em>
+                            <template v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID)">
                                 <em v-if="priceObj.actStatus==1 && promotions && promotions.type==1 && promotions.mode==1" class="p">
                                     <del v-text="'￥'+parseFloat(priceObj.originalPrice).toFixed(2)"></del>
                                 </em>
@@ -65,13 +65,13 @@
                         </template>
                         <em v-else>￥<i th:attr="class=${'icon mIcon i'+product.priceGrade}"></i></em>
                     </div>
-                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.normalPrice>0 && (priceObj.priceFlag==0 || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID))">
+                    <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.normalPrice>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID))">
                         <div class="row"> <span class="l">市场价</span><i>：</i>
                              <em><del>￥{{priceObj.normalPrice.toFixed(2)}}</del></em>
                         </div>
                     </template>
                     <div class="row" v-if="priceObj.actStatus==1||priceObj.ladderPriceFlag==1" ><span class="l">促销</span><i>：</i>
-                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && (priceObj.priceFlag==0 || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID))">
+                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.supplierId==GLOBAL_SHOP_ID))">
                             <!-- 阶梯价 -->
                             <div v-if="priceObj.ladderPriceFlag==1" class="priceTag">
                                 <i class="tag icon mIcon" @click="toggleThisLadder($event)">阶梯价格</i>

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

@@ -118,11 +118,11 @@
                                 </div>
                             </template>
                             <template v-else>
-                                <template v-if="p.priceFlag==0 && p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
                                     <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                     <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                 </template>
-                                <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
+                                <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                     <em>￥会员可见</em>
                                     <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                     <div class="btnBox">

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

@@ -52,11 +52,11 @@
                                 </div>
                             </template>
                             <template v-else>
-                                <template v-if="p.priceFlag==0 || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
                                     <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                     <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                 </template>
-                                <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
+                                <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                     <em>￥会员可见</em>
                                     <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                     <div class="btnBox">

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

@@ -66,11 +66,11 @@
                                             </div>
                                         </template>
                                         <template v-else>
-                                            <template v-if="p.priceFlag==0 || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                            <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
                                                 <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                                 <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                             </template>
-                                            <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
+                                            <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                                 <em>￥会员可见</em>
                                                 <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                                 <div class="btnBox">
@@ -116,13 +116,13 @@
                                             </div>
                                         </template>
                                         <template v-else>
-                                            <template v-if="p.priceFlag==0 || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
-                                                <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)" ></em>
+                                            <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.supplierId==GLOBAL_SHOP_ID)">
+                                                <em class="p" v-text="'￥'+parseFloat(p.price).toFixed(2)"></em>
                                                 <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                             </template>
-                                            <template v-else-if="p.priceFlag==2 && p.userIdentity!=2">
+                                            <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                                 <em>￥会员可见</em>
-                                                <span class="listTag" v-if="p.actStatus==1" >{{p.promotions.name}}</span>
+                                                <span class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</span>
                                                 <div class="btnBox">
                                                     <a href="/upgrade.html" class="btn">升级会员查看价格</a>
                                                 </div>