commit -m 楼层模板修改

components/cm-module/pageFloorTemplate/templateA.vue

@@ -28,7 +28,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1 && item.product.shopID == shopId">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1 && item.product.shopID == shopId">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -40,7 +40,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -53,42 +53,42 @@
 						<template v-if="item.product.productCategory == 1">
 							<template v-if="userIdentity == 3">
 								<template v-if="item.product.shopID == shopId">
-									<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+									<view class="title-none" v-if="item.product.priceFlag === 1">
 										<text class="p big">￥未公开价格</text>
 									</view>
 									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 									</view>
 								</template>	
 								<template v-else>
 									<view class="no-price">
 										<view class="p-stars">
 											<text class="p-no">￥</text>
-											<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+											<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 										</view>
 									</view>	
 								</template>
 							</template>
 							<template v-else-if="userIdentity ===4">
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
-								<view class="title-none"  v-if="item.product.price1TextFlag === '2'">
+								<view class="title-none"  v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
-								<view class="price tui-skeleton-rect" v-if="item.product.price1TextFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
+								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 							<template v-else>
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
 								<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 						</template>	
@@ -99,7 +99,7 @@
 							</view>
 							<view class="price tui-skeleton-rect" v-else>
 								<text class="p sm">￥</text>
-								<text class="p big">{{ item.product.retailPrice | NumFormat }}</text>
+								<text class="p big">{{ item.product.price | NumFormat }}</text>
 							</view>
 						</template>
 					</view>
@@ -107,7 +107,7 @@
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
-								<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+								<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 							</view>
 						</template>
 						<template v-else>

components/cm-module/pageFloorTemplate/templateB.vue

@@ -40,7 +40,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1 && item.product.shopID == shopId">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1 && item.product.shopID == shopId">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -52,7 +52,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -65,42 +65,42 @@
 						<template v-if="item.product.productCategory == 1">
 							<template v-if="userIdentity == 3">
 								<template v-if="item.product.shopID == shopId">
-									<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+									<view class="title-none" v-if="item.product.priceFlag === 1">
 										<text class="p big">￥未公开价格</text>
 									</view>
 									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 									</view>
 								</template>	
 								<template v-else>
 									<view class="no-price">
 										<view class="p-stars">
 											<text class="p-no">￥</text>
-											<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+											<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 										</view>
 									</view>	
 								</template>
 							</template>
 							<template v-else-if="userIdentity ===4">
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
-								<view class="title-none"  v-if="item.product.price1TextFlag === '2'">
+								<view class="title-none"  v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
-								<view class="price tui-skeleton-rect" v-if="item.product.price1TextFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
+								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === 0" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 							<template v-else>
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
 								<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 						</template>	
@@ -111,7 +111,7 @@
 							</view>
 							<view class="price tui-skeleton-rect" v-else>
 								<text class="p sm">￥</text>
-								<text class="p big">{{ item.product.retailPrice | NumFormat }}</text>
+								<text class="p big">{{ item.product.price | NumFormat }}</text>
 							</view>
 						</template>
 					</view>
@@ -119,7 +119,7 @@
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
-								<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+								<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 							</view>
 						</template>
 						<template v-else>

components/cm-module/pageFloorTemplate/templateC.vue

@@ -40,7 +40,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1 && item.product.shopID == shopId">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1 && item.product.shopID == shopId">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -52,7 +52,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -65,42 +65,42 @@
 						<template v-if="item.product.productCategory == 1">
 							<template v-if="userIdentity == 3">
 								<template v-if="item.product.shopID == shopId">
-									<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+									<view class="title-none" v-if="item.product.priceFlag === 1">
 										<text class="p big">￥未公开价格</text>
 									</view>
 									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 									</view>
 								</template>	
 								<template v-else>
 									<view class="no-price">
 										<view class="p-stars">
 											<text class="p-no">￥</text>
-											<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+											<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 										</view>
 									</view>	
 								</template>
 							</template>
 							<template v-else-if="userIdentity ===4">
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
-								<view class="title-none"  v-if="item.product.price1TextFlag === '2'">
+								<view class="title-none"  v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
-								<view class="price tui-skeleton-rect" v-if="item.product.price1TextFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
+								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 							<template v-else>
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
 								<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 						</template>	
@@ -111,7 +111,7 @@
 							</view>
 							<view class="price tui-skeleton-rect" v-else>
 								<text class="p sm">￥</text>
-								<text class="p big">{{ item.product.retailPrice | NumFormat }}</text>
+								<text class="p big">{{ item.product.price | NumFormat }}</text>
 							</view>
 						</template>
 					</view>
@@ -119,7 +119,7 @@
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
-								<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+								<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 							</view>
 						</template>
 						<template v-else>

components/cm-module/pageFloorTemplate/templateD.vue

@@ -52,7 +52,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1 && item.product.shopID == shopId">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1 && item.product.shopID == shopId">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -64,7 +64,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -77,42 +77,42 @@
 						<template v-if="item.product.productCategory == 1">
 							<template v-if="userIdentity == 3">
 								<template v-if="item.product.shopID == shopId">
-									<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+									<view class="title-none" v-if="item.product.priceFlag === 1">
 										<text class="p big">￥未公开价格</text>
 									</view>
 									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 									</view>
 								</template>	
 								<template v-else>
 									<view class="no-price">
 										<view class="p-stars">
 											<text class="p-no">￥</text>
-											<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+											<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 										</view>
 									</view>	
 								</template>
 							</template>
 							<template v-else-if="userIdentity ===4">
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
-								<view class="title-none"  v-if="item.product.price1TextFlag === '2'">
+								<view class="title-none"  v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
-								<view class="price tui-skeleton-rect" v-if="item.product.price1TextFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
+								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === 0" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 							<template v-else>
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
 								<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 						</template>	
@@ -123,7 +123,7 @@
 							</view>
 							<view class="price tui-skeleton-rect" v-else>
 								<text class="p sm">￥</text>
-								<text class="p big">{{ item.product.retailPrice | NumFormat }}</text>
+								<text class="p big">{{ item.product.price | NumFormat }}</text>
 							</view>
 						</template>
 					</view>
@@ -131,7 +131,7 @@
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
-								<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+								<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 							</view>
 						</template>
 						<template v-else>

components/cm-module/pageFloorTemplate/templateE.vue

@@ -28,7 +28,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1 && item.product.shopID == shopId">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1 && item.product.shopID == shopId">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -40,7 +40,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -53,42 +53,42 @@
 						<template v-if="item.product.productCategory == 1">
 							<template v-if="userIdentity == 3">
 								<template v-if="item.product.shopID == shopId">
-									<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+									<view class="title-none" v-if="item.product.priceFlag === 1">
 										<text class="p big">￥未公开价格</text>
 									</view>
 									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 									</view>
 								</template>	
 								<template v-else>
 									<view class="no-price">
 										<view class="p-stars">
 											<text class="p-no">￥</text>
-											<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+											<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 										</view>
 									</view>	
 								</template>
 							</template>
 							<template v-else-if="userIdentity ===4">
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
-								<view class="title-none"  v-if="item.product.price1TextFlag === '2'">
+								<view class="title-none"  v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
-								<view class="price tui-skeleton-rect" v-if="item.product.price1TextFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
+								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === 0" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 							<template v-else>
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
 								<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 						</template>	
@@ -99,7 +99,7 @@
 							</view>
 							<view class="price tui-skeleton-rect" v-else>
 								<text class="p sm">￥</text>
-								<text class="p big">{{ item.product.retailPrice | NumFormat }}</text>
+								<text class="p big">{{ item.product.price | NumFormat }}</text>
 							</view>
 						</template>
 					</view>
@@ -107,7 +107,7 @@
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
-								<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+								<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 							</view>
 						</template>
 						<template v-else>

components/cm-module/pageFloorTemplate/templateF.vue

@@ -16,7 +16,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1 && item.product.shopID == shopId">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1 && item.product.shopID == shopId">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -28,7 +28,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -41,42 +41,42 @@
 						<template v-if="item.product.productCategory == 1">
 							<template v-if="userIdentity == 3">
 								<template v-if="item.product.shopID == shopId">
-									<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+									<view class="title-none" v-if="item.product.priceFlag === 1">
 										<text class="p big">￥未公开价格</text>
 									</view>
 									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 									</view>
 								</template>	
 								<template v-else>
 									<view class="no-price">
 										<view class="p-stars">
 											<text class="p-no">￥</text>
-											<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+											<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 										</view>
 									</view>	
 								</template>
 							</template>
 							<template v-else-if="userIdentity ===4">
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
-								<view class="title-none"  v-if="item.product.price1TextFlag === '2'">
+								<view class="title-none"  v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
-								<view class="price tui-skeleton-rect" v-if="item.product.price1TextFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
+								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === 0" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 							<template v-else>
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
 								<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 						</template>	
@@ -87,7 +87,7 @@
 							</view>
 							<view class="price tui-skeleton-rect" v-else>
 								<text class="p sm">￥</text>
-								<text class="p big">{{ item.product.retailPrice | NumFormat }}</text>
+								<text class="p big">{{ item.product.price | NumFormat }}</text>
 							</view>
 						</template>
 					</view>
@@ -95,7 +95,7 @@
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
-								<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+								<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 							</view>
 						</template>
 						<template v-else>

components/cm-module/pageFloorTemplate/templateG.vue

@@ -16,7 +16,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1 && item.product.shopID == shopId">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1 && item.product.shopID == shopId">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -28,7 +28,7 @@
 							<template v-if="item.product.actStatus===1">
 								<view class="floor-tags" v-if="PromotionsFormat(item.product.promotions)">
 									{{item.product.promotions.name}}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1">:￥{{item.product.retailPrice | NumFormat}}</text>
+									<text v-if="hasLogin && item.product.priceFlag != 1">:￥{{item.product.price | NumFormat}}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.product.promotions.name}}</view>	
 							</template>
@@ -41,42 +41,42 @@
 						<template v-if="item.product.productCategory == 1">
 							<template v-if="userIdentity == 3">
 								<template v-if="item.product.shopID == shopId">
-									<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+									<view class="title-none" v-if="item.product.priceFlag === 1">
 										<text class="p big">￥未公开价格</text>
 									</view>
 									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+										<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 									</view>
 								</template>	
 								<template v-else>
 									<view class="no-price">
 										<view class="p-stars">
 											<text class="p-no">￥</text>
-											<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+											<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 										</view>
 									</view>	
 								</template>
 							</template>
 							<template v-else-if="userIdentity ===4">
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
-								<view class="title-none"  v-if="item.product.price1TextFlag === '2'">
+								<view class="title-none"  v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
-								<view class="price tui-skeleton-rect" v-if="item.product.price1TextFlag === '0'" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
+								<view class="price tui-skeleton-rect" v-if="item.product.priceFlag === 0" :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 							<template v-else>
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
 								<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.product.promotions) ? 'none' : ''">
 									<text class="p sm">￥</text>
-									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.price1 : item.product.retailPrice ) | NumFormat}}</text>
+									<text class="p big">{{ (PromotionsFormat(item.product.promotions) ? item.product.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>
 							</template>
 						</template>	
@@ -87,7 +87,7 @@
 							</view>
 							<view class="price tui-skeleton-rect" v-else>
 								<text class="p sm">￥</text>
-								<text class="p big">{{ item.product.retailPrice | NumFormat }}</text>
+								<text class="p big">{{ item.product.price | NumFormat }}</text>
 							</view>
 						</template>
 					</view>
@@ -95,7 +95,7 @@
 						<template v-if="item.product.productCategory == 1">
 							<view class="p-stars">
 								<text class="p-no">￥</text>
-								<uni-grader :grade="Number(item.product.price1Grade)" :margin="14"></uni-grader>
+								<uni-grader :grade="Number(item.product.priceGrade)" :margin="14"></uni-grader>
 							</view>
 						</template>
 						<template v-else>

components/cm-module/pageFloorTemplate/templateI.vue

@@ -89,10 +89,10 @@
 									<text
 										v-if="
 											hasLogin &&
-												item.product.price1TextFlag != 1 &&
+												item.product.priceFlag != 1 &&
 												item.product.shopID == shopId
 										"
-										>:￥{{ item.product.retailPrice | NumFormat }}</text
+										>:￥{{ item.product.price | NumFormat }}</text
 									>
 								</view>
 								<view class="floor-tags" v-else>{{
@@ -115,8 +115,8 @@
 									v-if="PromotionsFormat(item.product.promotions)"
 								>
 									{{ item.product.promotions.name }}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1"
-										>:￥{{ item.product.retailPrice | NumFormat }}</text
+									<text v-if="hasLogin && item.product.priceFlag != 1"
+										>:￥{{ item.product.price | NumFormat }}</text
 									>
 								</view>
 								<view class="floor-tags" v-else>{{
@@ -139,7 +139,7 @@
 								<template v-if="item.product.shopID == shopId">
 									<view
 										class="title-none"
-										v-if="item.product.price1TextFlag === '1'"
+										v-if="item.product.priceFlag === 1"
 									>
 										<text class="p big">￥未公开价格</text>
 									</view>
@@ -153,8 +153,8 @@
 										<text class="p sm">￥</text>
 										<text class="p big">{{
 											(PromotionsFormat(item.product.promotions)
-												? item.product.price1
-												: item.product.retailPrice) | NumFormat
+												? item.product.originalPrice
+												: item.product.price) | NumFormat
 										}}</text>
 									</view>
 								</template>
@@ -163,7 +163,7 @@
 										<view class="p-stars">
 											<text class="p-no">￥</text>
 											<uni-grader
-												:grade="Number(item.product.price1Grade)"
+												:grade="Number(item.product.priceGrade)"
 												:margin="14"
 											></uni-grader>
 										</view>
@@ -171,27 +171,27 @@
 								</template>
 							</template>
 							<template v-else-if="userIdentity === 4">
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
-								<view class="title-none" v-if="item.product.price1TextFlag === '2'">
+								<view class="title-none" v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
 								<view
 									class="price tui-skeleton-rect"
-									v-if="item.product.price1TextFlag === '0'"
+									v-if="item.product.priceFlag === 0"
 									:class="PromotionsFormat(item.product.promotions) ? 'none' : ''"
 								>
 									<text class="p sm">￥</text>
 									<text class="p big">{{
 										(PromotionsFormat(item.product.promotions)
-											? item.product.price1
-											: item.product.retailPrice) | NumFormat
+											? item.product.originalPrice
+											: item.product.price) | NumFormat
 									}}</text>
 								</view>
 							</template>
 							<template v-else>
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
 								<view
@@ -202,8 +202,8 @@
 									<text class="p sm">￥</text>
 									<text class="p big">{{
 										(PromotionsFormat(item.product.promotions)
-											? item.product.price1
-											: item.product.retailPrice) | NumFormat
+											? item.product.originalPrice
+											: item.product.price) | NumFormat
 									}}</text>
 								</view>
 							</template>
@@ -218,7 +218,7 @@
 							<view class="price tui-skeleton-rect" v-else>
 								<text class="p sm">￥</text>
 								<text class="p big">{{
-									item.product.retailPrice | NumFormat
+									item.product.price | NumFormat
 								}}</text>
 							</view>
 						</template>
@@ -228,7 +228,7 @@
 							<view class="p-stars">
 								<text class="p-no">￥</text>
 								<uni-grader
-									:grade="Number(item.product.price1Grade)"
+									:grade="Number(item.product.priceGrade)"
 									:margin="14"
 								></uni-grader>
 							</view>

components/cm-module/pageFloorTemplate/templateJ.vue

@@ -90,10 +90,10 @@
 									<text
 										v-if="
 											hasLogin &&
-												item.product.price1TextFlag != 1 &&
+												item.product.priceFlag != 1 &&
 												item.product.shopID == shopId
 										"
-										>:￥{{ item.product.retailPrice | NumFormat }}</text
+										>:￥{{ item.product.price | NumFormat }}</text
 									>
 								</view>
 								<view class="floor-tags" v-else>{{
@@ -116,8 +116,8 @@
 									v-if="PromotionsFormat(item.product.promotions)"
 								>
 									{{ item.product.promotions.name }}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1"
-										>:￥{{ item.product.retailPrice | NumFormat }}</text
+									<text v-if="hasLogin && item.product.priceFlag != 1"
+										>:￥{{ item.product.price | NumFormat }}</text
 									>
 								</view>
 								<view class="floor-tags" v-else>{{
@@ -140,7 +140,7 @@
 								<template v-if="item.product.shopID == shopId">
 									<view
 										class="title-none"
-										v-if="item.product.price1TextFlag === '1'"
+										v-if="item.product.priceFlag === 1"
 									>
 										<text class="p big">￥未公开价格</text>
 									</view>
@@ -154,8 +154,8 @@
 										<text class="p sm">￥</text>
 										<text class="p big">{{
 											(PromotionsFormat(item.product.promotions)
-												? item.product.price1
-												: item.product.retailPrice) | NumFormat
+												? item.product.originalPrice
+												: item.product.price) | NumFormat
 										}}</text>
 									</view>
 								</template>
@@ -164,7 +164,7 @@
 										<view class="p-stars">
 											<text class="p-no">￥</text>
 											<uni-grader
-												:grade="Number(item.product.price1Grade)"
+												:grade="Number(item.product.priceGrade)"
 												:margin="14"
 											></uni-grader>
 										</view>
@@ -172,27 +172,27 @@
 								</template>
 							</template>
 							<template v-else-if="userIdentity === 4">
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
-								<view class="title-none" v-if="item.product.price1TextFlag === '2'">
+								<view class="title-none" v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
 								<view
 									class="price tui-skeleton-rect"
-									v-if="item.product.price1TextFlag === '0'"
+									v-if="item.product.priceFlag === 0"
 									:class="PromotionsFormat(item.product.promotions) ? 'none' : ''"
 								>
 									<text class="p sm">￥</text>
 									<text class="p big">{{
 										(PromotionsFormat(item.product.promotions)
-											? item.product.price1
-											: item.product.retailPrice) | NumFormat
+											? item.product.originalPrice
+											: item.product.price) | NumFormat
 									}}</text>
 								</view>
 							</template>
 							<template v-else>
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
 								<view
@@ -203,8 +203,8 @@
 									<text class="p sm">￥</text>
 									<text class="p big">{{
 										(PromotionsFormat(item.product.promotions)
-											? item.product.price1
-											: item.product.retailPrice) | NumFormat
+											? item.product.originalPrice
+											: item.product.price) | NumFormat
 									}}</text>
 								</view>
 							</template>
@@ -219,7 +219,7 @@
 							<view class="price tui-skeleton-rect" v-else>
 								<text class="p sm">￥</text>
 								<text class="p big">{{
-									item.product.retailPrice | NumFormat
+									item.product.price | NumFormat
 								}}</text>
 							</view>
 						</template>
@@ -229,7 +229,7 @@
 							<view class="p-stars">
 								<text class="p-no">￥</text>
 								<uni-grader
-									:grade="Number(item.product.price1Grade)"
+									:grade="Number(item.product.priceGrade)"
 									:margin="14"
 								></uni-grader>
 							</view>

components/cm-module/pageFloorTemplate/templateK.vue

@@ -129,10 +129,10 @@
 									<text
 										v-if="
 											hasLogin &&
-												item.product.price1TextFlag != 1 &&
+												item.product.priceFlag != 1 &&
 												item.product.shopID == shopId
 										"
-										>:￥{{ item.product.retailPrice | NumFormat }}</text
+										>:￥{{ item.product.price | NumFormat }}</text
 									>
 								</view>
 								<view class="floor-tags" v-else>{{
@@ -155,8 +155,8 @@
 									v-if="PromotionsFormat(item.product.promotions)"
 								>
 									{{ item.product.promotions.name }}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1"
-										>:￥{{ item.product.retailPrice | NumFormat }}</text
+									<text v-if="hasLogin && item.product.priceFlag != 1"
+										>:￥{{ item.product.price | NumFormat }}</text
 									>
 								</view>
 								<view class="floor-tags" v-else>{{
@@ -179,7 +179,7 @@
 								<template v-if="item.product.shopID == shopId">
 									<view
 										class="title-none"
-										v-if="item.product.price1TextFlag === '1'"
+										v-if="item.product.priceFlag === 1"
 									>
 										<text class="p big">￥未公开价格</text>
 									</view>
@@ -193,8 +193,8 @@
 										<text class="p sm">￥</text>
 										<text class="p big">{{
 											(PromotionsFormat(item.product.promotions)
-												? item.product.price1
-												: item.product.retailPrice) | NumFormat
+												? item.product.originalPrice
+												: item.product.price) | NumFormat
 										}}</text>
 									</view>
 								</template>
@@ -203,7 +203,7 @@
 										<view class="p-stars">
 											<text class="p-no">￥</text>
 											<uni-grader
-												:grade="Number(item.product.price1Grade)"
+												:grade="Number(item.product.priceGrade)"
 												:margin="14"
 											></uni-grader>
 										</view>
@@ -211,27 +211,27 @@
 								</template>
 							</template>
 							<template v-else-if="userIdentity === 4">
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
-								<view class="title-none" v-if="item.product.price1TextFlag === '2'">
+								<view class="title-none" v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
 								<view
 									class="price tui-skeleton-rect"
-									v-if="item.product.price1TextFlag === '0'"
+									v-if="item.product.priceFlag === 0"
 									:class="PromotionsFormat(item.product.promotions) ? 'none' : ''"
 								>
 									<text class="p sm">￥</text>
 									<text class="p big">{{
 										(PromotionsFormat(item.product.promotions)
-											? item.product.price1
-											: item.product.retailPrice) | NumFormat
+											? item.product.originalPrice
+											: item.product.price) | NumFormat
 									}}</text>
 								</view>
 							</template>
 							<template v-else>
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
 								<view
@@ -242,8 +242,8 @@
 									<text class="p sm">￥</text>
 									<text class="p big">{{
 										(PromotionsFormat(item.product.promotions)
-											? item.product.price1
-											: item.product.retailPrice) | NumFormat
+											? item.product.originalPrice
+											: item.product.price) | NumFormat
 									}}</text>
 								</view>
 							</template>
@@ -258,7 +258,7 @@
 							<view class="price tui-skeleton-rect" v-else>
 								<text class="p sm">￥</text>
 								<text class="p big">{{
-									item.product.retailPrice | NumFormat
+									item.product.price | NumFormat
 								}}</text>
 							</view>
 						</template>
@@ -268,7 +268,7 @@
 							<view class="p-stars">
 								<text class="p-no">￥</text>
 								<uni-grader
-									:grade="Number(item.product.price1Grade)"
+									:grade="Number(item.product.priceGrade)"
 									:margin="14"
 								></uni-grader>
 							</view>

components/cm-module/pageTemplate/templateI.vue

@@ -90,10 +90,10 @@
 									<text
 										v-if="
 											hasLogin &&
-												item.product.price1TextFlag != 1 &&
+												item.product.priceFlag != 1 &&
 												item.product.shopID == shopId
 										"
-										>:￥{{ item.product.retailPrice | NumFormat }}</text
+										>:￥{{ item.product.price | NumFormat }}</text
 									>
 								</view>
 								<view class="floor-tags" v-else>{{
@@ -116,8 +116,8 @@
 									v-if="PromotionsFormat(item.product.promotions)"
 								>
 									{{ item.product.promotions.name }}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1"
-										>:￥{{ item.product.retailPrice | NumFormat }}</text
+									<text v-if="hasLogin && item.product.priceFlag != 1"
+										>:￥{{ item.product.price | NumFormat }}</text
 									>
 								</view>
 								<view class="floor-tags" v-else>{{
@@ -140,7 +140,7 @@
 								<template v-if="item.product.shopID == shopId">
 									<view
 										class="title-none"
-										v-if="item.product.price1TextFlag === '1'"
+										v-if="item.product.priceFlag === 1"
 									>
 										<text class="p big">￥未公开价格</text>
 									</view>
@@ -154,8 +154,8 @@
 										<text class="p sm">￥</text>
 										<text class="p big">{{
 											(PromotionsFormat(item.product.promotions)
-												? item.product.price1
-												: item.product.retailPrice) | NumFormat
+												? item.product.originalPrice
+												: item.product.price) | NumFormat
 										}}</text>
 									</view>
 								</template>
@@ -164,7 +164,7 @@
 										<view class="p-stars">
 											<text class="p-no">￥</text>
 											<uni-grader
-												:grade="Number(item.product.price1Grade)"
+												:grade="Number(item.product.priceGrade)"
 												:margin="14"
 											></uni-grader>
 										</view>
@@ -172,27 +172,27 @@
 								</template>
 							</template>
 							<template v-else-if="userIdentity === 4">
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
-								<view class="title-none" v-if="item.product.price1TextFlag === '2'">
+								<view class="title-none" v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
 								<view
 									class="price tui-skeleton-rect"
-									v-if="item.product.price1TextFlag === '0'"
+									v-if="item.product.priceFlag === 0"
 									:class="PromotionsFormat(item.product.promotions) ? 'none' : ''"
 								>
 									<text class="p sm">￥</text>
 									<text class="p big">{{
 										(PromotionsFormat(item.product.promotions)
-											? item.product.price1
-											: item.product.retailPrice) | NumFormat
+											? item.product.originalPrice
+											: item.product.price) | NumFormat
 									}}</text>
 								</view>
 							</template>
 							<template v-else>
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
 								<view
@@ -203,8 +203,8 @@
 									<text class="p sm">￥</text>
 									<text class="p big">{{
 										(PromotionsFormat(item.product.promotions)
-											? item.product.price1
-											: item.product.retailPrice) | NumFormat
+											? item.product.originalPrice
+											: item.product.price) | NumFormat
 									}}</text>
 								</view>
 							</template>
@@ -219,7 +219,7 @@
 							<view class="price tui-skeleton-rect" v-else>
 								<text class="p sm">￥</text>
 								<text class="p big">{{
-									item.product.retailPrice | NumFormat
+									item.product.price | NumFormat
 								}}</text>
 							</view>
 						</template>
@@ -229,7 +229,7 @@
 							<view class="p-stars">
 								<text class="p-no">￥</text>
 								<uni-grader
-									:grade="Number(item.product.price1Grade)"
+									:grade="Number(item.product.priceGrade)"
 									:margin="14"
 								></uni-grader>
 							</view>

components/cm-module/pageTemplate/templateJ.vue

@@ -91,10 +91,10 @@
 									<text
 										v-if="
 											hasLogin &&
-												item.product.price1TextFlag != 1 &&
+												item.product.priceFlag != 1 &&
 												item.product.shopID == shopId
 										"
-										>:￥{{ item.product.retailPrice | NumFormat }}</text
+										>:￥{{ item.product.price | NumFormat }}</text
 									>
 								</view>
 								<view class="floor-tags" v-else>{{
@@ -117,8 +117,8 @@
 									v-if="PromotionsFormat(item.product.promotions)"
 								>
 									{{ item.product.promotions.name }}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1"
-										>:￥{{ item.product.retailPrice | NumFormat }}</text
+									<text v-if="hasLogin && item.product.priceFlag != 1"
+										>:￥{{ item.product.price | NumFormat }}</text
 									>
 								</view>
 								<view class="floor-tags" v-else>{{
@@ -141,7 +141,7 @@
 								<template v-if="item.product.shopID == shopId">
 									<view
 										class="title-none"
-										v-if="item.product.price1TextFlag === '1'"
+										v-if="item.product.priceFlag === 1"
 									>
 										<text class="p big">￥未公开价格</text>
 									</view>
@@ -155,8 +155,8 @@
 										<text class="p sm">￥</text>
 										<text class="p big">{{
 											(PromotionsFormat(item.product.promotions)
-												? item.product.price1
-												: item.product.retailPrice) | NumFormat
+												? item.product.originalPrice
+												: item.product.price) | NumFormat
 										}}</text>
 									</view>
 								</template>
@@ -165,7 +165,7 @@
 										<view class="p-stars">
 											<text class="p-no">￥</text>
 											<uni-grader
-												:grade="Number(item.product.price1Grade)"
+												:grade="Number(item.product.priceGrade)"
 												:margin="14"
 											></uni-grader>
 										</view>
@@ -173,27 +173,27 @@
 								</template>
 							</template>
 							<template v-else-if="userIdentity === 4">
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
-								<view class="title-none" v-if="item.product.price1TextFlag === '2'">
+								<view class="title-none" v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
 								<view
 									class="price tui-skeleton-rect"
-									v-if="item.product.price1TextFlag === '0'"
+									v-if="item.product.priceFlag === 0"
 									:class="PromotionsFormat(item.product.promotions) ? 'none' : ''"
 								>
 									<text class="p sm">￥</text>
 									<text class="p big">{{
 										(PromotionsFormat(item.product.promotions)
-											? item.product.price1
-											: item.product.retailPrice) | NumFormat
+											? item.product.originalPrice
+											: item.product.price) | NumFormat
 									}}</text>
 								</view>
 							</template>
 							<template v-else>
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
 								<view
@@ -204,8 +204,8 @@
 									<text class="p sm">￥</text>
 									<text class="p big">{{
 										(PromotionsFormat(item.product.promotions)
-											? item.product.price1
-											: item.product.retailPrice) | NumFormat
+											? item.product.originalPrice
+											: item.product.price) | NumFormat
 									}}</text>
 								</view>
 							</template>
@@ -220,7 +220,7 @@
 							<view class="price tui-skeleton-rect" v-else>
 								<text class="p sm">￥</text>
 								<text class="p big">{{
-									item.product.retailPrice | NumFormat
+									item.product.price | NumFormat
 								}}</text>
 							</view>
 						</template>
@@ -230,7 +230,7 @@
 							<view class="p-stars">
 								<text class="p-no">￥</text>
 								<uni-grader
-									:grade="Number(item.product.price1Grade)"
+									:grade="Number(item.product.priceGrade)"
 									:margin="14"
 								></uni-grader>
 							</view>

components/cm-module/pageTemplate/templateK.vue

@@ -130,10 +130,10 @@
 									<text
 										v-if="
 											hasLogin &&
-												item.product.price1TextFlag != 1 &&
+												item.product.priceFlag != 1 &&
 												item.product.shopID == shopId
 										"
-										>:￥{{ item.product.retailPrice | NumFormat }}</text
+										>:￥{{ item.product.price | NumFormat }}</text
 									>
 								</view>
 								<view class="floor-tags" v-else>{{
@@ -156,8 +156,8 @@
 									v-if="PromotionsFormat(item.product.promotions)"
 								>
 									{{ item.product.promotions.name }}
-									<text v-if="hasLogin && item.product.price1TextFlag != 1"
-										>:￥{{ item.product.retailPrice | NumFormat }}</text
+									<text v-if="hasLogin && item.product.priceFlag != 1"
+										>:￥{{ item.product.price | NumFormat }}</text
 									>
 								</view>
 								<view class="floor-tags" v-else>{{
@@ -180,7 +180,7 @@
 								<template v-if="item.product.shopID == shopId">
 									<view
 										class="title-none"
-										v-if="item.product.price1TextFlag === '1'"
+										v-if="item.product.priceFlag === 1"
 									>
 										<text class="p big">￥未公开价格</text>
 									</view>
@@ -194,8 +194,8 @@
 										<text class="p sm">￥</text>
 										<text class="p big">{{
 											(PromotionsFormat(item.product.promotions)
-												? item.product.price1
-												: item.product.retailPrice) | NumFormat
+												? item.product.originalPrice
+												: item.product.price) | NumFormat
 										}}</text>
 									</view>
 								</template>
@@ -204,7 +204,7 @@
 										<view class="p-stars">
 											<text class="p-no">￥</text>
 											<uni-grader
-												:grade="Number(item.product.price1Grade)"
+												:grade="Number(item.product.priceGrade)"
 												:margin="14"
 											></uni-grader>
 										</view>
@@ -212,27 +212,27 @@
 								</template>
 							</template>
 							<template v-else-if="userIdentity === 4">
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
-								<view class="title-none" v-if="item.product.price1TextFlag === '2'">
+								<view class="title-none" v-if="item.product.priceFlag === 2">
 									<text class="p big">￥价格仅会员可见</text>
 								</view>
 								<view
 									class="price tui-skeleton-rect"
-									v-if="item.product.price1TextFlag === '0'"
+									v-if="item.product.priceFlag === 0"
 									:class="PromotionsFormat(item.product.promotions) ? 'none' : ''"
 								>
 									<text class="p sm">￥</text>
 									<text class="p big">{{
 										(PromotionsFormat(item.product.promotions)
-											? item.product.price1
-											: item.product.retailPrice) | NumFormat
+											? item.product.originalPrice
+											: item.product.price) | NumFormat
 									}}</text>
 								</view>
 							</template>
 							<template v-else>
-								<view class="title-none" v-if="item.product.price1TextFlag === '1'">
+								<view class="title-none" v-if="item.product.priceFlag === 1">
 									<text class="p big">￥未公开价格</text>
 								</view>
 								<view
@@ -243,8 +243,8 @@
 									<text class="p sm">￥</text>
 									<text class="p big">{{
 										(PromotionsFormat(item.product.promotions)
-											? item.product.price1
-											: item.product.retailPrice) | NumFormat
+											? item.product.originalPrice
+											: item.product.price) | NumFormat
 									}}</text>
 								</view>
 							</template>
@@ -259,7 +259,7 @@
 							<view class="price tui-skeleton-rect" v-else>
 								<text class="p sm">￥</text>
 								<text class="p big">{{
-									item.product.retailPrice | NumFormat
+									item.product.price | NumFormat
 								}}</text>
 							</view>
 						</template>
@@ -269,7 +269,7 @@
 							<view class="p-stars">
 								<text class="p-no">￥</text>
 								<uni-grader
-									:grade="Number(item.product.price1Grade)"
+									:grade="Number(item.product.priceGrade)"
 									:margin="14"
 								></uni-grader>
 							</view>

services/ajax.env.js

@@ -5,8 +5,8 @@ if(process.env.NODE_ENV === 'development'){
 	// URL_CONFIG = 'http://192.168.2.67:8008'	 //裴裴联调地址
 	// URL_CONFIG = 'http://192.168.2.81:8008'
 	// URL_CONFIG = 'http://192.168.2.75:8008'	 //超超联调地址
-    URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
-	// URL_CONFIG = 'https://spi.caimei365.com'
+    // URL_CONFIG = 'https://spi-b.caimei365.com'	 //采美测试地址
+	URL_CONFIG = 'https://spi.caimei365.com'
 }else{
     // 生产环境
 	URL_CONFIG = 'https://spi-b.caimei365.com'

services/common.service.js

@@ -141,6 +141,10 @@ export default class CommonService {
 	}
 	/*活动页面获取楼层*/
 	GetActivityFloorData (data = {}) {
-		return this.AjaxService.get({ url:'/home/activity/data', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/home/activity/data', 
+			data, 
+			isLoading: false ,
+		})
 	}
 }

services/config.env.js

@@ -3,8 +3,8 @@ if(process.env.NODE_ENV === 'development'){
     // 开发环境
     // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
 	// URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
-	URL_CONFIG = 'https://core-b.caimei365.com'
-	// URL_CONFIG = 'https://core.caimei365.com'
+	// URL_CONFIG = 'https://core-b.caimei365.com'
+	URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境
 	URL_CONFIG = 'https://core-b.caimei365.com'