From ded9bf93d4a6973a275ab6924ef045e898df18be Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Tue, 8 Feb 2022 17:14:39 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=A5=AE=E9=A3=9F=E5=81=A5=E5=BA=B7?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9E=E6=97=A5=E5=8E=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E9=A5=AE=E6=B0=B4=E6=A8=A1=E5=9D=97=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=97=A5=E5=8E=86=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=B0=81?=
 =?UTF-8?q?=E8=A3=85=E6=97=A5=E5=8E=86=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BD=93?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=A2=9E=E6=9B=B2=E7=BA=BF=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8F=8A=E6=8E=A5=E5=8F=A3=E8=AE=B0=E5=BD=95=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=88=9D=E5=A7=8B=E4=BD=93=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |   10 +-
 apis/interfaces/drink.js                      |   22 +-
 apis/interfaces/foods.js                      |   15 +-
 apis/interfaces/weight.js                     |   15 +-
 components/date-template/index.vue            |  342 +++++
 pages.json                                    |   10 +-
 pages/auth/auth.vue                           |    1 -
 pages/im/private/components/showVoice.nvue    |    3 +-
 pages/record/addFoods.vue                     |  325 ++---
 pages/record/drink.vue                        |  922 +++++++-----
 pages/record/foods.vue                        |  968 +++++++------
 pages/record/index.vue                        |    4 +-
 pages/record/weight.vue                       |  623 ++++----
 static/imgs/curve-1.png                       |  Bin 0 -> 2960 bytes
 static/imgs/curve-2.png                       |  Bin 0 -> 3185 bytes
 static/imgs/speed-1.png                       |  Bin 0 -> 5078 bytes
 static/imgs/speed-2.png                       |  Bin 0 -> 5438 bytes
 static/imgs/water-1.png                       |  Bin 0 -> 6309 bytes
 static/imgs/water-2.png                       |  Bin 0 -> 4441 bytes
 .../js_sdk/u-charts/config-ucharts.js         | 1253 +++++++++--------
 20 files changed, 2618 insertions(+), 1895 deletions(-)
 create mode 100644 components/date-template/index.vue
 create mode 100644 static/imgs/curve-1.png
 create mode 100644 static/imgs/curve-2.png
 create mode 100644 static/imgs/speed-1.png
 create mode 100644 static/imgs/speed-2.png
 create mode 100644 static/imgs/water-1.png
 create mode 100644 static/imgs/water-2.png

diff --git a/App.vue b/App.vue
index 7b7b95a..002072b 100644
--- a/App.vue
+++ b/App.vue
@@ -1,11 +1,13 @@
 <script>
-    import { getVersions } from './apis/interfaces/versions'
+    import {
+        getVersions
+    } from './apis/interfaces/versions'
     import im from '@/utils/im/index.js'
 
     export default {
         onLaunch: function() {
-            im.initIm('lmxuhwaglu76d')
-            return
+            im.initIm('lmxuhwaglu76d')
+            return
             //#ifdef APP-PLUS
             // 获取系统版本号
             getVersions({
@@ -27,7 +29,7 @@
                                     uni.downloadFile({
                                         url: res.info.download,
                                         success: apkPick => {
-                                            plus.runtime.install(apkPick
+                                            plus.runtime.install(apkPick 
                                                 .tempFilePath, '',
                                                 installRES => {
                                                     // 安装完成用于提示新版本引导，暂时无用
diff --git a/apis/interfaces/drink.js b/apis/interfaces/drink.js
index eacae00..cbc323b 100644
--- a/apis/interfaces/drink.js
+++ b/apis/interfaces/drink.js
@@ -9,9 +9,10 @@ import { request } from '../index'
 /**
  * @description:饮水记录首页
  */
-const waters = () => {
+const waters = (data) => {
 	return request({
 		url: 'health/waters',
+        data:data
 	})
 }
 /**
@@ -29,10 +30,11 @@ const setWaters = (data) => {
  * @description:喝水
  * @Date: 2022-01-12 12：56：00
  */
-const drinkWater = () => {
+const drinkWater = (data) => {
 	return request({
 		url: 'health/waters/drink',
 		method: 'POST',
+        data:data
 	})
 }
 /**
@@ -46,10 +48,24 @@ const delDrinkWater = (id) => {
 	})
 }
 
+/**
+ * @description:饮食运动日历
+ * @params {日期}
+ * @method {get}
+ * @Date: 2022-02-08 11点18分
+ */
+const dateList = (data) => {
+	return request({
+		url: 'health/calendar/water',
+		data:data
+	})
+}
+
 
 export {
 	waters,
 	setWaters,
 	drinkWater,
-	delDrinkWater
+	delDrinkWater,
+    dateList
 }
diff --git a/apis/interfaces/foods.js b/apis/interfaces/foods.js
index 85ee623..da44c20 100644
--- a/apis/interfaces/foods.js
+++ b/apis/interfaces/foods.js
@@ -78,11 +78,24 @@ const delHealthFoods = (intake_id) => {
 	})
 }
 
+/**
+ * @description:饮食运动日历
+ * @params {日期}
+ * @method {get}
+ * @Date: 2022-02-07 15点18分
+ */
+const dateList = (data) => {
+	return request({
+		url: 'health/calendar/intake',
+		data:data
+	})
+}
 export {
 	positions,
 	plans,
 	healthFoods,
 	addHealthFoods,
 	editHealthFoods,
-	delHealthFoods
+	delHealthFoods,
+    dateList
 }
diff --git a/apis/interfaces/weight.js b/apis/interfaces/weight.js
index 7a97283..ac72e0a 100644
--- a/apis/interfaces/weight.js
+++ b/apis/interfaces/weight.js
@@ -6,6 +6,7 @@
  * @LastEditTime: 2022-01-12 17:13:45
  */
 import { request } from '../index'
+
 /**
  * @description:称量体重模块首页
  */
@@ -15,6 +16,16 @@ const weights = (page) => {
 		data: { page: page }
 	})
 }
+
+/**
+ * @description:获取曲线进度
+ */
+const curves = () => {
+	return request({
+		url: 'health/weights/bight'
+	})
+}
+
 /**
  * @description:记录体重
  * @Date: 2022-01-12 16:46:19
@@ -26,7 +37,9 @@ const addWeight = (data) => {
 		data: data
 	})
 }
+
 export {
 	weights,
-	addWeight
+	addWeight,
+    curves
 }
diff --git a/components/date-template/index.vue b/components/date-template/index.vue
new file mode 100644
index 0000000..79ae7bf
--- /dev/null
+++ b/components/date-template/index.vue
@@ -0,0 +1,342 @@
+<!--
+ * @Description:日历模板
+ * @Author: Aimee·Zhang
+ * @Date: 2022-02-08 09:06:45
+ * @LastEditors: Aimee·Zhang
+ * @LastEditTime: 2022-02-08 09:06:45
+-->
+
+<template>
+    <view class="date">
+        <u-popup :show="dateShow" zIndex="10099890" @close="closeDate" mode="bottom" :safeAreaInsetBottom="true">
+            <view class="date-content">
+                <view class="title"><span @click="datePreNext('before')">上一月</span>{{month}}<span
+                        @click="datePreNext('after')">下一月</span></view>
+                <view class="date-item">
+                    <view class="week">
+                        <view class="week-item" v-for="(item,index) in weekList" :key="index">{{item}}</view>
+                    </view>
+                    <!-- 饮食模块 -->
+                    <block v-if="type === 'foods'">
+                        <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},{'is_intake0':item.intake === 1},{'is_intake1':item.intake === 2},{'is_intake2':item.intake === 3}]">
+                                {{item.day}}
+                            </view>
+                        </view>
+                        <view class="des">
+                            <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}]">
+                                {{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" />
+                            </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" />未完成指标
+                                </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" />
+                                    完成指标
+                                </view>
+                            </block>
+                            <view class="back" @click="backDate"> 回今天 </view>
+                        </view>
+                    </block>
+                </view>
+            </view>
+        </u-popup>
+    </view>
+</template>
+<script>
+    import moment from 'moment';
+    export default {
+        data() {
+            return {
+                weekList: ['日', '一', '二', '三', '四', '五', '六'],
+            };
+        },
+        props: {
+            /** 
+             *  lists 传过来的列表
+             *  type foods（食物运动） drink（饮水）weight（体重）
+             *  today 勾选时间
+             *  month 勾选日期
+             *  dateShow 页面是否显示
+             **/
+            lists: {
+                type: Array,
+                default: [],
+            },
+            type: {
+                type: String,
+                default: "",
+            },
+            today: {
+                type: String,
+                default: moment(new Date()).format('YYYY-MM-DD')
+            },
+            month: {
+                type: String,
+                default: moment(new Date()).format('YYYY-MM')
+            },
+            dateShow: {
+                type: Boolean,
+                default: false
+            }
+        },
+        methods: {
+            // 选择日期
+            dateClick(item) {
+                this.$emit('dateClick', item)
+            },
+            // 返回今天
+            backDate() {
+                this.$emit('backDate', '')
+            },
+            // 点击上一个月或者下一个月 before 上一月 after下一个月
+            datePreNext(type) {
+                this.$emit('datePreNext', type)
+            },
+            // 关闭日历
+            closeDate() {
+                this.$emit('closeDate')
+            }
+        },
+    };
+</script>
+<style lang="scss" scoped>
+    .date {
+
+        // 日历弹窗
+        .date-content {
+            width: 100%;
+            padding: $padding *2;
+            min-height: 800rpx;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: flex-start;
+            box-sizing: border-box;
+
+            .title {
+                font-size: $title-size + 4;
+                color: #20845f;
+                font-weight: bold;
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                justify-content: space-between;
+                box-sizing: border-box;
+                width: 100%;
+
+                span {
+                    display: inline-block;
+                    padding: $padding;
+                    font-size: $title-size-m;
+                    color: #cacaca;
+                    font-weight: normal;
+                }
+            }
+
+            .date-item {
+                padding-top: $padding;
+                width: 100%;
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                box-sizing: border-box;
+
+                .drink {
+                    display: flex;
+                    color: #cacaca;
+                    flex-direction: row;
+                    align-items: center;
+                    box-sizing: border-box;
+                    font-size: $title-size-m;
+                    justify-content: center;
+                    margin-top: $margin;
+                    width: 100%;
+
+                    .drink-item {
+                        padding-right: 40rpx;
+                        position: relative;
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+                        justify-content: center;
+                        box-sizing: border-box;
+                        u-image{
+                            padding-right: 10rpx;
+                        }
+                    }
+                }
+
+                .des {
+                    display: flex;
+                    color: #cacaca;
+                    flex-direction: row;
+                    align-items: center;
+                    box-sizing: border-box;
+                    font-size: $title-size-m;
+                    justify-content: center;
+                    margin-top: $margin;
+                    width: 100%;
+
+                    .des-item {
+                        padding-left: 40rpx;
+                        padding-right: 10rpx;
+                        position: relative;
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+                        justify-content: center;
+                        box-sizing: border-box;
+
+                        &:before {
+                            content: '';
+                            position: absolute;
+                            left: 14rpx;
+                            width: 20rpx;
+                            height: 20rpx;
+                            border-radius: 50%;
+                            background: #fa624d;
+                        }
+
+                        &:nth-child(2):before {
+                            background: #fbbf0f;
+                        }
+
+                        &:nth-child(1):before {
+                            background: #02c7bd;
+                        }
+                    }
+                }
+
+                .back {
+                    margin-left: 100rpx;
+                    background-color: rgba($color: $main-color, $alpha: 1);
+                    color: #fff;
+                    padding: 10rpx $padding;
+                    border-radius: $radius + 10;
+                }
+
+            }
+
+
+
+            .week {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                justify-content: flex-start;
+                box-sizing: border-box;
+                flex-wrap: wrap;
+                width: 100%;
+
+                .week-item {
+                    width: 14.28%;
+                    height: 90rpx;
+                    line-height: 90rpx;
+                    font-size: $title-size-m + 2;
+                    color: #888;
+                    position: relative;
+                    display: flex;
+                    flex-direction: column;
+                    align-items: center;
+                    justify-content: center;
+                    box-sizing: border-box;
+
+                    &::before {
+                        content: '';
+                        width: 14rpx;
+                        height: 14rpx;
+                        border-radius: 50%;
+                        position: absolute;
+                        bottom: 0;
+                        // background: #02c7bd;
+                    }
+                }
+
+                .waterIcon {
+                    position: absolute;
+                    width: 30rpx !important;
+                    bottom: -12rpx;
+                    padding-left: 10rpx;
+                }
+
+                &:nth-child(1),
+                &:nth-child(7),
+                &:nth-child(8),
+                &:nth-child(14),
+                &:nth-child(15),
+                &:nth-child(21),
+                &:nth-child(22),
+                &:nth-child(28),
+                &:nth-child(29),
+                &:nth-child(35),
+                    {
+                    color: rgba($color: #000000, $alpha: 0.4);
+
+                }
+            }
+
+            // 吃饭样式
+            .is_intake0::before {
+                background: #02c7bd !important;
+            }
+
+            .is_intake1::before {
+                background: #fbbf0f !important;
+            }
+
+            .is_intake2::before {
+                background: #fa624d !important;
+            }
+
+            .is_today {
+                color: #fff !important;
+                position: relative;
+                z-index: 1;
+
+                &:after {
+                    content: '';
+                    width: 50rpx;
+                    height: 50rpx;
+                    position: absolute;
+                    border-radius: 50%;
+                    background-color: $main-color;
+                    color: #Fff;
+                    z-index: -1;
+                }
+            }
+
+            .is_past {
+                color: rgba($color: #000000, $alpha: 0.1) !important;
+            }
+
+
+
+        }
+    }
+</style>
diff --git a/pages.json b/pages.json
index 91d3f80..03b0587 100644
--- a/pages.json
+++ b/pages.json
@@ -35,9 +35,8 @@
             "path": "pages/record/drink",
             "name": "Drink",
             "style": {
-                "navigationBarTitleText": "记录喝水",
-                "navigationBarBackgroundColor": "#34CE98",
-                "navigationBarTextStyle": "white"
+                "navigationBarTitleText": "记录",
+                "navigationStyle": "custom"
             }
         },
         {
@@ -53,9 +52,8 @@
             "path": "pages/record/foods",
             "name": "RecordFoods",
             "style": {
-                "navigationBarTitleText": "食物记录",
-                "navigationBarBackgroundColor": "#34CE98",
-                "navigationBarTextStyle": "white"
+               "navigationBarTitleText": "",
+               "navigationStyle": "custom"
             }
         },
         {
diff --git a/pages/auth/auth.vue b/pages/auth/auth.vue
index 33a8231..6c4cf79 100644
--- a/pages/auth/auth.vue
+++ b/pages/auth/auth.vue
@@ -83,7 +83,6 @@ export default {
                 mobileNo: this.phone,
                 code: this.code,
             }).then((res) => {
-				console.log(111)
 				this.$store.commit(
 					"setToken",
 					res.token_type + " " + res.access_token
diff --git a/pages/im/private/components/showVoice.nvue b/pages/im/private/components/showVoice.nvue
index 2686fc9..3c83771 100644
--- a/pages/im/private/components/showVoice.nvue
+++ b/pages/im/private/components/showVoice.nvue
@@ -65,7 +65,8 @@
         height: 79rpx;
         width: 170rpx;
         padding: 0 20rpx;
-        box-sizing: border-box;
+        box-sizing:border-box;
+        /* box-sizing: border-box; */
     }
 
     ,
diff --git a/pages/record/addFoods.vue b/pages/record/addFoods.vue
index cf476b8..b273661 100644
--- a/pages/record/addFoods.vue
+++ b/pages/record/addFoods.vue
@@ -14,180 +14,185 @@
             <view>高等热量</view>
         </view>
         <!-- 搜索页面 -->
-        <u-search
-            :show-action="true"
-            actionText="搜索"
-            :animation="true"
-            :clearabled="true"
-            placeholder="请输入食品名称"
-            @custom="searchCustom"
-            @clear="clearSearch"
-            v-model="name"
-        />
+        <u-search :show-action="true" actionText="搜索" :animation="true" :clearabled="true" placeholder="请输入食品名称"
+            @custom="searchCustom" @clear="clearSearch" v-model="name" />
         <!-- 食品列表 -->
-        <goodsList
-            :lists="lists"
-            type="dian"
-            @addGoods="addGoods"
-        />
+        <goodsList :lists="lists" type="dian" @addGoods="addGoods" />
         <!--  添加食谱弹窗 -->
-        <addFoods
-            v-if="addShow"
-            :addShow="addShow"
-            :selectGoods="selectGoods"
-            :decimals="true"
-            @confirm="confirmHandle"
-            @close="closeHandle"
-            @tabGoodsInfo="tabGoodsInfo"
-            max="999"
-        />
+        <addFoods v-if="addShow" :addShow="addShow" :selectGoods="selectGoods" :decimals="true" @confirm="confirmHandle"
+            @close="closeHandle" @tabGoodsInfo="tabGoodsInfo" max="999" />
     </view>
 </template>
 <script>
-import goodsList from "@/components/foods";
-import addFoods from "@/components/add-goods-template/add-goods-template";
-import { healthFoods, addHealthFoods } from "@/apis/interfaces/foods.js";
-import moment from "moment";
+    import goodsList from "@/components/foods";
+    import addFoods from "@/components/add-goods-template/add-goods-template";
+    import {
+        healthFoods,
+        addHealthFoods
+    } from "@/apis/interfaces/foods.js";
+    import moment from "moment";
 
-export default {
-    components: { goodsList, addFoods },
-    data() {
-        return {
-            addShow: false, // 添加食品显示
-            selectGoods: [], // 选择新增的食品
-            editGoodsId: "", // 编辑食物
-            type: "", // 新增食品时候 1早2午3晚4早加5午加6晚加
-            lists: [], // 食品列表
-            page: 1,
-            has_more: true,
-            name: "", // 搜索食品名称
-            date: moment(new Date()).format("YYYY-MM-DD"),
-        };
-    },
-    onShow() {
-        // 有id就是编辑不需要重新处理type了
-        if (this.$Route.query.id) {
-            this.editGoodsId = this.$Route.query.id;
-            return;
-        }
-        //没有id的时候就是新增要处理type
-        this.type = this.$Route.query.type;
-        // this.getFoods();
-    },
-    onLoad() {
-        this.getFoods();
-    },
-    // 触底加载更多
-    onReachBottom() {
-        if (!this.has_more) {
-            uni.showToast({
-                title: "没有更多啦~",
-                icon: "none",
-            });
-        } else {
-            this.page = this.page + 1;
+    export default {
+        components: {
+            goodsList,
+            addFoods
+        },
+        data() {
+            return {
+                addShow: false, // 添加食品显示
+                selectGoods: [], // 选择新增的食品
+                editGoodsId: "", // 编辑食物
+                type: "", // 新增食品时候 1早2午3晚4早加5午加6晚加
+                lists: [], // 食品列表
+                page: 1,
+                has_more: true,
+                name: "", // 搜索食品名称
+                date: moment(new Date()).format("YYYY-MM-DD"),
+            };
+        },
+        onShow() {
+            // 有id就是编辑不需要重新处理type了
+            if (this.$Route.query.id) {
+                this.editGoodsId = this.$Route.query.id;
+                return;
+            }
+            //没有id的时候就是新增要处理type
+            this.type = this.$Route.query.type;
+            this.date = this.$Route.query.date;
+            console.log(this.date,'date.........')
+            // this.getFoods();
+        },
+        onLoad() {
             this.getFoods();
-        }
-    },
-    methods: {
-        // 获取食品列表
-        getFoods() {
-            let data = {
-                page: this.page,
-                name: this.name,
-            };
-            healthFoods(data).then((res) => {
-                console.log(res);
-                this.lists = this.lists.concat(res.data);
-                this.has_more = res.page.has_more;
-            });
         },
-        // 监听点击键盘触发返回值新增食品
-        confirmHandle(value) {
-            console.log(value);
-            // 新添加食物
-            let data = {
-                type: this.type,
-                ser: 1,
-                weight: value,
-                food_id: this.selectGoods[0].food_id,
-                date: this.date,
-            };
-            this.addHealthFoods(data);
+        // 触底加载更多
+        onReachBottom() {
+            if (!this.has_more) {
+                uni.showToast({
+                    title: "没有更多啦~",
+                    icon: "none",
+                });
+            } else {
+                this.page = this.page + 1;
+                this.getFoods();
+            }
         },
-        // 添加食物
-        addHealthFoods(data) {
-            addHealthFoods(data).then((res) => {
-                console.log(res);
+        methods: {
+            // 获取食品列表
+            getFoods() {
+                let data = {
+                    page: this.page,
+                    name: this.name,
+                };
+                healthFoods(data).then((res) => {
+                    console.log(res);
+                    this.lists = this.lists.concat(res.data);
+                    this.has_more = res.page.has_more;
+                });
+            },
+            // 监听点击键盘触发返回值新增食品
+            confirmHandle(value) {
+                // 新添加食物
+                let data = {
+                    type: this.type,
+                    ser: 1,
+                    weight: value,
+                    food_id: this.selectGoods[0].food_id,
+                    date: this.date,
+                };
+                console.log(data,'data...........');
+                this.addHealthFoods(data);
+            },
+            // 添加食物
+            addHealthFoods(data) {
+                addHealthFoods(data).then((res) => {
+                    console.log(res);
+                    this.addShow = false;
+                    this.$Router.back();
+                }).catch(err => {
+                    console.log(err, '添加食物error');
+                    uni.showToast({
+                        title: err.message,
+                        icon: "none",
+                        duration:2000,
+                        mask:true
+                    })
+                    setTimeout(()=>{
+                        this.$Router.back();
+                    },2000)
+                });
+            },
+            closeHandle() {
+                //键盘关闭的回调函数
                 this.addShow = false;
-                this.$Router.back();
-            });
+            },
+            // 监听子组件的新增方法
+            addGoods(e) {
+                this.addShow = true;
+                this.selectGoods = [e];
+            },
+            // 点击搜索左侧按钮
+            searchCustom(e) {
+                console.log(e);
+                this.name = e;
+                this.reset();
+            },
+            // 清空数组重新请求数据
+            reset() {
+                this.page = 1;
+                this.has_more = true;
+                this.lists = [];
+                this.getFoods();
+            },
+            // 点击搜索后面按钮触发事件事件
+            clearSearch() {
+                this.name = "";
+                this.reset();
+            },
+            // 跳转到食品详情
+            tabGoodsInfo(e) {
+                this.$Router.push({
+                    name: "rankingDetails",
+                    params: e,
+                });
+            },
         },
-        closeHandle() {
-            //键盘关闭的回调函数
-            this.addShow = false;
-        },
-        // 监听子组件的新增方法
-        addGoods(e) {
-            this.addShow = true;
-            this.selectGoods = [e];
-        },
-        // 点击搜索左侧按钮
-        searchCustom(e) {
-            console.log(e);
-            this.name = e;
-            this.reset();
-        },
-        // 清空数组重新请求数据
-        reset() {
-            this.page = 1;
-            this.has_more = true;
-            this.lists = [];
-            this.getFoods();
-        },
-        // 点击搜索后面按钮触发事件事件
-        clearSearch() {
-            this.name = "";
-            this.reset();
-        },
-        // 跳转到食品详情
-        tabGoodsInfo(e) {
-            this.$Router.push({
-                name: "rankingDetails",
-                params: e,
-            });
-        },
-    },
-};
+    };
 </script>
 <style lang="scss" scoped>
-.add-foods {
-    padding: $padding;
+    .add-foods {
+        padding: $padding;
+    
     .re {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: space-around;
-        box-sizing: border-box;
-        padding: $padding $padding * 2;
-        font-size: $title-size-m;
-        view:before {
-            width: 20rpx;
-            height: 20rpx;
-            border-radius: 50%;
-            display: inline-block;
-            margin-right: 10rpx;
-            content: "";
-        }
-        view:nth-child(3):before {
-            background: #fa624d;
-        }
-        view:nth-child(2):before {
-            background: #fbbf0f;
-        }
-        view:nth-child(1):before {
-            background: #02c7bd;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: space-around;
+            box-sizing: border-box;
+            padding: $padding $padding * 2;
+            font-size: $title-size-m;
+
+            view:before {
+                width: 20rpx;
+                height: 20rpx;
+                border-radius: 50%;
+                display: inline-block;
+                margin-right: 10rpx;
+                content: "";
+        
+   }
+
+            view:nth-child(3):before {
+                background: #fa624d;
+            }
+
+            view:nth-child(2):before {
+                background: #fbbf0f;
+            }
+
+            view:nth-child(1):before {
+                background: #02c7bd;
+            }
         }
     }
-}
 </style>
diff --git a/pages/record/drink.vue b/pages/record/drink.vue
index 9bfd096..68a6caa 100644
--- a/pages/record/drink.vue
+++ b/pages/record/drink.vue
@@ -7,402 +7,544 @@
 -->
 
 <template>
-	<view class="drink" v-if="loaded">
-		<!-- 喝水及水杯文字 -->
-		<view class="drink-content">
-			<view class="title" v-if="!water.is_complete">
-				再喝
-				<span class="num">{{ water.lack.cup }}</span>
-				杯
-				<span class="total">（约{{ water.lack.value }}ml）</span>
-			</view>
-			<view class="title" v-if="water.is_complete">
-				已喝
-				<span class="num">{{ water.total }}ml</span>
-				<u-image class="is_complete" :src="require('../../static/imgs/target.png')" :lazy-load="true" mode="widthFix" width="140rpx" />
-			</view>
-			<!-- 水杯动态图片 -->
-			<view class="wave-content">
-				<u-image class="grass" :src="require('../../static/imgs/gress.png')" :lazy-load="true" mode="scaleToFill" width="320rpx" height="520rpx" />
-				<view class="wave" :style="{ '--ballPercent': -ballPercent + 40 + '%' }"></view>
-			</view>
-			<!-- 目标 -->
-			<view class="water-target">
-				<view class="target-item" @click="targetShow = true">
-					今日目标
-					<u-icon
-						class="target-icon"
-						name="arrow-right"
-						color="#666"
-						size="14"
-						:bold="true"
-						:label="water.target + 'ml'"
-						labelPos="left"
-						labelSize="16"
-						labelColor="#666"
-						space="6"
-					/>
-				</view>
-				<view class="target-item" @click="waterCShow = true">
-					水杯容量
-					<u-icon class="target-icon" name="arrow-right" color="#666" size="14" :bold="true" :label="water.ml + 'ml'" labelPos="left" labelSize="16" labelColor="#666" space="6" />
-				</view>
-			</view>
-			<!-- 目标弹出层 -->
-			<view>
-				<u-picker
-					:show="targetShow"
-					:columns="tagerts"
-					title="每天喝水目标"
-					keyName="label"
-					confirmColor="#34ce98"
-					:closeOnClickOverlay="true"
-					@close="targetShow = false"
-					@confirm="targetSure('1', $event)"
-					:defaultIndex="tagertsDefaultIndex"
-				/>
-				<u-picker
-					:show="waterCShow"
-					:columns="cup_mls"
-					title="设置水杯容量"
-					keyName="label"
-					confirmColor="#34ce98"
-					:closeOnClickOverlay="true"
-					@close="waterCShow = false"
-					@confirm="targetSure('2', $event)"
-					:defaultIndex="cupDefaultIndex"
-				/>
-			</view>
-			<!-- 加水 -->
-			<view class="add-water" @click="drinkWater">
-				<u-image class="grass" :src="require('../../static/imgs/gress2.png')" :lazy-load="true" mode="scaleToFill" width="60rpx" height="80rpx" />
-				<span>一杯水</span>
-				<u-icon class="add-icon" name="plus-circle-fill" color="#34ce98" size="24" />
-			</view>
-		</view>
-		<!-- 喝水记录 -->
-		<view class="--history">
-			<view class="title">喝水记录</view>
-			<template v-if="logs.length > 0">
-				<view class="lists" v-for="item in logs" :key="item.water_log_id" @longpress="delWater(item.water_log_id)">
-					<view class="lists-water"><u-icon size="30" :name="require('../../static/icon/water-icon.png')" /></view>
-					<view class="list-item">
-						<view class="list-item-title">
-							水
-							<span>{{ item.time }}</span>
-						</view>
-						{{ item.ml }}ml
-					</view>
-				</view>
-			</template>
-			<view v-else class="no-drink">今天一杯水还没有喝呢，来一杯吧~</view>
-		</view>
-	</view>
+    <view class="drink" v-if="loaded">
+        <!-- 自定义导航部分 -->
+        <u-navbar :safeAreaInsetTop="true" :fixed='true' bgColor="#34ce98" :autoBack="true">
+            <view class="u-nav-slot" slot="left">
+                <u-icon name="arrow-leftward" :bold="true" size="20" color="#fff" />
+            </view>
+            <view class="u-nav-slot u-center" slot="center" @click="dateShow = true,dateLists()">
+                <u-icon name="play-left-fill" size="14" color="#fff" @click="datePreNext('before')" />
+                <view class="date">
+                    <u-icon name="calendar" color="#fff" label-color="#fff" width="150" :label="today" label-size="14"
+                        size="20" />
+                </view>
+                <u-icon name="play-right-fill" size="14" color="#fff" @click="datePreNext('after')" />
+            </view>
+            <view class="u-nav-slot" slot="right">
+                <u-icon :name="require('@/static/icon/sign-icon.gif')" :bold="true" size="30"
+                    @click="$Router.push({name:'signIndex'})" />
+            </view>
+        </u-navbar>
+        <!-- 喝水及水杯文字 -->
+        <view class="drink-content">
+            <view class="title" v-if="!water.is_complete">
+                再喝
+                <span class="num">{{ water.lack.cup }}</span>
+                杯
+                <span class="total">（约{{ water.lack.value }}ml）</span>
+            </view>
+            <view class="title" v-if="water.is_complete">
+                已喝
+                <span class="num">{{ water.total }}ml</span>
+                <u-image class="is_complete" :src="require('../../static/imgs/target.png')" :lazy-load="true"
+                    mode="widthFix" width="140rpx" />
+            </view>
+            <!-- 水杯动态图片 -->
+            <view class="wave-content">
+                <u-image class="grass" :src="require('../../static/imgs/gress.png')" :lazy-load="true"
+                    mode="scaleToFill" width="320rpx" height="520rpx" />
+                <view class="wave" :style="{ '--ballPercent': -ballPercent + 40 + '%' }"></view>
+            </view>
+            <!-- 目标 -->
+            <view class="water-target">
+                <view class="target-item" @click="targetShow = true">
+                    今日目标
+                    <u-icon class="target-icon" name="arrow-right" color="#666" size="14" :bold="true"
+                        :label="water.target + 'ml'" labelPos="left" labelSize="16" labelColor="#666" space="6" />
+                </view>
+                <view class="target-item" @click="waterCShow = true">
+                    水杯容量
+                    <u-icon class="target-icon" name="arrow-right" color="#666" size="14" :bold="true"
+                        :label="water.ml + 'ml'" labelPos="left" labelSize="16" labelColor="#666" space="6" />
+                </view>
+            </view>
+            <!-- 目标弹出层 -->
+            <view>
+                <u-picker :show="targetShow" :columns="tagerts" title="每天喝水目标" keyName="label" confirmColor="#34ce98"
+                    :closeOnClickOverlay="true" @close="targetShow = false" @confirm="targetSure('1', $event)"
+                    :defaultIndex="tagertsDefaultIndex" />
+                <u-picker :show="waterCShow" :columns="cup_mls" title="设置水杯容量" keyName="label" confirmColor="#34ce98"
+                    :closeOnClickOverlay="true" @close="waterCShow = false" @confirm="targetSure('2', $event)"
+                    :defaultIndex="cupDefaultIndex" />
+            </view>
+            <!-- 加水 -->
+            <view class="add-water" @click="drinkWater">
+                <u-image class="grass" :src="require('../../static/imgs/gress2.png')" :lazy-load="true"
+                    mode="scaleToFill" width="60rpx" height="80rpx" />
+                <span>一杯水</span>
+                <u-icon class="add-icon" name="plus-circle-fill" color="#34ce98" size="24" />
+            </view>
+        </view>
+        <!-- 喝水记录 -->
+        <view class="--history">
+            <view class="title">喝水记录</view>
+            <template v-if="logs.length > 0">
+                <view class="lists" v-for="item in logs" :key="item.water_log_id"
+                    @longpress="delWater(item.water_log_id)">
+                    <view class="lists-water">
+                        <u-icon size="30" :name="require('../../static/icon/water-icon.png')" />
+                    </view>
+                    <view class="list-item">
+                        <view class="list-item-title">
+                            水
+                            <span>{{ item.time }}</span>
+                        </view>
+                        {{ item.ml }}ml
+                    </view>
+                </view>
+            </template>
+            <view v-else class="no-drink">今天一杯水还没有喝呢，来一杯吧~</view>
+        </view>
+
+        <!-- 选择日历 -->
+        <dateTemplate :lists="calendarList" :today="today" :month="month" :dateShow="dateShow" type='drink'
+            @backDate="backDate" @dateClick="dateClick" @closeDate="closeDate" @datePreNext="datePreNext" />
+    </view>
 </template>
 <script>
-import { waters, setWaters, drinkWater, delDrinkWater } from '@/apis/interfaces/drink';
-import moment from 'moment';
-export default {
-	data() {
-		return {
-			ballPercent: 0, // 喝水比例
-			logs: [], // 水记录
-			water: {}, // 水基本信息
-			targetShow: false,
-			tagerts: [], // 目标列表
-			tagertsDefaultIndex: ['1'], // 目标默认index
-			waterCShow: false,
-			cup_mls: [], // 水杯列表
-			cupDefaultIndex: ['2'], // 目标默认index
-			loaded: false
-		};
-	},
-	onShow() {
-		this.getWaters();
-	},
-	methods: {
-		// 获取喝水页面信息
-		getWaters() {
-			waters().then(res => {
-				this.cup_mls = [res.cup_mls];
-				this.tagerts = [res.tagerts];
-				this.water = res.water;
-				this.logs = res.logs;
-				this.ballPercent = res.water.lack.ratio;
-				this.cupDefaultIndex = [res.cup_mls.findIndex(item => item.number === res.water.ml)];
-				this.tagertsDefaultIndex = [res.tagerts.findIndex(item => item.number === res.water.target)];
-				this.loaded = true;
-			});
-		},
-		// 确认方法index===1 每日目标 2，水杯容量
-		targetSure(index, e) {
-			// console.log("触发了targetSure", index, e.value[0]);
-			// let date = moment(new Date()).format("YYYY--MM--DD");
-			let params = {};
-			if (index === '1') {
-				params = {
-					type: 'target',
-					ml: e.value[0].number,
-					date: moment(new Date()).format('YYYY-MM-DD')
-				};
-			} else {
-				params = {
-					type: 'ml',
-					ml: e.value[0].number,
-					date: moment(new Date()).format('YYYY-MM-DD')
-				};
-			}
-			setWaters(params).then(res => {
-				this.getWaters();
-				this.waterCShow = false;
-				this.targetShow = false;
-			});
-		},
-		// 喝水
-		drinkWater() {
-			drinkWater().then(res => {
-				this.getWaters();
-			});
-		},
-		// 删除和喝水记录
-		delWater(id) {
-			uni.showModal({
-				content: '确认删除么？',
-				confirmText: '确认删除',
-				confirmColor: '#34ce98',
-				cancelText: '再想想',
-				cancelColor: '#ddd',
-				success: res => {
-					if (res.confirm) {
-						delDrinkWater(id)
-							.then(res => {
-								this.getWaters();
-							})
-							.catch(err => {
-								uni.showToast({
-									title: err.message,
-									icon: 'none'
-								});
-							});
-					}
-				}
-			});
-		}
-	}
-};
+    import {
+        waters,
+        setWaters,
+        drinkWater,
+        delDrinkWater,
+        dateList
+    } from '@/apis/interfaces/drink';
+    import moment from 'moment';
+    import dateTemplate from '@/components/date-template/index.vue'
+    export default {
+        components: {
+            dateTemplate
+        },
+        data() {
+            return {
+                ballPercent: 0, // 喝水比例
+                logs: [], // 水记录
+                water: {}, // 水基本信息
+                targetShow: false,
+                tagerts: [], // 目标列表
+                tagertsDefaultIndex: ['1'], // 目标默认index
+                waterCShow: false,
+                cup_mls: [], // 水杯列表
+                cupDefaultIndex: ['2'], // 目标默认index
+                loaded: false,
+                today: moment(new Date()).format('YYYY-MM-DD'), // 当前时间
+                month: moment(new Date()).format('YYYY-MM'), //当前月份
+                dateShow: false, // 日历展示
+                calendarList: [],
+                dateType: '', // before after ''
+            };
+        },
+        onShow() {
+            this.getWaters();
+            this.dateLists();
+        },
+        methods: {
+            // 获取喝水页面信息
+            getWaters() {
+                let data = {
+                    date: this.today,
+                    // type:this.dateType
+                }
+                waters(data).then(res => {
+                    this.cup_mls = [res.cup_mls];
+                    this.tagerts = [res.tagerts];
+                    this.water = res.water;
+                    this.logs = res.logs;
+                    this.ballPercent = res.water.lack.ratio;
+                    this.cupDefaultIndex = [res.cup_mls.findIndex(item => item.number === res.water.ml)];
+                    this.tagertsDefaultIndex = [res.tagerts.findIndex(item => item.number === res.water
+                        .target)];
+                    this.loaded = true;
+                });
+            },
+            // 确认方法index===1 每日目标 2，水杯容量
+            targetSure(index, e) {
+                // console.log("触发了targetSure", index, e.value[0]);
+                // let date = moment(new Date()).format("YYYY--MM--DD");
+                let params = {};
+                if (index === '1') {
+                    params = {
+                        type: 'target',
+                        ml: e.value[0].number,
+                        date: moment(new Date()).format('YYYY-MM-DD')
+                    };
+                } else {
+                    params = {
+                        type: 'ml',
+                        ml: e.value[0].number,
+                        date: moment(new Date()).format('YYYY-MM-DD')
+                    };
+                }
+                setWaters(params).then(res => {
+                    this.getWaters();
+                    this.waterCShow = false;
+                    this.targetShow = false;
+                });
+            },
+            // 喝水
+            drinkWater() {
+                console.log('喝水。。。')
+                let data = {
+                    date: this.today
+                }
+                console.log(data, 'data....')
+                drinkWater(data).then(res => {
+                    this.getWaters();
+                    this.dateLists()
+                }).catch(err => {
+                    console.log(err, '添加食物error');
+                    uni.showToast({
+                        title: err.message,
+                        icon: "none",
+                        duration:2000,
+                        mask:true
+                    })
+                });
+            },
+            // 删除和喝水记录
+            delWater(id) {
+                uni.showModal({
+                    content: '确认删除么？',
+                    confirmText: '确认删除',
+                    confirmColor: '#34ce98',
+                    cancelText: '再想想',
+                    cancelColor: '#ddd',
+                    success: res => {
+                        if (res.confirm) {
+                            delDrinkWater(id)
+                                .then(res => {
+                                    this.getWaters();
+                                })
+                                .catch(err => {
+                                    uni.showToast({
+                                        title: err.message,
+                                        icon: 'none'
+                                    });
+                                });
+                        }
+                    }
+                });
+            },
+            //#region 日历操作相关
+            // 日历列表
+            dateLists() {
+                let data = {
+                    month: this.month,
+                    type: this.dateType
+                }
+                console.log(data,'data.....')
+                dateList(data).then(res => {
+                    console.log(res)
+                    this.calendarList = res.calendar
+                    this.dateType = ''
+                    this.month = res.month
+                }).catch(err => {
+                    uni.showToast({
+                        title: err.message,
+                        icon: 'none'
+                    })
+                })
+            },
+            // 选择日期
+            dateClick(item) {
+                console.log(item)
+                this.today = item.today
+                this.month = item.today
+                this.reset()
+            },
+            // 返回到今日
+            backDate() {
+                this.today = moment(new Date()).format('YYYY-MM-DD')
+                this.reset()
+            },
+            //  上一个月或者下一个月
+            datePreNext(type) {
+                this.dateType = type
+                this.dateLists()
+            },
+            // 关闭日历
+            closeDate() {
+                this.month = this.today
+                this.dateShow = false
+            },
+            // 重置日历数据
+            reset() {
+                this.calendarList = []
+                this.dateLists()
+                this.getWaters()
+                this.closeDate()
+            }
+            //#endregion 日历操作相关
+        }
+    };
 </script>
 <style lang="scss" scoped>
-.drink {
-	// 喝水 水杯及文字
+    .drink {
+        padding-top: 120rpx;
 
-	.drink-content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		box-sizing: border-box;
-		// padding: $padding  0;
-		position: relative;
-		// 标题 再喝水
-		.title {
-			font-size: $title-size + 4;
-			color: $main-color;
-			font-weight: normal;
-			margin: $margin * 2;
-			position: relative;
-			.is_complete {
-				position: absolute;
-				top: 30rpx;
-				right: -120rpx;
-			}
-			.num {
-				font-size: $title-size * 2.3;
-				padding: 0 $padding * 0.3;
-				font-weight: bold;
-			}
-			.total {
-				font-size: $title-size;
-				color: $text-gray-m;
-				padding-left: $padding * 0.2;
-			}
-		}
-		// 加一杯水
-		.add-water {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			box-sizing: border-box;
-			font-size: $title-size;
-			color: $text-color;
-			margin-top: $margin * 2;
-			position: relative;
-			span {
-				padding-top: $padding * 0.4;
-				color:$text-gray-m;
-				font-size: $title-size;
-			}
-			.add-icon {
-				position: absolute;
-				top: $margin + 8;
-				right: 0;
-			}
-		}
-		// 目标
-		.water-target {
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-			justify-content: center;
-			box-sizing: border-box;
-			color: $text-gray-m;
-			font-size: $title-size;
-			position: absolute;
-			z-index: 110;
-			right: $padding * 1.4;
-			top: 50%;
-			.target-item {
-				margin-top: $margin * 1.6;
-				.target-icon {
-					padding-top: $padding * 0.5;
-				}
-			}
-		}
-	}
-	// 喝水记录
-	.--history {
-		padding: $padding;
-		.no-drink {
-			color: $text-gray-m;
-			font-size: $title-size-m;
-			padding-top: $padding + 10;
-		}
-		// 标题
-		.title {
-			font-size: $title-size + 4;
-			font-weight: bold;
-			color: $text-color;
-			position: relative;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			justify-content: flex-start;
-			box-sizing: border-box;
-			padding-left: $padding;
-			padding-bottom: $padding;
-			&::before {
-				position: absolute;
-				content: '';
-				width: 8rpx;
-				height: 45rpx;
-				left: 0;
-				background-color: $main-color;
-				border-radius: 10rpx;
-			}
-		}
+        // 顶部日历筛选部分
+        .u-center {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
 
-		// 列表
-		.lists {
-			// background-color: pink;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			justify-content: space-between;
-			box-sizing: border-box;
-			border-bottom: solid 1rpx #f7f7f7;
-			.lists-water {
-				background-image: linear-gradient(to right, $main-color, $main-color);
-				width: 90rpx;
-				height: 90rpx;
-				border-radius: 50%;
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				justify-content: center;
-				box-sizing: border-box;
-			}
-			.list-item {
-				flex: 1;
-				margin-left: $margin * 0.7;
-				font-size: $title-size;
-				color: $text-gray-m;
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-				justify-content: space-between;
-				box-sizing: border-box;
-				margin: $margin 0 $margin $margin * 0.7;
-				.list-item-title {
-					font-size: $title-size + 3;
-					color: $text-color;
-					display: flex;
-					flex-direction: column;
-					align-items: flex-start;
-					justify-content: center;
-					box-sizing: border-box;
-					font-weight: bold;
-					span {
-						margin-top: $margin * 0.4;
-						background-color: #f7f7f7;
-						padding: 4rpx 10rpx;
-						border-radius: 50rpx;
-						font-weight: normal;
-						font-size: $title-size - 3;
-					}
-				}
-			}
-		}
-	}
-}
-// 水杯动画
-.wave-content {
-	position: relative;
-	z-index: 110;
-	.grass {
-		position: relative;
-		z-index: 120099;
-	}
+            .date {
+                background-color: rgba($color: #000000, $alpha: .1);
+                color: #fff;
+                min-width: 340rpx;
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                justify-content: center;
+                box-sizing: border-box;
+                padding: 8rpx 20rpx;
+                border-radius: $radius * 2;
+                margin: 0 10rpx;
+                font-size: $title-size - 2;
+            }
 
-	.wave {
-		position: absolute;
-		width: 290rpx;
-		height: 500rpx;
-		background-color: rgba($color: $main-color, $alpha: 0.6);
-		background-size: 100%;
-		overflow: hidden;
-		top: 10rpx;
-		left: 20rpx;
-		z-index: 10;
-		&::before,
-		&::after {
-			content: '';
-			position: absolute;
-			width: 1000rpx;
-			height: 1000rpx;
-			top: var(--ballPercent);
-			left: 50%;
-			background-color: rgba(255, 255, 255, 0.4);
-			border-radius: 45%;
-			transform: translate(-50%, -70%) rotate(0);
-			animation: rotate 4s linear infinite;
-			z-index: 10;
-		}
-		&::after {
-			border-radius: 47%;
-			background-color: rgba(255, 255, 255, 0.9);
-			transform: translate(-50%, -70%) rotate(0);
-			animation: rotate 6s linear -5s infinite;
-			z-index: 20;
-		}
-	}
+            .play-right-fill {
+                padding: $padding !important;
+                background-color: pink;
+            }
+        }
 
-	@keyframes rotate {
-		50% {
-			transform: translate(-50%, -73%) rotate(180deg);
-		}
-		100% {
-			transform: translate(-50%, -70%) rotate(360deg);
-		}
-	}
-}
+        // 喝水 水杯及文字
+
+        .drink-content {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            // padding: $padding  0;
+            position: relative;
+
+            // 标题 再喝水
+            .title {
+                font-size: $title-size + 4;
+                color: $main-color;
+                font-weight: normal;
+                margin: $margin * 2;
+                position: relative;
+
+                .is_complete {
+                    position: absolute;
+                    top: 30rpx;
+                    right: -120rpx;
+                }
+
+                .num {
+                    font-size: $title-size * 2.3;
+                    padding: 0 $padding * 0.3;
+                    font-weight: bold;
+                }
+
+                .total {
+                    font-size: $title-size;
+                    color: $text-gray-m;
+                    padding-left: $padding * 0.2;
+                }
+            }
+
+            // 加一杯水
+            .add-water {
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                box-sizing: border-box;
+                font-size: $title-size;
+                color: $text-color;
+                margin-top: $margin * 2;
+                position: relative;
+
+                span {
+                    padding-top: $padding * 0.4;
+                    color: $text-gray-m;
+                    font-size: $title-size;
+                }
+
+                .add-icon {
+                    position: absolute;
+                    top: $margin + 8;
+                    right: 0;
+                }
+            }
+
+            // 目标
+            .water-target {
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                justify-content: center;
+                box-sizing: border-box;
+                color: $text-gray-m;
+                font-size: $title-size;
+                position: absolute;
+                z-index: 110;
+                right: $padding * 1.4;
+                top: 50%;
+
+                .target-item {
+                    margin-top: $margin * 1.6;
+
+                    .target-icon {
+                        padding-top: $padding * 0.5;
+                    }
+                }
+            }
+        }
+
+        // 喝水记录
+        .--history {
+            padding: $padding;
+
+            .no-drink {
+                color: $text-gray-m;
+                font-size: $title-size-m;
+                padding-top: $padding + 10;
+            }
+
+            // 标题
+            .title {
+                font-size: $title-size + 4;
+                font-weight: bold;
+                color: $text-color;
+                position: relative;
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                justify-content: flex-start;
+                box-sizing: border-box;
+                padding-left: $padding;
+                padding-bottom: $padding;
+
+                &::before {
+                    position: absolute;
+                    content: '';
+                    width: 8rpx;
+                    height: 45rpx;
+                    left: 0;
+                    background-color: $main-color;
+                    border-radius: 10rpx;
+                }
+            }
+
+            // 列表
+            .lists {
+                // background-color: pink;
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                justify-content: space-between;
+                box-sizing: border-box;
+                border-bottom: solid 1rpx #f7f7f7;
+
+                .lists-water {
+                    background-image: linear-gradient(to right, $main-color, $main-color);
+                    width: 90rpx;
+                    height: 90rpx;
+                    border-radius: 50%;
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                    justify-content: center;
+                    box-sizing: border-box;
+                }
+
+                .list-item {
+                    flex: 1;
+                    margin-left: $margin * 0.7;
+                    font-size: $title-size;
+                    color: $text-gray-m;
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                    justify-content: space-between;
+                    box-sizing: border-box;
+                    margin: $margin 0 $margin $margin * 0.7;
+
+                    .list-item-title {
+                        font-size: $title-size + 3;
+                        color: $text-color;
+                        display: flex;
+                        flex-direction: column;
+                        align-items: flex-start;
+                        justify-content: center;
+                        box-sizing: border-box;
+                        font-weight: bold;
+
+                        span {
+                            margin-top: $margin * 0.4;
+                            background-color: #f7f7f7;
+                            padding: 4rpx 10rpx;
+                            border-radius: 50rpx;
+                            font-weight: normal;
+                            font-size: $title-size - 3;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // 水杯动画
+    .wave-content {
+        position: relative;
+        z-index: 1;
+
+        .grass {
+            position: relative;
+            z-index: 1;
+        }
+
+        .wave {
+            position: absolute;
+            width: 290rpx;
+            height: 500rpx;
+            background-color: rgba($color: $main-color, $alpha: 0.6);
+            background-size: 100%;
+            overflow: hidden;
+            top: 10rpx;
+            left: 20rpx;
+            z-index: 1;
+
+            &::before,
+            &::after {
+                content: '';
+                position: absolute;
+                width: 1000rpx;
+                height: 1000rpx;
+                top: var(--ballPercent);
+                left: 50%;
+                background-color: rgba(255, 255, 255, 0.4);
+                border-radius: 45%;
+                transform: translate(-50%, -70%) rotate(0);
+                animation: rotate 4s linear infinite;
+                z-index: 1;
+            }
+
+            &::after {
+                border-radius: 47%;
+                background-color: rgba(255, 255, 255, 0.9);
+                transform: translate(-50%, -70%) rotate(0);
+                animation: rotate 6s linear -5s infinite;
+                z-index: 20;
+            }
+        }
+
+        @keyframes rotate {
+            50% {
+                transform: translate(-50%, -73%) rotate(180deg);
+            }
+
+            100% {
+                transform: translate(-50%, -70%) rotate(360deg);
+            }
+        }
+    }
 </style>
diff --git a/pages/record/foods.vue b/pages/record/foods.vue
index 8b1f581..c0be654 100644
--- a/pages/record/foods.vue
+++ b/pages/record/foods.vue
@@ -3,450 +3,560 @@
  * @Author: Aimee·Zhang
  * @Date: 2022-01-11 08:54:49
  * @LastEditors: Aimee·Zhang
- * @LastEditTime: 2022-01-20 10:05:15
+ * @LastEditTime: 2022-02-08 10:41:15
 -->
 
 <template>
-	<view class="record--foods">
-		<!-- 饮食进度条 -->
-		<view class="cricle-content">
-			<view class="info">
-				饮食摄入
-				<span>{{ calorys.intake_total }}</span>
-			</view>
-			<arprogress
-				:percent="calorys.exceeds ? 100 : calorys.ratio"
-				inactiveColor="#f5f4f9"
-				:activeColor="calorys.exceeds ? '#f00' : '#34ce98'"
-				width="300"
-				class="cricle"
-				borderWidth="20"
-			>
-				<span>{{ calorys.exceeds ? '多吃了' : '还可以吃' }}</span>
-				<span :class="['num', calorys.exceeds ? 'num1' : '']">{{ calorys.amount }}</span>
-				<span>推荐预算{{ calorys.goal }}</span>
-			</arprogress>
-			<view class="info" @click="errToast">
-				运动消耗
-				<span>{{ calorys.exercise_total }}</span>
-			</view>
-			<view class="ic-left">摄入量推荐</view>
-			<u-icon class="ic-day" name="checkmark-circle" color="#34ce98" size="10" :label="`${calorys.days}天`" labelColor="#34ce98" labelSize="10" space="3" />
-		</view>
+    <view class="record--foods">
+        <!-- 自定义导航部分 -->
+        <u-navbar :safeAreaInsetTop="true" :fixed='true' bgColor="#34ce98" :autoBack="true">
+            <view class="u-nav-slot" slot="left">
+                <u-icon name="arrow-leftward" :bold="true" size="20" color="#fff" />
+            </view>
+            <view class="u-nav-slot u-center" slot="center" @click="dateShow = true,dateLists()">
+                <u-icon name="play-left-fill" size="14" color="#fff" @click="datePreNext('before')" />
+                <view class="date"> <u-icon name="calendar" color="#fff" label-color="#fff" width="150" :label="today" label-size="14" size="20" /> </view>
+                <u-icon name="play-right-fill" size="14" color="#fff" @click="datePreNext('after')" />
+            </view>
+            <view class="u-nav-slot" slot="right">
+                <u-icon :name="require('@/static/icon/sign-icon.gif')" :bold="true" size="30" @click="$Router.push({name:'signIndex'})" />
+            </view>
+        </u-navbar>
 
-		<!-- 有饮食记录 -->
-		<template v-if="intakes.length > 0">
-			<view class="foods-add" v-for="(it, index) in intakes" :key="index">
-				<view class="foods-title">
-					<view class="title-left">
-						{{ it.name }}
-						<span v-if="it.remark">{{ it.remark || '' }}</span>
-					</view>
-					<view class="title-right">
-						{{ it.total }}
-						<span class="dw">千卡</span>
-						<u-icon name="arrow-right" color="#ddd" size="13" :bold="true" />
-					</view>
-				</view>
-				<goodsList :lists="it.intake" type="no-dian" @editGoods="editGoods" @longClickGoods="longClickGoods" />
-			</view>
-		</template>
-		<!-- 运动列表 -->
-		<template v-if="sportsTotal > 0">
-			<view class="foods-title" style="padding-top:50rpx;">
-				<view class="title-left">运动</view>
-				<view class="title-right">
-					{{ sportsTotal }}
-					<span class="dw">千卡</span>
-					<u-icon name="arrow-right" color="#ddd" size="13" :bold="true" />
-				</view>
-			</view>
+        <!-- 饮食进度条 -->
+        <view class="cricle-content">
+            <view class="info">
+                饮食摄入
+                <span>{{ calorys.intake_total }}</span>
+            </view>
+            <arprogress :percent="calorys.exceeds ? 100 : calorys.ratio" inactiveColor="#f5f4f9"
+                :activeColor="calorys.exceeds ? '#f00' : '#34ce98'" width="300" class="cricle" borderWidth="20">
+                <span>{{ calorys.exceeds ? '多吃了' : '还可以吃' }}</span>
+                <span :class="['num', calorys.exceeds ? 'num1' : '']">{{ calorys.amount }}</span>
+                <span>推荐预算{{ calorys.goal }}</span>
+            </arprogress>
+            <view class="info" @click="errToast">
+                运动消耗
+                <span>{{ calorys.exercise_total }}</span>
+            </view>
+            <view class="ic-left">摄入量推荐</view>
+            <u-icon class="ic-day" name="checkmark-circle" color="#34ce98" size="10" :label="`${calorys.days}天`"
+                labelColor="#34ce98" labelSize="10" space="3" />
+        </view>
 
-			<sports type="edit" :lists="sports" @editSport="editSport" @longClick="longClick" />
-		</template>
+        <!-- 有饮食记录 -->
+        <template v-if="intakes.length > 0">
+            <view class="foods-add" v-for="(it, index) in intakes" :key="index">
+                <view class="foods-title">
+                    <view class="title-left">
+                        {{ it.name }}
+                        <span v-if="it.remark">{{ it.remark || '' }}</span>
+                    </view>
+                    <view class="title-right">
+                        {{ it.total }}
+                        <span class="dw">千卡</span>
+                        <u-icon name="arrow-right" color="#ddd" size="13" :bold="true" />
+                    </view>
+                </view>
+                <goodsList :lists="it.intake" type="no-dian" @editGoods="editGoods" @longClickGoods="longClickGoods" />
+            </view>
+        </template>
 
-		<!-- 没有饮食记录 -->
-		<view class="no-foods" v-if="sports.length === 0 && intakes.length === 0">
-			<u-image :src="require('../../static/imgs/no-foods.png')" :lazy-load="true" radius="10rpx" mode="widthFix" width="300rpx" class="no-foods-img" />
-			<view>还没有添加今日饮食记录</view>
-			<view>请点击屏幕下方按钮来添加</view>
-		</view>
+        <!-- 运动列表 -->
+        <template v-if="sportsTotal > 0">
+            <view class="foods-title" style="padding-top:50rpx;">
+                <view class="title-left">运动</view>
+                <view class="title-right">
+                    {{ sportsTotal }}
+                    <span class="dw">千卡</span>
+                    <u-icon name="arrow-right" color="#ddd" size="13" :bold="true" />
+                </view>
+            </view>
 
-		<!-- 加餐模块 -->
-		<u-action-sheet
-			:actions="addEatList"
-			title="加餐模块"
-			:closeOnClickOverlay="true"
-			:closeOnClickAction="true"
-			@select="selectClick"
-			cancelText="取消"
-			:show="addEatShow"
-			@close="addEatShow = false"
-		></u-action-sheet>
-		<!-- 底部 早餐等菜单 -->
-		<u-tabbar :fixed="true" :placeholder="true" :safeAreaInsetBottom="true" inactiveColor="#333" @click="tabbarClick">
-			<u-tabbar-item text="+早餐" @click="tabbarClick" :icon="require('../../static/imgs/foods-1.png')" />
-			<u-tabbar-item text="+午餐" @click="tabbarClick" :icon="require('../../static/imgs/foods-2.png')" />
-			<u-tabbar-item text="+晚餐" @click="tabbarClick" :icon="require('../../static/imgs/foods-3.png')" />
-			<u-tabbar-item text="+加餐" @click="tabbarClick" :icon="require('../../static/imgs/foods-4.png')" />
-			<u-tabbar-item text="+运动" @click="tabbarClick" :icon="require('../../static/imgs/foods-5.png')" />
-		</u-tabbar>
+            <sports type="edit" :lists="sports" @editSport="editSport" @longClick="longClick" />
+        </template>
 
-		<!-- 修改食品弹窗 -->
-		<!--  添加食谱弹窗 -->
-		<addFoods
-			v-if="addShow"
-			:addShow="addShow"
-			:selectGoods="selectGoods"
-			:decimals="true"
-			@confirm="confirmHandle"
-			@close="closeHandle"
-			@delThis="delThis"
-			@tabGoodsInfo="tabGoodsInfo"
-			max="999"
-		/>
+        <!-- 没有饮食记录 -->
+        <view class="no-foods" v-if="sports.length === 0 && intakes.length === 0">
+            <u-image :src="require('../../static/imgs/no-foods.png')" :lazy-load="true" radius="10rpx" mode="widthFix"
+                width="300rpx" class="no-foods-img" />
+            <view>还没有添加今日饮食记录</view>
+            <view>请点击屏幕下方按钮来添加</view>
+        </view>
 
-		<!-- 修改运动弹窗 -->
-		<addPopup :selectSports="selectSports" :addSportsShow="addSportsShow" @comfirmSport="comfirmSport" @cancleSport="cancleSport" @delSport="delSport" />
-	</view>
+        <!-- 加餐模块 -->
+        <u-action-sheet :actions="addEatList" title="加餐模块" :closeOnClickOverlay="true" :closeOnClickAction="true"
+            @select="selectClick" cancelText="取消" :show="addEatShow" @close="addEatShow = false"></u-action-sheet>
+            
+        <!-- 底部 早餐等菜单 -->
+        <u-tabbar :fixed="true" :placeholder="true" :safeAreaInsetBottom="true" inactiveColor="#333"
+            @click="tabbarClick">
+            <u-tabbar-item text="+早餐" @click="tabbarClick" :icon="require('../../static/imgs/foods-1.png')" />
+            <u-tabbar-item text="+午餐" @click="tabbarClick" :icon="require('../../static/imgs/foods-2.png')" />
+            <u-tabbar-item text="+晚餐" @click="tabbarClick" :icon="require('../../static/imgs/foods-3.png')" />
+            <u-tabbar-item text="+加餐" @click="tabbarClick" :icon="require('../../static/imgs/foods-4.png')" />
+            <u-tabbar-item text="+运动" @click="tabbarClick" :icon="require('../../static/imgs/foods-5.png')" />
+        </u-tabbar>
+
+        <!--  添加食谱弹窗 -->
+        <addFoods v-if="addShow" :addShow="addShow" :selectGoods="selectGoods" :decimals="true" @confirm="confirmHandle"
+            @close="closeHandle" @delThis="delThis" @tabGoodsInfo="tabGoodsInfo" max="999" />
+
+        <!-- 修改运动弹窗 -->
+        <addPopup :selectSports="selectSports" :addSportsShow="addSportsShow" @comfirmSport="comfirmSport"
+            @cancleSport="cancleSport" @delSport="delSport" />
+
+
+        <!-- 选择日历 -->
+        <dateTemplate :lists="calendarList" :today="today" :month="month" :dateShow="dateShow" type='foods' @backDate="backDate"
+            @dateClick="dateClick" @closeDate="closeDate" @datePreNext="datePreNext" />
+
+    </view>
 </template>
 
 <script>
-import arprogress from '@/components/ar-circle-progress/index.vue';
-import goodsList from '@/components/foods';
-import { plans, editHealthFoods, delHealthFoods } from '@/apis/interfaces/foods.js';
-import moment from 'moment';
-import addFoods from '@/components/add-goods-template/add-goods-template';
-import addPopup from '@/components/sports/addPopup';
-import sports from '@/components/sports';
-import { editHealthSports, delHealthSports } from '@/apis/interfaces/sport.js';
-export default {
-	components: {
-		arprogress,
-		goodsList,
-		addFoods,
-		addPopup,
-		sports
-	},
-	data() {
-		return {
-			lists: [],
-			addShow: false, // 添加食品显示
-			selectGoods: [], // 选择新增的食品
-			addEatShow: false, // 加餐弹窗默认不显示
-			addEatList: [
-				{
-					name: '上午加餐',
-					type: 2
-				},
-				{
-					name: '下午加餐',
-					type: 4
-				},
-				{
-					name: '晚上加餐',
-					type: 6
-				}
-			],
-			today: moment(new Date()).format('YYYY-MM-DD'),
-			calorys: {}, // 当日食谱推荐页面的信息
-			intakes: [], // 当日摄入列表
-			sports: [], // 运动列表
-			sportsTotal: 0,
-			addSportsShow: false, // 添加运动弹窗显示
-			selectSports: {} // 选择新增的运动
-		};
-	},
-	onShow() {
-		this.getList();
-	},
-	methods: {
-		// 编辑运动
-		editSport(item) {
-			this.selectSports = {
-				name: item.sport.name,
-				calory: item.sport.calory,
-				cover: item.sport.cover,
-				duration: item.duration,
-				sport_id: item.sport.sport_id,
-				exercise_id: item.exercise_id,
-				title: '编辑运动'
-			};
-			// console.log(this.selectSports);
-			console.log('编辑运动', item);
-			this.addSportsShow = true;
-		},
+    import moment from 'moment';
+    import sports from '@/components/sports';
+    import goodsList from '@/components/foods';
+    import addPopup from '@/components/sports/addPopup';
+    import arprogress from '@/components/ar-circle-progress/index.vue';
+    import addFoods from '@/components/add-goods-template/add-goods-template';
+    import dateTemplate from '@/components/date-template/index.vue'
+    import {
+        editHealthSports,
+        delHealthSports
+    } from '@/apis/interfaces/sport.js';
+    import {
+        plans,
+        editHealthFoods,
+        delHealthFoods,
+        dateList
+    } from '@/apis/interfaces/foods.js';
+    export default {
+        components: {
+            arprogress,
+            goodsList,
+            addFoods,
+            addPopup,
+            sports,
+            dateTemplate
+        },
+        data() {
+            return {
+                addShow: false, // 添加食品显示
+                selectGoods: [], // 选择新增的食品
+                addEatShow: false, // 加餐弹窗默认不显示
+                addEatList: [{name: '上午加餐',type: 2},{name: '下午加餐',type: 4},{name: '晚上加餐',type: 6}],
+                calorys: {}, // 当日食谱推荐页面的信息
+                intakes: [], // 当日摄入列表
+                sports: [], // 运动列表
+                sportsTotal: 0,
+                addSportsShow: false, // 添加运动弹窗显示
+                selectSports: {}, // 选择新增的运动
+                today: moment(new Date()).format('YYYY-MM-DD'),// 当前时间
+                month: moment(new Date()).format('YYYY-MM'), //当前月份
+                dateShow: false, // 日历展示
+                calendarList: [],
+                dateType: '', // before after ''
+            };
+        },
+        onShow() {
+            this.getList();
+            this.dateLists(); // 日期列表
+        },
+        methods: {
+            // 获取当前统计页面基本数据
+            getList() {
+                plans(this.today).then(res => {
+                    this.calorys = res.calorys;
+                    this.calorys.ratio = Number(this.calorys.ratio);
+                    this.intakes = res.intakes;
+                    this.sports = res.exercises.lists;
+                    this.sportsTotal = res.exercises.total;
+                });
+            },
 
-		// 弹窗确认按钮新增  这里接口报错了  ，
-		comfirmSport(show, duration) {
-			let params = {
-				unit: '1', // 时间单位：分钟 1 小时 2
-				duration: duration, // 时常
-				exercise_id: this.selectSports.exercise_id, //
-				sport_id: this.selectSports.sport_id, // 运动id
-				date: this.today // 日期
-			};
-			console.log(params);
-			editHealthSports(params).then(res => {
-				this.addSportsShow = false;
-				this.selectSports = {};
-				this.getList();
-			}).catch(err=>{
-				 uni.showToast({
-				 	title:err.message,
-					icon:'none'
-				 })
-			});
-		},
+            //#region 运动操作相关
+            // 编辑运动
+            editSport(item) {
+                this.selectSports = {
+                    name: item.sport.name,
+                    calory: item.sport.calory,
+                    cover: item.sport.cover,
+                    duration: item.duration,
+                    sport_id: item.sport.sport_id,
+                    exercise_id: item.exercise_id,
+                    title: '编辑运动'
+                };
+                // console.log(this.selectSports);
+                this.addSportsShow = true;
+            },
+            // 弹窗确认按钮新增  这里接口报错了  ，
+            comfirmSport(show, duration) {
+                let params = {
+                    unit: '1', // 时间单位：分钟 1 小时 2
+                    duration: duration, // 时常
+                    exercise_id: this.selectSports.exercise_id, //
+                    sport_id: this.selectSports.sport_id, // 运动id
+                    date: this.today // 日期
+                };
+                editHealthSports(params).then(res => {
+                    this.addSportsShow = false;
+                    this.selectSports = {};
+                    this.getList();
+                }).catch(err => {
+                    uni.showToast({
+                        title: err.message,
+                        icon: 'none'
+                    })
+                });
+            },
+            // 弹窗取消按钮
+            cancleSport(show) {
+                this.addSportsShow = show;
+            },
+            // 删除运动
+            delSport() {
+                let params = {
+                    exercise_id: this.selectSports.exercise_id //
+                };
+                console.log(params);
+                delHealthSports(params).then(res => {
+                    this.addSportsShow = false;
+                    this.selectSports = {};
+                    this.getList();
+                });
+            },
+            // 长按删除触发事件运动
+            longClick(item) {
+                this.selectSports = item;
+                uni.showModal({
+                    content: '确认删除么？',
+                    confirmText: '确认删除',
+                    confirmColor: '#34ce98',
+                    cancelText: '再想想',
+                    cancelColor: '#ddd',
+                    success: res => {
+                        if (res.confirm) {
+                            this.delSport();
+                        }
+                    }
+                });
+            },
+            //#endregion 运动操作相关
 
-		// 弹窗取消按钮
-		cancleSport(show) {
-			this.addSportsShow = show;
-		},
-		// 删除运动
-		delSport() {
-			let params = {
-				exercise_id: this.selectSports.exercise_id //
-			};
-			console.log(params);
-			delHealthSports(params).then(res => {
-				this.addSportsShow = false;
-				this.selectSports = {};
-				this.getList();
-			});
-		},
-		// 长按删除触发事件运动
-		longClick(item) {
-			this.selectSports = item;
-			uni.showModal({
-				content: '确认删除么？',
-				confirmText: '确认删除',
-				confirmColor: '#34ce98',
-				cancelText: '再想想',
-				cancelColor: '#ddd',
-				success: res => {
-					if (res.confirm) {
-						this.delSport();
-					}
-				}
-			});
-		},
-		// 长按删除食品
-		longClickGoods(e) {
-			this.selectGoods = [e];
-			uni.showModal({
-				content: '确认删除么？',
-				confirmText: '确认删除',
-				confirmColor: '#34ce98',
-				cancelText: '再想想',
-				cancelColor: '#ddd',
-				success: res => {
-					if (res.confirm) {
-						this.delThis();
-					}
-				}
-			});
-		},
-		// 错误提示
-		errToast() {
-			uni.showToast({
-				title: '努力开发中~',
-				icon: 'none'
-			});
-		},
-		getList() {
-			plans(this.today).then(res => {
-				this.calorys = res.calorys;
-				this.calorys.ratio = Number(this.calorys.ratio);
-				this.intakes = res.intakes;
-				this.sports = res.exercises.lists;
-				this.sportsTotal = res.exercises.total;
-			});
-		},
-		// 底部按钮点击触发的事件 早餐1 午餐3 晚餐5 加餐(早2中4晚6)
-		tabbarClick(e) {
-			console.log(e);
-			this.tabarIndex = e;
-			if (e === 3) {
-				this.addEatShow = true;
-			} else {
-				if (e === 4) {
-					// 新增运动
-					uni.navigateTo({
-						url: `/pages/record/addExercises`
-					});
-				} else {
-					uni.navigateTo({
-						url: `/pages/record/addFoods?type=${e === 0 ? 1 : e === 1 ? 3 : 5}`
-					});
-				}
-			}
-		},
-		// 选择了加餐跳转
-		selectClick(e) {
-			uni.navigateTo({
-				url: `/pages/record/addFoods?type=${e.type}`
-			});
-			// 选择加餐
-		},
-		// 编辑食品
-		editGoods(e) {
-			this.selectGoods = [e];
-			this.addShow = true;
-		},
-		closeHandle() {
-			//键盘关闭的回调函数
-			this.addShow = false;
-		},
-		// 监听点击键盘触发返回值新增食品
-		confirmHandle(value) {
-			// 新添加食物
-			let data = {
-				ser: 1,
-				weight: value,
-				food_id: this.selectGoods[0].food_id,
-				intake_id: this.selectGoods[0].intake_id
-			};
-			this.editHealthFoods(data);
-		},
-		// 添加食物
-		editHealthFoods(data) {
-			editHealthFoods(data).then(res => {
-				console.log(res);
-				this.addShow = false;
-				this.getList();
-			});
-		},
-		// 删除该食物
-		delThis(e) {
-			delHealthFoods(this.selectGoods[0].intake_id).then(res => {
-				this.addShow = false;
-				this.getList();
-			});
-		},
-		// 跳转到食品详情
-		tabGoodsInfo(e) {
-			this.$Router.push({
-				name: 'rankingDetails',
-				params: e
-			});
-		}
-	}
-};
+
+            //#region 食物操作相关
+            // 长按删除食品
+            longClickGoods(e) {
+                this.selectGoods = [e];
+                uni.showModal({
+                    content: '确认删除么？',
+                    confirmText: '确认删除',
+                    confirmColor: '#34ce98',
+                    cancelText: '再想想',
+                    cancelColor: '#ddd',
+                    success: res => {
+                        if (res.confirm) {
+                            this.delThis();
+                        }
+                    }
+                });
+            },
+            // 错误提示
+            errToast() {
+                uni.showToast({
+                    title: '努力开发中~',
+                    icon: 'none'
+                });
+            },
+            // 底部按钮点击触发的事件 早餐1 午餐3 晚餐5 加餐(早2中4晚6)
+            tabbarClick(e) {
+                console.log(e);
+                this.tabarIndex = e;
+                if (e === 3) {
+                    this.addEatShow = true;
+                } else {
+                    if (e === 4) {
+                        // 新增运动
+                        uni.navigateTo({
+                            url: `/pages/record/addExercises`
+                        });
+                    } else {
+                        uni.navigateTo({
+                            url: `/pages/record/addFoods?type=${e === 0 ? 1 : e === 1 ? 3 : 5}&date=${this.today}`
+                        });
+                    }
+                }
+            },
+            // 选择了加餐跳转
+            selectClick(e) {
+                uni.navigateTo({
+                    url: `/pages/record/addFoods?type=${e.type}&date=${this.today}`
+                });
+                // 选择加餐
+            },
+            // 编辑食品
+            editGoods(e) {
+                this.selectGoods = [e];
+                this.addShow = true;
+            },
+            closeHandle() {
+                //键盘关闭的回调函数
+                this.addShow = false;
+            },
+            // 监听点击键盘触发返回值新增食品
+            confirmHandle(value) {
+                // 新添加食物
+                let data = {
+                    ser: 1,
+                    weight: value,
+                    food_id: this.selectGoods[0].food_id,
+                    intake_id: this.selectGoods[0].intake_id
+                };
+                this.editHealthFoods(data);
+            },
+            // 添加食物
+            editHealthFoods(data) {
+                editHealthFoods(data).then(res => {
+                    console.log(res,'添加食物');
+                    this.addShow = false;
+                    this.getList();
+                }).catch(err=>{
+                    console.log(res,'添加食物error');
+                    uni.showToast({
+                        title:err.message,
+                        icon:"none"
+                    })
+                });
+            },
+            // 删除该食物
+            delThis(e) {
+                delHealthFoods(this.selectGoods[0].intake_id).then(res => {
+                    this.addShow = false;
+                    this.getList();
+                });
+            },
+            // 跳转到食品详情
+            tabGoodsInfo(e) {
+                this.$Router.push({
+                    name: 'rankingDetails',
+                    params: e
+                });
+            },
+            //#endregion 食物操作相关
+
+            //#region 日历操作相关 
+            // 日历列表
+            dateLists() {
+                let data = {
+                    month: this.month,
+                    type: this.dateType
+                }
+                dateList(data).then(res => {
+                    console.log(res)
+                    this.calendarList = res.calendar
+                    this.dateType = ''
+                    this.month = res.month
+                }).catch(err => {
+                    uni.showToast({
+                        title: err.message,
+                        icon: 'none'
+                    })
+                })
+            },
+            // 选择日期
+            dateClick(item) {
+                this.today = item.today
+                this.month = item.today
+                this.reset()
+            },
+            // 返回到今日
+            backDate() {
+                this.today = moment(new Date()).format('YYYY-MM-DD')
+                this.reset()
+            },
+            //  上一个月或者下一个月
+            datePreNext(type) {
+                this.dateType = type
+                this.dateLists()
+            },
+            // 关闭日历
+            closeDate() {
+                this.month = this.today
+                this.dateShow = false
+            },
+            // 重置日历数据
+            reset() {
+                this.calendarList = []
+                this.dateLists()
+                this.getList()
+                this.closeDate()
+            }
+            //#endregion 日历操作相关
+        }
+    };
 </script>
 
 <style lang="scss" scoped>
-.record--foods {
-	padding: $padding $padding $padding * 7 $padding;
-	// background: green;
-}
-// 饮食进度条
-.cricle-content {
-	box-shadow: 0 0 4rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
-	font-size: $title-size-m - 6;
-	padding: $padding * 1.8 $padding;
-	border-radius: $radius;
-	color: $text-gray-m;
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-around;
-	box-sizing: border-box;
-	position: relative;
-	.cricle {
-		.num {
-			color: $text-color;
-			font-size: $title-size * 1.8;
-			font-weight: bold;
-			padding: $padding * 0.2;
-		}
-		.num1 {
-			color: #f00;
-		}
-	}
-	.info {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		box-sizing: border-box;
-		span {
-			font-size: $title-size + 10;
-			font-weight: bold;
-			color: $text-color;
-			padding-top: $padding * 0.5;
-		}
-	}
-	.ic-left {
-		position: absolute;
-		left: 0;
-		top: 0;
-		background-image: linear-gradient(to right, #ffebb9, #fbd57b);
-		color: #664710;
-		padding: 10rpx $padding * 0.6;
-		border-radius: 0 0 $radius 0;
-	}
-	.ic-day {
-		position: absolute;
-		right: $padding;
-		top: $padding;
-	}
-}
-// 没有饮食记录
-.no-foods {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	box-sizing: border-box;
-	font-size: $title-size-m - 4;
-	color: $text-gray-m;
-	min-height: 40vh;
-	// background: pink;
-	.no-foods-img {
-		opacity: 0.5;
-	}
-	view {
-		padding: $padding * 0.2;
-	}
-}
-// 饮食记录 早中晚加餐等
-.foods-add {
-	border-bottom: solid 1rpx #f7f7f7;
-	margin-top: $margin;
-}
-// 主标题
-.foods-title {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-between;
-	box-sizing: border-box;
-	color: $text-color;
-	padding: $padding * 0.5 0;
-	.title-left {
-		font-size: $title-size;
-		color: $text-color;
-		font-weight: bold;
-		span {
-			font-weight: normal;
-			font-size: $title-size-m - 6;
-			color: $text-gray-m;
-			margin-left: $margin - 10;
-		}
-	}
-	.title-right {
-		font-size: $title-size-m - 6;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		box-sizing: border-box;
-		color: $main-color;
-		.dw {
-			margin: 0 $margin * 0.6 0 $margin * 0.4;
-			color: $text-gray;
-		}
-	}
-}
+    .record--foods {
+        padding: $padding $padding $padding * 7 $padding;
+        // background: green;
+    }
+
+    // 顶部日历筛选部分
+    .u-center {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+
+        .date {
+            background-color: rgba($color: #000000, $alpha: .1);
+            color: #fff;
+            min-width: 340rpx;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            padding: 8rpx 20rpx;
+            border-radius: $radius * 2;
+            margin: 0 10rpx;
+            font-size: $title-size - 2;
+        }
+
+        .play-right-fill {
+            padding: $padding !important;
+            background-color: pink;
+        }
+    }
+
+
+    // 饮食进度条
+    .cricle-content {
+        box-shadow: 0 0 4rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
+        font-size: $title-size-m - 6;
+        padding: $padding * 1.8 $padding;
+        border-radius: $radius;
+        color: $text-gray-m;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-around;
+        box-sizing: border-box;
+        position: relative;
+        margin-top: $margin * 5;
+
+        .cricle {
+            .num {
+                color: $text-color;
+                font-size: $title-size * 1.8;
+                font-weight: bold;
+                padding: $padding * 0.2;
+            }
+
+            .num1 {
+                color: #f00;
+            }
+        }
+
+        .info {
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+
+            span {
+                font-size: $title-size + 10;
+                font-weight: bold;
+                color: $text-color;
+                padding-top: $padding * 0.5;
+            }
+        }
+
+        .ic-left {
+            position: absolute;
+            left: 0;
+            top: 0;
+            background-image: linear-gradient(to right, #ffebb9, #fbd57b);
+            color: #664710;
+            padding: 10rpx $padding * 0.6;
+            border-radius: 0 0 $radius 0;
+        }
+
+        .ic-day {
+            position: absolute;
+            right: $padding;
+            top: $padding;
+        }
+    }
+
+    // 没有饮食记录
+    .no-foods {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        box-sizing: border-box;
+        font-size: $title-size-m - 4;
+        color: $text-gray-m;
+        min-height: 40vh;
+
+        // background: pink;
+        .no-foods-img {
+            opacity: 0.5;
+        }
+
+        view {
+            padding: $padding * 0.2;
+        }
+    }
+
+    // 饮食记录 早中晚加餐等
+    .foods-add {
+        border-bottom: solid 1rpx #f7f7f7;
+        margin-top: $margin;
+    }
+
+    // 主标题
+    .foods-title {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        box-sizing: border-box;
+        color: $text-color;
+        padding: $padding * 0.5 0;
+
+        .title-left {
+            font-size: $title-size;
+            color: $text-color;
+            font-weight: bold;
+
+            span {
+                font-weight: normal;
+                font-size: $title-size-m;
+                color: $text-gray-m;
+                margin-left: $margin - 10;
+            }
+        }
+
+        .title-right {
+            font-size: $title-size-m;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            color: $main-color;
+
+            .dw {
+                margin: 0 $margin * 0.6 0 $margin * 0.4;
+                color: $text-gray;
+            }
+        }
+    }
 </style>
diff --git a/pages/record/index.vue b/pages/record/index.vue
index 17660b4..dfa5f76 100644
--- a/pages/record/index.vue
+++ b/pages/record/index.vue
@@ -398,9 +398,7 @@ export default {
          */
 		logs() {
 			logs().then(res => {
-				
-				console.log(res.is_login)
-				
+				// console.log(res.is_login)
 				this.weight = res.weight;
 				this.water = res.water;
 				this.intake_run = res.intake_run;
diff --git a/pages/record/weight.vue b/pages/record/weight.vue
index b75cfad..1c43df8 100644
--- a/pages/record/weight.vue
+++ b/pages/record/weight.vue
@@ -8,231 +8,292 @@
 
 <template>
     <view class="weight">
-        <!-- 体重表 -->
-        <view class="progress-top">
-            <view class="unit">
-                <span
-                    :class="isJin === 2?'active':''"
-                    @click="isJin = 1"
-                >斤</span>
-                <span
-                    :class="isJin === 1?'active':''"
-                    @click="isJin = 1"
-                >公斤</span>
-            </view>
-            <view class="progress">
-                <view>{{weightInfo.text}}</view>
-                <u-count-to
-                    class="uCountTo"
-                    :startVal="0"
-                    :endVal="weightInfo.change"
-                    :decimals="1"
-                    color="#333"
-                    fontSize="36"
-                    :bold="true"
-                />
-                <view>保持 / 塑性</view>
-            </view>
-            <view
-                class="add-weight"
-                @click="addWeightShow = true"
-            >记录体重</view>
-            <view class="des-title">以最后一次记录为主且每日只能更新一次</view>
-        </view>
-        <!-- 体重列表 -->
-        <view
-            class="weight-list"
-            v-if="lists.length>0"
-        >
-            <view
-                class="list-item"
-                v-for="item in lists"
-                :key="item.wight_id"
-            >
-                <view class="list-left">
-                    <view class="list-title">
-                        <span>{{item.weight}}</span>公斤
-                    </view>
-                    测量结果
+        <!-- 进度模块 -->
+        <block v-if="tabbarId === 0">
+            <!-- 体重表 -->
+            <view class="progress-top">
+                <view class="unit"> <span :class="isJin === 2?'active':''" @click="isJin = 1">斤</span> <span :class="isJin === 1?'active':''" @click="isJin = 1">公斤</span> </view>
+                <view class="progress">
+                    <view>{{weightInfo.text}}</view>
+                    <u-count-to class="uCountTo" :startVal="0" :endVal="weightInfo.change" :decimals="1" color="#333" fontSize="36" :bold="true" />
+                    <view>保持 / 塑性</view>
                 </view>
-                <view class="list-right">
-                    <span>开始保持 / 塑性</span>
-                    {{item.created_at}}
+                <view class="add-weight" @click="addWeightShow = true">记录体重</view>
+                <view class="des-title">以最后一次记录为主且每日只能更新一次</view>
+            </view>
+
+            <!-- 体重列表 -->
+            <view class="weight-list" v-if="lists.length>0">
+                <view class="list-item">
+                    <view class="list-left"> <view class="list-title"> <span>{{weightInfo.begin}}</span>公斤 </view> 初始体重 </view>
+                    <view class="list-right"> <span>开始保持 / 塑性</span> {{weightInfo.first_weight_time}} </view>
+                </view>
+                <view class="list-item" v-for="item in lists" :key="item.wight_id">
+                    <view class="list-left"> <view class="list-title"> <span>{{item.weight}}</span>公斤 </view> 测量结果 </view>
+                    <view class="list-right"> <span>开始保持 / 塑性</span> {{item.created_at}} </view>
                 </view>
             </view>
+            <view class="no-lists" v-else>还没有体重信息，记录下呗~</view>
+        </block>
+        
+        
+        <!-- 曲线模块 -->
+        <view v-if="tabbarId === 1">
+            <!-- 健康测评 -->
+            <u-image :src="require('@/static/imgs/health1.png')" class="eval-img" @click="$Router.push({ name: 'EvaluationList' })" :lazy-load="true" radius="10rpx" mode="widthFix" width="100%" />
+            <view class="curve">
+               <view class="title"> 体重 <span>单位：公斤</span> </view>
+               <u-icon @click="addWeightShow = true" name="edit-pen-fill" color="#34ce98" size="20" :bold="true" label="更新" labelPos="right" labelSize="13" labelColor="#999" space="4" />
+            </view>
+            <view class="charts-box"> <qiun-data-charts type="area" :chartData="chartData" background="none" /> </view>
+            <view class="progress-top">
+                <view class="add-weight" @click="addWeightShow = true">记录体重</view>
+                <view class="des-title">只显示最近七次测量记录</view>
+            </view>
         </view>
-        <view
-            class="no-lists"
-            v-else
-        >还没有体重信息，记录下呗~</view>
         <!-- 记录体重弹窗 -->
-        <u-popup
-            :show="addWeightShow"
-            :round="10"
-            @close="addWeightShow = false"
-            :closeable="true"
-        >
+        <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)"
-                />
-                <view
-                    class="addBtn"
-                    @click="addWeight"
-                >确认添加</view>
+                <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-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>
     </view>
 </template>
 <script>
-import vueScale from "@/components/vueScale";
-import { weights, addWeight } from "@/apis/interfaces/weight.js";
-import moment from "moment";
-import l from "../../uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center";
-export default {
-    components: {
-        vueScale,
-    },
-    data() {
-        return {
-            isJin: 1, // 是公斤 2 是斤 所有用到斤的直接乘以这个字段即可
-            addWeightShow: false, // 是否添加体重展示
-            styles: {
-                line: "#dbdbdb",
-                bginner: "#fbfbfb",
-                bgoutside: "#ffffff",
-                font: "#404040",
-                fontColor: "#404040",
-                fontSize: 16,
-            },
-            weight: "",
-            date: "",
-            weightInfo: {},
-            lists: [],
-            has_more: true,
-            page: 1,
-        };
-    },
-    onShow() {
-        this.getWeights();
-        this.date = moment(new Date()).format("YYYY-MM-DD");
-    },
-    onReachBottom() {
-        if (!this.has_more) {
-            uni.showToast({
-                title: "没有更多啦~",
-                icon: "none",
-            });
-        } else {
-            this.page = this.page + 1;
-            this.getWeights();
-        }
-    },
-
-    methods: {
-        //获取体重首页接口
-        getWeights() {
-            weights(this.page).then((res) => {
-				if(res.lists.page.current === 1) {
-					this.lists = []
-				}
-                this.lists = this.lists.concat(res.lists.data);
-                this.has_more = res.lists.page.has_more;
-                this.weightInfo = res.weight;
-                this.weight = res.weight.now;
-            });
+    import vueScale from "@/components/vueScale";
+    import {
+        weights,
+        addWeight,
+        curves
+    } from "@/apis/interfaces/weight.js";
+    import moment from "moment";
+    import l from "../../uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center";
+    export default {
+        components: {
+            vueScale,
         },
-        addWeight() {
-            let data = {
-                weight: this.weight,
-                date: this.date,
+        data() {
+            return {
+                isJin: 1, // 是公斤 2 是斤 所有用到斤的直接乘以这个字段即可
+                addWeightShow: false, // 是否添加体重展示
+                styles: {
+                    line: "#dbdbdb",
+                    bginner: "#fbfbfb",
+                    bgoutside: "#ffffff",
+                    font: "#404040",
+                    fontColor: "#404040",
+                    fontSize: 16,
+                },
+                weight: "",
+                date: "",
+                weightInfo: {},
+                lists: [],
+                has_more: true,
+                page: 1,
+                tabbarId: 0,
+                chartData: {
+                    "categories": ["1/1","1/2","1/3","1/4","1/5","1/6","1/7"],
+                    "series": [{"name": "最近七天进度","data": [55,51,53.3,50.3,53.3]}]
+                }, // 曲线部分 start
             };
-            addWeight(data).then((res) => {
-                this.addWeightShow = false;
-                this.page = 1;
-                this.has_more = true;
-                this.lists = [];
+        },
+        onShow() {
+            this.getWeights();
+            this.getCurves();
+            this.date = moment(new Date()).format("YYYY-MM-DD");
+        },
+        onReachBottom() {
+            if (!this.has_more) {
+                uni.showToast({
+                    title: "没有更多啦~",
+                    icon: "none",
+                    duration: 1000,
+                    mask: true
+                });
+            } else {
+                this.page = this.page + 1;
                 this.getWeights();
-            });
+            }
         },
-        // 滚动标尺触发事件
-        scroll(msg) {
-            this.weight = msg;
+
+        methods: {
+            //获取体重首页接口
+            getWeights() {
+                weights(this.page).then((res) => {
+                    console.log(res)
+                    if (res.lists.page.current === 1) {
+                        this.lists = []
+                    }
+                    this.lists = this.lists.concat(res.lists.data);
+                    this.has_more = res.lists.page.has_more;
+                    this.weightInfo = res.weight;
+                    this.weight = res.weight.now;
+                }).catch(err=>{
+                    uni.showToast({
+                        title:err.message,
+                        icon:"none",
+                        mask:true,
+                        duration:2000
+                    })
+                });
+            },
+            // 获取曲线
+            getCurves() {
+                curves().then((res) => {
+                  this.chartData={
+                      categories:res.categories,
+                      "series": [res.series]
+                  }
+                }).catch(err=>{
+                    uni.showToast({
+                        title:err.message,
+                        icon:"none",
+                        mask:true,
+                        duration:2000
+                    })
+                });
+            },
+            
+            // 更新体重
+            addWeight() {
+                let data = {
+                    weight: this.weight,
+                    date: this.date
+                };
+                addWeight(data).then((res) => {
+                    this.addWeightShow = false;
+                    this.page = 1;
+                    this.has_more = true;
+                    this.lists = [];
+                    this.getWeights();
+                    this.getCurves();
+                }).catch(err=>{
+                    uni.showToast({
+                        title:err.message,
+                        icon:"none",
+                        mask:true,
+                        duration:2000
+                    })
+                });
+            },
+            
+            // 滚动标尺触发事件
+            scroll(msg) {
+                this.weight = msg;
+            },
+
+            // 点击底部切换
+            tabbarClick(e) {
+                console.log(e)
+                this.tabbarId = Number(e)
+            }
         },
-    },
-};
+    };
 </script>
 <style lang="scss" scoped>
-//体重top
-.progress-top {
-    padding: $padding * 2 $padding;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    box-sizing: border-box;
-    border-bottom: solid 1rpx #f7f7f7;
-    // 单位
-    .unit {
+    .charts-box{
+      width: 100%;
+      height:500rpx;
+      margin-top: $margin;
+    }
+    // curve
+    .curve{
+        margin-top: $margin;
+        padding: $padding $padding + 10;
         display: flex;
         flex-direction: row;
         align-items: center;
-        justify-content: flex-end;
-        width: 100%;
-        span {
-            display: inline-block;
-            width: 100rpx;
+        justify-content: space-between;
+        box-sizing: border-box;
+        font-size: $title-size + 5;
+        color: #333;
+        span{
+            color: #cacaca;
             font-size: $title-size-m;
-            color: $border-color;
-            padding: $padding * 0.5 0;
-            text-align: center;
-            border: solid 1rpx $border-color;
-            border-radius: 50rpx 0 0 50rpx;
-        }
-        span:nth-child(1) {
-            border-radius: 50rpx 0 0 50rpx;
-            border-style: solid;
-            border-color: $border-color $main-color $border-color $border-color;
-        }
-        span:nth-child(2) {
-            border-radius: 0 50rpx 50rpx 0;
-            border-style: solid;
-            border-color: $border-color $border-color $border-color $main-color;
-        }
-        span.active {
-            background-color: $main-color;
-            color: #fff;
-            border: solid 1rpx $main-color;
+            margin-left: 10rpx;
         }
     }
-
-    // 展示圈
-    .progress {
-        width: 360rpx;
-        height: 360rpx;
-        border: solid $padding * 0.7 #f7f7f7;
-        border-radius: 50%;
+    // 评测图片
+    .eval-img {
+    	box-shadow: 0 0 10rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
+    }
+    //体重top
+    .progress-top {
+        padding: $padding * 2 $padding;
         display: flex;
         flex-direction: column;
         align-items: center;
         justify-content: center;
         box-sizing: border-box;
-        color: $text-gray-m;
-        font-size: $title-size-m;
-        .uCountTo {
-            padding: $padding * 0.5;
+        border-bottom: solid 1rpx #f7f7f7;
+
+        // 单位
+        .unit {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: flex-end;
+            width: 100%;
+
+            span {
+                display: inline-block;
+                width: 100rpx;
+                font-size: $title-size-m;
+                color: $border-color;
+                padding: $padding * 0.5 0;
+                text-align: center;
+                border: solid 1rpx $border-color;
+                border-radius: 50rpx 0 0 50rpx;
+            }
+
+            span:nth-child(1) {
+                border-radius: 50rpx 0 0 50rpx;
+                border-style: solid;
+                border-color: $border-color $main-color $border-color $border-color;
+            }
+
+            span:nth-child(2) {
+                border-radius: 0 50rpx 50rpx 0;
+                border-style: solid;
+                border-color: $border-color $border-color $border-color $main-color;
+            }
+
+            span.active {
+                background-color: $main-color;
+                color: #fff;
+                border: solid 1rpx $main-color;
+            }
         }
-    }
-    //  记录按钮
+
+        // 展示圈
+        .progress {
+            width: 360rpx;
+            height: 360rpx;
+            border: solid $padding * 0.7 #f7f7f7;
+            border-radius: 50%;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+            color: $text-gray-m;
+            font-size: $title-size-m;
+
+            .uCountTo {
+                padding: $padding * 0.5;
+            }
+        }
+ //  记录按钮
     .add-weight {
         font-size: $title-size + 2;
         border-radius: $radius * 3;
@@ -242,92 +303,106 @@ export default {
         margin-top: $margin * 2;
         font-weight: bold;
     }
-    .des-title {
+        .des-title {
+            padding: $padding;
+            color: $text-gray-m;
+            font-size: $title-size-m - 4;
+
+        }
+    }
+   
+    
+
+    // 列表
+    .weight-list {
+        font-size: $title-size-m;
+        color: #cacaca;
+        padding: 0 $padding;
+
+        .list-item {
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            box-sizing: border-box;
+            justify-content: space-between;
+            border-bottom: solid 1rpx #f9f9f9;
+            padding: 20rpx 0;
+            font-size: $title-size-m - 2;
+
+            .list-title {
+                color: #555;
+                font-size: $title-size-m - 2;
+
+                span {
+                    font-size: $title-size + 10;
+                    font-weight: 500;
+                    margin-right: 10rpx;
+                }
+            }
+
+            .list-right {
+                display: flex;
+                flex-direction: column;
+                align-items: flex-end;
+                justify-content: center;
+                box-sizing: border-box;
+                margin-top: $margin * 0.4;
+                color: #999;
+
+                span {
+                    margin-bottom: 10rpx;
+                }
+            }
+        }
+    }
+
+    .no-lists {
         padding: $padding;
         color: $text-gray-m;
-        font-size: $title-size-m - 4;
+        font-size: $title-size-m;
     }
-}
-// 列表
-.weight-list {
-    font-size: $title-size-m;
-    color: $text-gray-m;
-    padding: $padding;
 
-    .list-item {
-        display: flex;
-        flex-direction: row;
-        align-items: center;
+    // 弹窗
+    .addWeightContent {
+        width: 100%;
+        height: 54vh;
+        padding: $padding * 4 0;
+        box-sizing: border-box;
+        color: $text-gray;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
         box-sizing: border-box;
-        justify-content: space-between;
-        border-bottom: solid 1rpx #f9f9f9;
-        padding: $padding 0;
-        .list-title {
-            color: $text-color;
-            font-size: $title-size-m;
-            margin-bottom: $margin * 0.4;
-            span {
-                font-size: $title-size + 14;
-                font-weight: 500;
-                margin-right: 10rpx;
-            }
-        }
-        .list-right {
-            display: flex;
-            flex-direction: column;
-            align-items: flex-end;
-            justify-content: center;
-            box-sizing: border-box;
-            margin-top: $margin * 0.4;
-            span {
-                margin-bottom: 10rpx;
-            }
-        }
-    }
-}
-.no-lists {
-    padding: $padding;
-    color: $text-gray-m;
-    font-size: $title-size-m;
-}
 
-// 弹窗
-.addWeightContent {
-    width: 100%;
-    height: 54vh;
-    padding: $padding * 4 0;
-    box-sizing: border-box;
-    color: $text-gray;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    box-sizing: border-box;
-    .date {
-        font-size: $title-size + 9;
-        text-align: center;
-    }
-    .count {
-        color: $main-color;
-        text-align: center;
-        margin-top: $margin * 2;
-        margin-bottom: $margin * 0.1;
-        font-size: $title-size + 2;
-        span {
-            font-weight: bold;
-            font-size: $title-size * 2.2;
-            margin-right: $margin * 0.3;
+        .date {
+            font-size: $title-size + 9;
+            text-align: center;
+        }
+
+        .count {
+            color: $main-color;
+            text-align: center;
+            margin-top: $margin * 2;
+            margin-bottom: $margin * 0.1;
+            font-size: $title-size + 2;
+
+            span {
+                font-weight: bold;
+                font-size: $title-size * 2.2;
+                margin-right: $margin * 0.3;
+            }
+        }
+
+        .addBtn {
+            background-color: $main-color;
+            color: #fff;
+            margin-top: $margin * 2;
+            font-size: $title-size * 1.2;
+            padding: $padding * 0.7 $padding * 4;
+            border-radius: $radius * 3;
+            font-size: $title-size + 6;
+            box-shadow: 0 0 10rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
         }
     }
-    .addBtn {
-        background-color: $main-color;
-        color: #fff;
-        margin-top: $margin * 2;
-        font-size: $title-size * 1.2;
-        padding: $padding * 0.7 $padding * 4;
-        border-radius: $radius * 3;
-        font-size: $title-size + 6;
-        box-shadow: 0 0 10rpx 4rpx rgba($color: $main-color, $alpha: 0.1);
-    }
-}
-</style>
\ No newline at end of file
+</style>
diff --git a/static/imgs/curve-1.png b/static/imgs/curve-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f6413ecac81c3983ab655d19b531076f926322a
GIT binary patch
literal 2960
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

literal 0
HcmV?d00001

diff --git a/static/imgs/curve-2.png b/static/imgs/curve-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7682019681758189c0dec518176d79c07ef9ae4
GIT binary patch
literal 3185
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

literal 0
HcmV?d00001

diff --git a/static/imgs/speed-1.png b/static/imgs/speed-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4c31e546c31d547416575201db9cf2091d50e9d
GIT binary patch
literal 5078
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
boS*r9#}SiGt1N6tgF2wDtbxu`GV}i*8zrVG

literal 0
HcmV?d00001

diff --git a/static/imgs/speed-2.png b/static/imgs/speed-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..56ac17dbe385f253841efbc04fa5c4edde9d14ae
GIT binary patch
literal 5438
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

literal 0
HcmV?d00001

diff --git a/static/imgs/water-1.png b/static/imgs/water-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3d7ef9e661932a336b0a500a82a65fc28c9b1e0
GIT binary patch
literal 6309
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
b7y#gZYwO}$l~%KU00000NkvXXu0mjfk$ym3

literal 0
HcmV?d00001

diff --git a/static/imgs/water-2.png b/static/imgs/water-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..50cbdb4c32f661a3cbc8d4071e45c27a6a3fbfe4
GIT binary patch
literal 4441
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

literal 0
HcmV?d00001

diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
index d36ecbc..46039c6 100644
--- a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
+++ b/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
@@ -21,630 +21,639 @@ const color = ['#91CB74', '#1890FF', '#FAC858', '#EE6666', '#73C0DE', '#3CA272',
 
 //事件转换函数，主要用作格式化x轴为时间轴，根据需求自行修改
 const formatDateTime = (timeStamp, returnType) => {
-	var date = new Date();
-	date.setTime(timeStamp * 1000);
-	var y = date.getFullYear();
-	var m = date.getMonth() + 1;
-	m = m < 10 ? ('0' + m) : m;
-	var d = date.getDate();
-	d = d < 10 ? ('0' + d) : d;
-	var h = date.getHours();
-	h = h < 10 ? ('0' + h) : h;
-	var minute = date.getMinutes();
-	var second = date.getSeconds();
-	minute = minute < 10 ? ('0' + minute) : minute;
-	second = second < 10 ? ('0' + second) : second;
-	if (returnType == 'full') { return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second; }
-	if (returnType == 'y-m-d') { return y + '-' + m + '-' + d; }
-	if (returnType == 'h:m') { return h + ':' + minute; }
-	if (returnType == 'h:m:s') { return h + ':' + minute + ':' + second; }
-	return [y, m, d, h, minute, second];
+    var date = new Date();
+    date.setTime(timeStamp * 1000);
+    var y = date.getFullYear();
+    var m = date.getMonth() + 1;
+    m = m < 10 ? ('0' + m) : m;
+    var d = date.getDate();
+    d = d < 10 ? ('0' + d) : d;
+    var h = date.getHours();
+    h = h < 10 ? ('0' + h) : h;
+    var minute = date.getMinutes();
+    var second = date.getSeconds();
+    minute = minute < 10 ? ('0' + minute) : minute;
+    second = second < 10 ? ('0' + second) : second;
+    if (returnType == 'full') {
+        return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+    }
+    if (returnType == 'y-m-d') {
+        return y + '-' + m + '-' + d;
+    }
+    if (returnType == 'h:m') {
+        return h + ':' + minute;
+    }
+    if (returnType == 'h:m:s') {
+        return h + ':' + minute + ':' + second;
+    }
+    return [y, m, d, h, minute, second];
 }
 
 const cfu = {
-	//demotype为自定义图表类型，一般不需要自定义图表类型，只需要改根节点上对应的类型即可
-	"type": ["pie", "ring", "rose", "word", "funnel", "map", "arcbar", "line", "column", "bar", "area", "radar", "gauge", "candle", "mix", "tline", "tarea", "scatter", "bubble", "demotype"],
-	"range": ["饼状图", "圆环图", "玫瑰图", "词云图", "漏斗图", "地图", "圆弧进度条", "折线图", "柱状图", "条状图", "区域图", "雷达图", "仪表盘", "K线图", "混合图", "时间轴折线", "时间轴区域", "散点图", "气泡图", "自定义类型"],
-	//增加自定义图表类型，如果需要categories，请在这里加入您的图表类型，例如最后的"demotype"
-	//自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴（矢量x轴）类图表，没有categories，不需要加入categories
-	"categories": ["line", "column", "bar", "area", "radar", "gauge", "candle", "mix", "demotype"],
-	//instance为实例变量承载属性，不要删除
-	"instance": {},
-	//option为opts及eopts承载属性，不要删除
-	"option": {},
-	//下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
-	"formatter": {
-		"yAxisDemo1": function (val) { return val + '元' },
-		"yAxisDemo2": function (val) { return val.toFixed(2) },
-		"xAxisDemo1": function (val) { return val + '年' },
-		"xAxisDemo2": function (val) { return formatDateTime(val, 'h:m') },
-		"seriesDemo1": function (val) { return val + '元' },
-		"tooltipDemo1": function (item, category, index, opts) {
-			if (index == 0) {
-				return '随便用' + item.data + '年'
-			} else {
-				return '其他我没改' + item.data + '天'
-			}
-		},
-		"pieDemo": function (val, index, series) {
-			if (index !== undefined) {
-				return series[index].name + '：' + series[index].data + '元'
-			}
-		},
-	},
-	//这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
-	"demotype": {
-		//我这里把曲线图当做了自定义图表类型，您可以根据需要随意指定类型或配置
-		"type": "line",
-		"color": color,
-		"padding": [15, 10, 0, 15],
-		"xAxis": {
-			"disableGrid": true,
-		},
-		"yAxis": {
-			"gridType": "dash",
-			"dashLength": 2,
-		},
-		"legend": {
-		},
-		"extra": {
-			"line": {
-				"type": "curve",
-				"width": 2
-			},
-		}
-	},
-	//下面是自定义配置，请添加项目所需的通用配置
-	"pie": {
-		"type": "pie",
-		"color": color,
-		"padding": [5, 5, 5, 5],
-		"extra": {
-			"pie": {
-				"activeOpacity": 0.5,
-				"activeRadius": 10,
-				"offsetAngle": 0,
-				"labelWidth": 15,
-				"border": true,
-				"borderWidth": 3,
-				"borderColor": "#FFFFFF"
-			},
-		}
-	},
-	"ring": {
-		"type": "ring",
-		"color": color,
-		"padding": [5, 5, 5, 5],
-		"rotate": false,
-		"dataLabel": true,
-		"legend": {
-			"show": true,
-			"position": "right",
-			"lineHeight": 25,
-		},
-		"title": {
-			"name": "收益率",
-			"fontSize": 15,
-			"color": "#666666"
-		},
-		"subtitle": {
-			"name": "70%",
-			"fontSize": 25,
-			"color": "#7cb5ec"
-		},
-		"extra": {
-			"ring": {
-				"ringWidth": 30,
-				"activeOpacity": 0.5,
-				"activeRadius": 10,
-				"offsetAngle": 0,
-				"labelWidth": 15,
-				"border": true,
-				"borderWidth": 3,
-				"borderColor": "#FFFFFF"
-			},
-		},
-	},
-	"rose": {
-		"type": "rose",
-		"color": color,
-		"padding": [5, 5, 5, 5],
-		"legend": {
-			"show": true,
-			"position": "left",
-			"lineHeight": 25,
-		},
-		"extra": {
-			"rose": {
-				"type": "area",
-				"minRadius": 50,
-				"activeOpacity": 0.5,
-				"activeRadius": 10,
-				"offsetAngle": 0,
-				"labelWidth": 15,
-				"border": false,
-				"borderWidth": 2,
-				"borderColor": "#FFFFFF"
-			},
-		}
-	},
-	"word": {
-		"type": "word",
-		"color": color,
-		"extra": {
-			"word": {
-				"type": "normal",
-				"autoColors": false
-			}
-		}
-	},
-	"funnel": {
-		"type": "funnel",
-		"color": color,
-		"padding": [15, 15, 0, 15],
-		"extra": {
-			"funnel": {
-				"activeOpacity": 0.3,
-				"activeWidth": 10,
-				"border": true,
-				"borderWidth": 2,
-				"borderColor": "#FFFFFF",
-				"fillOpacity": 1,
-				"labelAlign": "right"
-			},
-		}
-	},
-	"map": {
-		"type": "map",
-		"color": color,
-		"padding": [0, 0, 0, 0],
-		"dataLabel": true,
-		"extra": {
-			"map": {
-				"border": true,
-				"borderWidth": 1,
-				"borderColor": "#666666",
-				"fillOpacity": 0.6,
-				"activeBorderColor": "#F04864",
-				"activeFillColor": "#FACC14",
-				"activeFillOpacity": 1
-			},
-		}
-	},
-	"arcbar": {
-		"type": "arcbar",
-		"color": color,
-		"title": {
-			"name": "百分比",
-			"fontSize": 25,
-			"color": "#00FF00"
-		},
-		"subtitle": {
-			"name": "默认标题",
-			"fontSize": 15,
-			"color": "#666666"
-		},
-		"extra": {
-			"arcbar": {
-				"type": "default",
-				"width": 12,
-				"backgroundColor": "#E9E9E9",
-				"startAngle": 0.75,
-				"endAngle": 0.25,
-				"gap": 2
-			}
-		}
-	},
-	"line": {
-		"type": "line",
-		"color": color,
-		"padding": [15, 10, 0, 15],
-		"xAxis": {
-			"disableGrid": true,
-		},
-		"yAxis": {
-			"gridType": "dash",
-			"dashLength": 2,
-		},
-		"legend": {
-		},
-		"extra": {
-			"line": {
-				"type": "straight",
-				"width": 2
-			},
-		}
-	},
-	"tline": {
-		"type": "line",
-		"color": color,
-		"padding": [15, 10, 0, 15],
-		"xAxis": {
-			"disableGrid": false,
-			"boundaryGap": "justify",
-		},
-		"yAxis": {
-			"gridType": "dash",
-			"dashLength": 2,
-			"data": [
-				{
-					"min": 0,
-					"max": 80
-				}
-			]
-		},
-		"legend": {
-		},
-		"extra": {
-			"line": {
-				"type": "curve",
-				"width": 2
-			},
-		}
-	},
-	"tarea": {
-		"type": "area",
-		"color": color,
-		"padding": [15, 10, 0, 15],
-		"xAxis": {
-			"disableGrid": true,
-			"boundaryGap": "justify",
-		},
-		"yAxis": {
-			"gridType": "dash",
-			"dashLength": 2,
-			"data": [
-				{
-					"min": 0,
-					"max": 80
-				}
-			]
-		},
-		"legend": {
-		},
-		"extra": {
-			"area": {
-				"type": "curve",
-				"opacity": 0.2,
-				"addLine": true,
-				"width": 2,
-				"gradient": true
-			},
-		}
-	},
-	"column": {
-		"type": "column",
-		"color": color,
-		"padding": [15, 15, 0, 5],
-		"xAxis": {
-			"disableGrid": true,
-		},
-		"yAxis": {
-			"data": [{ "min": 0 }]
-		},
-		"legend": {
-		},
-		"extra": {
-			"column": {
-				"type": "group",
-				"width": 30,
-				"meterBorde": 1,
-				"meterFillColor": "#FFFFFF",
-				"activeBgColor": "#000000",
-				"activeBgOpacity": 0.08
-			},
-		}
-	},
-	"bar": {
-		"type": "bar",
-		"color": color,
-		"padding": [15, 30, 0, 5],
-		"xAxis": {
-			"boundaryGap": "justify",
-			"disableGrid": false,
-			"min": 0,
-			"axisLine": false
-		},
-		"yAxis": {
-		},
-		"legend": {
-		},
-		"extra": {
-			"bar": {
-				"type": "group",
-				"width": 30,
-				"meterBorde": 1,
-				"meterFillColor": "#FFFFFF",
-				"activeBgColor": "#000000",
-				"activeBgOpacity": 0.08
-			},
-		}
-	},
-	"area": {
-		"type": "area",
-		"color": color,
-		"padding": [15, 15, 0, 15],
-		"xAxis": {
-			"disableGrid": true,
-		},
-		"yAxis": {
-			"gridType": "dash",
-			"dashLength": 2,
-		},
-		"legend": {
-		},
-		"extra": {
-			"area": {
-				"type": "straight",
-				"opacity": 0.2,
-				"addLine": true,
-				"width": 2,
-				"gradient": false
-			},
-		}
-	},
-	"radar": {
-		"type": "radar",
-		"canvasId": "",
-		"canvas2d": false,
-		"background": "none",
-		"animation": true,
-		"timing": "easeOut",
-		"duration": 1000,
-		"color": [
-			"#91CB74",
-			"#1890FF",
-			"#FAC858",
-			"#EE6666",
-			"#73C0DE",
-			"#3CA272",
-			"#FC8452",
-			"#9A60B4",
-			"#ea7ccc"
-		],
-		"padding": [
-			5,
-			5,
-			5,
-			5
-		],
-		"rotate": false,
-		"errorReload": true,
-		"fontSize": 10,
-		"fontColor": "#666666",
-		"enableScroll": false,
-		"touchMoveLimit": 60,
-		"enableMarkLine": false,
-		"dataLabel": false,
-		"dataPointShape": true,
-		"dataPointShapeType": "solid",
-		"tapLegend": true,
-		"legend": {
-			"show": false,
-			"position": "bottom",
-			"float": "center",
-			"padding": 5,
-			"margin": 5,
-			"backgroundColor": "rgba(0,0,0,0)",
-			"borderColor": "rgba(0,0,0,0)",
-			"borderWidth": 0,
-			"fontSize": 13,
-			"fontColor": "#666666",
-			"lineHeight": 25,
-			"hiddenColor": "#CECECE",
-			"itemGap": 10
-		},
-		"extra": {
-			"radar": {
-				"gridType": "radar",
-				"gridColor": "#CCCCCC",
-				"gridCount": 3,
-				"labelColor": "#666666",
-				"opacity": 0.2,
-				"border": false,
-				"borderWidth": 2,
-				"max": 50
-			},
-			"tooltip": {
-				"showBox": true,
-				"showArrow": true,
-				"showCategory": false,
-				"borderWidth": 0,
-				"borderRadius": 0,
-				"borderColor": "#000000",
-				"borderOpacity": 0.7,
-				"bgColor": "#000000",
-				"bgOpacity": 0.7,
-				"gridType": "solid",
-				"dashLength": 4,
-				"gridColor": "#CCCCCC",
-				"fontColor": "#FFFFFF",
-				"splitLine": true,
-				"horizentalLine": false,
-				"xAxisLabel": false,
-				"yAxisLabel": false,
-				"labelBgColor": "#FFFFFF",
-				"labelBgOpacity": 0.7,
-				"labelFontColor": "#666666"
-			}
-		}
-	},
-	"gauge": {
-		"type": "gauge",
-		"color": color,
-		"title": {
-			"name": "66Km/H",
-			"fontSize": 25,
-			"color": "#2fc25b",
-			"offsetY": 50
-		},
-		"subtitle": {
-			"name": "实时速度",
-			"fontSize": 15,
-			"color": "#1890ff",
-			"offsetY": -50
-		},
-		"extra": {
-			"gauge": {
-				"type": "default",
-				"width": 30,
-				"labelColor": "#666666",
-				"startAngle": 0.75,
-				"endAngle": 0.25,
-				"startNumber": 0,
-				"endNumber": 100,
-				"labelFormat": "",
-				"splitLine": {
-					"fixRadius": 0,
-					"splitNumber": 10,
-					"width": 30,
-					"color": "#FFFFFF",
-					"childNumber": 5,
-					"childWidth": 12
-				},
-				"pointer": {
-					"width": 24,
-					"color": "auto"
-				}
-			}
-		}
-	},
-	"candle": {
-		"type": "candle",
-		"color": color,
-		"padding": [15, 15, 0, 15],
-		"enableScroll": true,
-		"enableMarkLine": true,
-		"dataLabel": false,
-		"xAxis": {
-			"labelCount": 4,
-			"itemCount": 40,
-			"disableGrid": true,
-			"gridColor": "#CCCCCC",
-			"gridType": "solid",
-			"dashLength": 4,
-			"scrollShow": true,
-			"scrollAlign": "left",
-			"scrollColor": "#A6A6A6",
-			"scrollBackgroundColor": "#EFEBEF"
-		},
-		"yAxis": {
-		},
-		"legend": {
-		},
-		"extra": {
-			"candle": {
-				"color": {
-					"upLine": "#f04864",
-					"upFill": "#f04864",
-					"downLine": "#2fc25b",
-					"downFill": "#2fc25b"
-				},
-				"average": {
-					"show": true,
-					"name": ["MA5", "MA10", "MA30"],
-					"day": [5, 10, 20],
-					"color": ["#1890ff", "#2fc25b", "#facc14"]
-				}
-			},
-			"markLine": {
-				"type": "dash",
-				"dashLength": 5,
-				"data": [
-					{
-						"value": 2150,
-						"lineColor": "#f04864",
-						"showLabel": true
-					},
-					{
-						"value": 2350,
-						"lineColor": "#f04864",
-						"showLabel": true
-					}
-				]
-			}
-		}
-	},
-	"mix": {
-		"type": "mix",
-		"color": color,
-		"padding": [15, 15, 0, 15],
-		"xAxis": {
-			"disableGrid": true,
-		},
-		"yAxis": {
-			"disabled": false,
-			"disableGrid": false,
-			"splitNumber": 5,
-			"gridType": "dash",
-			"dashLength": 4,
-			"gridColor": "#CCCCCC",
-			"padding": 10,
-			"showTitle": true,
-			"data": []
-		},
-		"legend": {
-		},
-		"extra": {
-			"mix": {
-				"column": {
-					"width": 20
-				}
-			},
-		}
-	},
-	"scatter": {
-		"type": "scatter",
-		"color": color,
-		"padding": [15, 15, 0, 15],
-		"dataLabel": false,
-		"xAxis": {
-			"disableGrid": false,
-			"gridType": "dash",
-			"splitNumber": 5,
-			"boundaryGap": "justify",
-			"min": 0
-		},
-		"yAxis": {
-			"disableGrid": false,
-			"gridType": "dash",
-		},
-		"legend": {
-		},
-		"extra": {
-			"scatter": {
-			},
-		}
-	},
-	"bubble": {
-		"type": "bubble",
-		"color": color,
-		"padding": [15, 15, 0, 15],
-		"xAxis": {
-			"disableGrid": false,
-			"gridType": "dash",
-			"splitNumber": 5,
-			"boundaryGap": "justify",
-			"min": 0,
-			"max": 250
-		},
-		"yAxis": {
-			"disableGrid": false,
-			"gridType": "dash",
-			"data": [{
-				"min": 0,
-				"max": 150
-			}]
-		},
-		"legend": {
-		},
-		"extra": {
-			"bubble": {
-				"border": 2,
-				"opacity": 0.5,
-			},
-		}
-	}
+    //demotype为自定义图表类型，一般不需要自定义图表类型，只需要改根节点上对应的类型即可
+    "type": ["pie", "ring", "rose", "word", "funnel", "map", "arcbar", "line", "column", "bar", "area", "radar",
+        "gauge", "candle", "mix", "tline", "tarea", "scatter", "bubble", "demotype"
+    ],
+    "range": ["饼状图", "圆环图", "玫瑰图", "词云图", "漏斗图", "地图", "圆弧进度条", "折线图", "柱状图", "条状图", "区域图", "雷达图", "仪表盘", "K线图",
+        "混合图", "时间轴折线", "时间轴区域", "散点图", "气泡图", "自定义类型"
+    ],
+    //增加自定义图表类型，如果需要categories，请在这里加入您的图表类型，例如最后的"demotype"
+    //自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴（矢量x轴）类图表，没有categories，不需要加入categories
+    "categories": ["line", "column", "bar", "area", "radar", "gauge", "candle", "mix", "demotype"],
+    //instance为实例变量承载属性，不要删除
+    "instance": {},
+    //option为opts及eopts承载属性，不要删除
+    "option": {},
+    //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
+    "formatter": {
+        "yAxisDemo1": function(val) {
+            return val + '元'
+        },
+        "yAxisDemo2": function(val) {
+            return val.toFixed(2)
+        },
+        "xAxisDemo1": function(val) {
+            return val + '年'
+        },
+        "xAxisDemo2": function(val) {
+            return formatDateTime(val, 'h:m')
+        },
+        "seriesDemo1": function(val) {
+            return val + '元'
+        },
+        "tooltipDemo1": function(item, category, index, opts) {
+            if (index == 0) {
+                return '随便用' + item.data + '年'
+            } else {
+                return '其他我没改' + item.data + '天'
+            }
+        },
+        "pieDemo": function(val, index, series) {
+            if (index !== undefined) {
+                return series[index].name + '：' + series[index].data + '元'
+            }
+        },
+    },
+    //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
+    "demotype": {
+        //我这里把曲线图当做了自定义图表类型，您可以根据需要随意指定类型或配置
+        "type": "line",
+        "color": color,
+        "padding": [15, 10, 0, 15],
+        "xAxis": {
+            "disableGrid": true,
+        },
+        "yAxis": {
+            "gridType": "dash",
+            "dashLength": 2,
+        },
+        "legend": {},
+        "extra": {
+            "line": {
+                "type": "curve",
+                "width": 2
+            },
+        }
+    },
+    //下面是自定义配置，请添加项目所需的通用配置
+    "pie": {
+        "type": "pie",
+        "color": color,
+        "padding": [5, 5, 5, 5],
+        "extra": {
+            "pie": {
+                "activeOpacity": 0.5,
+                "activeRadius": 10,
+                "offsetAngle": 0,
+                "labelWidth": 15,
+                "border": true,
+                "borderWidth": 3,
+                "borderColor": "#FFFFFF"
+            },
+        }
+    },
+    "ring": {
+        "type": "ring",
+        "color": color,
+        "padding": [5, 5, 5, 5],
+        "rotate": false,
+        "dataLabel": true,
+        "legend": {
+            "show": true,
+            "position": "right",
+            "lineHeight": 25,
+        },
+        "title": {
+            "name": "收益率",
+            "fontSize": 15,
+            "color": "#666666"
+        },
+        "subtitle": {
+            "name": "70%",
+            "fontSize": 25,
+            "color": "#7cb5ec"
+        },
+        "extra": {
+            "ring": {
+                "ringWidth": 30,
+                "activeOpacity": 0.5,
+                "activeRadius": 10,
+                "offsetAngle": 0,
+                "labelWidth": 15,
+                "border": true,
+                "borderWidth": 3,
+                "borderColor": "#FFFFFF"
+            },
+        },
+    },
+    "rose": {
+        "type": "rose",
+        "color": color,
+        "padding": [5, 5, 5, 5],
+        "legend": {
+            "show": true,
+            "position": "left",
+            "lineHeight": 25,
+        },
+        "extra": {
+            "rose": {
+                "type": "area",
+                "minRadius": 50,
+                "activeOpacity": 0.5,
+                "activeRadius": 10,
+                "offsetAngle": 0,
+                "labelWidth": 15,
+                "border": false,
+                "borderWidth": 2,
+                "borderColor": "#FFFFFF"
+            },
+        }
+    },
+    "word": {
+        "type": "word",
+        "color": color,
+        "extra": {
+            "word": {
+                "type": "normal",
+                "autoColors": false
+            }
+        }
+    },
+    "funnel": {
+        "type": "funnel",
+        "color": color,
+        "padding": [15, 15, 0, 15],
+        "extra": {
+            "funnel": {
+                "activeOpacity": 0.3,
+                "activeWidth": 10,
+                "border": true,
+                "borderWidth": 2,
+                "borderColor": "#FFFFFF",
+                "fillOpacity": 1,
+                "labelAlign": "right"
+            },
+        }
+    },
+    "map": {
+        "type": "map",
+        "color": color,
+        "padding": [0, 0, 0, 0],
+        "dataLabel": true,
+        "extra": {
+            "map": {
+                "border": true,
+                "borderWidth": 1,
+                "borderColor": "#666666",
+                "fillOpacity": 0.6,
+                "activeBorderColor": "#F04864",
+                "activeFillColor": "#FACC14",
+                "activeFillOpacity": 1
+            },
+        }
+    },
+    "arcbar": {
+        "type": "arcbar",
+        "color": color,
+        "title": {
+            "name": "百分比",
+            "fontSize": 25,
+            "color": "#00FF00"
+        },
+        "subtitle": {
+            "name": "默认标题",
+            "fontSize": 15,
+            "color": "#666666"
+        },
+        "extra": {
+            "arcbar": {
+                "type": "default",
+                "width": 12,
+                "backgroundColor": "#E9E9E9",
+                "startAngle": 0.75,
+                "endAngle": 0.25,
+                "gap": 2
+            }
+        }
+    },
+    "line": {
+        "type": "line",
+        "color": color,
+        "padding": [15, 10, 0, 15],
+        "xAxis": {
+            "disableGrid": true,
+        },
+        "yAxis": {
+            "gridType": "dash",
+            "dashLength": 2,
+        },
+        "legend": {},
+        "extra": {
+            "line": {
+                "type": "straight",
+                "width": 2
+            },
+        }
+    },
+    "tline": {
+        "type": "line",
+        "color": color,
+        "padding": [15, 10, 0, 15],
+        "xAxis": {
+            "disableGrid": false,
+            "boundaryGap": "justify",
+        },
+        "yAxis": {
+            "gridType": "dash",
+            "dashLength": 2,
+            "data": [{
+                "min": 0,
+                "max": 80
+            }]
+        },
+        "legend": {},
+        "extra": {
+            "line": {
+                "type": "curve",
+                "width": 2
+            },
+        }
+    },
+    "tarea": {
+        "type": "area",
+        "color": color,
+        "padding": [15, 10, 0, 15],
+        "xAxis": {
+            "disableGrid": true,
+            "boundaryGap": "justify",
+        },
+        "yAxis": {
+            "gridType": "dash",
+            "dashLength": 2,
+            "data": [{
+                "min": 0,
+                "max": 80
+            }]
+        },
+        "legend": {},
+        "extra": {
+            "area": {
+                "type": "curve",
+                "opacity": 0.2,
+                "addLine": true,
+                "width": 2,
+                "gradient": true
+            },
+        }
+    },
+    "column": {
+        "type": "column",
+        "color": color,
+        "padding": [15, 15, 0, 5],
+        "xAxis": {
+            "disableGrid": true,
+        },
+        "yAxis": {
+            "data": [{
+                "min": 0
+            }]
+        },
+        "legend": {},
+        "extra": {
+            "column": {
+                "type": "group",
+                "width": 30,
+                "meterBorde": 1,
+                "meterFillColor": "#FFFFFF",
+                "activeBgColor": "#000000",
+                "activeBgOpacity": 0.08
+            },
+        }
+    },
+    "bar": {
+        "type": "bar",
+        "color": color,
+        "padding": [15, 30, 0, 5],
+        "xAxis": {
+            "boundaryGap": "justify",
+            "disableGrid": false,
+            "min": 0,
+            "axisLine": false
+        },
+        "yAxis": {},
+        "legend": {},
+        "extra": {
+            "bar": {
+                "type": "group",
+                "width": 30,
+                "meterBorde": 1,
+                "meterFillColor": "#FFFFFF",
+                "activeBgColor": "#000000",
+                "activeBgOpacity": 0.08
+            },
+        }
+    },
+    "area": {
+        "type": "area",
+        "color": [
+            "#34ce98",
+        ],
+        "padding": [15, 15, 0, 15],
+        "xAxis": {
+            "disableGrid": true,
+        },
+        "yAxis": {
+            "gridType": "dash",
+            "dashLength": 2,
+        },
+        "fontColor": "#999",
+        "fontSize":"12",
+        "legend": {},
+        "extra": {
+            "area": {
+                "type": "straight",
+                "opacity": 0.2,
+                "addLine": true,
+                "width": 2,
+                "gradient": false
+            },
+        }
+    },
+    "radar": {
+        "type": "radar",
+        "canvasId": "",
+        "canvas2d": false,
+        "background": "none",
+        "animation": true,
+        "timing": "easeOut",
+        "duration": 1000,
+        "color": [
+            "#91CB74",
+            "#1890FF",
+            "#FAC858",
+            "#EE6666",
+            "#73C0DE",
+            "#3CA272",
+            "#FC8452",
+            "#9A60B4",
+            "#ea7ccc"
+        ],
+        "padding": [
+            5,
+            5,
+            5,
+            5
+        ],
+        "rotate": false,
+        "errorReload": true,
+        "fontSize": 10,
+        "fontColor": "#666666",
+        "enableScroll": false,
+        "touchMoveLimit": 60,
+        "enableMarkLine": false,
+        "dataLabel": false,
+        "dataPointShape": true,
+        "dataPointShapeType": "solid",
+        "tapLegend": true,
+        "legend": {
+            "show": false,
+            "position": "bottom",
+            "float": "center",
+            "padding": 5,
+            "margin": 5,
+            "backgroundColor": "rgba(0,0,0,0)",
+            "borderColor": "rgba(0,0,0,0)",
+            "borderWidth": 0,
+            "fontSize": 13,
+            "fontColor": "#666666",
+            "lineHeight": 25,
+            "hiddenColor": "#CECECE",
+            "itemGap": 10
+        },
+        "extra": {
+            "radar": {
+                "gridType": "radar",
+                "gridColor": "#CCCCCC",
+                "gridCount": 3,
+                "labelColor": "#666666",
+                "opacity": 0.2,
+                "border": false,
+                "borderWidth": 2,
+                "max": 50
+            },
+            "tooltip": {
+                "showBox": true,
+                "showArrow": true,
+                "showCategory": false,
+                "borderWidth": 0,
+                "borderRadius": 0,
+                "borderColor": "#000000",
+                "borderOpacity": 0.7,
+                "bgColor": "#000000",
+                "bgOpacity": 0.7,
+                "gridType": "solid",
+                "dashLength": 4,
+                "gridColor": "#CCCCCC",
+                "fontColor": "#FFFFFF",
+                "splitLine": true,
+                "horizentalLine": false,
+                "xAxisLabel": false,
+                "yAxisLabel": false,
+                "labelBgColor": "#FFFFFF",
+                "labelBgOpacity": 0.7,
+                "labelFontColor": "#666666"
+            }
+        }
+    },
+    "gauge": {
+        "type": "gauge",
+        "color": color,
+        "title": {
+            "name": "66Km/H",
+            "fontSize": 25,
+            "color": "#2fc25b",
+            "offsetY": 50
+        },
+        "subtitle": {
+            "name": "实时速度",
+            "fontSize": 15,
+            "color": "#1890ff",
+            "offsetY": -50
+        },
+        "extra": {
+            "gauge": {
+                "type": "default",
+                "width": 30,
+                "labelColor": "#666666",
+                "startAngle": 0.75,
+                "endAngle": 0.25,
+                "startNumber": 0,
+                "endNumber": 100,
+                "labelFormat": "",
+                "splitLine": {
+                    "fixRadius": 0,
+                    "splitNumber": 10,
+                    "width": 30,
+                    "color": "#FFFFFF",
+                    "childNumber": 5,
+                    "childWidth": 12
+                },
+                "pointer": {
+                    "width": 24,
+                    "color": "auto"
+                }
+            }
+        }
+    },
+    "candle": {
+        "type": "candle",
+        "color": color,
+        "padding": [15, 15, 0, 15],
+        "enableScroll": true,
+        "enableMarkLine": true,
+        "dataLabel": false,
+        "xAxis": {
+            "labelCount": 4,
+            "itemCount": 40,
+            "disableGrid": true,
+            "gridColor": "#CCCCCC",
+            "gridType": "solid",
+            "dashLength": 4,
+            "scrollShow": true,
+            "scrollAlign": "left",
+            "scrollColor": "#A6A6A6",
+            "scrollBackgroundColor": "#EFEBEF"
+        },
+        "yAxis": {},
+        "legend": {},
+        "extra": {
+            "candle": {
+                "color": {
+                    "upLine": "#f04864",
+                    "upFill": "#f04864",
+                    "downLine": "#2fc25b",
+                    "downFill": "#2fc25b"
+                },
+                "average": {
+                    "show": true,
+                    "name": ["MA5", "MA10", "MA30"],
+                    "day": [5, 10, 20],
+                    "color": ["#1890ff", "#2fc25b", "#facc14"]
+                }
+            },
+            "markLine": {
+                "type": "dash",
+                "dashLength": 5,
+                "data": [{
+                        "value": 2150,
+                        "lineColor": "#f04864",
+                        "showLabel": true
+                    },
+                    {
+                        "value": 2350,
+                        "lineColor": "#f04864",
+                        "showLabel": true
+                    }
+                ]
+            }
+        }
+    },
+    "mix": {
+        "type": "mix",
+        "color": color,
+        "padding": [15, 15, 0, 15],
+        "xAxis": {
+            "disableGrid": true,
+        },
+        "yAxis": {
+            "disabled": false,
+            "disableGrid": false,
+            "splitNumber": 5,
+            "gridType": "dash",
+            "dashLength": 4,
+            "gridColor": "#CCCCCC",
+            "padding": 10,
+            "showTitle": true,
+            "data": []
+        },
+        "legend": {},
+        "extra": {
+            "mix": {
+                "column": {
+                    "width": 20
+                }
+            },
+        }
+    },
+    "scatter": {
+        "type": "scatter",
+        "color": color,
+        "padding": [15, 15, 0, 15],
+        "dataLabel": false,
+        "xAxis": {
+            "disableGrid": false,
+            "gridType": "dash",
+            "splitNumber": 5,
+            "boundaryGap": "justify",
+            "min": 0
+        },
+        "yAxis": {
+            "disableGrid": false,
+            "gridType": "dash",
+        },
+        "legend": {},
+        "extra": {
+            "scatter": {},
+        }
+    },
+    "bubble": {
+        "type": "bubble",
+        "color": color,
+        "padding": [15, 15, 0, 15],
+        "xAxis": {
+            "disableGrid": false,
+            "gridType": "dash",
+            "splitNumber": 5,
+            "boundaryGap": "justify",
+            "min": 0,
+            "max": 250
+        },
+        "yAxis": {
+            "disableGrid": false,
+            "gridType": "dash",
+            "data": [{
+                "min": 0,
+                "max": 150
+            }]
+        },
+        "legend": {},
+        "extra": {
+            "bubble": {
+                "border": 2,
+                "opacity": 0.5,
+            },
+        }
+    }
 }
 
-export default cfu;
\ No newline at end of file
+export default cfu;

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 2/4] =?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>

From 7d85dadbe6e7c40dd27fab711791a35ccc11d2f4 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Fri, 11 Feb 2022 17:47:27 +0800
Subject: [PATCH 3/4] ...

---
 pages/im/components/messageCell.vue | 7 ++++++-
 pages/im/components/showText.nvue   | 9 +++++----
 pages/im/group/chat.nvue            | 3 ++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pages/im/components/messageCell.vue b/pages/im/components/messageCell.vue
index bb6bfd4..16773e0 100644
--- a/pages/im/components/messageCell.vue
+++ b/pages/im/components/messageCell.vue
@@ -6,7 +6,7 @@
         </view>
         <view class="content">
             <view class="header">
-                <view class="name">{{ contact(item.targetId).name }}</view>
+                <view class="name">{{ contact(item.targetId).name }} <span v-if="item.conversationType === 3" class='qun'>[群]</span></view>
                 <view class="time">{{ item.sentTime|timeCustomCN }}</view>
             </view>
             <message-preview class="preview" :msg="item.latestMessage" :conversationType="item.conversationType"
@@ -71,6 +71,11 @@
                     font-size: $title-size + 2;
                     color: #454545;
                     color: #454545;
+                    .qun{
+                        color: $main-color;
+                        font-size: $title-size-m;
+                        margin-left: 4px;
+                    }
                 }
 
                 .time {
diff --git a/pages/im/components/showText.nvue b/pages/im/components/showText.nvue
index ddf2456..cfe4eb6 100644
--- a/pages/im/components/showText.nvue
+++ b/pages/im/components/showText.nvue
@@ -28,16 +28,17 @@
 <style scoped lang="scss">
     .msg--text {
         .name {
-            font-size: 24rpx;
-            line-height: 34rpx;
+            font-size: 26rpx;
+            padding-bottom: 10rpx;
             color: $text-gray-m;
         }
 
         .im--text {
-            max-width: 500rpx;
+            max-width: 508rpx;
             padding: 20rpx;
-            line-height: 44rpx;
+            line-height: 46rpx;
             font-size: 32rpx;
+            color: $text-color;
 
             &.left {
                 border-radius: 0 20rpx 20rpx 20rpx;
diff --git a/pages/im/group/chat.nvue b/pages/im/group/chat.nvue
index b60dfe4..332a9ec 100644
--- a/pages/im/group/chat.nvue
+++ b/pages/im/group/chat.nvue
@@ -126,7 +126,8 @@
                 .cell-item {
                     width: 690rpx;
                     justify-content: flex-start;
-
+                    align-items: flex-start;
+                    margin-top: 20rpx;
 
                     &.left {
                         flex-direction: row;

From 4b59804633dbcab1d6fcaca7d6013e40add91213 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Fri, 11 Feb 2022 17:51:41 +0800
Subject: [PATCH 4/4] ...

---
 pages/im/components/showImage.nvue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pages/im/components/showImage.nvue b/pages/im/components/showImage.nvue
index 52a1c68..af297cc 100644
--- a/pages/im/components/showImage.nvue
+++ b/pages/im/components/showImage.nvue
@@ -49,20 +49,21 @@
     .name {
         font-size: 24rpx;
         line-height: 34rpx;
-        color: $text-gray-m;
+        color: $text-gray-m;
+        padding-bottom: 10rpx;
     }
     
     .msg--image {
-        padding: 20rpx;
+        // padding: 20rpx;
 
         &.left {
             border-radius: 0 20rpx 20rpx 20rpx;
-            background: white;
+            // background: white;
         }
 
         &.right {
             border-radius: 20rpx 0 20rpx 20rpx;
-            background: #34CE98;
+            // background: #34CE98;
         }
 
         .img {