commit -m 商品模块化接口联调

common/config/caimeiApi.js

@@ -207,11 +207,11 @@ const caimeiApi = {
 		if(pros.listType == 1){
 			if(pros.product.productCategory == '1'){
 				uni.navigateTo({
-				  	url:`/pages/goods/product?id=${pros.product.productID}`
+				  	url:`/pages/goods/product?id=${pros.product.productId}`
 				})
 			}else{
 				uni.navigateTo({
-				  	url:`/second/pages/product/product-details?id=${pros.product.productID}`
+				  	url:`/second/pages/product/product-details?id=${pros.product.productId}`
 				})
 			}
 		}else{

common/config/common.js

@@ -45,7 +45,7 @@ const utils = {
 		return value.replace(/^(\d{3})\d{4}(\d+)/,"$1****$2")
 	},
 	interceptHtmlFn: function(value){
-		return value.replace(/<[^>]+>/g,"")
+		return value ? value.replace(/<[^>]+>/g,"") : value
 	},
 	desensitizationName:function(value){
 		if(null != value && value != undefined){

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

@@ -1,79 +0,0 @@
-<template name="cm-price">
-	<!-- 商品详情价格判断 -->
-	<view class="wrap-main">
-		<view class="" v-if="userIdentity == 1">
-			<view class="wrap-main-price">
-				<view class="p-price tui-skeleton-fillet">
-					<text class="txt sm">￥</text>
-					<text class="txt big">{{product.price1Str}}</text>
-					<text class="txt big">{{smallMoney== '0'?'.00':smallMoney}}</text>
-				</view>
-			</view>	
-		</view>
-	</view>
-</template>
-
-<script>
-	export default{
-		name:'cm-price',
-		props:{
-			product:{
-				type:Object,
-			},
-			userIdentity: {
-				type: Number,
-				default: 2
-			},
-			ladderPriceList:{
-				type: Array,
-			},
-			retailPrice:{
-				type:String,
-			},
-			smallMoney:{
-				type:String,
-			},
-			minBuyNumber:{
-				type: Number,
-				default: 1
-			}
-		},
-		data() {
-			return{
-				
-			}
-		},
-		created() {
-			
-		},
-		methods:{
-
-		},
-		
-	}
-</script>
-
-<style lang="scss">	
-
-</style>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

components/cm-module/productDetails/secondPrice.vue

@@ -17,7 +17,7 @@
 				<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.price1Str}}</text>
+					<text class="txt big" v-else>{{product.price | NumFormat}}</text>
 				</view>
 			</view>
 			

h5/pages/activity/activity-list.vue

@@ -10,7 +10,7 @@
 				<view class="mack" v-if="item.status == 3">
 					<view class="mack-text">活动已经结束</view>
 				</view>
-			</view>
+			</view> 
 			<!--加载loadding-->
 			<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
 			<tui-nomore :visible="!pullUpOn" :backgroundColor="'#ffffff'" :text='nomoreText'></tui-nomore>

pages/goods/goods-active.vue

@@ -37,6 +37,7 @@
 <script>
 	import tuiLoadmore from "@/components/tui-components/loadmore/loadmore"
 	import tuiNomore from "@/components/tui-components/nomore/nomore"
+	import { mapState,mapMutations} from 'vuex';
 	
 	export default {
 		components: {

pages/tabBar/home/index.vue

@@ -14,7 +14,7 @@
 		<!-- 楼层 -->
 		<view class="container-section tui-skeleton">
 			<page-floor :list="pageList" :pageType='1' v-if="isRequest"></page-floor>
-			<!-- <supplier-list :supplierObj="supplierObj" v-if="isRequest"></supplier-list> -->
+			<supplier-list :supplierObj="supplierObj" v-if="isRequest"></supplier-list>
 		</view>
 		<!-- 侧边 -->
 		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>

search/pages/search/search-supplier.vue

@@ -56,7 +56,7 @@
 							</view>
 						</view>
 						<view class="list-bottom">
-							<view class="pros-item" v-for="(pros, pdx) in item.products" :key="pdx" @click.stop="navToDetailPage(pros.id)">
+							<view class="pros-item" v-for="(pros, pdx) in item.products" :key="pdx" @click.stop="navToDetailPage(pros.productId)">
 								<image class="pros-item-image" :src="pros.image" mode="scaleToFill"></image>
 								<view class="pros-name">{{ pros.name }}</view>
 							</view>

second/pages/form/form.vue

@@ -269,7 +269,7 @@
 				],
 				BrandList:[],
 				isShow:false,
-				GoodsImagesList:['https://img.caimei365.com/group1/M00/03/CB/Cmis2F_NkrqAfl7uAADETMOGKpQ791.png'],
+				GoodsImagesList:[''],
 				vShow_GoodsImages:false,
 				secondParams:{
 					secondHandType:'',//一级分类
@@ -293,7 +293,7 @@
 					secondProductType:'',//
 					townId:'',//县区地址
 					address:'',//详细地址
-					image:'https://img.caimei365.com/group1/M00/03/CB/Cmis2F_NkrqAfl7uAADETMOGKpQ791.png',//图片
+					image:'',//图片
 					productDetails:'',//商品详细信息
 					source:2
 				 },

second/pages/product/product-details.vue

@@ -51,7 +51,7 @@
 					</view>
 					<view class="product-wrap clearfix">
 						<view class="wrap-top" >
-							<view class="wrap-top-price">
+							<view class="wrap-top-price">  
 								<second-price :product="product"></second-price>
 							</view>
 							<view class="p-title tui-skeleton-fillet">
@@ -231,9 +231,6 @@
 				}	
 			}
 		},
-		computed: {
-			...mapState(['hasLogin','isWxAuthorize'])
-		},
 		methods:{
 			initData(){// 初始化商品详情查询
 				this.SecondService.ProductDetail({productId:this.productID}).then(response =>{	

second/pages/product/product-list.vue

@@ -33,7 +33,7 @@
 		<view class="shopList" :style="{'overflow':(showSkeleton? 'hidden' : 'auto'),'height': (showSkeleton? windowHeight + 'px' : 'auto')}">
 			<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="tabchildList.length > 0">
 		            <view class="Listitem" v-if="isShow" v-for="(item, index) in tabchildList" :key="index" :class="item.sold==1?'activeImg':''"
-					 :productid="item.productID" @click.stop="navToDetailPage(item.productID)">
+					 :productid="item.productId" @click.stop="navToDetailPage(item.productId)">
 		                <view class="itemImg onhref" >
 		                    <image :src="item.imageList[0]" class="bigImg"></image>
 							<image src="https://static.caimei365.com/app/img/icon/yishou.png" class="yishou_bg" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0"></image>
@@ -47,7 +47,7 @@
 		                        <text v-if="item.detailTalkFlag ==2 && hasLogin==false">￥详聊</text>
 		                        <text v-else-if="!hasLogin" class="priceparam" @click.stop="this.$api.navigateTo('/pages/login/login')">登录查看价格></text>
 		                        <text v-else-if="hasLogin && item.detailTalkFlag==2">￥详聊</text>
-		                        <text v-else>￥{{item.price}}</text>
+		                        <text v-else>￥{{ item.price | NumFormat}}</text>
 		                    </view>
 							<view class="shijian">
 								<text class="iconfont  icon-shijian"></text> {{item.onLineDateStr}}
@@ -150,6 +150,11 @@
 		computed: {
 			...mapState(['hasLogin','userInfo','isWxAuthorize'])
 		},
+		filters: {
+			NumFormat:function(text) {//处理金额
+				return Number(text).toFixed(2);
+			},
+		},
 		onLoad(option) {
 			if(option.type =='share'){
 				if(uni.getStorageSync('_WX_State')){

seller/pages/cart/immediately.vue

@@ -163,7 +163,7 @@
 					this.buyRetailPriceStep = data.step
 					this.specClass = 'show';
 					if(this.handleData.ladderPriceFlag == '1'){
-						this.ProductService.GetSearchProductLadderPrice({productId:this.handleData.p_id}).then(response=>{
+						this.ProductService.GetSearchProductLadderPrice({productId:this.handleData.productId}).then(response=>{
 							this.handleDataLadderPriceList = response.data
 							this.handleDataLadderPriceList.forEach((item,index)=>{
 								if(this.number>=item.buyNum){

services/product.service.js

@@ -195,7 +195,12 @@ export default class ProductService {
 	}
 	/* 新商品搜索查询商品阶梯价格 */
 	GetSearchProductLadderPrice (data = {}) {
-		return this.AjaxService.get({ url:'/product/ladderPrice', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/commodity/price/ladder', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/* 获取分类导航 */
 	GetProductClassify (data = {}) {

services/second.service.js

@@ -40,6 +40,11 @@ export default class SecondService {
 	 *@param productId：商品ID（数字类型，必传）
 	 */
 	ProductDetail (data={}){//商品详情
-		return this.AjaxService.get({ url:'/product/getSecondHandProductDetail', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/commodity/second/detail', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 }

services/shop.service.js

@@ -30,7 +30,12 @@ export default class ShopService {
 	}
 	/* 小程序供应商我的商品 */
 	GetSupplierPyProduct (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/myProduct', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/commodity/shop/product/list', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 小程序供应商操作添加删除主推商品 */
 	SupplierSwitchFeaturedyProduct (data = {}) {
@@ -46,15 +51,29 @@ export default class ShopService {
 	}
 	/* 小程序供应商我的店铺banner */
 	GetSupplierHomeBanner (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/home/images', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/supplier/home/images', 
+			data, 
+			isLoading: true ,
+		})
 	}
 	/* 小程序供应商我的店铺主推商品 */
 	GetSupplierHomeProduct (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/home/products', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/commodity/shop/product/main', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 小程序供应商我的店铺全部商品 */
 	GetSupplierHomeProductList (data = {}) {
-		return this.AjaxService.get({ url:'/search/query/product/supplier', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/commodity/search/query/product/shop', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/* 小程序供应商我的订单 */
 	GetSupplierMyOrderList (data = {}) {

supplier/pages/user/my-product.vue

@@ -30,15 +30,15 @@
 										<view class="checkbox iconfont" :class="[item.isChecked ?'icon-yixuanze':'icon-weixuanze']" @click="checkedSoperv(item)"></view>
 									</view>
 									<view class="tui-goods-image">
-										<image :src="item.mainImage" class="tui-goods-img"/>
+										<image :src="item.image" class="tui-goods-img"/>
 									</view>
 									<view class="tui-goods-info" :style="{width:isSuperv ? '360rpx' : '420rpx'}"> 
 										<view class="tui-goods-title">{{ item.name }}</view>
 										<view class="tui-price-box">
-											<view class="tui-goods-price">￥{{item.price1 | NumFormat}}</view>
+											<view class="tui-goods-price">￥{{item.price | NumFormat}}</view>
 										</view>
 										<view class="tui-goods-pip">市场价:￥{{item.normalPrice | NumFormat}}</view>
-										<view class="tui-goods-pip">分类:{{ item.typeName }}</view>
+										<view class="tui-goods-pip">分类:{{ item.typeName ? item.typeName : '无' }}</view>
 									</view>
 									<view class="tui-goods-status">
 										<view class="status-text" :style="{ color: verifyColorFilter(item.validFlag)}">
@@ -82,7 +82,14 @@
 						<text class="iconfont icon-xiangyou"></text>
 					</picker>
 				</view>
-				<view class="d-label">分类:</view>
+				<view class="d-label">商品属性:</view>
+				<view class="d-input">
+					<picker @change="bindPickerChange(0,$event)" :value="index" :range="commodityTypeActons" range-key="name">
+						<input class="input" type="text" disabled="false" v-model="commodityTypeText" value="" placeholder="请选择"/>
+						<text class="iconfont icon-xiangyou"></text>
+					</picker>
+				</view>
+				<view class="d-label">商品分类:</view>
 				<view class="d-input">
 					<picker @change="bindPickerChange(3,$event)" :value="index" :range="classificationFirstList" range-key="name">
 						<input class="input" type="text" disabled="false" v-model="firstClassificationText" value="" placeholder="请选择一分类"/>
@@ -93,7 +100,7 @@
 					<picker @change="bindPickerChange(4,$event)" :value="index" :range="classificationTwoList" range-key="name">
 						<input class="input" type="text" disabled="false" v-model="twoClassificationText" value="" placeholder="请选择二级分类"/>
 						<text class="iconfont icon-xiangyou"></text>
-					</picker>
+					</picker> 
 				</view>
 				<view class="d-input">
 					<picker @change="bindPickerChange(5,$event)" :value="index" :range="classificationThreeList" range-key="name">
@@ -125,16 +132,17 @@
 	import modalLayer from "@/components/modal-layer"
 	import { mapState,mapMutations } from 'vuex'
 	const defaultListQuery = {
-			shopID:'',
+			shopId:'',
 			pageNum:1,
 			pageSize:10,
 			productCode:'',//货号
 			name:'',//商品名称
 			validFlag:'',//状态
 			featuredFlag:'',//是否主推
-			bigTypeID:0,//一级
-			smallTypeID:0,//二级
-			tinyTypeID:0//三级
+			commodityType:1,//商品属性
+			bigTypeId:0,//一级
+			smallTypeId:0,//二级
+			tinyTypeId:0//三级
 	 };
 	export default{
 		components: {
@@ -143,15 +151,17 @@
 		},
 		data() {
 			return{	
-				shopID:0,
+				shopId:0,
 				isSuperv:false,
 				isProductChecked:false,
 				validFlagText:'',
 				featuredFlagText:'',
+				commodityTypeText:'产品',//预览商品属性
 				firstClassificationText:'',
 				twoClassificationText:'',
 				threeClassificationText:'',
 				recommendActions: [{name:'是',value:1},{name: '否',value:0}],
+				commodityTypeActons: [{name:'产品',value:1},{name: '仪器',value:2}],
 				statusActions: [
 					{name:'全部',value:''},
 					{name: '未审核',value:1},
@@ -207,9 +217,9 @@
 					break;
 			}
 			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.listQuery.shopID = this.shopID = resolve.shopId
+				this.listQuery.shopId = this.shopId = resolve.shopId
 				this.GetProductListInfo()
-				this.GetPrimaryClassification()
+				this.GetPrimaryClassification(this.listQuery.commodityType)
 			})
 		},
 		filters: {
@@ -324,9 +334,10 @@
 			},	
 			handSearchClear(){//重置搜索条件
 				this.listQuery = Object.assign({}, defaultListQuery)
-				this.listQuery.shopID = this.shopID
+				this.listQuery.shopId = this.shopId
 				this.validFlagText='';
 				this.featuredFlagText='';
+				this.commodityTypeText='';
 				this.firstClassificationText='';
 				this.twoClassificationText='';
 				this.threeClassificationText='';
@@ -466,6 +477,10 @@
 			},
 			bindPickerChange: function(type,e) {//选择筛选条件
 				switch(type){
+					case 0:
+						this.commodityTypeText = this.statusActions[e.target.value].name
+						this.listQuery.commodityType = this.commodityTypeActons[e.target.value].value
+						break;
 					case 1:
 						this.validFlagText = this.statusActions[e.target.value].name
 						this.listQuery.validFlag = this.statusActions[e.target.value].value
@@ -474,34 +489,34 @@
 						this.featuredFlagText = this.recommendActions[e.target.value].name
 						this.listQuery.featuredFlag = this.recommendActions[e.target.value].value
 						break;
-					case 3:					
+					case 3:			
 						this.firstClassificationText = this.classificationFirstList[e.target.value].name
-						this.listQuery.bigTypeID = this.classificationFirstList[e.target.value].value
-						this.GetPrimarySecondaryClassification(this.listQuery.bigTypeID)
+						this.listQuery.bigTypeId = this.classificationFirstList[e.target.value].value
+						this.GetPrimarySecondaryClassification(this.listQuery.bigTypeId)
 						this.twoClassificationText = ''
 						this.threeClassificationText=''
 						break;
 					case 4:
-						if(this.listQuery.bigTypeID == 0){
+						if(this.listQuery.bigTypeId == 0){
 							this.$util.msg('请先选择一级分类',2000)
 							return
 						}
 						this.twoClassificationText = this.classificationTwoList[e.target.value].name
-						this.listQuery.smallTypeID = this.classificationTwoList[e.target.value].value
-						this.GetPrimaryThreeLevelClassification(this.listQuery.smallTypeID)
+						this.listQuery.smallTypeId = this.classificationTwoList[e.target.value].value
+						this.GetPrimaryThreeLevelClassification(this.listQuery.smallTypeId)
 						break;
 					case 5:
-						if(this.listQuery.smallTypeID == 0){
+						if(this.listQuery.smallTypeId == 0){
 							this.$util.msg('请先选择二级分类',2000)
 							return
 						}
 						this.threeClassificationText = this.classificationThreeList[e.target.value].name
-						this.listQuery.tinyTypeID = this.classificationThreeList[e.target.value].value
+						this.listQuery.tinyTypeId = this.classificationThreeList[e.target.value].value
 						break;
 				}
 			},
-			GetPrimaryClassification(){//获取筛选条件一级分类
-				this.ShopService.GetPrimaryClassification().then(response =>{
+			GetPrimaryClassification(value){//获取筛选条件一级分类
+				this.ShopService.GetPrimaryClassification({typeSort:value}).then(response =>{
 					const data = response.data
 					data.forEach(item =>{
 						let _obj = {name:item.name,value:item.bigTypeID} 

supplier/pages/user/my-shop.vue

@@ -37,92 +37,92 @@
 						<image class="none-image" :src="iconNoneData" mode=""></image>
 						<view class="none-text">暂无主推商品~</view>
 					</view>
-					<view v-else class="floor-item" v-for="(item, index) in recommendList" :key="index" @click.stop="navToDetailPage(item.id)">
-						<image class="item-img tui-skeleton-fillet" :src="item.image" mode="aspectFill"></image>
+					<view v-else class="floor-item" v-for="(prop, index) in recommendList" :key="index" @click.stop="navToDetailPage(prop.productId)">
+						<image class="item-img tui-skeleton-fillet" :src="prop.image" mode="aspectFill"></image>
 						<view class="floor-item-content">
 							<view class="title tui-skeleton-rect">
-								<text class="mclap-tag" v-if="item.beautyActFlag == '1'">美博会</text>
-								<text class="mclap" :class="item.beautyActFlag =='1' ? 'indent' : ''">{{isInterceptHtmlFn(item.name)}}</text>
+								<text class="mclap-tag" v-if="prop.beautyActFlag == '1'">美博会</text>
+								<text class="mclap" :class="prop.beautyActFlag =='1' ? 'indent' : ''">{{ prop.name }}</text>
 							</view>
 							<view class="floor-item-act">
 								<template v-if="userIdentity === 3">
-									<template v-if="item.actStatus===1">
-										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}
-											<text v-if="hasLogin && item.p_price_flag != 1 && item.supplierId == shopId">:￥{{item.price | NumFormat}}</text>
+									<template v-if="prop.actStatus===1">
+										<view class="floor-tags" v-if="PromotionsFormat(prop.promotions)">
+											{{prop.promotions.name}}
+											<text v-if="hasLogin && prop.priceFlag != 1 && prop.shopId == shopId">:￥{{prop.price | NumFormat}}</text>
 										</view>
-										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+										<view class="floor-tags" v-else>{{prop.promotions.name}}</view>	
 									</template>
-									<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
+									<template v-if="prop.actStatus ===0  &&  prop.ladderPriceFlag===1">
 										<view class="floor-tags">阶梯价格</view>	
 									</template>
 								</template>	
 								<template v-else>
-									<template v-if="item.actStatus===1">
-										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}
-											<text v-if="hasLogin && item.p_price_flag != 1">:￥{{item.price | NumFormat}}</text>
+									<template v-if="prop.actStatus===1">
+										<view class="floor-tags" v-if="PromotionsFormat(prop.promotions)">
+											{{prop.promotions.name}}
+											<text v-if="hasLogin && prop.priceFlag != 1">:￥{{prop.price | NumFormat}}</text>
 										</view>
-										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+										<view class="floor-tags" v-else>{{prop.promotions.name}}</view>	
 									</template>
-									<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
+									<template v-if="prop.actStatus ===0  &&  prop.ladderPriceFlag===1">
 										<view class="floor-tags">阶梯价格</view>	
 									</template>
 								</template>
 							</view>	
 							<view class="" v-if="hasLogin">
 								<template v-if="userIdentity == 3">
-									<template v-if="item.supplierId == shopId">
-										<view class="title-none" v-if="item.p_price_flag === '1'">
+									<template v-if="prop.shopId == shopId">
+										<view class="title-none" v-if="prop.priceFlag === 1">
 											<text class="p big">￥未公开价格</text>
 										</view>
-										<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+										<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(prop.promotions) ? 'none' : ''">
 											<text class="p sm">￥</text>
-											<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
+											<text class="p big">{{ (PromotionsFormat(prop.promotions) ? prop.originalPrice : prop.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.priceGrade)" :margin="14"></uni-grader>
+												<uni-grader :grade="Number(prop.priceGrade)" :margin="14"></uni-grader>
 											</view>
 										</view>	
 									</template>
 								</template>
 								<template v-else-if="userIdentity ===4">
-									<view class="title-none" v-if="item.p_price_flag === '1'">
+									<view class="title-none" v-if="prop.priceFlag === 1">
 										<text class="p big">￥未公开价格</text>
 									</view>
-									<view class="title-none"  v-if="item.p_price_flag === '2'">
+									<view class="title-none"  v-if="prop.priceFlag === 2">
 										<text class="p big">￥价格仅会员可见</text>
 									</view>
-									<view class="price tui-skeleton-rect" v-if="item.p_price_flag === '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+									<view class="price tui-skeleton-rect" v-if="prop.priceFlag === 0" :class="PromotionsFormat(prop.promotions) ? 'none' : ''">
 										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
+										<text class="p big">{{ (PromotionsFormat(prop.promotions) ? prop.originalPrice : prop.price ) | NumFormat}}</text>
 									</view>
 								</template>
 								<template v-else>
-									<view class="title-none" v-if="item.p_price_flag === '1'">
+									<view class="title-none" v-if="prop.priceFlag === 1">
 										<text class="p big">￥未公开价格</text>
 									</view>
-									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(prop.promotions) ? 'none' : ''">
 										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
+										<text class="p big">{{ (PromotionsFormat(prop.promotions) ? prop.originalPrice : prop.price ) | NumFormat}}</text>
 									</view>
 								</template>	
 							</view>
 							<view v-else class="no-price">
 								<view class="p-stars">
 									<text class="p-no">￥</text>
-									<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
-									<template v-if="item.actStatus==1">
-										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}<text v-if="hasLogin && item.p_price_flag != '1'">:￥{{item.price | NumFormat}}</text>
+									<uni-grader :grade="Number(prop.priceGrade)"></uni-grader>
+									<template v-if="prop.actStatus==1">
+										<view class="floor-tags" v-if="PromotionsFormat(prop.promotions)">
+											{{prop.promotions.name}}<text v-if="hasLogin && prop.priceFlag != 1">:￥{{prop.price | NumFormat}}</text>
 										</view>
-										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+										<view class="floor-tags" v-else>{{prop.promotions.name}}</view>	
 									</template>
-									<template v-if="item.actStatus ==0  &&  item.ladderPriceFlag==1">
+									<template v-if="prop.actStatus ==0  &&  prop.ladderPriceFlag==1">
 										<view class="floor-tags">阶梯价格</view>	
 									</template>
 								</view>
@@ -138,85 +138,85 @@
 						<image class="none-image" :src="iconNoneData1" mode=""></image>
 						<view class="none-text">暂未发布任何商品~</view>
 					</view>
-					<view v-else class="floor-item" v-for="(item, index) in productList" :key="index" @click.stop="navToDetailPage(item.p_id)">
-						<image class="item-img tui-skeleton-fillet" :src="item.p_image" mode="aspectFill"></image>
+					<view v-else class="floor-item" v-for="(prop, index) in productList" :key="index" @click.stop="navToDetailPage(prop.productId)">
+						<image class="item-img tui-skeleton-fillet" :src="prop.image" mode="aspectFill"></image>
 						<view class="floor-item-content">
 							<view class="title tui-skeleton-rect">
-								<text class="mclap-tag" v-if="item.p_act_flag == '1'">美博会</text>
-								<text class="mclap" :class="item.p_act_flag =='1' ? 'indent' : ''">{{isInterceptHtmlFn(item.p_name)}}</text>
+								<text class="mclap-tag" v-if="prop.priceFlag == '1'">美博会</text>
+								<text class="mclap" :class="prop.priceFlag =='1' ? 'indent' : ''">{{isInterceptHtmlFn(prop.name)}}</text>
 							</view>
 							<view class="floor-item-act">
 								<template v-if="userIdentity === 3">
-									<template v-if="item.actStatus===1">
-										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}
-											<text v-if="hasLogin && item.p_price_flag != 1 && item.supplierId == shopId">:￥{{item.price | NumFormat}}</text>
+									<template v-if="prop.actStatus===1">
+										<view class="floor-tags" v-if="PromotionsFormat(prop.promotions)">
+											{{prop.promotions.name}}
+											<text v-if="hasLogin && prop.priceFlag != 1 && prop.shopId == shopId">:￥{{prop.price | NumFormat}}</text>
 										</view>
-										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+										<view class="floor-tags" v-else>{{prop.promotions.name}}</view>	
 									</template>
-									<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
+									<template v-if="prop.actStatus ===0  &&  prop.ladderPriceFlag===1">
 										<view class="floor-tags">阶梯价格</view>	
 									</template>
 								</template>	
 								<template v-else>
-									<template v-if="item.actStatus===1">
-										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}
-											<text v-if="hasLogin && item.p_price_flag != 1">:￥{{item.price | NumFormat}}</text>
+									<template v-if="prop.actStatus===1">
+										<view class="floor-tags" v-if="PromotionsFormat(prop.promotions)">
+											{{prop.promotions.name}}
+											<text v-if="hasLogin && prop.priceFlag != 1">:￥{{prop.price | NumFormat}}</text>
 										</view>
-										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
+										<view class="floor-tags" v-else>{{prop.promotions.name}}</view>	
 									</template>
-									<template v-if="item.actStatus ===0  &&  item.ladderPriceFlag===1">
+									<template v-if="prop.actStatus ===0  &&  prop.ladderPriceFlag===1">
 										<view class="floor-tags">阶梯价格</view>	
 									</template>
 								</template>
 							</view>	
 							<view class="" v-if="hasLogin">
 								<template v-if="userIdentity == 3">
-									<template v-if="item.supplierId == shopId">
-										<view class="title-none" v-if="item.p_price_flag === '1'">
+									<template v-if="prop.shopId == shopId">
+										<view class="title-none" v-if="prop.priceFlag === 1">
 											<text class="p big">￥未公开价格</text>
 										</view>
-										<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+										<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(prop.promotions) ? 'none' : ''">
 											<text class="p sm">￥</text>
-											<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
+											<text class="p big">{{ (PromotionsFormat(prop.promotions) ? prop.originalPrice : prop.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.priceGrade)" :margin="14"></uni-grader>
+												<uni-grader :grade="Number(prop.priceGrade)" :margin="14"></uni-grader>
 											</view>
 										</view>	
 									</template>
 								</template>
 								<template v-else-if="userIdentity ===4">
-									<view class="title-none" v-if="item.p_price_flag === '1'">
+									<view class="title-none" v-if="prop.priceFlag === 1">
 										<text class="p big">￥未公开价格</text>
 									</view>
-									<view class="title-none"  v-if="item.p_price_flag === '2'">
+									<view class="title-none"  v-if="prop.priceFlag === 2">
 										<text class="p big">￥价格仅会员可见</text>
 									</view>
-									<view class="price tui-skeleton-rect" v-if="item.p_price_flag === '0'" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+									<view class="price tui-skeleton-rect" v-if="prop.priceFlag === 0" :class="PromotionsFormat(prop.promotions) ? 'none' : ''">
 										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
+										<text class="p big">{{ (PromotionsFormat(prop.promotions) ? prop.originalPrice : prop.price ) | NumFormat}}</text>
 									</view>
 								</template>
 								<template v-else>
-									<view class="title-none" v-if="item.p_price_flag === '1'">
+									<view class="title-none" v-if="prop.priceFlag === 1">
 										<text class="p big">￥未公开价格</text>
 									</view>
-									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(item.promotions) ? 'none' : ''">
+									<view class="price tui-skeleton-rect" v-else :class="PromotionsFormat(prop.promotions) ? 'none' : ''">
 										<text class="p sm">￥</text>
-										<text class="p big">{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price ) | NumFormat}}</text>
+										<text class="p big">{{ (PromotionsFormat(prop.promotions) ? prop.originalPrice : prop.price ) | NumFormat}}</text>
 									</view>
 								</template>	
 							</view>
 							<view v-else class="no-price">
 								<view class="p-stars">
 									<text class="p-no">￥</text>
-									<uni-grader :grade="Number(item.p_price_grade)"></uni-grader>
+									<uni-grader :grade="Number(prop.p_price_grade)"></uni-grader>
 								</view>
 							</view>	
 						</view>
@@ -273,7 +273,7 @@
 			}
 		},
 		computed: {
-			...mapState(['isWxAuthorize'])
+			...mapState(['hasLogin','userInfo','isActivity','identity','isWxAuthorize'])
 		},
 		onLoad(option) {
 			if(option.type =='share'){
@@ -298,10 +298,7 @@
 			NumFormat:function(text) {//处理金额
 				return Number(text).toFixed(2);
 			},
-		},
-		computed: {
-			...mapState(['hasLogin','userInfo','isActivity'])
-		},
+		},	
 		methods: {
 			...mapMutations(['login','logout']),
 			InitShopDataInfo(){//初始化请求数据
@@ -329,7 +326,7 @@
 				})
 			},
 			GetSupplierHomeProduct(){//主推商品
-				this.ShopService.GetSupplierHomeProduct({supplierId:this.supplierId}).then(response =>{
+				this.ShopService.GetSupplierHomeProduct({shopId:this.supplierId,identity:this.identity}).then(response =>{
 					let data = response.data
 					console.log('主推商品',data)
 					if(data.length>0){
@@ -374,7 +371,7 @@
 				let productIdArr = [];
 				let productIds ='';
 				data.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
-					productIdArr.push(item.id)
+					productIdArr.push(item.productId)
 				})
 				productIds = productIdArr.join(",");
 				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:productIds}).then(response =>{
@@ -387,11 +384,11 @@
 				let productIdArr = [];
 				let productIds ='';
 				data.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
-					productIdArr.push(item.p_id)
+					productIdArr.push(item.productId)
 				})
 				productIds = productIdArr.join(",");
 				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:productIds}).then(response =>{
-					this.productList = this.ReturnNewProducts1(data,response.data);
+					this.productList = this.ReturnNewProducts(data,response.data);
 					console.log('合并价格后',this.productList)
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -401,18 +398,7 @@
 				let NewArray = []
 				listA.map(item=>{
 					for (let i = 0; i < listB.length; i++) {
-						if( item.id == listB[i].productId ){
-							NewArray.push(Object.assign(item,listB[i])) 
-						}
-					}
-				});
-				return NewArray
-			},
-			ReturnNewProducts1(listA,listB){
-				let NewArray = []
-				listA.map(item=>{
-					for (let i = 0; i < listB.length; i++) {
-						if( item.p_id == listB[i].productId ){
+						if( item.productId == listB[i].productId ){
 							NewArray.push(Object.assign(item,listB[i])) 
 						}
 					}