mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新优化

Browse Source
This commit is contained in:
weipengfei 2023-11-08 12:00:24 +08:00
parent f63e22e9ba
commit f43ef06ff0
3 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pages/columnGoods/goods_search_con/index.vue
View File

@ -158,26 +158,30 @@
<image :src="item.mer_avatar" mode=""></image> <image :src="item.mer_avatar" mode=""></image>
</view> </view>
<view class="text"> <view class="text">
<view class="text_one"> <view class="text_one text_flex">
<view class=""> <view class="text_flex">
<image src="@/static/images/phone.png" mode=""></image> <image src="@/static/images/phone.png" mode=""></image>
{{item.service_phone}} {{item.service_phone}}
</view> </view>
<view class="text_one_r"> <view class="text_one_r text_flex">
<image src="@/static/images/clock.png" mode=""></image> <image src="@/static/images/clock.png" mode=""></image>
{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}} {{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}
</view> </view>
</view> </view>
<view class="text_two"> <view class="text_two text_flex">
<image src="@/static/images/shangpu.png" mode=""></image> <image src="@/static/images/shangpu.png" mode=""></image>
<view class="text_tip">
{{item.mer_info}} {{item.mer_info}}
</view> </view>
<view class="text_three"> </view>
<view class="text_three text_flex">
<image src="@/static/images/dingwei.png" mode=""></image> <image src="@/static/images/dingwei.png" mode=""></image>
<view class="text_tip">
{{item.mer_address}} {{item.mer_address}}
</view> </view>
</view> </view>
</view> </view>
</view>
</view> </view>
@ -1204,6 +1208,12 @@
} }
} }
.text_flex{
display: flex;
align-items: center;
}
.productList .list .item .text .money { .productList .list .item .text .money {
display: flex; display: flex;
align-items: center; align-items: center;
@ -1521,11 +1531,12 @@
margin-left: 20px; margin-left: 20px;
.avater { .avater {
width: 60px; width: 80px;
height: 80px; height: 80px;
flex-shrink: 0;
image { image {
width: 60px; width: 80px;
height: 80px; height: 80px;
} }
} }
@ -1541,10 +1552,13 @@
width: 20px; width: 20px;
height: 20px; height: 20px;
margin-right: 10px; margin-right: 10px;
flex-shrink: 0;
} }
.text_one_r { .text_one_r {
flex: 1;
margin-left: 10px; margin-left: 10px;
} }
} }
@ -1553,14 +1567,17 @@
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
padding-left: 10px; padding-left: 10px;
.text_tip{
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
}
image { image {
width: 20px; width: 20px;
height: 20px; height: 20px;
margin-right: 10px; margin-right: 10px;
flex-shrink: 0;
} }
} }
@ -1569,9 +1586,11 @@
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
padding-left: 10px; padding-left: 10px;
.text_tip{
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
}
image { image {
width: 20px; width: 20px;

2
pages/order_addcart/order_addcart.vue
View File

@ -579,7 +579,7 @@
}) })
if (selectValue.length > 0) { if (selectValue.length > 0) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/users/order_confirm/index?cartId=' + selectValue.join(',') url: '/pages/users/order_confirm/index?cartId=' + selectValue.join(',') + '&product_type=' + this.product_type
}); });
} else { } else {
return this.$util.Tips({ return this.$util.Tips({

3
pages/users/order_confirm/index.vue
View File

@ -1029,7 +1029,8 @@
address_id: address_id, address_id: address_id,
takes: that.take, takes: that.take,
use_coupon: that.subCoupon, use_coupon: that.subCoupon,
use_integral: that.use_integral use_integral: that.use_integral,
product_type: that.product_type
}).then(res => { }).then(res => {
// 默认选中 // 默认选中
that.product_type=res.data.order_type that.product_type=res.data.order_type