Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

pages/goods/list.vue

@@ -83,7 +83,7 @@
 									<!-- 商品价格 -->
 									<view class="desc-footer">
 										<text
-											class="price-x">¥{{ item.goods_price_min>0?Number(item.goods_price_min):'' }}</text>
+											class="price-x">¥{{ item.goods_price_min>0?Number(item.goods_price_min):0.00 }}</text>
 										<text class="price-y col-9"
 											v-if="item.line_price_min > 0">¥{{ item.line_price_min>0?Number(item.line_price_min):'' }}</text>
 									</view>
@@ -111,6 +111,7 @@
 										<view class="shipping">
 											包邮
 										</view>
+										<view class="goodsInfo">
 										<!-- <view class="goodsInfo">
 											<view class="oneTip tip">
 												85英寸
@@ -120,15 +121,15 @@
 											</view>
 											<view class="threeTip tip">
 												4K电视
-											</view>
+											</view> -->
-										</view> -->
+										</view>
 										<!-- 商品价格 -->
 										<view class="detail-price oneline-hide">
 											<text
-												class="goods-price f-30 col-m">￥{{ item.goods_price_min>0?Number(item.goods_price_min):'' }}
+												class="goods-price f-30 col-m">￥{{ item.goods_price_min>0?Number(item.goods_price_min):0.00}}
 												<text class="delPrice">到手价</text></text>
 											<text v-if="item.line_price_min > 0"
-												class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):''  }}</text>
+												class="line-price col-9 f-24">￥{{ item.line_price_min>0?Number(item.line_price_min):0.00  }}</text>
 										</view>
 									</view>
 								</view>
@@ -176,7 +177,7 @@
 						</template>
 					</u-waterfall>
 				</view>
-				<u-empty text="暂无数据显示哦～" v-if="list.data.length==0" mode="list"></u-empty>
+				<!-- <u-empty text="暂无数据显示哦～" v-if="list.data.length==0" mode="list"></u-empty> -->
 			</view>
 		</mescroll-body>
 	</view>