test

components/cm-module/listTemplate/immediatelyList.vue

@@ -18,6 +18,7 @@
 					   placeholder="请输入商品关键词" 
 					   @input="onShowClose" 
 					   @confirm="searchOpertor"
+					   bindconfirm='goSearch'
 					   maxlength="20"/>
 				<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
 			</view>
@@ -77,13 +78,11 @@
 								<view class="list-details-price zuhe_list_price">
 									<view class="list-shop">
 										<view class="list-price zuhe_list_price" >
-											<view :style="{'float': 'left','width': '402rpx'}">
-												<text class="zuhe_price-larger zuhe_list_text" >价格：￥{{pros.retailPrice.toFixed(2)}}</text>
-												<text class="price-two zuhe_list_text" >总价：<text class="zuhe_list_zj">￥ {{pros.totalPrice.toFixed(2)}}</text></text>
-											</view>
-											<view :style="{'float': 'right','margin-top': '10rpx'}">
-												<text class="price-view ladder" v-if="pros.ladderPriceFlag == '1'" @click.stop="alertjieti(pros)">阶</text>
-												<text class="price-view activity" v-if="pros.actStatus == '1'">活动价</text>
+											<view class="zuhe_price-larger zuhe_list_text" >价格：￥{{pros.retailPrice.toFixed(2)}}</view>
+											<view :style="{'overflow':'hidden'}">
+											<view class="price-two zuhe_list_text" >总价：<text class="zuhe_list_zj">￥ {{pros.totalPrice.toFixed(2)}}</text></view>
+											<text class="price-view ladder zuhe-price-ladder" v-if="pros.ladderPriceFlag == '1'" @click.stop="alertjieti(pros)">阶</text>
+											<text class="price-view activity" v-if="pros.actStatus == '1'">活动价</text>
 											</view>
 										</view>
 										<view class="list-price-none" v-if="pros.repurchasePriceState">
@@ -162,6 +161,7 @@
 				loadingNow: true,
 				loadingText: '上拉加载更多',
 				pageSize: 10,
+				zuhepageSize:5,
 				pageNum: 1,
 				hasNextPage: false,
 				pullFlag: true,
@@ -177,6 +177,7 @@
 					{name:'组合商品',id:'zuhe'}
 				],
 				 isShow: false,
+				 keyWord: '',
 			}
 		},
 		created() {
@@ -194,7 +195,6 @@
 					if(tabIndex ==0){
 						this.getProductAgainInfo(true);
 					}else if(tabIndex==1){
-						console.log('tabindex11111')
 						this.getcombinationProduct(true);
 					}
 				}
@@ -271,13 +271,18 @@
 					this.getcombinationProduct();
 				}
 			},
+			goSearch(event){
+				 if (this.keyWord) {
+				      this.getcombinationProduct();
+				    }
+			},
 			getcombinationProduct(loadMore){//组合搜索商品
 				this.showLoading = true;
 				this.loadingNow = true;
 				this.loadingText = '加载中';
 				this.isShowEmpty = false;				
 				if(loadMore) {this.pageNum += 1;}
-				let params = {clubUserId:this.clubUserId,pageNum:this.pageNum,pageSize:this.pageSize,searchWord:this.searchInputVal}
+				let params = {clubUserId:this.clubUserId,pageNum:this.pageNum,pageSize:this.zuhepageSize,searchWord:this.searchInputVal}
 				getcombinationProduct(params).then(response =>{
 					this.isShowWrapper = true
 					const responseData = response.data;
@@ -715,12 +720,12 @@
 				}
 				.zuhe_price-larger{
 					color: #666666;
-					float: left;
+					// float: left;
 					// margin-right: 85rpx;
 				}
 				.price-two{
 					color: #666666;
-					float: right;
+					float: left;
 					
 				}
 				.zuhe_list_zj{
@@ -745,7 +750,9 @@
 				}
 			}
 			.zuhe_list_price .price-view{
-				margin-left:10rpx;
+				margin-left:20rpx;
+				float: left;
+				margin-top: 5rpx;
 			}
 			.zuhe_list_price{
 				width: 470rpx;