commit-m 商品列表优化价格显示

components/cm-module/listTemplate/classifyProductList.vue

@@ -10,15 +10,28 @@
 					<text class="list-details-specs">规格：{{item.unit}}</text>
 					<view class="list-details-specs" v-if="item.productCode!=''&&item.productCode!=null">商品编码：{{item.productCode}}</view>
 					<view class="list-details-price">
-						<view class="floor-item-act" v-if="item.actStatus==1">
-							<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-								{{item.promotions.name}}<text v-if="hasLogin && item.price1TextFlag != '1'">:￥{{ item.price | NumFormat }}</text>
+						<template v-if="userIdentity == 3">
+							<view class="floor-item-act" v-if="item.actStatus==1">
+								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+									{{item.promotions.name}}<text v-if="item.price1TextFlag != '1' && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
+								</view>
+								<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 							</view>
-							<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-						</view>
-						<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-							<view class="floor-tags">阶梯价格</view>	
-						</view>
+							<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
+								<view class="floor-tags">阶梯价格</view>	
+							</view>
+						</template>
+						<template v-else>
+							<view class="floor-item-act" v-if="item.actStatus==1">
+								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+									{{item.promotions.name}}<text v-if="hasLogin && item.price1TextFlag != '1'">:￥{{ item.price | NumFormat }}</text>
+								</view>
+								<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+							</view>
+							<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
+								<view class="floor-tags">阶梯价格</view>	
+							</view>
+						</template>
 						<view v-if="hasLogin" class="list-price">
 							<view v-if="userIdentity == 1">
 								<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">

components/cm-module/listTemplate/commodityList.vue

@@ -10,15 +10,28 @@
 					<text class="list-details-specs">规格：{{item.p_unit}}</text>
 					<view class="list-details-specs" v-if="item.p_code!=''&&item.p_code!=null">商品编码：{{item.p_code}}</view>
 					<view class="list-details-price">
-						<view class="floor-item-act" v-if="item.actStatus==1">
-							<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-								{{item.promotions.name}}<text v-if="hasLogin && item.p_price_flag != '1'">:￥{{ item.price | NumFormat }}</text>
+						<template v-if="userIdentity == 3">
+							<view class="floor-item-act" v-if="item.actStatus==1">
+								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+									{{item.promotions.name}}<text v-if="item.p_price_flag != '1' && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
+								</view>
+								<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 							</view>
-							<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-						</view>
-						<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-							<view class="floor-tags">阶梯价格</view>	
-						</view>
+							<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
+								<view class="floor-tags">阶梯价格</view>	
+							</view>
+						</template>
+						<template v-else>
+							<view class="floor-item-act" v-if="item.actStatus==1">
+								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+									{{item.promotions.name}}<text v-if="hasLogin && item.p_price_flag != '1'">:￥{{ item.price | NumFormat }}</text>
+								</view>
+								<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+							</view>
+							<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
+								<view class="floor-tags">阶梯价格</view>	
+							</view>
+						</template>
 						<view v-if="hasLogin" class="list-price">
 							<template v-if="userIdentity == 1">
 								<text v-if="priceLoading" class="price-larger small">正在获取价格...</text>
@@ -146,7 +159,7 @@
 			this.$api.getComStorage('userInfo').then((resolve) =>{
 				this.clubStatus = resolve.clubStatus
 				this.userID = resolve.userID ? resolve.userID : 0;
-				this.shopId = resolve.shopId ? resolve.shopId : 0;
+				this.shopId = resolve.shopID ? resolve.shopID : 0;
 				this.userIdentity = resolve.userIdentity
 				if(this.userIdentity == 1){
 					this.identity = 1
@@ -339,9 +352,6 @@
 		width: 100%;
 		height: 54rpx;
 		line-height: 54rpx;
-		position: absolute;
-		bottom: -10rpx;
-		right: 0;
 		.floor-item-act{
 			height: 54rpx;
 			text-align: center;

pages/search/search.vue

@@ -41,15 +41,28 @@
 							<view>商品编码：{{item.p_code}}</view>
 						</view>
 						<view class="list-details-price">
-							<view class="floor-item-act" v-if="item.actStatus==1">
-								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-									{{item.promotions.name}}<text v-if="hasLogin && item.p_price_flag != '1'">:￥{{ item.price | NumFormat }}</text>
+							<template v-if="userIdentity == 3">
+								<view class="floor-item-act" v-if="item.actStatus==1">
+									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+										{{item.promotions.name}}<text v-if="item.p_price_flag != '1' && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
+									</view>
+									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 								</view>
-								<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
-							</view>
-							<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
-								<view class="floor-tags">阶梯价格</view>	
-							</view>
+								<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
+									<view class="floor-tags">阶梯价格</view>	
+								</view>
+							</template>
+							<template v-else>
+								<view class="floor-item-act" v-if="item.actStatus==1">
+									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
+										{{item.promotions.name}}<text v-if="hasLogin && item.p_price_flag != '1'">:￥{{ item.price | NumFormat }}</text>
+									</view>
+									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+								</view>
+								<view class="floor-item-act" v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
+									<view class="floor-tags">阶梯价格</view>	
+								</view>
+							</template>
 							<view v-if="hasLogin"class="list-price">
 								<template v-if="userIdentity == 1">
 									<text v-if="priceLoading" class="price-larger small">正在获取价格...</text>