bug修复
This commit is contained in:
parent
011fcbc2e4
commit
991f55a47d
@ -718,7 +718,7 @@
|
||||
<div class="broadcast_details_tit">{{productInfo.store_name}}</div>
|
||||
<div class="acea-row row-between product_price">
|
||||
<div class="broadcast_details_pic p-color">
|
||||
¥{{ saleType == 1? productInfo.price :productInfo.wholesale_price}}
|
||||
¥{{ saleType == 1 ? productInfo.price :productInfo.wholesale_price}}
|
||||
</div>
|
||||
<div class="broadcast_details_btn product_btn" @click="sendProduct">发送商品</div>
|
||||
</div>
|
||||
@ -1458,7 +1458,8 @@
|
||||
sendProduct() {
|
||||
consultApi({
|
||||
user_id: this.toUid,
|
||||
product_id: this.productId
|
||||
product_id: this.productId,
|
||||
sale_type: this.saleType
|
||||
})
|
||||
if (this.presellId || this.combinationId) {
|
||||
if (this.presellId) {
|
||||
|
@ -45,7 +45,7 @@
|
||||
</scroll-view>
|
||||
|
||||
<view class="category-all" v-if="store_category.length > 0" @click="onAllCategory">
|
||||
<view style="margin-bottom: 20rpx;">全部</view>
|
||||
<view style="margin-bottom: 10rpx;">全部</view>
|
||||
<u-icon name="list"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
@ -415,17 +415,16 @@
|
||||
right: 0;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
height: 100%;
|
||||
background-color: #f3f3f3;
|
||||
height: 101%;
|
||||
z-index: 10;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
font-size: 24rpx;
|
||||
border-radius: 4rpx;
|
||||
width: 70rpx;
|
||||
color: #919191;
|
||||
box-shadow: 0px 0px 60rpx #c5c5c5;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -554,16 +554,15 @@
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
height: 100%;
|
||||
background-color: #f3f3f3;
|
||||
z-index: 10;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
font-size: 24rpx;
|
||||
border-radius: 4rpx;
|
||||
width: 70rpx;
|
||||
color: #919191;
|
||||
box-shadow: 0px 0px 60rpx #c5c5c5;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -408,16 +408,15 @@
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
height: 100%;
|
||||
background-color: #f3f3f3;
|
||||
z-index: 10;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
font-size: 24rpx;
|
||||
border-radius: 4rpx;
|
||||
width: 70rpx;
|
||||
color: #919191;
|
||||
box-shadow: 0px 0px 60rpx #c5c5c5;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1502,7 +1502,7 @@
|
||||
toLogin()
|
||||
} else {
|
||||
uni.navigateTo({
|
||||
url: `/pages/chat/customer_list/chat?mer_id=${that.storeInfo.mer_id}&uid=${that.uid}&productId=${that.id}$sale_type=${that.sale_type}`
|
||||
url: `/pages/chat/customer_list/chat?mer_id=${that.storeInfo.mer_id}&uid=${that.uid}&productId=${that.id}&sale_type=${that.sale_type}`
|
||||
});
|
||||
}
|
||||
},
|
||||
|
@ -105,7 +105,8 @@
|
||||
@click="toOrder('', 3)">
|
||||
<text>综合</text>
|
||||
</view>
|
||||
<view class="comprehensive-discount" v-else @click="deduction_rate=!deduction_rate;">
|
||||
|
||||
<view class="comprehensive-discount" v-else @click="onChangeDeductionRate">
|
||||
<text>抵扣</text>
|
||||
<image class="loudou" src="@/static/new_define/loudou.png"></image>
|
||||
</view>
|
||||
@ -417,7 +418,6 @@
|
||||
this.getProductslist(true);
|
||||
},
|
||||
changeSub(e) {
|
||||
console.log(e);
|
||||
this.subCurr = e;
|
||||
this.where = {
|
||||
page: 1,
|
||||
@ -486,12 +486,35 @@
|
||||
|
||||
// 高度判断
|
||||
getHeight() {
|
||||
|
||||
console.log(this.store_category_children);
|
||||
|
||||
if (this.tabsCurr == 1) {
|
||||
if (this.cate_change) {
|
||||
this.wrapHeight = 410;
|
||||
|
||||
if (this.where.cate_pid) {
|
||||
if (this.deduction_rate) {
|
||||
this.wrapHeight = 460;
|
||||
} else {
|
||||
this.wrapHeight = 410;
|
||||
}
|
||||
} else {
|
||||
this.wrapHeight = 360;
|
||||
if (this.deduction_rate) {
|
||||
this.wrapHeight = 410;
|
||||
} else {
|
||||
this.wrapHeight = 360;
|
||||
}
|
||||
}
|
||||
// if (this.store_category_children.length > 1 && this.deduction_rate) {
|
||||
// this.wrapHeight = 460;
|
||||
// } else if (this.store_category_children.length == 1 || !this.deduction_rate) {
|
||||
// this.wrapHeight = 410;
|
||||
// } else {
|
||||
// if (this.cate_change || this.deduction_rate) {
|
||||
// this.wrapHeight = 410;
|
||||
// } else {
|
||||
// this.wrapHeight = 360;
|
||||
// }
|
||||
// }
|
||||
} else if (this.tabsCurr == 2) {
|
||||
if (this.subCurr == 1) {
|
||||
this.wrapHeight = 400;
|
||||
@ -503,6 +526,11 @@
|
||||
}
|
||||
},
|
||||
|
||||
onChangeDeductionRate() {
|
||||
this.deduction_rate = !this.deduction_rate;
|
||||
this.getHeight()
|
||||
},
|
||||
|
||||
changeCate(e) {
|
||||
this.cate_change = e;
|
||||
this.store_category_children = [];
|
||||
@ -799,16 +827,15 @@
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
height: 100%;
|
||||
background-color: #f3f3f3;
|
||||
z-index: 10;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
font-size: 24rpx;
|
||||
border-radius: 4rpx;
|
||||
width: 70rpx;
|
||||
color: #919191;
|
||||
box-shadow: 0px 0px 60rpx #c5c5c5;
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user