Merge branch 'developer' of http://git.caimei365.com/caimei-repository/caimei-applets-caimei into developer

App.vue

@@ -8,6 +8,28 @@
 	export default {
 		onLaunch: function() {
 			let self = this
+			//小程序热更新代码
+			// if (wx.canIUse('getUpdateManager')) {
+			// 	const updateManager = wx.getUpdateManager()
+			// 	updateManager.onCheckForUpdate(function (res) {
+			//         console.log('onCheckForUpdate====', res)
+			//         // 请求完新版本信息的回调
+			//         if (res.hasUpdate) {
+			// 			console.log('res.hasUpdate====')
+			// 			updateManager.onUpdateReady(function () {// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+			// 				self.$util.modal('更新提示','新版本已经准备好，是否重启应用？','确定','取消',true,() =>{
+			// 					updateManager.applyUpdate()
+			// 				})
+			// 			})
+			// 			updateManager.onUpdateFailed(function () {  // 新的版本下载失败
+			// 				self.$util.modal('已经有新版本了哟~','新版本已经上线啦~，请您删除当前小程序，重新搜索打开哟~','确定','取消',true,() =>{
+			// 					// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+			// 					updateManager.applyUpdate()
+			// 				})
+			// 			})
+			//         }
+			// 	})
+			// }
 			uni.getSystemInfo({
 				success: function(e) {
 					let modelmes = e.model;
@@ -99,12 +121,6 @@
 							this.$api.navigateTo('/pages/authorization/authorization')
 						}
 					})
-					// if(uni.getStorageSync('_WX_State')){
-					// 	this.getWxAuthorize()
-					// }else{
-					// 	console.log(new Date +'用户未授权微信信息')
-					// 	this.$api.navigateTo('/pages/authorization/authorization')
-					// }	
 				},TIME)
 			},
 			diffTime(t){

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{
@@ -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]

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/cm-seller/category.vue

@@ -16,11 +16,11 @@
 			<!--右侧子导航-->
 			<scroll-view  scroll-y="true" class="right-aside" :style="{top:(CustomBar+38)+'px',height:(windowHeight-CustomBar+38)+'px'}">
 				<view class="category" v-for="(first,index) in categoryList" :key="index" v-show="index==showCategoryIndex" >
-					<template v-if="first.smalltypeList">
-						<view class="category-box AAA" v-for="(small,oIndex) in first.smalltypeList" :key="oIndex">
+					<template v-if="first.smallTypeList && first.smallTypeList.length > 0">
+						<view class="category-box AAA" v-for="(small,oIndex) in first.smallTypeList" :key="oIndex">
 							<view class="title">{{small.name}}</view>
-							<view class="list" v-if="small.tinytypeList.length > 0">
-								<view class="box" v-for="(pro,proIndex) in small.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,3)">
+							<view class="list" v-if="small.tinyTypeList && small.tinyTypeList.length > 0">
+								<view class="box" v-for="(pro,proIndex) in small.tinyTypeList" :key="proIndex" @click.stop="navToListPage(pro,3)">
 									<image :src="pro.crmIcon ? pro.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">{{pro.name}}</view>
 								</view>
@@ -39,7 +39,7 @@
 							<view class="no-data">
 								<view class="box" @click.stop="navToListPage(first,1)">
 									<image :src="first.crmIcon ? first.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
-									<view class="text">全部商品</view>
+									<view class="text">全部商品a</view>
 								</view>
 							</view>
 						</view>
@@ -80,8 +80,7 @@
 			this.initData();
 		},
 		methods: {
-			// 数据初始化
-			initData() {
+			initData() {// 数据初始化
 				this.GetProductCate(this.categoryTabIndex);
 				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
 				this.windowHeight = windowHeight - 1;
@@ -91,13 +90,12 @@
 				this.categoryList = []
 				this.GetProductCate(data);
 			},
-			// 获取商品分类列表
-			GetProductCate (index) {
+			GetProductCate (index) {// 获取商品分类列表
 				this.CommonService.GetFirstClassly({typeSort:index,source :'crm'}).then(response =>{
 					this.categoryList = response.data
 					// 查询第一个拥有二级菜单的子菜单
 					for (let i = 0; i < this.categoryList.length; i++) {
-						if (this.categoryList[i].smalltypeList.length > 0) {
+						if (this.categoryList[i].smallTypeList.length > 0) {
 							this.showCategoryIndex = i;
 							break;
 						}
@@ -113,19 +111,19 @@
 			},
 			toSearch () {// 跳转至搜索详情页
 				uni.navigateTo({
-					url: `/search/pages/search/search?search=${JSON.stringify(this.search)}`
+					url: `/pages/search/search?search=${JSON.stringify(this.search)}`
 				})
 			},
 			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;
 				}
 			},

components/cm-module/listTemplate/buyagainList.vue

@@ -3,21 +3,21 @@
 		<list-skeleton v-if="showSkeleton"></list-skeleton>
 		<view class="product-container" v-if="!isShowEmpty" :style="{paddingTop:searchStatus?'112rpx':''}">
 			<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="productList.length > 0">
-				<view v-for="(item,index) in productList" :key="index" :id="item.id" 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 productList" :key="index" :id="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">
 						<text class="list-details-title">{{item.name}}</text>
 						<text class="list-details-specs">规格：{{item.unit !=null ? item.unit : ''}}</text>
-						<text class="list-details-miniQuantity">起订量：{{item.ladderPriceFlag == '1' ? item.maxBuyNumber : item.minBuyNumber}}</text>
+						<text class="list-details-miniQuantity">起订量：{{item.ladderPriceFlag == 1 ? item.maxBuyNumber : item.minBuyNumber}}</text>
 						<view class="list-details-price">
 							<view class="list-shop">
-								<view class="list-price-none" v-if="item.repurchasePriceState">
-									<text class="price-none">￥{{item.discountPrice}}</text>
+								<view class="list-price-none" v-if="item.repurchaseFlag == 1">
+									<text class="price-none">￥{{item.originalPrice}}</text>
 									<text class="iconfont icon-wenhao" @click.stop="repurchModel"></text>
 								</view>
 								<view class="list-price" v-else>
 									<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.price1 : item.retailPrice) | NumFormat }}
+										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat }}
 									</text>
 								</view>
 							</view>
@@ -26,7 +26,7 @@
 						<view class="list-details-price" v-if="item.actStatus==1">
 							<view class="floor-item-act">
 								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-									{{item.promotions.name}}<text>:￥{{ item.retailPrice | NumFormat }}</text>
+									{{item.promotions.name}}<text>:￥{{ item.price | NumFormat }}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 							</view>
@@ -81,7 +81,7 @@
 				windowHeight: '',
 				showSkeleton: true,
 				isShowEmpty: false,
-				userID: '',
+				userId: '',
 				scrollHeight: '',
 				productList: [],
 				showLoading: false,
@@ -103,8 +103,8 @@
 			this.setScrollHeight();		
 			this.$parent.getClubProductNum()
 			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
-				this.userID = resolve.userID
-				this.getProductAgainInfo()
+				this.userId = resolve.userID
+				this.getProductAgainInfo(false)
 			})
 		},
 		filters: {
@@ -132,22 +132,30 @@
 				this.loadingText = '加载中';
 				this.isShowEmpty = false;				
 				if(loadMore) {this.pageNum += 1;}
-				let params = {userId:this.userID,pageNum:this.pageNum,pageSize:this.pageSize}
-				this.ProductService.GetRepeatBuyAgainProductList(params).then(response =>{
+				this.ProductService.GetRepeatBuyAgainProductList(
+					{
+						userId:this.userId,
+						pageNum:this.pageNum,
+						pageSize:this.pageSize,
+					}
+				)
+				.then(response =>{
 					this.isShowWrapper = true
-					const responseData = response.data.pageDate;
-					if(responseData.results && responseData.results.length > 0){
-						this.hasNextPage = responseData.hasNextPage;
+					this.showSkeleton = false;
+					const listData = response.data.results;
+					if(listData && listData.length > 0){
+						this.hasNextPage = response.data.hasNextPage;
 						this.isShowEmpty = false;
 						if(loadMore) {
-							this.productList = [...this.productList,...responseData.results];
+							this.productList = [...this.productList,...listData];
 						} else {
-							this.productList = [...responseData.results];
-							this.showSkeleton = false;
+							this.productList = listData;
+							console.log(this.productList)
 						}
 						//价格显示处理
 						let isActFlg,newProductList=[];
 						this.productList.map((item, index)=> {
+							console.log(item)
 							if(item.actStatus == 1){
 								isActFlg = true
 							}else if(item.actStatus == 1 && item.ladderPriceFlag == 1){
@@ -158,6 +166,7 @@
 							newProductList.push(Object.assign({},item,{isShowActFlg:isActFlg}))
 						})
 						this.productList = newProductList
+						console.log(this.productList)
 						// 防上拉暴滑
 						this.pullFlag = false;
 						setTimeout(()=>{
@@ -175,7 +184,8 @@
 							this.isShowEmpty = true;
 						}
 					}
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})
 			},

components/cm-module/listTemplate/immediatelyList.vue

@@ -31,14 +31,14 @@
 		<view class="product-container" v-else >
 			<view :class="tabIndex" v-if="tabIndex === 0"  :style="{paddingTop:searchStatus?'128rpx':''}">
 				<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower(tabIndex)" scroll-y v-if="listData.length > 0">
-					<view v-for="(item,index) in listData" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.p_id)"  >
-					    <image mode='widthFix' :src="item.p_image"  class="list-img" alt="list-img"></image>
+					<view v-for="(item,index) in listData" :key="index" :id="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">
-							<text class="list-details-title">{{isInterceptHtmlFn(item.p_name)}}</text>
-							<text class="list-details-specs">规格：{{item.p_unit?item.p_unit:''}}</text>
+							<text class="list-details-title">{{isInterceptHtmlFn(item.name)}}</text>
+							<text class="list-details-specs">规格：{{item.unit ? item.unit : ''}}</text>
 							<text class="list-details-miniQuantity list-details-specs">起订量：{{item.minBuyNumber}}</text>
-							<view class="list-details-specs" v-if="item.p_code!=''&&item.p_code!=null">
-								<view>商品编码：{{item.p_code}}</view>
+							<view class="list-details-specs" v-if="item.code!=''&& item.code!=null">
+								<view>商品编码：{{item.code}}</view>
 							</view>
 							<view class="list-details-price">
 								<template v-if="priceLoading">
@@ -79,19 +79,19 @@
 				<scroll-view :style="{'height':scrollHeight+'px',paddingTop:searchStatus?'112rpx':''}" @scrolltolower="scrolltolower(tabIndex)" scroll-y>
 					<view class="all-zuhe-list" v-for="(item,index) in combinationProduct" :key="index" :id="item.id">
 						<view class="zuhe_title" :class="index%2==0 ? 'active' : ''">{{item.name}}</view>
-						<view v-for="(pros,proIndex) in item.combinationProductList" :class="index%2==0 ? 'stylecontent' : ''" :key="proIndex" :id="pros.productID" class="zuhe-list-content commodity-list" >
+						<view v-for="(pros,proIndex) in item.combinationProductList" :class="index%2==0 ? 'stylecontent' : ''" :key="proIndex" :id="pros.productId" class="zuhe-list-content commodity-list" >
 							<view class="list-details-info" >
-								<text class="list-details-title zuhe_list_text">商品编码：{{pros.productCode}}</text>
-								<text class="list-details-specs zuhe_list_text" @click.stop="navToDetailPage(pros.productID)">{{pros.name}}</text>
+								<text class="list-details-title zuhe_list_text">商品编码：{{pros.code}}</text>
+								<text class="list-details-specs zuhe_list_text" @click.stop="navToDetailPage(pros.productId)">{{pros.name}}</text>
 								<view class="list-details-price zuhe_list_price">
 									<view class="list-shop com">
 										<view class="list-price zuhe_list_price" >
 											<view class="zuhe_price-larger zuhe_list_text" >
-												<view class="list-price-none" v-if="pros.repurchasePriceState">
-													<text class="price-none">价格：￥{{pros.discountPrice}}</text>
+												<view class="list-price-none" v-if="pros.repurchaseFlag == 1">
+													<text class="price-none">价格：￥{{ pros.originalPrice }}</text>
 													<text class="iconfont icon-wenhao" @click.stop="repurchModel"></text>
 												</view>
-												<view class="price-larger">价格：￥{{ pros.retailPrice | NumFormat }}</view>
+												<view class="price-larger">价格：￥{{ pros.price | NumFormat }}</view>
 											</view>
 											<view class="zuhe_price-larger zuhe_list_text" >
 												<view class="floor-item-act" v-if="pros.actStatus==1">
@@ -257,8 +257,17 @@
 				this.loadingText = '加载中';
 				this.isShowEmpty = false;				
 				if(loadMore) {this.pageNum += 1;}
-				let params = {identity:this.identity,keyword:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize,sortField:'',sortType:''}
-				this.ProductService.GetProductSearchList(params).then(response =>{
+				this.ProductService.GetProductSearchList(
+					{
+						identity:this.identity,
+						keyword:this.searchInputVal,
+						pageNum:this.pageNum,
+						pageSize:this.pageSize,
+						sortField:'',
+						sortType:'',
+					}
+				)
+				.then(response =>{
 					this.isShowWrapper = true
 					const resData = JSON.parse(response.data);
 					const resList = resData.items;
@@ -289,7 +298,8 @@
 							this.isShowEmptyText ='暂无相关商品'
 						}
 					}
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})
 			},
@@ -297,7 +307,7 @@
 				let productIdArr = [];
 				let productIds ='';
 				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
-					productIdArr.push(item.p_id)
+					productIdArr.push(item.productId)
 				})
 				productIds = productIdArr.join(",");
 				this.ProductService.querySearchProductPrice({userId: this.clubUserId,productIds:productIds}).then(response =>{
@@ -311,7 +321,7 @@
 				let NewArray = []
 				Array.map(item=>{
 					for (let i = 0; i < list.length; i++) {
-						if( item.p_id == list[i].productId ){
+						if( item.productId == list[i].productId ){
 							NewArray.push(Object.assign(item,list[i])) 
 						}
 					}
@@ -341,10 +351,18 @@
 				this.loadingText = '加载中';
 				this.isShowEmpty = false;				
 				if(loadMore) {this.pageNum += 1;}
-				let params = {clubUserId:this.clubUserId,pageNum:this.pageNum,pageSize:this.zuhepageSize,searchWord:this.searchInputVal}
-				this.SellerService.GetCombinationProduct(params).then(response =>{
+				this.ProductService.GetSearchCombinationProduct(
+					{
+						clubUserId:this.clubUserId,
+						pageNum:this.pageNum,
+						pageSize:this.zuhepageSize,
+						searchWord:this.searchInputVal,
+						}
+					)
+				.then(response =>{
 					this.isShowWrapper = true
 					const responseData = response.data;
+					console.log(responseData)
 					if(responseData.results && responseData.results.length > 0){
 						this.hasNextPage = responseData.hasNextPage;
 						this.isShowEmpty = false;
@@ -371,7 +389,8 @@
 						this.isShowEmpty = true;
 						this.isShowEmptyText ='暂无相关商品'
 					}
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})
 			},
@@ -422,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)
@@ -451,13 +470,13 @@
 				})
 			},
 			processActivityPrice(pros){//单独处理活动价格和阶梯价格
-				let ladderPriceList = pros.ladderPriceList;
+				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

@@ -3,24 +3,24 @@
 		<list-skeleton v-if="showSkeleton" :listType='0'></list-skeleton>
 		<view class="product-container" v-if="!isShowEmpty">
 			<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower" scroll-y v-if="productList.length > 0">
-				<view v-for="(item,index) in productList" :key="index" :id="item.id" 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 productList" :key="index" :id="item.id" 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">
 						<text class="list-details-title">{{item.name}}</text>
 						<text class="list-details-specs">规格：{{item.unit !=null ? item.unit : ''}}</text>
 						<text class="list-details-miniQuantity">起订量：{{ item.ladderPriceFlag == '1' ? item.maxBuyNumber : item.minBuyNumber}}</text>
-						<view class="list-details-price" v-if="item.price1TextFlag == 1">
+						<view class="list-details-price" v-if="item.priceFlag == 1">
 							<view class="list-none"><view class="price-small">未公开价格</view></view>
 						</view>
 						<view class="list-details-price" v-else>
 							<view class="list-shop">
-								<view class="list-price-none" v-if="item.repurchasePriceState">
-									<text class="price-none">￥{{item.discountPrice}}</text>
+								<view class="list-price-none" v-if="item.repurchaseFlag == 1">
+									<text class="price-none">￥{{item.originalPrice}}</text>
 									<text class="iconfont icon-wenhao" @click.stop="repurchModel"></text>
 								</view>
 								<view class="list-price" v-else>
 									<text class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
-										￥{{ (PromotionsFormat(item.promotions) ? item.price1 : item.retailPrice) | NumFormat }}
+										￥{{ (PromotionsFormat(item.promotions) ? item.originalPrice : item.price) | NumFormat }}
 									</text>
 								</view>
 							</view>
@@ -29,7 +29,7 @@
 						<view class="list-details-price" v-if="item.actStatus==1">
 							<view class="floor-item-act">
 								<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-									{{item.promotions.name}}<text v-if="item.price1TextFlag != 1">:￥{{ item.retailPrice | NumFormat }}</text>
+									{{item.promotions.name}}<text v-if="item.priceFlag != 1">:￥{{ item.price | NumFormat }}</text>
 								</view>
 								<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 							</view>
@@ -90,7 +90,7 @@
 				windowHeight: '',
 				showSkeleton: true,
 				isShowEmpty: false,
-				userID: '',
+				userId: '',
 				scrollHeight: '',
 				productList: [],
 				showLoading: false,
@@ -109,7 +109,7 @@
 		created() {
 			this.setScrollHeight();		
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userId ? resolve.userId : 0
+				this.userId = resolve.userId ? resolve.userId : 0
 				this.getProductAgainInfo()
 			})
 		},
@@ -138,18 +138,25 @@
 				this.loadingText = '加载中';
 				this.isShowEmpty = false;				
 				if(loadMore) {this.pageNum += 1;}
-				let params = {userId:this.userID,identity:this.identity,pageNum:this.pageNum,pageSize:this.pageSize}
-				this.ProductService.GetRepeatBuyAgainProductList(params).then(response =>{
+				this.ProductService.GetRepeatBuyAgainProductList(
+					{
+						userId:this.userId,
+						identity:this.identity,
+						pageNum:this.pageNum,
+						pageSize:this.pageSize,
+					}
+				)
+				.then(response =>{
 					this.isShowWrapper = true
 					this.cartQuantity = response.data.cartQuantity
-					const responseData = response.data.pageDate;
-					if(responseData.results && responseData.results.length > 0){
-						this.hasNextPage = responseData.hasNextPage;
+					const listData = response.data.results;
+					if(listData && listData.length > 0){
+						this.hasNextPage = response.data.hasNextPage;
 						this.isShowEmpty = false;
 						if(loadMore) {
-							this.productList = [...this.productList,...responseData.results];
+							this.productList = [...this.productList,...listData];
 						} else {
-							this.productList = [...responseData.results];
+							this.productList = listData;
 							this.showSkeleton = false;
 						}
 						//价格显示处理

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

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

components/cm-module/pageTemplate/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/pageTemplate/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/pageTemplate/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/pageTemplate/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/pageTemplate/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/pageTemplate/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/pageTemplate/templateH.vue

@@ -19,7 +19,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>
@@ -31,7 +31,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>
@@ -44,42 +44,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>	
@@ -90,7 +90,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>
@@ -98,7 +98,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>
@@ -156,6 +156,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/pageTemplate/templateNav.vue

@@ -37,7 +37,7 @@
 				console.log(this.navList)
 			},
 			NavToDetailPage(item){//分类导航跳转
-				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}`)
 				// uni.setStorage({
 				// 	key: 'commodity_id',
 				// 	data: pro.tinyTypeID,

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

@@ -4,7 +4,7 @@
 		<template v-if="!hasLogin">
 			<view class="p-login grade tui-skeleton-fillet">
 				<text class="p-no">￥</text>
-				<uni-grader :grade="Number(product.price1Grade)"></uni-grader>
+				<uni-grader :grade="Number(product.priceGrade)"></uni-grader>
 				<view v-if="product.actStatus==1" class="floor-item-act">
 					<view v-if="product.promotions.type == 1 && product.promotions.mode==1"  class="floor-tags" @click.stop="clickPopupShow()">
 						{{product.promotions.name}}<text v-if="hasLogin">:￥{{ product.price | NumFormat }}</text>
@@ -25,7 +25,7 @@
 				<view class="wrap-main-item">
 					<view class="p-price tui-skeleton-fillet" :class="PromotionsFormat(product.promotions) ? 'none' : ''">
 						<text class="txt sm">￥</text>
-						<text class="txt big">{{ (PromotionsFormat(product.promotions) ? product.price1 : product.retailPrice) | NumFormat }}</text>
+						<text class="txt big">{{ (PromotionsFormat(product.promotions) ? product.originalPrice : product.price) | NumFormat }}</text>
 					</view>
 					<view v-if="product.actStatus==1" class="floor-item-act">
 						<view v-if="product.promotions.type == 1 && product.promotions.mode == 1"  class="floor-tags" @click.stop="clickPopupShow(1)">
@@ -41,14 +41,14 @@
 			<!-- 会员机构  -->
 			<template v-if="userIdentity == 2">
 				<view class="wrap-main-item">
-					<view v-if="product.price1TextFlag == '1'" class="wrap-main-text">￥未公开价格</view>
+					<view v-if="product.priceFlag == 1" class="wrap-main-text">￥未公开价格</view>
 					<view v-else class="p-price tui-skeleton-fillet" :class="PromotionsFormat(product.promotions) ? 'none' : ''">
 						<text class="txt sm">￥</text>
-						<text class="txt big">{{ (PromotionsFormat(product.promotions) ? product.price1 : product.retailPrice) | NumFormat }}</text>
+						<text class="txt big">{{ (PromotionsFormat(product.promotions) ? product.originalPrice : product.price) | NumFormat }}</text>
 					</view>
 					<view v-if="product.actStatus==1" class="floor-item-act">
 						<view v-if="product.promotions.type == 1 && product.promotions.mode == 1"  class="floor-tags" @click.stop="clickPopupShow(1)">
-							{{product.promotions.name}}<text v-if="hasLogin && product.price1TextFlag != '1'">:￥{{ product.promotions == null ? '0.00' : product.promotions.touchPrice | NumFormat }}</text>
+							{{product.promotions.name}}<text v-if="hasLogin && product.priceFlag != 1">:￥{{ product.promotions == null ? '0.00' : product.promotions.touchPrice | NumFormat }}</text>
 						</view>
 						<view v-else class="floor-tags" @click.stop="clickPopupShow()">{{product.promotions.name}}</view>	
 					</view>
@@ -61,14 +61,14 @@
 			<template v-if="userIdentity == 3">
 				<template v-if="product.shopID === shopID">
 					<view class="wrap-main-item">
-						<view v-if="product.price1TextFlag == '1'" class="wrap-main-text">￥未公开价格</view>
+						<view v-if="product.priceFlag == 1" class="wrap-main-text">￥未公开价格</view>
 						<view v-else class="p-price tui-skeleton-fillet" :class="PromotionsFormat(product.promotions) ? 'none' : ''">
 							<text class="txt sm">￥</text>
-							<text class="txt big">{{ (PromotionsFormat(product.promotions) ? product.price1 : product.retailPrice) | NumFormat }}</text>
+							<text class="txt big">{{ (PromotionsFormat(product.promotions) ? product.originalPrice : product.price) | NumFormat }}</text>
 						</view>
 						<view v-if="product.actStatus==1" class="floor-item-act">
 							<view v-if="product.promotions.type == 1 && product.promotions.mode == 1"  class="floor-tags" @click.stop="clickPopupShow(1)">
-								{{product.promotions.name}}<text v-if="hasLogin && product.price1TextFlag != '1'">:￥{{ product.promotions == null ? '0.00' : product.promotions.touchPrice | NumFormat }}</text>
+								{{product.promotions.name}}<text v-if="hasLogin && product.priceFlag != 1">:￥{{ product.promotions == null ? '0.00' : product.promotions.touchPrice | NumFormat }}</text>
 							</view>
 							<view v-else class="floor-tags" @click.stop="clickPopupShow()">{{product.promotions.name}}</view>	
 						</view>
@@ -80,30 +80,30 @@
 				<template v-else>
 					<view class="p-login grade tui-skeleton-fillet">
 						<text class="p-no">￥</text>
-						<uni-grader :grade="Number(product.price1Grade)"></uni-grader>
+						<uni-grader :grade="Number(product.priceGrade)"></uni-grader>
 					</view>
 				</template>	
 			</template>
 			<!-- 普通机构  -->
 			<template v-if="userIdentity == 4">
-				<template v-if="product.price1TextFlag == '1'">
+				<template v-if="product.priceFlag == 1">
 					<text class="wrap-main-text">￥未公开价格</text>
 				</template>
-				<template v-if="product.price1TextFlag == '2'">
+				<template v-if="product.priceFlag == 2">
 					<text class="wrap-main-text">￥价格仅会员可见</text>
 					<view class="floor-item-btn">
 						<view class="btn" @click.stop="goUpgradeApply">升级会员查看价格</view>
 					</view>
 				</template>
-				<template v-if="product.price1TextFlag == '0'">
+				<template v-if="product.priceFlag == 0">
 					<view class="wrap-main-item">
 						<view class="p-price tui-skeleton-fillet" :class="PromotionsFormat(product.promotions) ? 'none' : ''">
 							<text class="txt sm">￥</text>
-							<text class="txt big">{{ (PromotionsFormat(product.promotions) ? product.price1 : product.retailPrice) | NumFormat }}</text>
+							<text class="txt big">{{ (PromotionsFormat(product.promotions) ? product.originalPrice : product.price) | NumFormat }}</text>
 						</view>
 						<view v-if="product.actStatus==1" class="floor-item-act">
 							<view v-if="product.promotions.type == 1 && product.promotions.mode == 1"  class="floor-tags" @click.stop="clickPopupShow(1)">
-								{{product.promotions.name}}<text v-if="hasLogin && product.price1TextFlag != '1'">:￥{{ product.promotions == null ? '0.00' : product.promotions.touchPrice | NumFormat }}</text>
+								{{product.promotions.name}}<text v-if="hasLogin && product.priceFlag != 1">:￥{{ product.promotions == null ? '0.00' : product.promotions.touchPrice | NumFormat }}</text>
 							</view>
 							<view v-else class="floor-tags" @click.stop="clickPopupShow()">{{product.promotions.name}}</view>	
 						</view>
@@ -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/recommend.vue

@@ -85,7 +85,7 @@
 		padding: 0 24rpx;
 		font-size: $font-size-28;
 		color: #999999;
-		text-align: center;
+		text-align: left;
 	}
 	.recommend-list{
 		width: 100%;

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

@@ -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.price1Str}}</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(){

components/cm-module/supplier/category.vue

@@ -16,11 +16,11 @@
 			<!--右侧子导航-->
 			<scroll-view  scroll-y="true" class="right-aside" :style="{top:(CustomBar+38)+'px',height:(windowHeight-CustomBar+38)+'px'}">
 				<view class="category" v-for="(first,index) in categoryList" :key="index" v-show="index==showCategoryIndex" >
-					<template v-if="first.smalltypeList">
-						<view class="category-box AAA" v-for="(small,oIndex) in first.smalltypeList" :key="oIndex">
+					<template v-if="first.smallTypeList && first.smallTypeList.length > 0">
+						<view class="category-box AAA" v-for="(small,oIndex) in first.smallTypeList" :key="oIndex">
 							<view class="title">{{small.name}}</view>
-							<view class="list" v-if="small.tinytypeList.length > 0">
-								<view class="box" v-for="(pro,proIndex) in small.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,3)">
+							<view class="list" v-if="small.tinyTypeList && small.tinyTypeList.length > 0">
+								<view class="box" v-for="(pro,proIndex) in small.tinyTypeList" :key="proIndex" @click.stop="navToListPage(pro,3)">
 									<image :src="pro.crmIcon ? pro.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">{{pro.name}}</view>
 								</view>
@@ -39,7 +39,7 @@
 							<view class="no-data">
 								<view class="box" @click.stop="navToListPage(first,1)">
 									<image :src="first.crmIcon ? first.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
-									<view class="text">全部商品</view>
+									<view class="text">全部商品a</view>
 								</view>
 							</view>
 						</view>
@@ -80,8 +80,7 @@
 			this.initData();
 		},
 		methods: {
-			// 数据初始化
-			initData() {
+			initData() {// 数据初始化
 				this.GetProductCate(this.categoryTabIndex);
 				const {windowHeight, pixelRatio} = wx.getSystemInfoSync();
 				this.windowHeight = windowHeight - 1;
@@ -91,13 +90,12 @@
 				this.categoryList = []
 				this.GetProductCate(data);
 			},
-			// 获取商品分类列表
-			GetProductCate (index) {
+			GetProductCate (index) {// 获取商品分类列表
 				this.CommonService.GetFirstClassly({typeSort:index,source :'crm'}).then(response =>{
 					this.categoryList = response.data
 					// 查询第一个拥有二级菜单的子菜单
 					for (let i = 0; i < this.categoryList.length; i++) {
-						if (this.categoryList[i].smalltypeList.length > 0) {
+						if (this.categoryList[i].smallTypeList.length > 0) {
 							this.showCategoryIndex = i;
 							break;
 						}
@@ -113,19 +111,19 @@
 			},
 			toSearch () {// 跳转至搜索详情页
 				uni.navigateTo({
-					url: `/search/pages/search/search?search=${JSON.stringify(this.search)}`
+					url: `/pages/search/search?search=${JSON.stringify(this.search)}`
 				})
 			},
 			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;
 				}
 			},

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>

h5/pages/activity/activity_mid.vue

@@ -248,12 +248,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.$store.commit('setLoginType',9)
-				// 	this.$api.navigateTo('/pages/login/login?type=0')
-				// }else{
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }	
 			},	
 			toFixedFn(text){//处理小数点后两位数
 				return Number(text).toFixed(2);

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>
@@ -245,12 +245,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=0')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.$api.redirectTo('/pages/login/login?type=4')
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				// }	
 			},
 			clickPopupShow(pros,type){
 				this.popupShow = true;

pages/goods/good-floor.vue

@@ -34,7 +34,7 @@
 		},
 		data(){
 			return{
-				userID:0,
+				userId:0,
 				shopId:0,
 				userIdentity:0,
 				skeletonShow:true,
@@ -62,15 +62,10 @@
 						console.log(new Date +'用户未授权微信信息')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// }	
 			}
 			this.pageId = option.linkId
 			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.userID = resolve.userId ? resolve.userId : 0;
+				this.userId = resolve.userId ? resolve.userId : 0;
 				this.shopId = resolve.shopId ? resolve.shopId : 0;
 				this.userIdentity = resolve.userIdentity
 				this.GetInstrumentPageData();
@@ -83,9 +78,9 @@
 		},
 		methods:{
 			GetInstrumentPageData(){//获取楼层数据
-				this.CommonService.GetInstrumentPageData({pageId:this.pageId,userId:this.userID,source:2}).then(response =>{
+				this.CommonService.GetInstrumentPageData({pageId:this.pageId,userId:this.userId,source:2}).then(response =>{
 					let data = response.data
-					this.typeSort = data.page.typeSort
+					this.typeSort = data.typeSort
 					this.pageList = data.floorList
 					this.GetHomeInit()
 				}).catch(error =>{

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: {
@@ -62,6 +63,9 @@
 				nomoreText: '上拉显示更多',
 			}
 		},
+		computed: {
+			...mapState(['identity'])
+		},
 		onLoad(option) {
 			this.promotionsId=option.id
 			this.$api.getComStorage('userInfo').then((resolve) =>{
@@ -78,16 +82,30 @@
 		},
 		methods: {
 			initSsoMemberCollectionList(id){//凑单初始化
-				this.ProductService.queryProductPromotionInfo({promotionsId:this.promotionsId}).then(response =>{
+				this.ProductService.queryProductPromotionInfo(
+					{
+						promotionsId:this.promotionsId,
+					}
+				)
+				.then(response =>{
 					let data = response.data
 					this.promotionsInfo = data
 					this.queryProductPromotionList()
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.message,2000)
 				})	
 			},
 			queryProductPromotionList(id){//查询凑单商品列表
-				this.ProductService.queryProductPromotionList({pageNum:this.pageNum,pageSize:this.pageSize,promotionsId:this.promotionsId}).then(response =>{
+				this.ProductService.queryProductPromotionList(
+					{
+						identity:this.identity,
+						pageNum:this.pageNum,
+						pageSize:this.pageSize,
+						promotionsId:this.promotionsId,
+					}
+				)
+				.then(response =>{
 					let data = response.data
 					if(data.list && data.list.length > 0){
 						this.hasNextPage = data.hasNextPage;
@@ -109,13 +127,21 @@
 							}
 						}
 					}
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.message,2000)
 				})	
 			},
 			getOnReachBottomData(){//上滑加载
 				this.pageNum+=1
-				this.ProductService.queryProductPromotionList({pageNum:this.pageNum,pageSize:this.pageSize,promotionsId:this.promotionsId}).then(response =>{
+				this.ProductService.queryProductPromotionList(
+					{
+						pageNum:this.pageNum,
+						pageSize:this.pageSize,
+						promotionsId:this.promotionsId,
+					}
+				)
+				.then(response =>{
 					let data = response.data
 					if(data.list&&data.list.length > 0){
 						this.hasNextPage = data.hasNextPage;
@@ -132,7 +158,8 @@
 							this.nomoreText = '已至底部'
 						}
 					}
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},

pages/goods/goods-classify.vue

@@ -41,20 +41,20 @@
 			</view>
 			<template v-else>
 				<view class="container-list" :style="{'height':scrollHeight+'px',paddingTop:(CustomBar+44)+'px'}">
-					<view v-for="(item,index) in listData" :key="index" :id="item.p_id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.p_id)">
-						<image mode='widthFix' :src="item.p_image"  class="list-img" alt="list-img"></image>
+					<view v-for="(item,index) in listData" :key="index" :id="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">
 							<text class="list-details-title">
-								<text class="mclap-tag" v-if="item.p_act_flag == '1'">美博会</text>
-								<text class="mclap" :class="item.p_act_flag =='1' ? 'indent' : ''">{{ item.p_name }}</text>
+								<text class="mclap-tag" v-if="item.beautyActFlag == 1">美博会</text>
+								<text class="mclap" :class="item.beautyActFlag == 1 ? 'indent' : ''">{{ item.name }}</text>
 							</text>
-							<text class="list-details-specs">规格：{{item.p_unit}}</text>
-							<view class="list-details-specs" v-if="item.p_code!=''&&item.p_code!=null">商品编码：{{item.p_code}}</view>
+							<text class="list-details-specs">规格：{{item.unit}}</text>
+							<view class="list-details-specs" v-if="item.code!=''&&item.code!=null">商品编码：{{item.code}}</view>
 							<view class="list-details-price">
 								<template v-if="userIdentity == 3">
 									<view class="floor-item-act" v-if="item.actStatus==1">
 										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}<text v-if="item.p_price_flag != '1' && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
+											{{item.promotions.name}}<text v-if="item.priceFlag != 1 && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
 										</view>
 										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 									</view>
@@ -65,7 +65,7 @@
 								<template v-else>
 									<view class="floor-item-act" v-if="item.actStatus==1">
 										<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-											{{item.promotions.name}}<text v-if="hasLogin && item.p_price_flag != '1'">:￥{{ item.price | NumFormat }}</text>
+											{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != 1">:￥{{ item.price | NumFormat }}</text>
 										</view>
 										<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 									</view>
@@ -83,10 +83,10 @@
 										</template>
 									</template>	
 									<template v-if="userIdentity == 4">
-										<view class="price-larger" v-if="item.p_price_flag == '1'">
+										<view class="price-larger" v-if="item.priceFlag == 1">
 											<text class="txt">￥未公开价格</text>
 										</view>
-										<view class="price-larger" v-if="item.p_price_flag == '2'">
+										<view class="price-larger" v-if="item.priceFlag == 1">
 											<text class="txt">￥价格仅会员可见</text>
 										</view>
 										<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
@@ -98,7 +98,7 @@
 									</template>
 									<template v-if="userIdentity == 3">
 										<template v-if="item.supplierId === shopId">
-											<view class="price-larger" v-if="item.p_price_flag == '1'">
+											<view class="price-larger" v-if="item.priceFlag == 1">
 												<text class="txt">￥未公开价格</text>
 											</view>
 											<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
@@ -109,12 +109,12 @@
 										<template v-else>
 											<view  class="list-login-now">
 												<text class="p-no">￥</text>
-												<uni-grader :grade="Number(item.p_price_grade)"></uni-grader>
+												<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
 											</view>
 										</template>
 									</template>
 									<template v-if="userIdentity == 2">
-										<view class="price-larger" v-if="item.p_price_flag == '1'">
+										<view class="price-larger" v-if="item.priceFlag == 1">
 											<text class="txt">￥未公开价格</text>
 										</view>
 										<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
@@ -127,7 +127,7 @@
 								</view>	
 								<view  v-else class="list-login-now">
 									<text class="p-no">￥</text>
-									<uni-grader :grade="Number(item.p_price_grade)"></uni-grader>
+									<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
 								</view>
 							</view>
 						</view>
@@ -144,11 +144,11 @@
 			<view class="drawer-container clearfix" :style="{paddingTop:CustomBar+'px'}">
 				<view class="drawer-title">{{ classData.name }}</view>
 				<view class="drawer-main">
-					<template v-if="classData.smalltypeList">
-						<view class="drawer-item-cell" v-for="(item,index) in classData.smalltypeList" :key="index">
+					<template v-if="classData.smallTypeList">
+						<view class="drawer-item-cell" v-for="(item,index) in classData.smallTypeList" :key="index">
 							<view class="drawer-item-title">{{ item.name }}</view>
-							<view class="drawer-item-main" v-if="item.tinytypeList">
-								<text class="drawer-item-text" :class="tiny.isChecked ? 'checked' : ''" v-for="(tiny,tinyIndex) in item.tinytypeList" :key="tinyIndex"  @click="SearchCondition(3,item,tiny)">{{ tiny.name }}</text>
+							<view class="drawer-item-main" v-if="item.tinyTypeList">
+								<text class="drawer-item-text" :class="tiny.isChecked ? 'checked' : ''" v-for="(tiny,tinyIndex) in item.tinyTypeList" :key="tinyIndex"  @click="SearchCondition(3,item,tiny)">{{ tiny.name }}</text>
 							</view>
 							<view class="drawer-item-main" v-else>
 								<text class="drawer-item-text" :class="item.isChecked ? 'checked' : ''" @click="SearchCondition(2,item)">全部商品</text>
@@ -182,9 +182,9 @@
 	import modalLayer from "@/components/modal-layer"
 	import authorize from '@/common/config/authorize.js'
 	import wxLogin from "@/common/config/wxLogin.js"
-	
 	const defaultListQuery = {
 			id:0,
+			identity:0,
 			pageNum:1,
 			pageSize:10,
 			sortField:'',
@@ -200,7 +200,7 @@
 		},
 		data(){
 			return{
-				shopID:0,
+				shopId:0,
 				tabIndex:0,
 				isModallayer:false,
 				isSearchSalesFirst:true,
@@ -217,7 +217,7 @@
 				isRequest:false,
 				showSkeleton: true,
 				showEmpty: false,
-				userID: 0,
+				userId: 0,
 				userIdentity:'',
 				listData: [],
 				windowHeight: '',
@@ -249,12 +249,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			}
 			this.SetScrollHeight()
 			this.InitOption(option)
@@ -268,11 +262,12 @@
 		methods:{
 			InitOption(option) {
 				this.listQuery.id = option.id;
+				this.listQuery.identity = this.identity;
 				this.listQuery.idType = this.classifyType = Number(option.classType);
 				uni.setNavigationBarTitle({title:option.title});
 				this.$api.getComStorage('userInfo').then((resolve) =>{
-					this.userID = resolve.userId ? resolve.userId : 0
-					this.shopID = resolve.shopId ? resolve.shopId : 0
+					this.userId = resolve.userId ? resolve.userId : 0
+					this.shopId = resolve.shopId ? resolve.shopId : 0
 					this.userIdentity = resolve.userIdentity
 					this.isRequest = true
 					this.GetProductListInfo()
@@ -284,10 +279,17 @@
 				console.log(this.classifyID)
 			},
 			GetProductOneClassly(){//根据分类ID 查询二三级分类
-				this.CommonService.GetProductOneClassly({typeId:this.listQuery.id,idType:this.classifyType,source :'crm'}).then(response =>{
-					console.log(response.data)
+				this.CommonService.GetProductOneClassly(
+					{
+						typeId:this.listQuery.id,
+						idType:this.classifyType,
+						source :'crm',
+					}
+				)
+				.then(response =>{
 					this.classData = response.data
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000)
 				})
 			},
@@ -320,6 +322,7 @@
 								this.nomoreText = '已至底部'
 							}
 						}
+						console.log(this.listData)
 					} else {
 						this.showEmpty = true;
 					}
@@ -354,11 +357,11 @@
 			GetProductPrice(){//获取价格
 				let productIdArr = [];
 				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
-					productIdArr.push(item.p_id)
+					productIdArr.push(item.productId)
 				})
 				this.priceLoading = true;
 				this.productIds = productIdArr.join(",");
-				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:this.productIds}).then(response =>{
+				this.ProductService.querySearchProductPrice({userId: this.userId,productIds:this.productIds}).then(response =>{
 					if(response.data) {
 						this.listData = this.ReturnNewProducts(this.listData,response.data);
 					}
@@ -371,7 +374,7 @@
 				let NewArray = []
 				Array.map(item=>{
 					for (let i = 0; i < list.length; i++) {
-						if( item.p_id == list[i].productId ){
+						if( item.productId == list[i].productId ){
 							NewArray.push(Object.assign(item,list[i])) 
 						}
 					}

pages/goods/instrument-details.vue

@@ -191,7 +191,8 @@
 					title: ''		// 导航栏 中间的标题
 				},
 				linkPath:'',
-				popupShow:false//参数弹窗
+				popupShow:false,//参数弹窗
+				description:''
 			}
 		},
 		computed: {
@@ -214,12 +215,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			}
 		},
 		methods:{
@@ -227,6 +222,7 @@
 				this.ProductService.GetEquipmentDetails({equipmentId:this.equipmentId}).then(response =>{	
 					let data = response.data 
 					let pageMap = data.pageContentMap
+					this.description = pageMap.description
 					this.secondFloorList = pageMap.secondFloorList
 					this.firstFloorList = pageMap.firstFloorList
 					this.crmDetailList = pageMap.pcDetailList
@@ -283,16 +279,6 @@
 				})
 				return systeminfo
 			},
-			onShare(res){//分享转发
-				if (res.from === 'button') {
-			      // 来自页面内转发按钮
-			    }
-				return {
-				  title: `${this.product.name}`,
-				  path: `pages/goods/product?type=share&id=${this.productID}`,
-				  imageUrl:`${this.productImage[0]}`
-				}
-			},
 			showPopup(){
 				this.popupShow = true
 			},
@@ -325,8 +311,8 @@
 		      // 来自页面内转发按钮
 		    }
 			return {
-			  title: `${this.product.name}`,
-			  path: `pages/goods/product?type=share&id=${this.productID}`,
+			  title: `${this.description}`,
+			  path: `pages/goods/instrument-details?id=${this.equipmentId}`,
 			  imageUrl:`${this.productImage[0]}`
 			}
 		},

pages/goods/product.vue

@@ -121,7 +121,7 @@
 						<view class="title-tab">商品详情</view>
 					</view>
 					<view class="content tui-banner product-rich-text tui-skeleton-rect">
-						<parser :html="html" :img-mode="widthFix" v-if="!goodsData.isNoneDisabled"></parser>
+						<parser :html="html" :img-mode="widthFix" v-if="!goodsData.isNoneDisabled && product.productDetail.detailInfo"></parser>
 						<view class="product-rich-text-none" v-else>暂无商品信息</view>
 					</view>
 				</view>	
@@ -143,7 +143,7 @@
 						<view class="title-tab">相关推荐</view>
 					</view>
 					<view class="content hot">
-						<recommend :query-productid="product.productID" :query-type="product.recommendType" v-if="isRequest"></recommend>
+						<recommend :query-productid="product.productId" :query-type="product.recommendType" v-if="isRequest"></recommend>
 					</view>
 				</view>	
 				<!-- 商品参数 -->
@@ -319,9 +319,9 @@
 				disabled:false,
 				isNoneDisabled:false,
 				tabCurrentIndex:0,
-				userID:'',
+				userId:'',
 				shopID:'',
-				productID:0,
+				productId:0,
 				userIdentity:0,//用户类型
 				goodsData:{},//自定义数据
 				shop:{},//供应商信息
@@ -361,7 +361,7 @@
 			...mapState(['hasLogin','isWxAuthorize','identity'])
 		},
 		onLoad(option) {
-			this.productID = option.id;//获取商品ID
+			this.productId = option.id;//获取商品ID
 			this.isShareType = option.type
 			this.linkPath = option.path
 			this.isHeaderPoduct = true
@@ -377,18 +377,19 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			}
 			this.getWinHeight()
 		},
 		methods:{
 			initData(){// 初始化商品详情查询
-				this.ProductService.queryProductDetils({userId:this.userID,productID:this.productID,identity:this.identity}).then(response =>{	
+				this.ProductService.QueryProductDetils(
+					{
+						userId:this.userId,
+						productId:this.productId,
+						identity:this.identity,
+					}
+				)
+				.then(response =>{
 					this.skeletonShow = false
 					this.productImage=[];
 					this.shop = response.data.shop
@@ -421,22 +422,23 @@
 						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){
 						this.isNoneDisabled = true
 						this.disabled = true
-					}else{			
+					}else{
 						this.disabled = false
 						this.isNoneDisabled = false
 						this.goodsData.disabledText = ''
 					}
-					if(this.product.price1TextFlag == "1"){
+					if(this.product.priceFlag == 1){
 						this.disabled = true
-					}else if(this.product.price1TextFlag == "2"){
+					}else if(this.product.priceFlag == 2){
 						if(this.userIdentity == 4){
 							this.disabled = true
 						}else{
@@ -456,11 +458,13 @@
 					if(this.stock == 0){
 						this.goodsData.disabledText = '售罄'
 					}
+					console.log(this.disabled);
 					setTimeout(()=>{
 						this.getSectionProps();
 					},2000)
 					this.isRequest = true
-				}).catch(error =>{
+				})
+				.catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})
 			},
@@ -503,23 +507,13 @@
 					if(res == 1){
 						if(this.hasLogin){
 							this.$api.navigateTo('/pages/goods/cart')
-						}else{					
+						}else{
 							this.$api.navigateTo('/pages/login/login?type=1')
 						}
 					}else{
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	if(this.hasLogin){
-				// 		this.$api.navigateTo('/pages/goods/cart')
-				// 	}else{					
-				// 		this.$api.navigateTo('/pages/login/login?type=1')
-				// 	}
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }	
 			},
 			btnGetConfirm(type){//加入购物车&&立即购买点击
 				authorize.getSetting().then(res =>{
@@ -527,23 +521,13 @@
 					if(res == 1){
 						if(this.hasLogin){
 							this.showSpec(type);
-						}else{					
+						}else{
 							this.$api.navigateTo('/pages/login/login?type=1')
 						}
 					}else{
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	if(this.hasLogin){
-				// 		this.showSpec(type);
-				// 	}else{					
-				// 		this.$api.navigateTo('/pages/login/login?type=1')
-				// 	}
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }	
 			},	
 			changeCountAdd(){//popup弹窗数量增加按钮
 				if(this.buyRetailPriceStep == 2){
@@ -586,7 +570,7 @@
 			},
 			processActivityPrice(){//单独处理活动价格和阶梯价格
 				if(this.ladderPriceFlag == '0' && this.product.actStatus == 0 || this.product.actStatus == 1){
-					this.buyRetailPrice = this.product.retailPrice
+					this.buyRetailPrice = this.product.price
 				}else{
 					this.ladderPriceList.forEach((item,index)=>{
 						if(this.number>=item.buyNum){
@@ -598,6 +582,9 @@
 			showSpec(type) {//显示选择数量确认弹窗
 				this.isBtnType = type
 				this.specClass = 'show';
+				if (this.ladderPriceFlag) {
+					this.processActivityPrice()
+				}
 			},
 			hideSpec() {//关闭选择数量确认弹窗
 				this.specClass = 'hide';
@@ -617,7 +604,7 @@
 				let productStp ={
 						allPrice:this.number*this.buyRetailPrice,
 						allCount:this.number,
-						productID:this.product.productID,
+						productID:this.product.productId,
 						productCount:this.number
 				}	
 				this.$api.navigateTo(`/pages/user/order/create-order?type=prodcut&data=${JSON.stringify({data:productStp})}`)
@@ -626,7 +613,7 @@
 				}, 200);
 			},
 			getAddProductCart(){//增加购物车成功和toast弹窗提示成功	
-				this.ProductService.shoppingAddCart({productID:this.productID,userID:this.userID,productCount:this.number}).then(response => {
+				this.ProductService.shoppingAddCart({productID:this.productId,userID:this.userId,productCount:this.number}).then(response => {
 					this.specClass = 'hide';
 					this.$util.msg('加入购物车成功',1500,true,'success')
 					this.isAnimation = true
@@ -648,14 +635,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.$store.commit('setLoginType',8)
-				// 	this.$store.commit('setLoginProductId',this.productID)
-				// 	this.$api.navigateTo(`/pages/login/login?id=${this.productID}`)
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }	
 			},
 			setHeaderBtnPosi(){
 				// 获得胶囊按钮位置信息
@@ -688,7 +667,7 @@
 			    }
 				return {
 				  title: `${this.product.name}`,
-				  path: `pages/goods/product?type=share&id=${this.productID}`,
+				  path: `pages/goods/product?type=share&id=${this.productId}`,
 				  imageUrl:`${this.productImage[0]}`
 				}
 			},
@@ -784,13 +763,13 @@
 		    }
 			return {
 			  title: `${this.product.name}`,
-			  path: `pages/goods/product?type=share&id=${this.productID}`,
+			  path: `pages/goods/product?type=share&id=${this.productId}`,
 			  imageUrl:`${this.productImage[0]}`
 			}
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) => {
-				this.userID = resolve.userId ? resolve.userId : '';	
+				this.userId = resolve.userId ? resolve.userId : '';
 				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 0
 				this.shopID =  resolve.shopId ? resolve.shopId : '';
 				if(this.userIdentity == 0 || this.userIdentity == 2 || this.userIdentity == 4){

pages/login/bindOperator.vue

@@ -114,13 +114,6 @@
 					this.isUserInfo = true
 				}
 			})	
-			// if(uni.getStorageSync('_WX_State')){
-			// 	this.getWxAuthorize()
-			// }else{
-			// 	console.log(new Date +'用户未授权微信信息')
-			// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-			// 	this.isUserInfo = true
-			// }	
 		},
 		methods:{
 			...mapMutations(['login','logout']),
@@ -186,12 +179,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.bindingWechatLogin()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			},
 			getVerificationCode(){//图形验证
 				this.PublicService.GetImgVerifyCode().then(res => {

pages/login/binding.vue

@@ -252,12 +252,6 @@
 					this.$api.navigateTo('/pages/authorization/authorization')
 				}
 			})
-			// if(uni.getStorageSync('_WX_State')){
-			// 	this.getWxAuthorize()
-			// }else{
-			// 	console.log(new Date +'用户未授权微信信息')
-			// 	this.$api.navigateTo('/pages/authorization/authorization')
-			// }	
 		}
 	}
 </script>

pages/login/login.vue

@@ -72,12 +72,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=0')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.AorganizationLogin()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				// }	
 			},
 			AorganizationLogin(){
 				this.UserService.AorganizationLogin(this.params)
@@ -113,12 +107,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=0')
 					}
 				})	
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginQuick()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				// }	
 			}
 		},
 		onShow() {

pages/login/logincode.vue

@@ -86,9 +86,6 @@
 						wxLogin.wxLoginQuick()
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginQuick()
-				// }
 			}
 		},
 		onShow() {

pages/login/register-supplier.vue

@@ -297,7 +297,7 @@
 				isCheck:false,			//是否勾选协议
 				userID:'',		//公司userID
 				clubID:'',		//公司ID
-				stepIndex:2,
+				stepIndex:1,
 				firstParmas:{
 					bindMobile:'',
 					smsCode:'',
@@ -654,12 +654,6 @@
 					this.$api.navigateTo('/pages/authorization/authorization?type=0')
 				}
 			})
-			// if(uni.getStorageSync('_WX_State')){
-			// 	wxLogin.wxLoginQuick()
-			// }else{
-			// 	console.log(new Date +'用户未授权微信信息')
-			// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-			// }	
 		}
 	}
 </script>

pages/login/register.vue

@@ -194,6 +194,7 @@
 				}
 				let params = {
 						mobile:this.params.bindMobile,
+						isCheckCaptcha:1,
 						activateCodeType:2,
 						platformType:2
 					}
@@ -239,12 +240,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=0')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginQuick()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				// }	
 			}
 		},
 		onShow() {

pages/tabBar/cart/cart.vue

@@ -233,12 +233,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=0')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.$api.redirectTo('/pages/login/login?type=4')
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=0')
-				// }	
 			},
 			clickPopupShow(pros,type){
 				this.popupShow = true;

pages/tabBar/category/index.vue

@@ -15,11 +15,11 @@
 			<!--右侧子导航-->
 			<scroll-view  scroll-y="true" class="right-aside" :style="{top:(CustomBar+38)+'px',height:(windowHeight-CustomBar+38)+'px'}">
 				<view class="category" v-for="(first,index) in categoryList" :key="index" v-show="index==showCategoryIndex" >
-					<template v-if="first.smalltypeList">
-						<view class="category-box AAA" v-for="(small,oIndex) in first.smalltypeList" :key="oIndex">
+					<template v-if="first.smallTypeList && first.smallTypeList.length > 0">
+						<view class="category-box AAA" v-for="(small,oIndex) in first.smallTypeList" :key="oIndex">
 							<view class="title">{{small.name}}</view>
-							<view class="list" v-if="small.tinytypeList.length > 0">
-								<view class="box" v-for="(pro,proIndex) in small.tinytypeList" :key="proIndex" @click.stop="navToListPage(pro,3)">
+							<view class="list" v-if="small.tinyTypeList && small.tinyTypeList.length > 0">
+								<view class="box" v-for="(pro,proIndex) in small.tinyTypeList" :key="proIndex" @click.stop="navToListPage(pro,3)">
 									<image :src="pro.crmIcon ? pro.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
 									<view class="text">{{pro.name}}</view>
 								</view>
@@ -38,7 +38,7 @@
 							<view class="no-data">
 								<view class="box" @click.stop="navToListPage(first,1)">
 									<image :src="first.crmIcon ? first.crmIcon : 'https://static.caimei365.com/app/img/icon/icon-noneproduct.jpg'"></image>
-									<view class="text">全部商品</view>
+									<view class="text">全部商品a</view>
 								</view>
 							</view>
 						</view>
@@ -93,7 +93,7 @@
 					this.categoryList = response.data
 					// 查询第一个拥有二级菜单的子菜单
 					for (let i = 0; i < this.categoryList.length; i++) {
-						if (this.categoryList[i].smalltypeList.length > 0) {
+						if (this.categoryList[i].smallTypeList.length > 0) {
 							this.showCategoryIndex = i;
 							break;
 						}
@@ -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;
 				}
 			},

pages/tabBar/home/index.vue

@@ -13,8 +13,8 @@
 		</view>	
 		<!-- 楼层 -->
 		<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> -->
+			<page-floor :list="pageList" :userIdentity="userIdentity" :pageType='1' v-if="isRequest"></page-floor>
+			<supplier-list :supplierObj="supplierObj" v-if="isRequest"></supplier-list>
 		</view>
 		<!-- 侧边 -->
 		<scroll-top :isScrollTop="isScrollTop" :bottom="50"></scroll-top>
@@ -193,16 +193,6 @@
 						})
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.GetWxAuthorize()
-				// }else{
-				// 	this.$api.getComStorage('userInfo').then((resolve) =>{
-				// 		this.userID = resolve.userId ? resolve.userId :0;
-				// 		this.getHomeInformation()
-				// 	}).catch(error =>{
-				// 		this.getHomeInformation()
-				// 	})
-				// }
 			}
 		},
 		onPageScroll(e){//实时获取到滚动的值

pages/tabBar/user/user.vue

@@ -247,7 +247,7 @@
 					this.waitShipmentsCount = this.showBadge(data.waitShipmentsCount)//待收货		
 					this.shipmentsCount = this.showBadge(data.shipmentsCount)//已发货	
 					this.salesReturnCount = this.showBadge(data.salesReturnCount)//退货/款	
-					let clubInfo ={name:this.name,image:this.headpic,clubID:$clubData.clubID}
+					let clubInfo ={name:this.name,image:this.headpic,userId:$userData.userID}
 					uni.setStorage({key: 'clubInfo',data: clubInfo}) 
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000)
@@ -290,16 +290,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	if(this.hasLogin){
-				// 		this.$api.navigateTo(url)
-				// 	}else{
-				// 		this.$api.navigateTo('/pages/login/login?type=0')
-				// 	}
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }	
 			},	
 			navigatorNex(url,type){
 				console.log(this.isWxAuthorize)
@@ -314,14 +304,6 @@
 						this.$api.navigateTo(`/pages/authorization/authorization?type=${type}`)
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	if(!this.hasLogin){
-				// 		this.$api.navigateTo(url)
-				// 	}
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo(`/pages/authorization/authorization?type=${type}`)
-				// }	
 			},		
 			showBadge(n){
 				let num ='';

pages/user/operator/addoperator.vue

@@ -3,12 +3,12 @@
 		<view class="operator-content">
 			<view class="operator-from">
 				<view class="from-row">
-					<input class="input" type="text" v-model="linkman" placeholder="请输入运营人员姓名" maxlength="6"/>
+					<input class="input" type="text" v-model="params.linkName" placeholder="请输入运营人员姓名" maxlength="6"/>
 				</view>
 				<view class="from-row">
-					<input class="input" type="text" v-model="clubMobile" placeholder="请输入运营人员手机号" maxlength="11"/>
+					<input class="input" type="text" v-model="params.mobile" placeholder="请输入运营人员手机号" maxlength="11"/>
 				</view>
-				<button class="add-btn" @click="confirm">确定</button>
+				<button class="add-btn" @click="hanldConfirm">确定</button>
 			</view>
 			<view class="operator-text">
 				<view class="text-main">
@@ -28,10 +28,13 @@
 	export default {
 		data() {
 			return {
-				clubID:'',
-				userID:'',
-				linkman:'',
-				clubMobile:'',
+				params:{
+					mobile:'',
+					linkName:'',
+					userId:0,
+					clubId:0,
+					configFlag:2
+				}
 			}
 		},
 		onLoad(option){
@@ -39,28 +42,21 @@
 		},
 		methods: {			
 			//提交
-			confirm(){
+			hanldConfirm(){
 				let data = this.addressData;
-				if(this.linkman== ''){
+				if(this.params.linkName== ''){
 					this.$util.msg('请输入运营人员姓名');
 					return;
 				}
-				if(this.clubMobile == ''){
+				if(this.params.mobile == ''){
 					this.$util.msg('请输入运营人员手机号');
 					return;
 				}
-				if(!/(^1[0-9][0-9]{9}$)/.test(this.clubMobile)){
+				if(!/(^1[0-9][0-9]{9}$)/.test(this.params.mobile)){
 					this.$util.msg('请输入正确的手机号码');
 					return;
 				}
-				let params = {
-						mobile:this.clubMobile,
-						linkName:this.linkman,
-						userID:this.userID,
-						clubID:this.clubID,
-						configFlag:2
-					}
-				this.UserService.PostAddOperator(params).then(response =>{
+				this.UserService.PostAddOperator(this.params).then(response =>{
 					this.$util.msg('添加成功',2000,true,'success')
 					setTimeout(() =>{
 						uni.navigateBack();
@@ -72,8 +68,8 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userId ? resolve.userId : 0
-				this.clubID = resolve.clubId ? resolve.clubId : 0
+				this.params.userId = resolve.userId ? resolve.userId : 0
+				this.params.clubId = resolve.clubId ? resolve.clubId : 0
 			})
 		}
 	}

pages/user/operator/list.vue

@@ -8,13 +8,13 @@
 			<view class="operator-search">
 				<view class="search-wrap">
 					<view class="search-from name">
-						<input class="input" type="text" v-model="linkman" placeholder="请输入姓名" maxlength="6"/>
+						<input class="input" type="text" v-model="listQuery.linkName" placeholder="请输入姓名" maxlength="6"/>
 					</view>
 					<view class="search-from phone">
-						<input class="input" type="text" v-model="clubMobile" placeholder="请输入手机号" maxlength="11"/>
+						<input class="input" type="text" v-model="listQuery.mobile" placeholder="请输入手机号" maxlength="11"/>
 					</view>
 					<view class="search-from search">
-						<button class="search-btn" type="default" @click.stop="searchOpertor">搜索</button>
+						<button class="search-btn" type="default" @click.stop="handSearchOpertor">搜索</button>
 					</view>
 				</view>
 			</view>
@@ -67,13 +67,15 @@
 				<view class="content">
 					<view class="ciew-t">姓名：{{modelData.linkName}}</view>
 					<view class="ciew-t">手机号：{{modelData.mobile}}</view>
-					<view class="ciew-t">邀请码：{{modelData.invitationCode ? modelData.invitationCode : '无'}}<text :style="{color: rexpStautsColor(modelData.status)}">{{modelStautsText(modelData.effectiveFlag)}}</text></view>
-					<view class="ciew-t">邀请码有效期：{{modelData.effectiveDays}}天</view>
-					<view class="ciew-t">状态：{{modelData.status == '2' ? '已绑定' : '未绑定'}}</view>
+					<view class="ciew-t">邀请码：{{modelData.invitationCode ? modelData.invitationCode : '无'}}
+						<text :style="{color: rexpStautsColor(modelData.status)}">{{modelStautsText(modelData.effectiveFlag)}}</text>
+					</view>
+					<view class="ciew-t">邀请码有效期：{{modelData.effectiveDays ? modelData.effectiveDays : '0'}}天</view>
+					<view class="ciew-t">状态：{{modelData.status == 2 ? '已绑定' : '未绑定'}}</view>
 					<view class="ciew-t">添加时间：{{modelData.addTime}}</view>
 					<view class="ciew-t">绑定时间：{{modelData.bindTime == null ? '无' : modelData.bindTime }}</view>
 				</view>
-				<view class="btn" v-if="modelData.status != '2'" @click.stop="updateInvitationCode(modelData)">更新邀请码</view>
+				<view class="btn" v-if="modelData.status != 2" @click.stop="updateInvitationCode(modelData)">更新邀请码</view>
 			</view>
 		</view>
 	</view>
@@ -90,7 +92,6 @@
 		},
 		data() {
 			return {
-				clubID:'',
 				clubName:'',
 				clubImage:'',
 				linkman:'',
@@ -113,7 +114,14 @@
 				isOperatorModel:false,
 				operatorList:[],
 				isIphoneX:this.$store.state.isIphoneX,
-				modelData:''
+				modelData:'',
+				listQuery:{
+					userId:'',
+					linkName:'',
+					mobile:'',
+					pageNum:1,
+					pageSize:10
+				}
 			}
 		},
 		onLoad(){				
@@ -134,13 +142,12 @@
 					})
 				}, 500)
 			},
-			searchOpertor(){
-				this.pageNum=1
-				this.initOperatorList()
+			handSearchOpertor(){
+				this.listQuery.pageNum=1
+				this.InitOperatorList()
 			},
-			initOperatorList(){	
-				let params = {clubID:this.clubID,pageNum:1,pageSize:this.pageSize,linkName:this.linkman,mobile:this.clubMobile}
-				this.UserService.QueryOperatorList(params).then(response =>{
+			InitOperatorList(){	//查询机构运营人员列表
+				this.UserService.QueryOperatorList(this.listQuery).then(response =>{
 					let responseData = response.data
 					if(responseData.results&&responseData.results.length > 0){
 						this.isEmpty = false
@@ -164,9 +171,8 @@
 				})
 			},	
 			getOnReachBottomData(){
-				this.pageNum+=1
-				let params = {pageNum:this.pageNum,pageSize:this.pageSize,linkName:this.linkman,mobile:this.clubMobile}
-				this.UserService.QueryOperatorList(params).then(response =>{
+				this.listQuery.pageNum+=1
+				this.UserService.QueryOperatorList(this.listQuery).then(response =>{
 					let responseData = response.data
 					if(responseData.results&&responseData.results.length > 0){
 						this.hasNextPage = response.data.hasNextPage
@@ -197,7 +203,9 @@
 				this.$util.modal('','确定删除运营人员吗？','确定删除','取消',true,() =>{
 					this.UserService.PostDeleteOperator({id:id}).then(response =>{
 						this.$util.msg('删除成功',2000,true,'success')
-						this.initOperatorList()
+						setTimeout(()=>{
+							this.InitOperatorList()
+						},2000)
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)
 					})
@@ -206,9 +214,11 @@
 			updateInvitationCode(item){	//更新邀请码	
 				this.$util.modal('','确定更新邀请码并发送给运营人员？','确定更新','取消',true,() =>{
 					this.UserService.PostUpdateOperatorCode({id:item.id,status:item.status}).then(response =>{
-						this.$util.msg('更新邀请码成功',2000)
 						this.isOperatorModel = false
-						this.initOperatorList()
+						this.$util.msg('更新邀请码成功',2000)
+						setTimeout(()=>{
+							this.InitOperatorList()
+						},2000)
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)
 					})
@@ -220,13 +230,13 @@
 					case '':
 						text = '--'
 						break
-			        case '1':
+			        case 1:
 			          text = '邀请码有效'
 			          break
-			        case '2':
+			        case 2:
 			          text = '邀请码已使用'
 			          break
-			        case '3':
+			        case 3:
 			          text = '邀请码已过期'
 			          break
 			      }
@@ -235,13 +245,13 @@
 			modelStautsText(n) {
 			      let text = ''
 			      switch (n) {
-			        case '1':
+			        case 1:
 			          text = '(有效)'
 			          break
-			        case '2':
+			        case 2:
 			          text = '(已使用)'
 			          break
-			        case '3':
+			        case 3:
 			          text = '(已过期)'
 			          break
 			      }
@@ -250,13 +260,13 @@
 			rexpStautsColor(status) {
 			  let textColor = ''
 			  switch (status) {
-				case '1':
+				case 1:
 				  textColor = '#55BB00'
 				  break
-				case '2':
+				case 2:
 				  textColor = '#0056BB'
 				  break
-				case '3':
+				case 3:
 				  textColor = '#BB0000'
 				  break
 			  }
@@ -264,7 +274,7 @@
 			},  
 			iconStautsColor(status) {
 			  let textColor = ''
-			  if(status == '2'){
+			  if(status == 2){
 				   textColor = '#09BB07'
 			  }else{
 				   textColor = '#DDDDDD'
@@ -280,12 +290,13 @@
 			}	
 		},
 		onShow() {
-			this.$api.getComStorage('clubInfo').then(response =>{
-				this.clubID = response.clubID
-				this.clubName = response.name
-				this.clubImage = response.image
-				this.pageNum = 1;
-				this.initOperatorList();
+			this.$api.getComStorage('clubInfo').then((resolve) =>{
+				this.clubName = resolve.name
+				this.clubImage = resolve.image ? resolve.image : ''
+				this.listQuery.userId = resolve.userId
+				this.listQuery.pageNum = 1;
+				console.log('222222222222')
+				this.InitOperatorList();
 			})
 		}
 	}

pages/user/regularPurchase/regularPurchase.vue

@@ -8,7 +8,7 @@
 			<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-332rpx' : '-294rpx'}">
 				<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">
@@ -44,7 +44,7 @@
 		},
 		data(){
 			return{
-				userID: '',
+				userId: '',
 				serverUrl: '',
 				emptyText: '',
 				lastPageType: '',
@@ -68,7 +68,7 @@
 				this.specClass = 'show'
 				this.handleData = data
 				this.minBuyNumber = data.minBuyNumber
-				this.buyRetailPrice = data.retailPrice
+				this.buyRetailPrice = data.price
 				this.buyRetailPriceStep = data.step
 				if(this.handleData.ladderPriceFlag == '1'){
 					this.number = data.maxBuyNumber
@@ -135,7 +135,7 @@
 				let productStp ={
 						allPrice:this.number*this.buyRetailPrice,
 						allCount:this.number,
-						productID:this.handleData.productID,
+						productID:this.handleData.productId,
 						productCount:this.number
 				}	
 				this.$api.navigateTo(`/pages/user/order/create-order?type=prodcut&data=${JSON.stringify({data:productStp})}`)
@@ -144,15 +144,22 @@
 				}, 200);
 			},
 			getAddProductCart(){//增加购物车成功和toast弹窗提示成功
-				this.ProductService.shoppingAddCart({productID:this.handleData.productID,userID:this.userID,productCount:this.number}).then(response => {
+				this.ProductService.shoppingAddCart({productID:this.handleData.productId,userID:this.userId,productCount:this.number}).then(response => {
 					this.specClass = 'hide';
 					this.$util.msg(response.msg,1500,true,'success')
 					setTimeout(() => {this.specClass = 'none'}, 200)
-					this.$refs.productList.cartQuantity = response.data
+					this.GetUserCartNumber()
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})
 			},
+			GetUserCartNumber(){
+				this.UserService.GetUserCartNumber({userId:this.userId}).then(response =>{
+					this.$refs.productList.cartQuantity = response.data.length
+				}).catch(error =>{
+					console.log('查询用户购物车数量失败')
+				})
+			},
 			discard(){
 				//丢弃
 			}
@@ -160,7 +167,7 @@
 		onShow() {
 			let pages = getCurrentPages(),thisPage = pages[pages.length - 1];
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userId ? resolve.userId : 0
+				this.userId = resolve.userId ? resolve.userId : 0
 			})
 		},
 	}

search/pages/search/search-instrument.vue

@@ -24,9 +24,9 @@
 				<view class="txt">暂无项目仪器数据^_^</view>
 			</view>
 			<view v-else class="supplier-list">
-					<view class="list clearfix" v-for="(item, index) in list" :key="index" @click.stop="navToDetailPage(item.e_id)">
-						<image class="pros-item-image" :src="item.e_image" mode="scaleToFill"></image>
-						<view class="pros-name">{{ isInterceptHtmlFn(item.e_name) }}</view>
+					<view class="list clearfix" v-for="(item, index) in list" :key="index" @click.stop="navToDetailPage(item.id)">
+						<image class="pros-item-image" :src="item.image" mode="scaleToFill"></image>
+						<view class="pros-name">{{ isInterceptHtmlFn(item.name) }}</view>
 					</view>
 					<!--加载loadding-->
 					<tui-loadmore :visible="loadding" :index="3" type="black"></tui-loadmore>
@@ -69,9 +69,6 @@
 				total:0
 			}
 		},
-		computed: {
-			...mapState(['hasLogin','userInfo','isWxAuthorize'])
-		},
 		onLoad(option){
 			if(option.type =='share'){
 				authorize.getSetting().then(res =>{
@@ -83,12 +80,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			}
 			if(option.keyWord){
 				this.listQuery.keyword = option.keyWord

search/pages/search/search-supplier.vue

@@ -26,10 +26,10 @@
 			<view v-else class="supplier-list">
 					<view class="list clearfix" v-for="(item, index) in supplierList" :key="index">
 						<view class="list-top">
-							<view class="list-top-supplier" @click="goSupplier(item.s_id)">
-								<view class="logo"><img :src="item.s_logo" alt=""></view>
+							<view class="list-top-supplier" @click="goSupplier(item.shopId)">
+								<view class="logo"><img :src="item.logo" alt=""></view>
 								<view class="main">
-									<view class="name">{{ item.s_name }}</view>
+									<view class="name">{{ item.name }}</view>
 									<view class="massgs">
 										<view class="label">满意度:</view>
 										<view class="p-stars">
@@ -42,8 +42,8 @@
 							<view class="list-top-msg">
 								<view class="msg-pin clearfix">
 									<view class="label">经营品项:</view>
-									<view class="label-li" v-if="item.s_business">
-										<text class="text" v-for="(label, idx) in SetNewBusiness(item.s_business)" :key="idx">{{ label }}</text>
+									<view class="label-li" v-if="item.business">
+										<text class="text" v-for="(label, idx) in SetNewBusiness(item.business)" :key="idx">{{ label }}</text>
 									</view>
 									<view class="label-li" v-else>
 										<text class="none">暂无</text>
@@ -51,14 +51,14 @@
 								</view>
 								<view class="msg-pin clearfix">
 									<view class="label">所在地区:</view>
-									<view class="label-text">{{ item.s_address ? item.s_address : '暂无'}}</view>
+									<view class="label-text">{{ item.address ? item.address : '暂无'}}</view>
 								</view>
 							</view>
 						</view>
 						<view class="list-bottom">
-							<view class="pros-item" v-for="(pros, pdx) in item.products" :key="pdx" @click.stop="navToDetailPage(pros.p_id)">
-								<image class="pros-item-image" :src="pros.p_image" mode="scaleToFill"></image>
-								<view class="pros-name">{{ pros.p_name }}</view>
+							<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>
 						</view>
 					</view>
@@ -108,9 +108,6 @@
 				total:0
 			}
 		},
-		computed: {
-			...mapState(['hasLogin','userInfo','isWxAuthorize'])
-		},
 		onLoad(option){
 			if(option.type =='share'){
 				authorize.getSetting().then(res =>{
@@ -122,12 +119,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			}
 			if(option.keyWord){
 				console.log(option.keyWord)

search/pages/search/search.vue

@@ -55,22 +55,22 @@
 		</view>
 		<view v-else class="commodity-list-wrapper"  :style="{'overflow':'auto','height':(listData.length>4? windowHeight + 'px' : 'auto')}">
 			<scroll-view :style="{'height':(listData.length>4? scrollHeight+'px' : 'auto')}" @scrolltolower="scrolltolower" scroll-y v-if="!showEmpty">
-				<view v-for="(item,index) in listData" :key="index" :id="item.id" class="all-type-list-content commodity-list" @click.stop="navToDetailPage(item.p_id)">
-					<image mode='widthFix' :src="item.p_image"  class="list-img" alt="list-img"></image>
+				<view v-for="(item,index) in listData" :key="index" :id="item.id" 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">
-							<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="item.beautyActFlag == 1">美博会</text>
+							<text class="mclap" :class="item.beautyActFlag == 1 ? 'indent' : ''">{{isInterceptHtmlFn(item.name)}}</text>
 						</view>
-						<text class="list-details-specs">规格：{{item.p_unit}}</text>
-						<view class="list-details-specs" v-if="item.p_code!=''&&item.p_code!=null">
-							<view>商品编码：{{item.p_code}}</view>
+						<text class="list-details-specs">规格：{{item.unit}}</text>
+						<view class="list-details-specs" v-if="item.code!=''&&item.code!=null">
+							<view>商品编码：{{item.code}}</view>
 						</view>
 						<view class="list-details-price">
 							<template v-if="userIdentity == 3">
 								<view class="floor-item-act" v-if="item.actStatus==1">
 									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-										{{item.promotions.name}}<text v-if="item.p_price_flag != '1' && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
+										{{item.promotions.name}}<text v-if="item.priceFlag != 1 && item.supplierId === shopId">:￥{{ item.price | NumFormat }}</text>
 									</view>
 									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 								</view>
@@ -81,7 +81,7 @@
 							<template v-else>
 								<view class="floor-item-act" v-if="item.actStatus==1">
 									<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
-										{{item.promotions.name}}<text v-if="hasLogin && item.p_price_flag != '1'">:￥{{ item.price | NumFormat }}</text>
+										{{item.promotions.name}}<text v-if="hasLogin && item.priceFlag != 1">:￥{{ item.price | NumFormat }}</text>
 									</view>
 									<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 								</view>
@@ -97,12 +97,12 @@
 									</text>
 								</template>	
 								<template v-if="userIdentity == 4">
-									<view class="price-larger" v-if="item.p_price_flag == '1'">
+									<view class="price-larger" v-if="item.priceFlag == 1">
 										<text class="txt">￥未公开价格</text>
 									</view>
 									<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
 									<view v-else>
-										<view class="price-larger" v-if="item.p_price_flag == '2'">
+										<view class="price-larger" v-if="item.priceFlag == 2">
 											<text class="txt">￥价格仅会员可见</text>
 										</view>
 										<text v-else class="price-larger" :class="PromotionsFormat(item.promotions) ? 'none' : ''">
@@ -112,7 +112,7 @@
 								</template>
 								<template v-if="userIdentity == 3">
 									<template v-if="item.supplierId == shopId">
-										<view class="price-larger" v-if="item.p_price_flag == '1'">
+										<view class="price-larger" v-if="item.priceFlag == 1">
 											<text class="txt">￥未公开价格</text>
 										</view>
 										<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
@@ -123,12 +123,12 @@
 									<template v-else>
 										<view  class="list-login-now">
 											<text class="p-no">￥</text>
-											<uni-grader :grade="Number(item.p_price_grade)"></uni-grader>
+											<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
 										</view>
 									</template>
 								</template>
 								<template v-if="userIdentity == 2">
-									<view class="price-larger" v-if="item.p_price_flag == '1'">
+									<view class="price-larger" v-if="item.priceFlag == 1">
 										<text class="txt">￥未公开价格</text>
 									</view>
 									<text v-else-if="priceLoading" class="price-larger small">正在获取价格...</text>
@@ -139,7 +139,7 @@
 							</view>	
 							<view  v-else class="list-login-now">
 								<text class="p-no">￥</text>
-								<uni-grader :grade="Number(item.p_price_grade)"></uni-grader>
+								<uni-grader :grade="Number(item.priceGrade)"></uni-grader>
 							</view>
 						</view>
 					</view>
@@ -174,7 +174,7 @@
 		data() {
 			return {
 				shopId:0,
-				userID:0,
+				userId:0,
 				tabValue:'产品',
 				themeClass: 'block',
 				show:false,
@@ -224,15 +224,9 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			}
 			this.$api.getStorage().then((resolve) =>{
-				this.userID = resolve.userId ? resolve.userId : 0;
+				this.userId = resolve.userId ? resolve.userId : 0;
 				this.shopId = resolve.shopId ? resolve.shopId : 0;
 				this.userIdentity = resolve.userIdentity;
 				this.listQuery.identity = this.identity;
@@ -264,7 +258,7 @@
 				})
 			},
 			initGetSerachRecord(){//查询搜索历史记录
-				this.ProductService.GetProductSearchHistory({userId:this.userID}).then(response =>{
+				this.ProductService.GetProductSearchHistory({userId:this.userId}).then(response =>{
 					if(response.code == 0){
 						this.serachRecordList = response.data
 					}
@@ -309,6 +303,7 @@
 					this.isShowWrapper = true
 					const resData = JSON.parse(response.data);
 					const resList = resData.items;
+					console.log(resList)
 					if(resList && resList.length > 0){
 						this.total = resData.total;
 						this.showEmpty = false;
@@ -340,7 +335,7 @@
 			},
 			setSearchHistoryAdd(){//添加搜索记录
 				if (!this.hasLogin) {return false;}
-				this.ProductService.GetAddProductSearchHistory({userId: this.userID,keyword:this.listQuery.keyword}).then(response =>{
+				this.ProductService.GetAddProductSearchHistory({userId: this.userId,keyword:this.listQuery.keyword}).then(response =>{
 					//此为每次搜索同时添加用户的搜索记录
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
@@ -349,10 +344,10 @@
 			getProductPrice(){//获取价格
 				let productIdArr = [];
 				this.listData.map(item=>{// 0公开价格 1不公开价格 2仅对会员机构公开
-					productIdArr.push(item.p_id)
+					productIdArr.push(item.productId)
 				})
 				this.productIds = productIdArr.join(",");
-				this.ProductService.querySearchProductPrice({userId: this.userID,productIds:this.productIds}).then(response =>{
+				this.ProductService.querySearchProductPrice({userId: this.userId,productIds:this.productIds}).then(response =>{
 					if (response.data) {
 						this.listData = this.ReturnNewProducts(this.listData,response.data);
 					}
@@ -365,7 +360,7 @@
 				let NewArray = []
 				Array.map(item=>{
 					for (let i = 0; i < list.length; i++) {
-						if( item.p_id == list[i].productId ){
+						if( item.productId == list[i].productId ){
 							NewArray.push(Object.assign(item,list[i])) 
 						}
 					}
@@ -407,7 +402,7 @@
 			},
 			confirmDetele() {//清空历史记录
 				this.$util.modal('提示','确定删除历史记录？','确定','取消',true,() =>{
-					this.ProductService.GetDeleteProductSearchHistory({userId:this.userID}).then(response =>{
+					this.ProductService.GetDeleteProductSearchHistory({userId:this.userId}).then(response =>{
 						this.$util.msg('删除成功',2000,true,'success')
 						this.serachRecordList=[];
 					}).catch(error =>{

second/pages/form/form.vue

@@ -54,7 +54,7 @@
 							</view>	
 						</tui-bottom-popup>	
 					 </view>
-					 <view class="row" v-if="secondParams.brandID==161">
+					 <view class="row" v-if="secondParams.brandId==161">
 						 <view class="label">其它品牌</view>
 						 <view class="spacing">
 							 <input type="text" maxlength="40" v-model="secondParams.brandName" placeholder="请输入商品品牌" placeholder-class="placeholder">
@@ -87,7 +87,7 @@
 					 <view class="row">
 						 <view class="label">交易价</view>
 						 <view class="spacing">
-							 <input type="text" maxlength="20" v-model="secondParams.price1"  placeholder="请输入交易价" placeholder-class="placeholder">
+							 <input type="text" maxlength="20" v-model="secondParams.price"  placeholder="请输入交易价" placeholder-class="placeholder">
 						 </view>
 					 </view>
 					 <view style="margin-top: 15rpx;">
@@ -130,19 +130,19 @@
 					 <view class="row">
 						 <view class="label">联系方式</view>
 						 <view class="spacing">
-							 <input type="text"  v-model="secondParams.contactMobile" maxlength="11" placeholder="请输入联系人手机号" placeholder-class="placeholder">
+							 <input type="text" v-model="secondParams.contactMobile" maxlength="11" placeholder="请输入联系人手机号" placeholder-class="placeholder">
 					    </view> 
 					 </view>
 					 <view class="row">
-						 <view class="label">采美对接人</view>
+						 <view class="label">采美对接人</view> 
 						 <view class="spacing">
-							 <input type="text"  v-model="secondParams.dockingPeopleName" maxlength="15" placeholder="请输入采美对接人姓名" placeholder-class="placeholder">
+							 <input type="text" v-model="secondParams.dockingPeopleName" maxlength="15" placeholder="请输入采美对接人姓名" placeholder-class="placeholder">
 					    </view> 
 					 </view>
 					 <view class="row">
 						 <view class="label">对接人联系方式</view>
 						 <view class="spacing">
-							 <input type="text"  v-model="secondParams.dockingPeopleMobile" maxlength="11" placeholder="请输入采美对接人手机号" placeholder-class="placeholder">
+							 <input type="text" v-model="secondParams.dockingPeopleMobile" maxlength="11" placeholder="请输入采美对接人手机号" placeholder-class="placeholder">
 					    </view> 
 					 </view>
 					 <view class="row">
@@ -275,12 +275,12 @@
 					secondHandType:'',//一级分类
 					instrumentType:'',//二手仪器分类
 					name:'',
-					brandID:'',//品牌ID
+					brandId:'',//品牌ID
 					brandName:'',//其他品牌
 					fixedYears:'',//出厂
 					companyName:'',//公司名称
 					maturityYears:'',//产品到期
-					price1:'',//交易价
+					price:'',//交易价
 					detailTalkFlag:1,//是否启用详聊
 					normalPrice:'',//市场价
 					originalPrice:'',//采购价
@@ -293,7 +293,7 @@
 					secondProductType:'',//
 					townId:'',//县区地址
 					address:'',//详细地址
-					image1:'',//图片
+					image:'',//图片
 					productDetails:'',//商品详细信息
 					source:2
 				 },
@@ -318,9 +318,9 @@
 			   this.secondParams.productDetails = e.detail.value;
 			},
 			radioChange(e){//品牌
-				this.secondParams.brandID = e.target.value;
+				this.secondParams.brandId = e.target.value;
 				this.BrandList.forEach((item,index)=>{
-					if(item.id==this.secondParams.brandID){
+					if(item.id==this.secondParams.brandId){
 						this.brandname = item.name;
 						this.popupShow = false;
 					}
@@ -365,12 +365,12 @@
 			 uploadGoodsImagesFn(event){//上传商品图片
 				uploadFileImage().then(res =>{
 					 this.GoodsImagesList.push(JSON.parse(res.data).data);
-					 this.secondParams.image1 =this.GoodsImagesList.toString()+',';
+					 this.secondParams.image =this.GoodsImagesList.toString()+',';
 				})
 			},
 			 removeGoodsImagesFn(index){//删除商品图片
 				this.GoodsImagesList.splice(index,1);
-				this.secondParams.image1 =this.GoodsImagesList.toString()+',';
+				this.secondParams.image =this.GoodsImagesList.toString()+',';
 			 },
 			getProductType(e){
 			  this.secondParams.secondProductType = e.target.value ;
@@ -386,7 +386,7 @@
 						return;
 					}
 				}
-				if(this.secondParams.brandID == ''){
+				if(this.secondParams.brandId == ''){
 					this.$util.msg('请选择商品品牌',2000);
 					return;
 				}
@@ -400,7 +400,7 @@
 				// 		 return
 				// 	} 
 				// }
-				if(!this.$api.isNumber(this.secondParams.price1)){
+				if(!this.$api.isNumber(this.secondParams.price)){
 					  this.$util.msg('请输入交易价',2000);
 						return
 				}

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">
@@ -232,12 +232,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			}
 		},
 		methods:{
@@ -303,14 +297,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.$store.commit('setLoginType',8)
-				// 	this.$store.commit('setLoginProductId',this.productID)
-				// 	this.$api.navigateTo(`/pages/login/login?id=${this.productID}`)
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }	
 			},
 			setHeaderBtnPosi(){
 				// 获得胶囊按钮位置信息

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.price1Str}}</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'){
 				authorize.getSetting().then(res =>{
@@ -160,11 +165,6 @@
 						console.log(new Date +'用户未授权微信信息')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// }
 			}
 		},
 		methods:{

seller/pages/cart/buyagain.vue

@@ -11,7 +11,7 @@
 			<view class="layer" @tap.stop="discard" :style="{paddingBottom :isIphoneX ? '68rpx' : '36rpx',bottom:isIphoneX ?'-352rpx' : '-320rpx'}">
 				<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">
@@ -77,7 +77,7 @@
 				this.specClass = 'show';
 				this.handleData = data
 				this.minBuyNumber = data.minBuyNumber
-				this.buyRetailPrice = data.retailPrice;
+				this.buyRetailPrice = data.price;
 				this.buyRetailPriceStep = data.step
 				if(this.handleData.ladderPriceFlag == '1'){
 					this.number = data.maxBuyNumber
@@ -132,7 +132,7 @@
 			},
 			calculatPerice(){//判断是否为阶梯价然后做计算价格处理
 				if(this.handleData.ladderPriceFlag == '1'){
-					this.handleData.ladderPriceList.forEach((item,index)=>{
+					this.handleData.ladderPrices.forEach((item,index)=>{
 						if(this.number>=item.buyNum){
 							this.buyRetailPrice = item.buyPrice
 						}
@@ -143,7 +143,7 @@
 			},
 			getAddProductCart(){//增加购物车成功和toast弹窗提示成功
 				let params ={
-						productId:this.handleData.productID,
+						productId:this.handleData.productId,
 						clubId:this.clubID,
 						serviceProviderId:this.serviceProviderId,
 						num:this.number

seller/pages/cart/immediately.vue

@@ -17,10 +17,10 @@
 			<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.p_image" mode=""></image>
+						<image :src="handleData.image" mode=""></image>
 					</view>
 					<view class="layer-nunbox">
-						<view class="layer-nunbox-m" v-if="handleData.p_code!=''&& handleData.p_code!=null">商品编码：{{handleData.p_code}}</view>
+						<view class="layer-nunbox-m" v-if="handleData.code!=''&& handleData.code!=null">商品编码：{{handleData.code}}</view>
 						<view class="layer-nunbox-t">
 							<view class="layer-nunbox-text">数量：</view>
 							<view class="number-box">
@@ -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){
@@ -247,11 +247,11 @@
 			getzuheCart(){//组合商品加入购物车
 				let productInfo=[];
 				let setGoodsList ={};
-				let productID = '';
+				let productId = '';
 				let productNum ='';
 				this.handleData.combinationProductList.forEach(item =>{
 					if(item.initProductNum >0){
-						setGoodsList.productId = item.productID
+						setGoodsList.productId = item.productId
 						setGoodsList.productNum =item.initProductNum
 						productInfo.push(JSON.parse(JSON.stringify(setGoodsList)))
 					}
@@ -281,7 +281,7 @@
 			},
 			getAddProductCart(){//增加购物车成功和toast弹窗提示成功
 				let params ={
-						productId:this.handleData.p_id,
+						productId:this.handleData.productId,
 						clubId:this.clubID,
 						serviceProviderId:this.serviceProviderId,
 						num:this.number

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})}`)

seller/pages/login/login.vue

@@ -104,12 +104,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization?type=1')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	this.SellerLogin()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization?type=1')
-				// }	
 			},
 			SellerLogin(){
 				this.SellerService.SellerLogin(this.params)
@@ -147,18 +141,12 @@
 			authorize.getSetting().then(res =>{
 				console.log('用户是否授权过',res)
 				if(res == 1){
-					this.SellerLogin()
+					this.getWxAuthorize()
 				}else{
 					console.log(new Date +'用户未授权微信信息')
 					this.$api.navigateTo('/pages/authorization/authorization?type=1')
 				}
 			})
-			// if(uni.getStorageSync('_WX_State')){
-			// 	this.getWxAuthorize()
-			// }else{
-			// 	this.$api.navigateTo('/pages/authorization/authorization')
-			// 	this.isSeller= true
-			// }	
 		}
 	}
 </script>

services/common.service.js

@@ -8,70 +8,153 @@ export default class CommonService {
 	}
 	/* 首页导航模块商品列表 */
 	GetHomeClassify (data = {}) {
-		return this.AjaxService.get({ url:'/home/classify', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/home/classify', 
+			data, 
+			isLoading: true ,
+		})
 	}
 	/* 首页初始化 */
 	GetHomeModulesDataInfo (data = {}) {
-		return this.AjaxService.get({ url:'/home/modules', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/home/modules', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 首页楼层数据 */
 	GetHomeDataInfo (data = {}) {
-		return this.AjaxService.get({ url:'/home/data', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/commodity/home/floor', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/* 首页楼层查看更多数据 */
 	GetHomeFloorContentDetails (data = {}) {
-		return this.AjaxService.get({ url:'/home/floorContentDetails', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/commodity/page/floor/details', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/* 二级页楼层查看更多数据 */
 	GePageFloorContentDetails (data = {}) {
-		return this.AjaxService.get({ url:'/home/pageFloorDetails', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/commodity/page/floor/centre', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/* 首页顶部三个模块数据 */
 	GetHomeTopDataInfo (data = {}) {
-		return this.AjaxService.get({ url:'/home/top/data', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/home/top/data', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 获取其他服务信息 */
 	QueryAfterSale (data = {}) {
-		return this.AjaxService.get({ url:'/home/afterSale', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/home/afterSale', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 首页金刚区分类 */
+	// GetHomeInit (data = {}) {
+	// 	return this.AjaxService.get({ 
+	// 		url:'/home/init', 
+	// 		data, 
+	// 		isLoading: false ,
+	// 	})
+	// }
 	GetHomeInit (data = {}) {
-		return this.AjaxService.get({ url:'/home/init', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/commodity/home/init', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/* 首页金刚区二级分类 */
 	GetHomeSubMenu (data = {}) {
-		return this.AjaxService.get({ url:'/home/subMenu', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/home/subMenu', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 首页楼层 */
 	GetHomeFloorInfo (data = {}) {
-		return this.AjaxService.get({ url:'/home/floor', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/home/floor', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 直播专题页图片 */
 	GetHomeLiveAdvertising (data = {}) {
-		return this.AjaxService.get({ url:'/home/live/advertising', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/home/live/advertising', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 搜索热门关键词 */
 	GetHomeHotSearchTerms (data = {}) {
-		return this.AjaxService.get({ url:'/home/hotSearchTerms', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/home/hotSearchTerms', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 二级列表楼层 */
 	GetInstrumentPageData (data = {}) {
-		return this.AjaxService.get({ url:'/home/instrumentData', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/commodity/classify/product', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/* 一级分类 */
 	GetFirstClassly (data = {}) {
-		return this.AjaxService.get({ url:'/product/classify', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/commodity/classify', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/* 根据一级分类获取二、三级分类 */
 	GetProductChildrenClassly (data = {}) {
-		return this.AjaxService.get({ url:'/product/bigType/classify', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/product/bigType/classify', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 根据一、二、三级分类ID查询单条分类 */
 	GetProductOneClassly (data = {}) {
-		return this.AjaxService.get({ url:'/product/typeId/classify', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/commodity/type/id', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/*活动页面获取楼层*/
 	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/config.env.js

@@ -1,9 +1,8 @@
 let URL_CONFIG = ''
 if(process.env.NODE_ENV === 'development'){
     // 开发环境
-    // URL_CONFIG = 'http://192.168.2.75:18002'	 //采美测试地址
+    // URL_CONFIG = 'http://192.168.2.75:18002'	 //超超联调地址
 	// URL_CONFIG = 'http://192.168.2.67:18002'	 //裴裴联调地址
-	// URL_CONFIG = 'http://192.168.2.68:8008'
 	URL_CONFIG = 'https://core-b.caimei365.com'
 	// URL_CONFIG = 'https://core.caimei365.com'
 }else{

services/product.service.js

@@ -35,7 +35,12 @@ export default class ProductService {
 	 * @param:productID 商品ID','符号拼接
 	 */
 	querySearchProductPrice (data = {}) {
-		return this.AjaxService.get({ url:'/product/listPrice', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/commodity/price/list', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	
 	/**
@@ -43,7 +48,12 @@ export default class ProductService {
 	 * @param:promotionsId 促销ID
 	 */
 	queryProductPromotionInfo (data = {}) {
-		return this.AjaxService.get({ url:'/product/promotion/info', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/commodity/promotions/info', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/**
 	 * @查询凑单商品列表
@@ -52,7 +62,12 @@ export default class ProductService {
 	 * @param:pageNum 查询页数
 	 */
 	queryProductPromotionList (data = {}) {
-		return this.AjaxService.get({ url:'/product/promotion/products', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/commodity/promotions/product', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	
 	/**
@@ -60,8 +75,13 @@ export default class ProductService {
 	 * @param:userId 用户ID(未登录传0或者'')
 	 * @param:productIds 商品ID
 	 */
-	queryProductDetils (data = {}) {
-		return this.AjaxService.get({ url:'/product/details', data, isLoading: false })
+	QueryProductDetils (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/commodity/product/details', 
+			data, 
+			isLoading: false ,
+			isHost:true
+		})
 	}
 	/**
 	 * @商品详情-相关推荐
@@ -116,15 +136,30 @@ export default class ProductService {
 	}
 	/* 活动专题列表 */
 	GetPromotionsrList (data = {}) {
-		return this.AjaxService.get({ url:'/promotions/list', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/commodity/promotions/list', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 搜索项目仪器列表 */
 	GetSearchEquipmentList (data = {}) {
-		return this.AjaxService.get({ url:'/search/query/equipment', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/commodity/search/query/equipment', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 项目仪器详情 */
 	GetEquipmentDetails (data = {}) {
-		return this.AjaxService.get({ url:'/equipment/recommend', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/commodity/equipment/details', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 查询搜索历史记录 */
 	GetProductSearchHistory (data = {}) {
@@ -140,11 +175,30 @@ export default class ProductService {
 	}
 	/* 搜索商品列表 */
 	GetProductSearchList (data = {}) {
-		return this.AjaxService.get({ url:'/search/query/product', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/commodity/search/query/product', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 搜索分类商品列表 */
 	GetSearchProductTypeData (data = {}) {
-		return this.AjaxService.get({ url:'/search/query/product/type', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/commodity/search/query/product/type', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
+	}
+	/* 搜索分类商品列表 */
+	GetSearchCombinationProduct (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/commodity/seller/product/combination', 
+			data, 
+			isLoading: true,
+			isHost:true
+		})
 	}
 	/* 获取商品评价 */
 	GetProductEvaluate (data = {}) {
@@ -152,11 +206,21 @@ export default class ProductService {
 	}
 	/* 获取再次购买商品列表 */
 	GetRepeatBuyAgainProductList (data = {}) {
-		return this.AjaxService.get({ url:'/repeat/buyAgain', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/commodity/product/repeat', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 新商品搜索查询商品阶梯价格 */
 	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

@@ -11,7 +11,12 @@ export default class SecondService {
 	 *@param 搜索关键词 searchKeyword	【选传】 
 	 */
 	SeconHandProductList (data = {}) {
-		return this.AjaxService.get({ url:'/product/getSecondHandProductList', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/commodity/second/list', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/*二手发布/品牌列表 */
 	brandList (data = {}) {
@@ -19,17 +24,31 @@ export default class SecondService {
 	}
 	/*二手发布/提交发布 */
 	SecondHandProduct (data = {}) {
-		return this.AjaxService.post({ url:'/product/releaseSecondHandProduct', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/commodity/second/release', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/*二手发布/浏览量 */
 	ProductCount (data = {}) {
-		return this.AjaxService.get({ url:'/product/updateSecondHandProductCount', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/product/updateSecondHandProductCount', 
+			data, 
+			isLoading: true ,
+		})
 	}
 	/**
 	 *@二手商品详情
 	 *@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/sellse.service.js

@@ -92,16 +92,6 @@ export default class SellerService {
 	GetSellerClubOrderList (data = {}) {
 		return this.AjaxService.get({ url:'/seller/clubOrder', data, isLoading: true })
 	}
-	/**
-	 *@协销帮机构下单组合商品搜索
-	 *@param clubUserId 机构的userID
-	 *@param pageNum 	页码
-	 *@param pageSize 	条数
-	 *@param searchWord 搜索关键词
-	 */
-	GetCombinationProduct (data = {}) {
-		return this.AjaxService.get({ url:'/seller/combinationProduct/search', data, isLoading: true })
-	}
 	/**
 	 *@协销-二手下单商品列表
 	 *@param 二手商品分类 secondHandType	1二手仪器，2临期产品，3其他  【必传】
@@ -109,7 +99,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
+		})
 	}
 	/**
 	 *@协销-二手去结算接口

services/shop.service.js

@@ -17,7 +17,12 @@ export default class ShopService {
 	}
 	/* 小程序-搜索供应商列表 */
 	GetSearchSupplierList (data = {}) {
-		return this.AjaxService.get({ url:'/search/query/supplier', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/commodity/search/query/shop', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 小程序供应商个人中心 */
 	GetHomePageData (data = {}) {
@@ -25,31 +30,64 @@ 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 = {}) {
-		return this.AjaxService.post({ url:'/supplier/switchFeatured', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/commodity/shop/featured/switch', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 小程序供应商操作下架商品 */
 	SupplierSoldOutProduct (data = {}) {
-		return this.AjaxService.post({ url:'/supplier/soldOut', data, isLoading: true })
+		return this.AjaxService.post({ 
+			url:'/commodity/shop/product/offline', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
 	}
 	/* 小程序供应商我的店铺详情 */
 	GetSupplierHomeDeatils (data = {}) {
-		return this.AjaxService.get({ url:'/supplier/home/detail', data, isLoading: true })
+		return this.AjaxService.get({ 
+			url:'/supplier/home/detail', 
+			data, 
+			isLoading: true ,
+		})
 	}
 	/* 小程序供应商我的店铺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 = {}) {

services/user.service.js

@@ -226,31 +226,43 @@ export default class UserService {
 	/* 运营人员管理-列表 */
 	QueryOperatorList (data = {}) {
 		return this.AjaxService.get({ 
-			url:'/operation/list', 
+			url:'/user/operation/list', 
 			data, 
 			isLoading: true ,
+			isHost:true
 		})
 	}
 	/* 运营人员管理-添加 */
 	PostAddOperator (data = {}) {
 		return this.AjaxService.post({ 
-			url:'/operation/add', 
+			url:'/user/operation/save', 
 			data, 
 			isLoading: true ,
+			isHost:true
 		})
 	}
 	/* 运营人员管理-删除 */
 	PostDeleteOperator (data = {}) {
 		return this.AjaxService.post({ 
-			url:'/operation/delete', 
+			url:'/user/operation/delete', 
 			data, 
 			isLoading: true ,
+			isHost:true
 		})
 	}
 	/* 运营人员管理-更新邀请码 */
 	PostUpdateOperatorCode (data = {}) {
 		return this.AjaxService.post({ 
-			url:'/operation/updateInvitationCode', 
+			url:'/user/operation/code/update', 
+			data, 
+			isLoading: true ,
+			isHost:true
+		})
+	}
+	/* 机构购物车简单列表*/
+	GetUserCartNumber (data = {}) {
+		return this.AjaxService.get({ 
+			url:'/shoppingCart/header/cart', 
 			data, 
 			isLoading: true ,
 		})

supplier/pages/login/share-info.vue

@@ -50,14 +50,6 @@
 					},2000)
 				}
 			})
-			// if(uni.getStorageSync('_WX_State')){
-			// 	this.infoMiniShipments();
-			// }else{
-			// 	this.$api.navigateTo('/pages/authorization/authorization?type=4')
-			// 	setTimeout(()=>{
-			// 		this.isRequest = true
-			// 	},2000)
-			// }	
 		},
 		methods:{
 			infoMiniShipments(){
@@ -111,13 +103,6 @@
 					this.$api.navigateTo('/pages/authorization/authorization')
 				}
 			})
-			// if(uni.getStorageSync('_WX_State')){
-			// 	this.isRequest = false;
-			// 	this.infoMiniShipments();
-			// }else{
-			// 	console.log(new Date +'用户未授权微信信息')
-			// 	this.$api.navigateTo('/pages/authorization/authorization')
-			// }	
 		}
 	}
 </script>

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:'',//商品属性
+			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: {
@@ -219,13 +229,14 @@
 			verifyStatusFilter: function(state){
 				let stateText = '',
 					stateTextObject={
-						'2':'已上架',
-						'3':'已下架',
-						'1':'待审核',
-						'8':'审核未通过',
-						'9':'已隐身',
-						'10':'已冻结',
-						'0':'已删除'
+						0:'已删除',
+						1:'待审核',
+						2:'已上架',
+						3:'已下架',
+						8:'审核未通过',
+						9:'已隐身',
+						10:'已冻结',
+						
 					};
 				Object.keys(stateTextObject).forEach(function(key) {
 					if(key == state){
@@ -292,16 +303,16 @@
 			},	
 			handleDataList(){//根据商品状态set不同的tabAction返回新的数据
 				this.dataList.forEach(item =>{
-					if(item.validFlag === '0' || item.validFlag === '3' || item.validFlag === '8' || item.validFlag === '9'){
+					if(item.validFlag === 0 || item.validFlag === 3 || item.validFlag === 8 || item.validFlag === 9){
 						item.actions = [
 							{name: '无操作',color: '#fff',fontsize: 26,width: 50,background: '#e1e1e1'},
 						]
-					}else if(item.validFlag === '1' || item.validFlag === '10'){
+					}else if(item.validFlag === 1 || item.validFlag === 10){
 						item.actions = [
 							{name: '查看详情',color: '#fff',fontsize: 26,width: 50,background: '#f9a94b'},
 						]
-					}else if(item.validFlag === '2'){
-						if(item.featuredFlag ==='1'){
+					}else if(item.validFlag === 2){
+						if(item.featuredFlag ===1){
 							item.actions = [
 								{name: '查看详情',color: '#fff',fontsize: 26,width: 50,background: '#f9a94b'},
 								{name: '删除主页推荐',color: '#fff',fontsize: 26,width: 50,background: '#ff7a51'},
@@ -316,6 +327,7 @@
 						}
 					}
 				})
+				console.log(this.dataList)
 			},
 			handSearchList(){//搜索
 				this.GetProductListInfo()
@@ -324,9 +336,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='';
@@ -334,21 +347,21 @@
 				this.classificationThreeList = [];
 			},
 			handlerButton(e,item){//监听侧滑按钮点击事件
-				if(item.validFlag === '0' || item.validFlag === '3' || item.validFlag === '8' || item.validFlag === '9'){
+				if(item.validFlag === 0 || item.validFlag === 3 || item.validFlag === 8 || item.validFlag === 9){
 					if(e.index == 0){
 						return
 					}
-				}else if(item.validFlag === '1' || item.validFlag === '10'){
+				}else if(item.validFlag === 1 || item.validFlag === 10){
 					if(e.index == 0){
-						this.$api.navigateTo(`/pages/goods/product?id=${item.productID}`)
+						this.$api.navigateTo(`/pages/goods/product?id=${item.productId}`)
 					}
-				}else if(item.validFlag === '2'){
+				}else if(item.validFlag === 2){
 					switch(e.index){
 						case 0:
-							this.$api.navigateTo(`/pages/goods/product?id=${item.productID}`)
+							this.$api.navigateTo(`/pages/goods/product?id=${item.productId}`)
 							break;
 						case 1:
-							if(item.featuredFlag ==='1'){
+							if(item.featuredFlag === 1){
 								this.handleDeleteShopRemb(item)
 							}else{
 								this.handleAddShopRemb(item)
@@ -360,15 +373,12 @@
 				}
 			},
 			handleAddShopRemb(item){//添加主页推荐
-				console.log(this.featuredNum);
 				let num = 4- this.featuredNum;
-				console.log(num);
 				this.OperationType = 'add'
 				this.handlerProduct = item
 				this.modal = true;
 				this.contentModalText = `总共能添加4个主推商品，您还能添加${num}个确定将该商品添加为主推商品吗？`;
 			},
-			
 			handleDeleteShopRemb(item){//删除主页推荐
 				this.OperationType = 'delete'
 				this.handlerProduct = item
@@ -382,27 +392,30 @@
 				this.contentModalText = '确定下架该商品吗？';
 			},
 			handleAllUnder(){//批量下架操作
-				let isValidFlag = false
+				let checkedArray = [];
+				let isValidFlag = false;
+				this.productIds = '';
 				if(this.isProductChecked){
 					this.dataList.forEach(el => {
 						if(el.isChecked) { 
-							if(el.validFlag != 2){ 
-								isValidFlag = true; 
-							}else{
-								isValidFlag = false
-								this.productIds += el.productID+','
-							}
+							checkedArray.push(el)						
+						}
+					})
+					checkedArray.forEach(el =>{
+						if(el.validFlag == 2){
+							this.productIds += el.productId+','
 						}
+						if(el.validFlag != 2){
+							isValidFlag = true; 
+						}	
 					})
 					if(isValidFlag){
 						this.$util.modal('','部分选中的商品暂未上架，不能进行下架操作','确定','',false,() =>{})
-					}else{	
-						this.OperationType = 'allunder'
-						this.modal = true;
-						this.contentModalText = '确定下架选中的商品吗？';												
+						return;
 					}
-				}else{
-					return;
+					this.OperationType = 'allunder'
+					this.modal = true;
+					this.contentModalText = '确定下架选中的商品吗？';												
 				}
 			},
 			handleClick(e) {//弹窗提示用户操作
@@ -425,7 +438,7 @@
 				this.modal = false;
 			},
 			SupplierDeleteSwitchFeatured(item){//操作删除主页推荐
-				this.ShopService.SupplierSwitchFeaturedyProduct({productId:item.productID,featuredFlag:0}).then(response =>{
+				this.ShopService.SupplierSwitchFeaturedyProduct({productId:item.productId,featuredFlag:0}).then(response =>{
 					this.$util.msg('删除成功',2000,true,'success');
 					setTimeout(() => {
 						this.GetProductListInfo()
@@ -435,7 +448,7 @@
 				})
 			},
 			SupplierAddSwitchFeatured(item){//操作添加主页推荐
-				this.ShopService.SupplierSwitchFeaturedyProduct({productId:item.productID,featuredFlag:1}).then(response =>{
+				this.ShopService.SupplierSwitchFeaturedyProduct({productId:item.productId,featuredFlag:1}).then(response =>{
 					this.$util.msg('添加成功',2000,true,'success');
 					setTimeout(() => {
 						this.GetProductListInfo()
@@ -445,7 +458,7 @@
 				})
 			},
 			SupplierSoldOutProduct(item){//操作下架商品
-				this.ShopService.SupplierSoldOutProduct({productIds:item.productID}).then(response =>{
+				this.ShopService.SupplierSoldOutProduct({productIds:item.productId}).then(response =>{
 					this.$util.msg('下架成功',2000,true,'success');
 					setTimeout(() => {
 						this.GetProductListInfo()
@@ -457,6 +470,7 @@
 			SupplierAllSoldOutProduct(ids){//操作批量下架商品
 				this.ShopService.SupplierSoldOutProduct({productIds:ids}).then(response =>{
 					this.$util.msg('下架成功',2000,true,'success');
+					this.productIds = '';
 					setTimeout(() => {
 						this.GetProductListInfo()
 					},2000)
@@ -466,6 +480,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 +492,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} 
@@ -566,6 +584,7 @@
 			},
 			checkedSoperv(item){//选择
 				item.isChecked = !item.isChecked
+				console.log(item)
 				this.updateCheckAllBtn()
 			},
 			supervClickFn(){//管理全选
@@ -589,12 +608,12 @@
 			verifyColorFilter: function(state){
 				let stateColor = '',
 					stateColorObject={
-						'2':'#1890f9',
-						'1':'#f9a94b',
-						'0':'#FFB12A',
-						'3':'#627386',
-						'8':'#FF2A2A',
-						'9':'#f94b4b'
+						0:'#FFB12A',
+						1:'#f9a94b',
+						2:'#1890f9',
+						3:'#627386',
+						8:'#FF2A2A',
+						9:'#f94b4b'
 					};
 				Object.keys(stateColorObject).forEach(function(key){
 					if(key == state){

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>
@@ -272,7 +272,9 @@
 				total:0
 			}
 		},
-		
+		computed: {
+			...mapState(['hasLogin','userInfo','isActivity','identity','isWxAuthorize'])
+		},
 		onLoad(option) {
 			if(option.type =='share'){
 				authorize.getSetting().then(res =>{
@@ -284,12 +286,6 @@
 						this.$api.navigateTo('/pages/authorization/authorization')
 					}
 				})
-				// if(uni.getStorageSync('_WX_State')){
-				// 	wxLogin.wxLoginAuthorize()
-				// }else{
-				// 	console.log(new Date +'用户未授权微信信息')
-				// 	this.$api.navigateTo('/pages/authorization/authorization')
-				// }	
 			}
 			this.listQuery.id = this.supplierId = option.shopId
 			this.$api.getStorage().then((resolve) =>{
@@ -306,9 +302,6 @@
 				return Number(text).toFixed(2);
 			},
 		},
-		computed: {
-			...mapState(['hasLogin','userInfo','isActivity','isWxAuthorize'])
-		},
 		methods: {
 			...mapMutations(['login','logout']),
 			InitShopDataInfo(){//初始化请求数据
@@ -336,7 +329,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){
@@ -381,7 +374,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 =>{
@@ -394,11 +387,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)
@@ -408,18 +401,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])) 
 						}
 					}

supplier/pages/user/operator/addoperator.vue

@@ -28,8 +28,8 @@
 		data() {
 			return {
 				params:{
-					shopID:'',
-					userID:'',
+					shopId:'',
+					userId:'',
 					mobile:'',
 					linkName:'',
 					configFlag:2
@@ -67,8 +67,8 @@
 		},
 		onShow() {
 			this.$api.getStorage().then((resolve) =>{
-				this.params.userID = resolve.userId ? resolve.userId : 0
-				this.params.shopID = resolve.shopId ? resolve.shopId : 0 
+				this.params.userId = resolve.userId ? resolve.userId : 0
+				this.params.shopId = resolve.shopId ? resolve.shopId : 0 
 				
 			})
 		}

supplier/pages/user/operator/list.vue

@@ -68,12 +68,12 @@
 					<view class="ciew-t">姓名：{{modelData.linkName}}</view>
 					<view class="ciew-t">手机号：{{modelData.mobile}}</view>
 					<view class="ciew-t">邀请码：{{modelData.invitationCode ? modelData.invitationCode : '无'}}<text :style="{color: rexpStautsColor(modelData.status)}">{{modelStautsText(modelData.effectiveFlag)}}</text></view>
-					<view class="ciew-t">邀请码有效期：{{modelData.effectiveDays}}天</view>
-					<view class="ciew-t">状态：{{modelData.status == '2' ? '已绑定' : '未绑定'}}</view>
+					<view class="ciew-t">邀请码有效期：{{modelData.effectiveDays ? modelData.effectiveDays : '0' }}天</view>
+					<view class="ciew-t">状态：{{modelData.status == 2 ? '已绑定' : '未绑定'}}</view>
 					<view class="ciew-t">添加时间：{{modelData.addTime}}</view>
 					<view class="ciew-t">绑定时间：{{modelData.bindTime == null ? '无' : modelData.bindTime }}</view>
 				</view>
-				<view class="btn" v-if="modelData.status != '2'" @click.stop="updateInvitationCode(modelData)">更新邀请码</view>
+				<view class="btn" v-if="modelData.status != 2" @click.stop="updateInvitationCode(modelData)">更新邀请码</view>
 			</view>
 		</view>
 	</view>
@@ -90,7 +90,6 @@
 		},
 		data() {
 			return {
-				shopId:'',
 				shopName:'',
 				shopLogo:'',
 				defalutLogo:'https://static.caimei365.com/app/img/icon/logo@3x.png',
@@ -111,7 +110,7 @@
 				isIphoneX:this.$store.state.isIphoneX,
 				modelData:'',
 				listQuery:{
-					userID:0,
+					userId:0,
 					linkName:'',
 					mobile:'',
 					pageNum:1,
@@ -139,15 +138,13 @@
 			},
 			GetHomePageData(){//初始化供应商信息
 				this.$api.getStorage().then((resolve) =>{
-					this.userId = resolve.userId ? resolve.userId : 0
-					this.ShopService.GetHomePageData({userId:this.userId}).then(response =>{
-						console.log(response)
+					this.listQuery.userId = resolve.userId ? resolve.userId : 0
+					this.ShopService.GetHomePageData({userId:this.listQuery.userId}).then(response =>{
 						let data = response.data
-						this.shopId = data.shop.shopID
 						this.shopName = data.shop.name
 						this.shopLogo = data.shop.logo
 						this.listQuery.userID = data.shop.userID
-						this.initOperatorList()
+						this.InitOperatorList()
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)
 					})
@@ -155,9 +152,9 @@
 			},
 			searchOpertor(){//搜索
 				this.listQuery.pageNum=1
-				this.initOperatorList()
+				this.InitOperatorList()
 			},
-			initOperatorList(){	//查询列表
+			InitOperatorList(){	//查询列表
 				this.UserService.QueryOperatorList(this.listQuery).then(response =>{
 					let responseData = response.data
 					if(responseData.results&&responseData.results.length > 0){
@@ -215,7 +212,7 @@
 					this.UserService.PostDeleteOperator({id:id}).then(response =>{
 						this.$util.msg('删除成功',2000,true,'success')
 						setTimeout(()=>{
-							this.initOperatorList()
+							this.InitOperatorList()
 						},2000)
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)
@@ -225,10 +222,10 @@
 			updateInvitationCode(item){	//更新邀请码	
 				this.$util.modal('','确定更新邀请码并发送给运营人员？','确定更新','取消',true,() =>{
 					this.UserService.PostUpdateOperatorCode({id:item.id,status:item.status}).then(response =>{
-						this.$util.msg('更新邀请码成功',2000)
 						this.isOperatorModel = false
+						this.$util.msg('更新邀请码成功',2000)
 						setTimeout(()=>{
-							this.initOperatorList()
+							this.InitOperatorList()
 						},2000)
 					}).catch(error =>{
 						this.$util.msg(error.msg,2000)
@@ -241,13 +238,13 @@
 					case '':
 						text = '--'
 						break
-			        case '1':
+			        case 1:
 			          text = '邀请码有效'
 			          break
-			        case '2':
+			        case 2:
 			          text = '邀请码已使用'
 			          break
-			        case '3':
+			        case 3:
 			          text = '邀请码已过期'
 			          break
 			      }
@@ -256,13 +253,13 @@
 			modelStautsText(n) {
 			      let text = ''
 			      switch (n) {
-			        case '1':
+			        case 1:
 			          text = '(有效)'
 			          break
-			        case '2':
+			        case 2:
 			          text = '(已使用)'
 			          break
-			        case '3':
+			        case 3:
 			          text = '(已过期)'
 			          break
 			      }
@@ -271,13 +268,13 @@
 			rexpStautsColor(status) {
 			  let textColor = ''
 			  switch (status) {
-				case '1':
+				case 1:
 				  textColor = '#55BB00'
 				  break
-				case '2':
+				case 2:
 				  textColor = '#0056BB'
 				  break
-				case '3':
+				case 3:
 				  textColor = '#BB0000'
 				  break
 			  }
@@ -285,7 +282,7 @@
 			},  
 			iconStautsColor(status) {
 			  let textColor = ''
-			  if(status == '2'){
+			  if(status == 2){
 				   textColor = '#09BB07'
 			  }else{
 				   textColor = '#DDDDDD'