优化

components/cm-module/listTemplate/buyagainList.vue

@@ -12,8 +12,8 @@
 						<view class="list-details-price">
 							<view class="list-shop">
 								<view class="list-price" >
-									<text class="price-view activity" v-if="item.isShowActFlg">活动价</text>
-									<text class="price-view ladder" v-if="item.ladderPriceFlag == 1">阶梯价</text>
+									<text class="price-view activity" v-if="item.isShowActFlg">活</text>
+									<text class="price-view ladder" v-if="item.ladderPriceFlag == 1">阶</text>
 									<text class="price-larger">￥{{item.retailPrice.toFixed(2)}}</text>
 								</view>
 								<view class="list-price-none" v-if="item.repurchasePriceState">
@@ -323,9 +323,9 @@
 				}
 				.price-view{
 					display: inline-block;
-					width: 78rpx;
-					border-radius: 18rpx;
-					font-size: $font-size-20;
+					width: 40rpx;
+					border-radius: 10rpx;
+					font-size: $font-size-22;
 					text-align: center;
 					color: #FFFFFF;
 					height: 36rpx;

components/cm-module/listTemplate/immediatelyList.vue

@@ -44,8 +44,8 @@
 								<view v-if="priceLoading" class="list-price-loding">正在获取价格...</view>
 								<view v-else class="list-shop">
 									<view class="list-price">
-										<text class="price-view activity" v-if="item.isShowActFlg">活动价</text>
 										<text class="price-larger">￥{{item.price}}</text>
+										<text class="price-view activity" v-if="item.isShowActFlg">活</text>
 										<text class="price-view ladder" v-if="item.ladderPriceFlag == '1'" @click.stop="alertjieti(item)">阶</text>
 									</view>
 									<view class="list-price-none" v-if="item.repurchasePriceState">
@@ -65,8 +65,8 @@
 			</view>
 			<!-- 组合商品 -->
 			<view :class="tabIndex"  v-if="tabIndex === 1">
-				<scroll-view :style="{'height':scrollHeight+'px'}" @scrolltolower="scrolltolower(tabIndex)" scroll-y>
-					<view class="all-zuhe-list" v-for="(item,index) in combinationProduct" :key="index" :id="item.id" :style="{paddingTop:searchStatus?'112rpx':''}" >
+				<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 class="list-details-info" >
@@ -160,7 +160,8 @@
 				priceLoading:true,
 				isShowEmpty: false,
 				isShowEmptyText: '搜索相关商品',
-				clubUserId: '',
+				clubUserId: '',
+				identity:'',
 				scrollHeight: '',
 				listData: [],
 				combinationProduct:[],
@@ -189,10 +190,18 @@
 			}
 		},
 		created() {
-			this.setScrollHeight();		
+			this.setScrollHeight();		
+			this.$api.getComStorage('userInfo').then((resolve) =>{
+				if(resolve.userIdentity = 1){
+					this.identity = 1
+				}
+			}).catch(error =>{
+				console.log(error)
+			})
 			this.$api.getComStorage('orderUserInfo').then((resolve) =>{
 				this.clubUserId = resolve.userID
-			})
+			})
+			this.getProductAgainInfo()
 		},
 		computed: {
 			...mapState(['hasLogin','userInfo'])
@@ -221,7 +230,7 @@
 				this.loadingText = '加载中';
 				this.isShowEmpty = false;				
 				if(loadMore) {this.pageNum += 1;}
-				let params = {keyword:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize,sortField:'',sortType:''}
+				let params = {identity:this.identity,keyword:this.searchInputVal,pageNum:this.pageNum,pageSize:this.pageSize,sortField:'',sortType:''}
 				queryNewSearchProduct(params).then(response =>{
 					this.isShowWrapper = true
 					const resData = JSON.parse(response.data);
@@ -448,11 +457,11 @@
 			changeTab(index){
 				this.tabIndex = index;
 				if(index == 0){
-					this.loadingNow = false
-					this.isShowEmpty = true;
-					this.isShowEmptyText ='暂无相关商品'
+					this.getProductAgainInfo()
+				}else{
+					this.getcombinationProduct()
 				}
-				this.$emit('changetab',index);
+				// this.$emit('changetab',index);
 			},
 			navToDetailPage(id) {
 				this.isModallayer = true;
@@ -812,7 +821,7 @@
 					display: inline-block;
 					width: 40rpx;
 					border-radius: 10rpx;
-					font-size: $font-size-24;
+					font-size: $font-size-22;
 					text-align: center;
 					color: #FFFFFF;
 					height: 36rpx;

seller/pages/cart/immediately.vue

@@ -136,8 +136,6 @@
 			hanldChangeTab(index){
 				if(index == 1){
 					this.$refs.productList.getcombinationProduct()
-				}else{
-					this.$refs.productList.getProductAgainInfo();
 				}
 			},
 			hanldalertjietiConfim(data){