commit -m 商品模块服务化

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>

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>

pages/goods/good-floor.vue

@@ -34,7 +34,7 @@
 		},
 		data(){
 			return{
-				userID:0,
+				userId:0,
 				shopId:0,
 				userIdentity:0,
 				skeletonShow:true,
@@ -62,7 +62,7 @@
 			}
 			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();
@@ -75,9 +75,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/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>

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)

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();
 			})
 		}
 	}

search/pages/search/search-instrument.vue

@@ -68,9 +68,6 @@
 				total:0
 			}
 		},
-		computed: {
-			...mapState(['hasLogin','userInfo','isWxAuthorize'])
-		},
 		onLoad(option){
 			if(option.type =='share'){
 				if(uni.getStorageSync('_WX_State')){

search/pages/search/search-supplier.vue

@@ -107,9 +107,6 @@
 				total:0
 			}
 		},
-		computed: {
-			...mapState(['hasLogin','userInfo','isWxAuthorize'])
-		},
 		onLoad(option){
 			if(option.type =='share'){
 				if(uni.getStorageSync('_WX_State')){

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,
@@ -223,7 +223,7 @@
 				}	
 			}
 			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;
@@ -258,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
 					}
@@ -303,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;
@@ -334,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);
@@ -343,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);
 					}
@@ -359,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])) 
 						}
 					}

services/ajax.env.js

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

services/common.service.js

@@ -8,67 +8,135 @@ 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:'/home/floorContentDetails', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 二级页楼层查看更多数据 */
 	GePageFloorContentDetails (data = {}) {
-		return this.AjaxService.get({ url:'/home/pageFloorDetails', data, isLoading: false })
+		return this.AjaxService.get({ 
+			url:'/home/pageFloorDetails', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 首页顶部三个模块数据 */
 	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 })
+		return this.AjaxService.get({ 
+			url:'/home/init', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	/* 首页金刚区二级分类 */
 	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:'/product/classify', 
+			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:'/product/typeId/classify', 
+			data, 
+			isLoading: false ,
+		})
 	}
 	
 }

services/config.env.js

@@ -1,10 +1,10 @@
 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 = 'https://core-b.caimei365.com'
-	URL_CONFIG = 'https://core.caimei365.com'
+	// URL_CONFIG = 'https://core.caimei365.com'
 }else{
     // 生产环境
 	// URL_CONFIG = 'https://core-b.caimei365.com'

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
+		})
 	}
 	
 	/**
@@ -140,7 +145,12 @@ 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 = {}) {

services/user.service.js

@@ -226,33 +226,37 @@ 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
 		})
 	}
 	

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'