|
|
@@ -10,7 +10,6 @@
|
|
|
</view>
|
|
|
<view class="search-from name">
|
|
|
<text class="iconfont icon-iconfonticonfontsousuo1"></text>
|
|
|
- <form class="search-block" action="javascript:void 0">
|
|
|
<input class="input"
|
|
|
type="text"
|
|
|
focus
|
|
|
@@ -18,10 +17,8 @@
|
|
|
v-model="searchInputVal"
|
|
|
placeholder="请输入商品关键词"
|
|
|
@input="onShowClose"
|
|
|
- @confirm="searchOpertor"
|
|
|
- @keyup.13="goSearch"
|
|
|
+ @confirm="searchOpertor(tabIndex)"
|
|
|
maxlength="20"/>
|
|
|
- </form>
|
|
|
<text class="iconfont icon-shanchu1" v-if="isShowClose" @click="delInputText()"></text>
|
|
|
</view>
|
|
|
<view class="search-btn" :class="tabIndex">
|
|
|
@@ -94,7 +91,7 @@
|
|
|
<view class="count">
|
|
|
<view class="number-box">
|
|
|
<view class="iconfont icon-jianhao" @click.stop="changeCountSub(item,pros)"></view>
|
|
|
- <input class="btn-input" type="number" maxlength='4' v-model="pros.initProductNum" @blur="changeNnmber($event,item,pros)">
|
|
|
+ <input class="btn-input" type="number" maxlength='6' v-model="pros.initProductNum" @blur="changeNnmber($event,item,pros)">
|
|
|
<view class="iconfont icon-jiahao" @click.stop="changeCountAdd(item,pros)"></view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -104,9 +101,10 @@
|
|
|
</view>
|
|
|
<view class="foot_conten" >
|
|
|
<view class="zuhe_foot-box">
|
|
|
- <!-- -->
|
|
|
- <text>种类：{{item.productKind}}</text>
|
|
|
- <text >总数：{{item.productTotalNum}}</text>
|
|
|
+ <view class="">
|
|
|
+ <text>种类：{{item.productKind}}</text>
|
|
|
+ <text >总数：{{item.productTotalNum}}</text>
|
|
|
+ </view>
|
|
|
<text>总额：<text class="foot_text">{{item.productTotalAmount.toFixed(2)}}</text></text>
|
|
|
</view>
|
|
|
<button type="default" class="buycart" @click.stop="operationHanld(item)">加入购物车</button>
|
|
|
@@ -175,8 +173,8 @@
|
|
|
tabIndex:0,
|
|
|
goodsList:[],
|
|
|
tabBars:[
|
|
|
- {name:'单一商品',id:'danyi'},
|
|
|
- {name:'组合商品',id:'zuhe'}
|
|
|
+ {name:'单一',id:'danyi'},
|
|
|
+ {name:'组合',id:'zuhe'}
|
|
|
],
|
|
|
isShow: false,
|
|
|
}
|
|
|
@@ -272,11 +270,6 @@
|
|
|
this.getcombinationProduct();
|
|
|
}
|
|
|
},
|
|
|
- goSearch(event){
|
|
|
- if (event.keyCode == 13) {
|
|
|
- this.getcombinationProduct();
|
|
|
- }
|
|
|
- },
|
|
|
getcombinationProduct(loadMore){//组合搜索商品
|
|
|
this.showLoading = true;
|
|
|
this.loadingNow = true;
|
|
|
@@ -453,8 +446,8 @@
|
|
|
width: 655rpx;
|
|
|
background: #fff;
|
|
|
font-size: 28rpx;
|
|
|
- height: 70rpx;
|
|
|
- line-height: 70rpx;
|
|
|
+ height: 80rpx;
|
|
|
+ // line-height: 80rpx;
|
|
|
display: inherit;
|
|
|
padding: 10px;
|
|
|
overflow: hidden;
|
|
|
@@ -504,7 +497,7 @@
|
|
|
.icon-gou{
|
|
|
color: #E15616;
|
|
|
position: absolute;
|
|
|
- top: 22rpx;
|
|
|
+ top: 30rpx;
|
|
|
right: 0rpx;
|
|
|
font-weight: bold
|
|
|
}
|
|
|
@@ -514,12 +507,12 @@
|
|
|
}
|
|
|
.tabstyle{
|
|
|
width: 128rpx;
|
|
|
- height: 64rpx;
|
|
|
+ height: 80rpx;
|
|
|
font-size: 26rpx;
|
|
|
display: inline-block;
|
|
|
border-radius: 10rpx;
|
|
|
text-align: center;
|
|
|
- line-height: 64rpx;
|
|
|
+ line-height: 80rpx;
|
|
|
border: 2rpx solid #EEEEEE;
|
|
|
position: relative;
|
|
|
margin-right: 12rpx;
|
|
|
@@ -543,7 +536,7 @@
|
|
|
}
|
|
|
}
|
|
|
.good-search{
|
|
|
- height: 64rpx;
|
|
|
+ height: 80rpx;
|
|
|
width: 702rpx;
|
|
|
padding: 24rpx;
|
|
|
background: #FFFFFF;
|
|
|
@@ -556,23 +549,23 @@
|
|
|
z-index: 999;
|
|
|
.search-from{
|
|
|
width: 326rpx;
|
|
|
- height: 64rpx;
|
|
|
+ height: 80rpx;
|
|
|
background: #F7F7F7;
|
|
|
border-radius: 14rpx;
|
|
|
float: left;
|
|
|
position: relative;
|
|
|
.input{
|
|
|
// width: 500rpx;
|
|
|
- height: 64rpx;
|
|
|
+ height: 80rpx;
|
|
|
float: left;
|
|
|
- line-height: 64rpx;
|
|
|
+ line-height: 80rpx;
|
|
|
color: $text-color;
|
|
|
font-size: $font-size-24;
|
|
|
}
|
|
|
.icon-iconfonticonfontsousuo1{
|
|
|
width: 64rpx;
|
|
|
- height: 64rpx;
|
|
|
- line-height: 64rpx;
|
|
|
+ height: 80rpx;
|
|
|
+ line-height: 80rpx;
|
|
|
text-align: center;
|
|
|
display: block;
|
|
|
font-size: $font-size-38;
|
Administrator