From 7c965b7bfca1f911e5d17e6cecf0e6411bb86a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Fri, 14 Jan 2022 12:43:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json      |  7 ++++++-
 package.json           |  2 +-
 pages.json             | 16 ++++++++--------
 pages/im/index.vue     |  4 ++++
 pages/record/foods.vue |  6 +-----
 pages/user/index.vue   | 15 ++++++++++-----
 6 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 88ca34b..f939534 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -172,6 +172,11 @@
 			"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
 			"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
 		},
+		"moment": {
+			"version": "2.29.1",
+			"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+			"integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
+		},
 		"randombytes": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -211,4 +216,4 @@
 			"integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index d94311f..429be0a 100644
--- a/package.json
+++ b/package.json
@@ -23,4 +23,4 @@
   },
   "author": "唐明明",
   "license": "ISC"
-}
\ No newline at end of file
+}
diff --git a/pages.json b/pages.json
index a97dd07..daa3269 100644
--- a/pages.json
+++ b/pages.json
@@ -27,8 +27,8 @@
 			"path": "pages/record/index",
 			"name": "Record",
 			"style": {
-				"navigationBarTitleText": "记录",
-				"navigationStyle": "custom"
+				"navigationBarTitleText": "记录"
+				// "navigationStyle": "custom"
 			}
 		},
 		{
@@ -739,17 +739,17 @@
 				"selectedIconPath": "static/tabBar/tabBar_show_00.png",
 				"pagePath": "pages/index/index",
 				"text": "健康"
+			},
+			{
+				"iconPath": "static/tabBar/tabBar_02.png",
+				"selectedIconPath": "static/tabBar/tabBar_show_02.png",
+				"pagePath": "pages/store/index",
+				"text": "好物"
 			},
 			{
 				"iconPath": "static/tabBar/tabBar_01.png",
 				"selectedIconPath": "static/tabBar/tabBar_show_01.png",
 				"pagePath": "pages/service/index",
-				"text": "服务"
-			},
-			{
-				"iconPath": "static/tabBar/tabBar_02.png",
-				"selectedIconPath": "static/tabBar/tabBar_show_02.png",
-				"pagePath": "pages/store/index",
 				"text": "生活"
 			},
 			{
diff --git a/pages/im/index.vue b/pages/im/index.vue
index 9e8ee58..9140551 100644
--- a/pages/im/index.vue
+++ b/pages/im/index.vue
@@ -44,6 +44,10 @@
 					</view>
 				</view>
 			</view>
+			
+			<view @click="$Router.push({name: 'Record'})">
+				临时记录
+			</view>
 		</block>
 	</view>
 </template>
diff --git a/pages/record/foods.vue b/pages/record/foods.vue
index 9f65821..9c45b18 100644
--- a/pages/record/foods.vue
+++ b/pages/record/foods.vue
@@ -141,11 +141,7 @@
 <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 { plans, editHealthFoods, delHealthFoods } from "@/apis/interfaces/foods.js";
 import moment from "moment";
 import addFoods from "@/components/add-goods-template/add-goods-template";
 export default {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 382a52a..62a93dc 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -37,16 +37,16 @@
 			<view class="btn" @click="openVip">开通</view>
 		</view>
 		<!-- 健康数据 -->
-		<view class="health-flex">
+		<view class="health-flex" v-if="userInfo.has_record">
 			<view class="health-flex-item">
 				<view class="title">
 					体脂率
 					<image class="icon" src="@/static/user/icon_04.png" mode="widthFix"></image>
 				</view>
 				<view class="num">
-					22<text>%</text>
+					{{userInfo.record.fat.fat}}<text>%</text>
 				</view>
-				<view class="hith">处于正常范围</view>
+				<view class="hith">{{userInfo.record.fat.text}}</view>
 			</view>
 			<view class="health-flex-item">
 				<view class="title">
@@ -54,9 +54,9 @@
 					<image class="icon" src="@/static/user/icon_05.png" mode="widthFix"></image>
 				</view>
 				<view class="num">
-					78.0<text>KG</text>
+					{{userInfo.record.weight.weight}}<text>KG</text>
 				</view>
-				<view class="hith">你上周减少1.2kg</view>
+				<view class="hith">{{userInfo.record.weight.text}}</view>
 			</view>
 		</view>
 		<!-- 订单 -->
@@ -135,6 +135,7 @@
 			getInfo(){
 				if(this.$store.state.token === '') return
 				info().then(res => {
+					console.log(res)
 					uni.setNavigationBarTitle({
 						title: res.nickname
 					})
@@ -200,6 +201,10 @@
 			},
 			// 退出登录
 			logOut(){
+				this.userInfo = {
+					nickname: "",
+					avatar	: ""
+				}
 				this.$store.commit('setToken', '')
 			}
 		}