commit - m 测试优化

components/cm-module/cm-seller/home.vue

@@ -87,9 +87,9 @@
 				isLogin:false,
 				skeletonShow: true,
 				userIdentity:'',
+				flootData:[],//楼层
 				bannerImageList:[],//轮播
 				navBarsList:[],//导航分类
-				pagesList:[],//楼层
 				RecommendList:[],//热门推荐
 				isScrollTop:false,
 				isRequest:false
@@ -181,7 +181,8 @@
 				}
 				return false
 			},
-			swiperChange(e) {//轮播图切换修改背景色
+			//轮播图切换修改背景色
+			swiperChange(e) {
 				const index = e.detail.current;
 				this.current = index;
 			},

components/cm-module/homeIndex/hotProduct.vue

@@ -18,7 +18,7 @@
 										<template v-if="item.actStatus===1">
 											<view class="floor-tags" v-if="PromotionsFormat(item.promotions)">
 												{{item.promotions.name}}
-												<text v-if="hasLogin && item.priceFlag != 1">:￥{{item.price | NumFormat}}</text>
+												<text v-if="hasLogin && item.priceFlag != 1 && item.supplierId == shopId">:￥{{item.price | NumFormat}}</text>
 											</view>
 											<view class="floor-tags" v-else>{{item.promotions.name}}</view>	
 										</template>
@@ -59,7 +59,7 @@
 											</view>	
 										</template>
 									</template>
-									<template v-if="userIdentity ===4">
+									<template v-else-if="userIdentity ===4">
 										<view class="title-none" v-if="item.priceFlag === '1'">
 											<text class="p big">￥未公开价格</text>
 										</view>

pages/goods/product.vue

@@ -177,7 +177,7 @@
 					</view>	
 				</tui-bottom-popup>	
 				<!-- 底部按钮 -->
-				<view class="menu" v-if="userIdentity!=1 || userIdentity != 3">
+				<view class="menu" v-if="isShowButton">
 					<view class="bottom-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
 						<view class="bottom-le">
 							<view class="item-bt" @click="this.$api.switchTabTo('/pages/tabBar/home/index')">
@@ -341,7 +341,8 @@
 				sectionPropsArr: [],
 				scrollTopArray:[],
 				sectionTopRangeArr: [],
-				winHeight:''
+				winHeight:'',
+				isShowButton:true,
 			}
 		},
 		onLoad(option) {
@@ -736,6 +737,9 @@
 				this.userID = resolve.userID ? resolve.userID : '';	
 				this.userIdentity = resolve.userIdentity ? resolve.userIdentity : 3
 				this.shopID =  resolve.shopID ? resolve.shopID : '';	
+				if(this.userIdentity === 1 || this.userIdentity === 3){
+					this.isShowButton = false
+				}
 				if (isPreviewImg) {
 					isPreviewImg = false;
 					return;

supplier/pages/user/my-product.vue

@@ -143,6 +143,7 @@
 		},
 		data() {
 			return{	
+				shopID:0,
 				isSuperv:false,
 				isProductChecked:false,
 				validFlagText:'',
@@ -206,7 +207,7 @@
 					break;
 			}
 			this.$api.getComStorage('userInfo').then((resolve) =>{
-				this.listQuery.shopID = resolve.shopID
+				this.listQuery.shopID = this.shopID = resolve.shopID
 				this.GetProductListInfo()
 				this.GetPrimaryClassification()
 			})
@@ -261,7 +262,9 @@
 							}
 						}
 					}else{
+						this.dataList = []
 						this.isEmpty = true
+						this.pullUpOn = true
 					}
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
@@ -321,6 +324,7 @@
 			},	
 			handSearchClear(){//重置搜索条件
 				this.listQuery = Object.assign({}, defaultListQuery)
+				this.listQuery.shopID = this.shopID
 				this.validFlagText='';
 				this.featuredFlagText='';
 				this.firstClassificationText='';