diff --git a/pages/fengxiang/index.vue b/pages/fengxiang/index.vue index fd5a068..776e3ae 100644 --- a/pages/fengxiang/index.vue +++ b/pages/fengxiang/index.vue @@ -139,7 +139,7 @@ <image class=" image_15" src="../../static/重量.png" /> <text class="font_5 text_9 text-l">重量</text> <text class=" font_5 text_13" - v-if="item.weight_day_text">{{item.weight_day_text}}</text> + v-if="item.weight_day_text">{{item.weight_day_text == '-0' ? 0 : item.weight_day_text}}</text> <text class=" font_5 text_13" v-else>{{item.weight_day}}</text> </view> <view class="flex-taxt"> @@ -166,7 +166,7 @@ <view class="flex-taxt"> <image class=" image_16" src="../../static/蜂箱-温度.png" /> <text class="font_5 text_9 text-l">箱外</text> - <text class=" font_5 text_13">{{item.temperature_out_box.substring(0, 3) < -40 || item.temperature_out_box.substring(0, 3) > 100 ? '--' : item.temperature_in_box}}</text> + <text class=" font_5 text_13">{{item.temperature_out_box.substring(0, 3) < -40 || item.temperature_out_box.substring(0, 3) > 100 ? '--' : item.temperature_out_box}}</text> </view> <view class="flex-taxt"> <image class=" image_17" src="../../static/蜂箱-湿度.png" /> @@ -1301,7 +1301,7 @@ } .font_5 { - font-size: 26rpx; + font-size: 24rpx; font-family: 微软雅黑; line-height: 24rpx; color: #444444; diff --git a/pages/login/index.vue b/pages/login/index.vue index 2bad0d0..f9b5c96 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -491,14 +491,14 @@ } .font_2 { - font-size: 26rpx; + font-size: 24rpx; font-family: Poppins; line-height: 24rpx; color: #888888; } .font_3 { - font-size: 26rpx; + font-size: 24rpx; font-family: Poppins; line-height: 24rpx; font-weight: 600; diff --git a/pagesFengChang/components/map.vue b/pagesFengChang/components/map.vue index 06a5c5f..ed70782 100644 --- a/pagesFengChang/components/map.vue +++ b/pagesFengChang/components/map.vue @@ -234,7 +234,7 @@ } .mt-taxtbox-2 { - font-size: 26rpx; + font-size: 24rpx; color: #818586; display: flex; margin-top: 20rpx; diff --git a/pagesFengXiang/pages/fengxiangDetail/index.vue b/pagesFengXiang/pages/fengxiangDetail/index.vue index 586b84f..ccaa424 100644 --- a/pagesFengXiang/pages/fengxiangDetail/index.vue +++ b/pagesFengXiang/pages/fengxiangDetail/index.vue @@ -1046,7 +1046,7 @@ } .font_5 { - font-size: 26rpx; + font-size: 24rpx; font-family: 微软雅黑; line-height: 24rpx; color: #444444; @@ -1187,7 +1187,7 @@ } .massagebox { - font-size: 26rpx; + font-size: 24rpx; padding: 20rpx 30rpx; border-bottom: 1px solid #8888; } diff --git a/pagesFengXiang/pages/fengxiangDetailtwo/index.vue b/pagesFengXiang/pages/fengxiangDetailtwo/index.vue index ca8461e..76c10b8 100644 --- a/pagesFengXiang/pages/fengxiangDetailtwo/index.vue +++ b/pagesFengXiang/pages/fengxiangDetailtwo/index.vue @@ -1054,7 +1054,7 @@ } .font_5 { - font-size: 26rpx; + font-size: 24rpx; font-family: 微软雅黑; line-height: 24rpx; color: #444444; @@ -1195,7 +1195,7 @@ } .massagebox { - font-size: 26rpx; + font-size: 24rpx; padding: 20rpx 30rpx; border-bottom: 1px solid #8888; }