From acb045bf8cf0e5f93803139e4b98870cc4c49f61 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Fri, 11 Feb 2022 15:25:46 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/date-template/index.vue | 24 ++++++------------------
 pages/record/weight.vue            | 10 ++++++----
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/components/date-template/index.vue b/components/date-template/index.vue
index 79ae7bf..94be887 100644
--- a/components/date-template/index.vue
+++ b/components/date-template/index.vue
@@ -25,38 +25,26 @@
                             </view>
                         </view>
                         <view class="des">
-                            <block>
-                                <view class="des-item">吃少了</view>
-                                <view class="des-item">正好</view>
-                                <view class="des-item">吃多了</view>
-                            </block>
+                            <block> <view class="des-item">吃少了</view> <view class="des-item">正好</view> <view class="des-item">吃多了</view> </block>
                             <view class="back" @click="backDate"> 回今天 </view>
                         </view>
                     </block>
                     <!-- 喝水模块 -->
                     <block v-if="type === 'drink'">
                         <view class="week" style="padding-top: 30rpx;">
-                            <view v-for="item in lists" :key="item.today" @click="dateClick(item)"
-                                :class="['week-item',{'is_past':!item.is_month},{'is_today':item.today ===  today}]">
+                            <view v-for="item in lists" :key="item.today" @click="dateClick(item)" :class="['week-item',{'is_past':!item.is_month},{'is_today':item.today ===  today}]">
                                 {{item.day}}
-                                <u-image class='waterIcon' :src="require('@/static/imgs/water-1.png')"
-                                    v-if="item.drink === 2" :lazy-load="true" width="20rpx" radius="10rpx"
-                                    mode="widthFix" />
-                                <u-image class='waterIcon' :src="require('@/static/imgs/water-2.png')"
-                                    v-if="item.drink === 1" :lazy-load="true" width="20rpx" radius="10rpx"
-                                    mode="widthFix" />
+                                <u-image class='waterIcon' :src="require('@/static/imgs/water-1.png')" v-if="item.drink === 2" :lazy-load="true" width="20rpx" radius="10rpx" mode="widthFix" />
+                                <u-image class='waterIcon' :src="require('@/static/imgs/water-2.png')" v-if="item.drink === 1" :lazy-load="true" width="20rpx" radius="10rpx" mode="widthFix" />
                             </view>
                         </view>
                         <view class="drink">
                             <block>
                                 <view class="drink-item">
-                                    <u-image class='waterIcon' :src="require('@/static/imgs/water-1.png')"
-                                        :lazy-load="true" width="22rpx" radius="10rpx" mode="widthFix" />未完成指标
+                                    <u-image class='waterIcon' :src="require('@/static/imgs/water-1.png')" :lazy-load="true" width="22rpx" radius="10rpx" mode="widthFix" />未完成指标
                                 </view>
                                 <view class="drink-item">
-                                    <u-image class='waterIcon' :src="require('@/static/imgs/water-2.png')"
-                                        :lazy-load="true" width="22rpx" radius="10rpx" mode="widthFix" />
-                                    完成指标
+                                    <u-image class='waterIcon' :src="require('@/static/imgs/water-2.png')" :lazy-load="true" width="22rpx" radius="10rpx" mode="widthFix" /> 完成指标
                                 </view>
                             </block>
                             <view class="back" @click="backDate"> 回今天 </view>
diff --git a/pages/record/weight.vue b/pages/record/weight.vue
index 1c43df8..7024580 100644
--- a/pages/record/weight.vue
+++ b/pages/record/weight.vue
@@ -51,19 +51,21 @@
                 <view class="des-title">只显示最近七次测量记录</view>
             </view>
         </view>
+        
+        
         <!-- 记录体重弹窗 -->
         <u-popup :show="addWeightShow" :round="10" @close="addWeightShow = false" :closeable="true">
             <view class="addWeightContent">
                 <view class="date">今天</view>
                 <view class='count'><span>{{weight}}</span>公斤</view>
-                <vue-scale :min="10" :max="100" :int="false" :single="10" :h="80" :styles="styles" @scroll="scroll"
-                    :scrollLeft="Number(weight)" />
+                <vue-scale :min="10" :max="100" :int="false" :single="10" :h="80" :styles="styles" @scroll="scroll" :scrollLeft="Number(weight)" />
                 <view class="addBtn" @click="addWeight">确认添加</view>
             </view>
         </u-popup>
+        
+        
         <!-- 底部 进度 曲线菜单 -->
-        <u-tabbar :value="tabbarId" :fixed="true" :placeholder="false" :safeAreaInsetBottom="false"
-            activeColor="#34ce98">
+        <u-tabbar :value="tabbarId" :fixed="true" :placeholder="false" :safeAreaInsetBottom="false" activeColor="#34ce98">
             <u-tabbar-item text="进度" :icon="tabbarId === 0 ?require('../../static/imgs/speed-2.png'):require('../../static/imgs/speed-1.png')" @click="tabbarClick" />
             <u-tabbar-item text="曲线" :icon="tabbarId === 1 ?require('../../static/imgs/curve-2.png'):require('../../static/imgs/curve-1.png')" @click="tabbarClick" />
         </u-tabbar>