合并冲突

9 months ago · 1df9a4fab6
parent ce8391a499 d65c674f44
commit 1df9a4fab6
1 changed files with 2 additions and 1 deletions
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@ -112,7 +112,8 @@
 											包邮
 										</view>
 										<view class="goodsInfo">
-											<!-- <view class="oneTip tip">
+										<!-- <view class="goodsInfo">
+											<view class="oneTip tip">
 												85英寸
 											</view>
 											<view class="twoTip tip">