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

# Conflicts:
#	second/pages/form/form.vue

common/config/caimeiApi.js

@@ -258,7 +258,6 @@ const caimeiApi = {
 			const typeMap = {
 				1:`/pages/goods/goods-instrument?linkId=${linkId}`,
 				2:`/pages/goods/instrument-details?id=${linkId}`,
-				3:`/h5/pages/article/page-image?image=${pros.adsImage}&title=专题直播`,
 				4:`/h5/pages/activity/activity?id=${linkId}`,
 				5:`/pages/goods/product?id=${linkId}`, 
 				// 7:`/supplier/pages/user/my-shop?shopId=${linkId}`,
@@ -275,7 +274,6 @@ const caimeiApi = {
 				19:`/search/pages/search/search-supplier?keyWord=${keyword}`,
 				21:'/h5/pages/activity/meobohui',
 				// '-1':`/h5/pages/article/path?link=${pros.link}`
-				23:`/h5/pages/activity/activity-topic?linkId=${pros.linkParam.id}`,
 				24:'/pages/user/coupon/coupon'
 			}
 			const url = typeMap[linkType]

components/cm-module/listTemplate/immediatelyList.vue

@@ -441,7 +441,7 @@
 				let productsList =[];
 				productsList=item.combinationProductList;
 				productsList.forEach(pros=>{	
-					prosPrice+=pros.retailPrice*pros.initProductNum;
+					prosPrice+=pros.price*pros.initProductNum;
 					item.productTotalAmount = prosPrice;
 				})
 				// console.log(prosPrice)
@@ -472,11 +472,11 @@
 			processActivityPrice(pros){//单独处理活动价格和阶梯价格
 				let ladderPriceList = pros.ladderPrices;
 				if(pros.ladderPriceFlag == '0' || pros.actStatus == 1){
-					pros.totalPrice = pros.initProductNum*pros.retailPrice
+					pros.totalPrice = pros.initProductNum*pros.price
 				}else{
 					ladderPriceList.forEach((item,index)=>{
 						if(pros.initProductNum>=item.buyNum){
-							pros.retailPrice = item.buyPrice
+							pros.price = item.buyPrice
 							pros.totalPrice = pros.initProductNum*item.buyPrice
 						}
 					})

components/cm-module/listTemplate/productList.vue

@@ -140,8 +140,7 @@
 				if(loadMore) {this.pageNum += 1;}
 				this.ProductService.GetRepeatBuyAgainProductList(
 					{
-						userId:13863,
-						// userId:this.userId,
+						userId:this.userId,
 						identity:this.identity,
 						pageNum:this.pageNum,
 						pageSize:this.pageSize,

components/cm-module/listTemplate/secondHand.vue

@@ -55,8 +55,8 @@
 		<view class="product-container" v-else >
 			<view :class="tabIndex"  :style="{paddingTop:searchStatus?'160rpx':''}">
 				<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="listData.length > 0">
-					<view v-for="(item,index) in listData" :key="index" :id="item.id" :productid="item.productID" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.productID)"  >
-					    <image mode='widthFix' :src="item.mainImage"  class="list-img" alt="list-img"></image>
+					<view v-for="(item,index) in listData" :key="index" :id="item.id" :productid="item.productId" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.productId)"  >
+					    <image mode='widthFix' :src="item.image"  class="list-img" alt="list-img"></image>
 						<view class="list-details-info">
 							<view class="list-details-title"> 
 								<view class="tabs" v-if="item.newAdded == 1">
@@ -67,7 +67,7 @@
 							<view class="list-details-price">
 								<view class="list-shop">
 									<view class="list-price">
-										<text class="price-larger">￥{{toFixedFn(item.price1)}}</text>
+										<text class="price-larger">￥{{toFixedFn(item.price)}}</text>
 									</view>
 								</view>
 								<button class="add-cart-btn" @click.stop="operationHanld(item)">数量</button>

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/templateA.vue

@@ -153,6 +153,7 @@
 			...mapState(['hasLogin','userInfo','isActivity'])
 		},
 		created(){
+			console.log(this.userIdentity)
 			this.initData(this.pageData)
 		},
 		watch: {

components/cm-module/pageTemplate/templateC.vue

@@ -89,7 +89,7 @@
 								<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.priceFlag === '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.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>

components/cm-module/pageTemplate/templateG.vue

@@ -65,7 +65,7 @@
 								<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.priceFlag === '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.originalPrice : item.product.price ) | NumFormat}}</text>
 								</view>

components/cm-module/pageTemplate/templateH.vue

@@ -68,7 +68,7 @@
 											<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.priceFlag === '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.originalPrice : item.product.price ) | NumFormat}}</text>
 											</view>
@@ -155,6 +155,7 @@
 		},
 		created(){
 			this.initData(this.pageData)
+			console.log(this.userIdentity)
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo','isActivity'])

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>

components/cm-module/productDetails/cm-price.vue

@@ -124,7 +124,7 @@
 									<view class="ladder-item-td">价格</view>
 								</view>
 								<view class="ladder-item" v-for="(ladd, index) in product.ladderPriceList" :key="index">
-									<view class="ladder-item-td">{{ ladd.buyNumRangeShow }}</view>
+									<view class="ladder-item-td">{{ ladd.numRange }}</view>
 									<view class="ladder-item-td">{{ ladd.buyPrice | NumFormat }}</view>
 								</view>
 							</view>

components/cm-module/productDetails/secondPrice.vue

@@ -13,16 +13,20 @@
 			</view>
 		</template>
 		<template v-else>
-			<view class="wrap-main-item">
+			<view class="wrap-main-item" v-if="identity == 1">
 				<view class="p-price tui-skeleton-fillet">
 					<text class="txt sm">￥</text>
 					<text class="txt big" v-if="product.detailTalkFlag==2">详聊</text>
 					<text class="txt big" v-else>{{product.price | NumFormat}}</text>
 				</view>
 			</view>
-			
+			<view class="wrap-main-item" v-else>
+				<view class="p-price tui-skeleton-fillet">
+					<text class="txt sm">￥</text>
+					<text class="txt big">{{product.price | NumFormat}}</text>
+				</view>
+			</view>
 		</template>
-		
 	</view>
 </template>
 
@@ -49,7 +53,7 @@
 			console.log(this.product)
 		},
 		computed: {
-			...mapState(['hasLogin','isWxAuthorize'])
+			...mapState(['hasLogin','isWxAuthorize','identity'])
 		},
 		methods:{
 			loginClick(){

pages/goods/cart.vue

@@ -2,7 +2,7 @@
 	<view class="container cart clearfix" v-if="hasLogin" :style="{paddingTop:CustomBar+'px'}"> 	
 		<headerNavbar :systeminfo='systeminfo' :navbar-data='nvabarData' :headerBtnPosi ="headerBtnPosi" :page='1'></headerNavbar>
 		<tui-skeleton v-if="skeletonShow" backgroundColor="#fafafa" borderRadius="10rpx" :isLoading	="true" :loadingType="5"></tui-skeleton>
-		<view class="container-cart-main tui-skeleton" :style="{paddingTop:isshowDelbtn || goodsList.length == 0 ? '0rpx':'80rpx'}">
+		<view class="container-cart-main tui-skeleton" :style="{paddingTop:isshowDelbtn ? '0rpx':'80rpx'}">
 			<view class="foot-check-delbtn" v-if="!isshowDelbtn && goodsList.length>0" :style="{top:CustomBar+'px'}">
 				<view class="foot-text">共<text>{{kindCount}}</text>件商品</view>
 				<view class="delBtn" @tap.stop="showDelManager">删除</view>

pages/goods/product.vue

@@ -422,9 +422,9 @@
 						this.ladderPriceList = this.product.ladderPriceList;
 					}
 					//拆分金额并转千分位格式显示
-					if(this.product.retailPrice!=null){
-						this.retailPrice = this.product.retailPrice.toFixed(2);
-						this.buyRetailPrice = this.product.retailPrice;
+					if(this.product.price!=null){
+						this.retailPrice = this.product.price.toFixed(2);
+						this.buyRetailPrice = this.product.price;
 					}
 					//处理下架商品和售罄商品
 					if(this.product.validFlag =='3' || this.stock == 0){

pages/tabBar/category/index.vue

@@ -114,13 +114,13 @@
 			navToListPage(item,index){//分类导航跳转
 				switch(index){
 					case 1:
-						this.$api.navigateTo(`/pages/goods/goods-classify?classType=1&id=${item.bigTypeID}&title=${item.name}`)
+						this.$api.navigateTo(`/pages/goods/goods-classify?classType=1&id=${item.bigTypeId}&title=${item.name}`)
 						break;
 					case 2:
-						this.$api.navigateTo(`/pages/goods/goods-classify?classType=2&id=${item.smallTypeID}&title=${item.name}`)
+						this.$api.navigateTo(`/pages/goods/goods-classify?classType=2&id=${item.smallTypeId}&title=${item.name}`)
 						break;
 					case 3:
-						this.$api.navigateTo(`/pages/goods/goods-classify?classType=3&id=${item.tinyTypeID}&title=${item.name}`)
+						this.$api.navigateTo(`/pages/goods/goods-classify?classType=3&id=${item.tinyTypeId}&title=${item.name}`)
 						break;
 				}
 			},

second/pages/form/form.vue

@@ -180,11 +180,11 @@
 					    </view> 
 						<text class="iconfont icon-xiayibu"></text>
 					 </view>
-					 <textarea  type="text"  
-								class="border-grey address-details" 
-								v-model="secondParams.address" 
+					 <textarea  type="text"
+								class="border-grey address-details"
+								v-model="secondParams.address"
 								maxlength="50"
-								placeholder="请填写详细地址，如街道/小区/门牌等"  
+								placeholder="请填写详细地址，如街道/小区/门牌等"
 								placeholder-class="placeholder"/>
 					</textarea>
 					<view class="release-main-container">
@@ -211,7 +211,7 @@
 							<view class="label">二手出让承诺函文件</view>
 							<view class="spacing file-none" v-if="secondParams.fileName == ''">
 								<view class="file-none-button" @click="uploadCommitmentFile">上传</view>
-							</view> 
+							</view>
 							<view class="spacing file-text" v-else>
 								<text class="file-text-em">{{ secondParams.fileName }}</text>
 								<i class=" del iconfont icon-shanchu1" @click="deleteCommitmentFile"></i>
@@ -566,7 +566,7 @@
 				this.SecondHandProduct(this.secondParams)
 			},
 			SecondHandProduct(params){//提交发布
-				this.SecondService.SecondHandProduct(params).then(res=>{ 
+				this.SecondService.SecondHandProduct(params).then(res=>{
 					this.PopupShow = true;
 					this.tipsContentText = '发布二手商品，采美需要收取您每个商品100元的展示费，展示期为3个月支付完成后，商品会在1-2个工作日内进行审核，审核通过后，商品会立即上线'
 					this.cancelButtonText = '取消发布'
@@ -584,7 +584,7 @@
 					case 1:
 						this.SecondHandProduct(this.secondParams)
 						break;
-					case 2:	
+					case 2:
 						this.PopupShow = false;
 						break;
 				}
@@ -594,7 +594,7 @@
 					case 1:
 						this.PopupShow = false;
 						break;
-					case 2:	
+					case 2:
 						this.MiniWxPayFor()
 						this.PopupShow = false;
 						break;

seller/pages/cart/second.vue

@@ -12,7 +12,7 @@
 			<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-370rpx' : '-360rpx'}">
 				<view class="content">
 					<view class="layer-smimg">
-						<image :src="handleData.mainImage" mode=""></image>
+						<image :src="handleData.image" mode=""></image>
 					</view>
 					<view class="layer-nunbox">
 						<view class="layer-nunbox-t">
@@ -85,7 +85,7 @@
 				console.log(this.handleData)
 				this.handleData = data
 					this.number = 1
-					this.buyRetailPrice = Number(data.price1);
+					this.buyRetailPrice = Number(data.price);
 					this.secondProductType = data.secondProductType
 					this.specClass = 'show';
 			},
@@ -169,7 +169,7 @@
 						clubId:this.clubID,
 						allPrice:this.buyRetailPrice,
 						allCount:this.number,
-						productID:this.handleData.productID,
+						productID:this.handleData.productId,
 						productCount:this.number
 				}
 				this.$api.navigateTo(`/seller/pages/order/create-order?type=prodcut&data=${JSON.stringify({data:cartPramsData})}`)

services/common.service.js

@@ -34,17 +34,19 @@ export default class CommonService {
 	/* 首页楼层查看更多数据 */
 	GetHomeFloorContentDetails (data = {}) {
 		return this.AjaxService.get({ 
-			url:'/home/floorContentDetails', 
+			url:'/commodity/page/floor/details', 
 			data, 
 			isLoading: false ,
+			isHost:true
 		})
 	}
 	/* 二级页楼层查看更多数据 */
 	GePageFloorContentDetails (data = {}) {
 		return this.AjaxService.get({ 
-			url:'/home/pageFloorDetails', 
+			url:'/commodity/page/floor/centre', 
 			data, 
 			isLoading: false ,
+			isHost:true
 		})
 	}
 	/* 首页顶部三个模块数据 */
@@ -115,7 +117,6 @@ export default class CommonService {
 	/* 一级分类 */
 	GetFirstClassly (data = {}) {
 		return this.AjaxService.get({ 
-			// url:'/product/classify', 
 			url:'/commodity/classify', 
 			data, 
 			isLoading: false ,
@@ -141,6 +142,11 @@ export default class CommonService {
 	}
 	/*活动页面获取楼层*/
 	GetActivityFloorData (data = {}) {
-		return this.AjaxService.get({ url:'/home/activity/data', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/commodity/page/floor', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 }

services/second.service.js

@@ -33,7 +33,11 @@ export default class SecondService {
 	}
 	/*二手发布/浏览量 */
 	ProductCount (data = {}) {
-		return this.AjaxService.get({ url:'/product/updateSecondHandProductCount', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/product/updateSecondHandProductCount', 
+			data, 
+			isLoading: true ,
+		})
 	}
 	/**
 	 *@二手商品详情

services/sellse.service.js

@@ -111,7 +111,12 @@ export default class SellerService {
 	 *@param 搜索关键词 searchKeyword	【选传】 
 	 */
 	GetOrderSecondHandProductList (data = {}) {
-		return this.AjaxService.get({ url:'/product/getOrderSecondHandProductList', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/commodity/second/order/products', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/**
 	 *@协销-二手去结算接口

supplier/pages/user/my-product.vue

@@ -139,7 +139,7 @@
 			name:'',//商品名称
 			validFlag:'',//状态
 			featuredFlag:'',//是否主推
-			commodityType:1,//商品属性
+			commodityType:'',//商品属性
 			bigTypeId:0,//一级
 			smallTypeId:0,//二级
 			tinyTypeId:0//三级