perfect

.gitignore

@@ -1 +0,0 @@
-unpackage

App.vue

@@ -8,22 +8,7 @@
 		},
 		onHide: function() {
 			console.log('App Hide')
-		},
-		globeData:
-		{
-			gender:-1,
-			weight:-1,
-			high:-1,
-			age:-1,
-			waist:-1,
-			bmr:-1,
-			calorie:-1,
-			heartRate:-1,
-			lowestHeartRate:-1,
-			highestHeartRate:-1,
-			fatWeight:-1,
-			fatRate:-1,
-		},
+		}
 	}
 </script>
 

manifest.json

@@ -74,9 +74,14 @@
             "base" : "./",
             "mode" : "history"
         },
-        "title" : "宁哥减脂助手",
         "devServer" : {
             "port" : 9967
-        }
+        },
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
+            }
+        },
+        "title" : "宁哥减脂助手"
     }
 }

package.json

@@ -0,0 +1,109 @@
+{
+  "name": "ninggeassistant",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "serve": "npm run dev:h5",
+    "build": "npm run build:h5",
+    "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
+    "build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
+    "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
+    "build:mp-360": "cross-env NODE_ENV=production UNI_PLATFORM=mp-360 vue-cli-service uni-build",
+    "build:mp-alipay": "cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build",
+    "build:mp-baidu": "cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build",
+    "build:mp-jd": "cross-env NODE_ENV=production UNI_PLATFORM=mp-jd vue-cli-service uni-build",
+    "build:mp-kuaishou": "cross-env NODE_ENV=production UNI_PLATFORM=mp-kuaishou vue-cli-service uni-build",
+    "build:mp-lark": "cross-env NODE_ENV=production UNI_PLATFORM=mp-lark vue-cli-service uni-build",
+    "build:mp-qq": "cross-env NODE_ENV=production UNI_PLATFORM=mp-qq vue-cli-service uni-build",
+    "build:mp-toutiao": "cross-env NODE_ENV=production UNI_PLATFORM=mp-toutiao vue-cli-service uni-build",
+    "build:mp-weixin": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build",
+    "build:mp-xhs": "cross-env NODE_ENV=production UNI_PLATFORM=mp-xhs vue-cli-service uni-build",
+    "build:quickapp-native": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp-native vue-cli-service uni-build",
+    "build:quickapp-webview": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp-webview vue-cli-service uni-build",
+    "build:quickapp-webview-huawei": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp-webview-huawei vue-cli-service uni-build",
+    "build:quickapp-webview-union": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp-webview-union vue-cli-service uni-build",
+    "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch",
+    "dev:custom": "cross-env NODE_ENV=development uniapp-cli custom",
+    "dev:h5": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve",
+    "dev:mp-360": "cross-env NODE_ENV=development UNI_PLATFORM=mp-360 vue-cli-service uni-build --watch",
+    "dev:mp-alipay": "cross-env NODE_ENV=development UNI_PLATFORM=mp-alipay vue-cli-service uni-build --watch",
+    "dev:mp-baidu": "cross-env NODE_ENV=development UNI_PLATFORM=mp-baidu vue-cli-service uni-build --watch",
+    "dev:mp-jd": "cross-env NODE_ENV=development UNI_PLATFORM=mp-jd vue-cli-service uni-build --watch",
+    "dev:mp-kuaishou": "cross-env NODE_ENV=development UNI_PLATFORM=mp-kuaishou vue-cli-service uni-build --watch",
+    "dev:mp-lark": "cross-env NODE_ENV=development UNI_PLATFORM=mp-lark vue-cli-service uni-build --watch",
+    "dev:mp-qq": "cross-env NODE_ENV=development UNI_PLATFORM=mp-qq vue-cli-service uni-build --watch",
+    "dev:mp-toutiao": "cross-env NODE_ENV=development UNI_PLATFORM=mp-toutiao vue-cli-service uni-build --watch",
+    "dev:mp-weixin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch",
+    "dev:mp-xhs": "cross-env NODE_ENV=development UNI_PLATFORM=mp-xhs vue-cli-service uni-build --watch",
+    "dev:quickapp-native": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-native vue-cli-service uni-build --watch",
+    "dev:quickapp-webview": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview vue-cli-service uni-build --watch",
+    "dev:quickapp-webview-huawei": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview-huawei vue-cli-service uni-build --watch",
+    "dev:quickapp-webview-union": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview-union vue-cli-service uni-build --watch",
+    "info": "node node_modules/@dcloudio/vue-cli-plugin-uni/commands/info.js",
+    "serve:quickapp-native": "node node_modules/@dcloudio/uni-quickapp-native/bin/serve.js",
+    "test:android": "cross-env UNI_PLATFORM=app-plus UNI_OS_NAME=android jest -i",
+    "test:h5": "cross-env UNI_PLATFORM=h5 jest -i",
+    "test:ios": "cross-env UNI_PLATFORM=app-plus UNI_OS_NAME=ios jest -i",
+    "test:mp-baidu": "cross-env UNI_PLATFORM=mp-baidu jest -i",
+    "test:mp-weixin": "cross-env UNI_PLATFORM=mp-weixin jest -i"
+  },
+  "dependencies": {
+    "@dcloudio/uni-app-plus": "^2.0.1-34720220422002",
+    "@dcloudio/uni-h5": "^2.0.1-34720220422002",
+    "@dcloudio/uni-helper-json": "*",
+    "@dcloudio/uni-i18n": "^2.0.1-34720220422002",
+    "@dcloudio/uni-mp-360": "^2.0.1-34720220422002",
+    "@dcloudio/uni-mp-alipay": "^2.0.1-34720220422002",
+    "@dcloudio/uni-mp-baidu": "^2.0.1-34720220422002",
+    "@dcloudio/uni-mp-jd": "^2.0.1-34720220422002",
+    "@dcloudio/uni-mp-kuaishou": "^2.0.1-34720220422002",
+    "@dcloudio/uni-mp-lark": "^2.0.1-34720220422002",
+    "@dcloudio/uni-mp-qq": "^2.0.1-34720220422002",
+    "@dcloudio/uni-mp-toutiao": "^2.0.1-34720220422002",
+    "@dcloudio/uni-mp-vue": "^2.0.1-34720220422002",
+    "@dcloudio/uni-mp-weixin": "^2.0.1-34720220422002",
+    "@dcloudio/uni-mp-xhs": "^2.0.1-34720220422002",
+    "@dcloudio/uni-quickapp-native": "^2.0.1-34720220422002",
+    "@dcloudio/uni-quickapp-webview": "^2.0.1-34720220422002",
+    "@dcloudio/uni-stat": "^2.0.1-34720220422002",
+    "@vue/shared": "^3.0.0",
+    "core-js": "^3.6.5",
+    "flyio": "^0.6.2",
+    "regenerator-runtime": "^0.12.1",
+    "vue": "^2.6.11",
+    "vuex": "^3.2.0"
+  },
+  "devDependencies": {
+    "@babel/runtime": "~7.17.9",
+    "@dcloudio/types": "^2.6.7",
+    "@dcloudio/uni-automator": "^2.0.1-34720220422002",
+    "@dcloudio/uni-cli-i18n": "^2.0.1-34720220422002",
+    "@dcloudio/uni-cli-shared": "^2.0.1-34720220422002",
+    "@dcloudio/uni-migration": "^2.0.1-34720220422002",
+    "@dcloudio/uni-template-compiler": "^2.0.1-34720220422002",
+    "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.1-34720220422002",
+    "@dcloudio/vue-cli-plugin-uni": "^2.0.1-34720220422002",
+    "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.1-34720220422002",
+    "@dcloudio/webpack-uni-mp-loader": "^2.0.1-34720220422002",
+    "@dcloudio/webpack-uni-pages-loader": "^2.0.1-34720220422002",
+    "@vue/cli-plugin-babel": "~4.5.13",
+    "@vue/cli-service": "~4.5.13",
+    "babel-plugin-import": "^1.11.0",
+    "cross-env": "^7.0.2",
+    "jest": "^25.4.0",
+    "mini-types": "*",
+    "miniprogram-api-typings": "*",
+    "postcss-comment": "^2.0.0",
+    "vue-template-compiler": "^2.6.11"
+  },
+  "browserslist": [
+    "Android >= 4.4",
+    "ios >= 9"
+  ],
+  "resolutions": {
+    "@babel/runtime": "~7.17.9"
+  },
+  "uni-app": {
+    "scripts": {}
+  }
+}

pages/basalMetabolism/basalMetabolism.vue

@@ -4,27 +4,43 @@
 		<view class="back" @click="onBack(0, $event)">
 			<image src="/static/backArrow.png" mode="aspectFit" style="width:100%"></image>
 		</view>
+		<view class="blue" @click="onHelp(0, $event)">
+			<image src="/static/home/blue.png" mode="aspectFit" style="width:100%"></image>
+		</view>
 		
 		<view class="content">
 			
-			<text class="result-area">{{result}}</text>
-			<button class="help" @click="onHelp(0, $event)">宁哥笔记</button>
+			<view class="result-area">
+				<view class="border">
+					<image class="item-logo" src="../../static/home/basalMetabolismLogo.png" mode=""></image>
+					<view class="">
+						{{result}}
+					</view>
+					<!-- <view class="">
+						基础代谢率
+					</view> -->
+				</view>
+			</view>
+			<!-- <button class="help" @click="onHelp(0, $event)">宁哥笔记</button> -->
 			
 			<view class="input-area">
-				<view class="weight">
-					<view class="input-title">体重 : </view>
-					<!-- <input  class="input" type="number"  placeholder="请输入体重" v-model="weight" @input="onInput(0, $event)" :value="weight"/> -->
-					<input  class="input" type="number"  placeholder="请输入体重" v-model="weight" />
+				<view class="age">
+					<view class="input-title">年龄 : </view>
+					<input  class="input" type="number"  placeholder="请输入年龄" v-model="age" />
+					<text class="Company">岁</text>
 				</view>
 				
 				<view class="high">
 					<view class="input-title">身高 : </view>
 					<input  class="input" type="number"  placeholder="请输入身高" v-model="high" />
+					<text class="Company">厘米</text>
 				</view>
 				
-				<view class="age">
-					<view class="input-title">年龄 : </view>
-					<input  class="input" type="number"  placeholder="请输入年龄" v-model="age" />
+				<view class="weight">
+					<view class="input-title">体重 : </view>
+					<!-- <input  class="input" type="number"  placeholder="请输入体重" v-model="weight" @input="onInput(0, $event)" :value="weight"/> -->
+					<input  class="input" type="number"  placeholder="请输入体重" v-model="weight" />
+					<text class="Company">公斤</text>
 				</view>
 			</view>
 			
@@ -43,15 +59,13 @@
 				age:-1,
 				//基础代谢率
 				bmr:-1,
-				result:'',
+				result:'0',
 			}
 		},
 		onLoad() {
-			
 			this.weight = 0;
 			this.high = 0;
 			this.age = 0;
-			
 			// console.log('gender=',getApp().globalData.gender)
 			// console.log('weight=',getApp().globalData.weight)
 			// console.log('high=',getApp().globalData.high)
@@ -81,7 +95,7 @@
 			},
 			onHelp: function(id,e) {
 				uni.navigateTo({
-					url: '/pages/bodyFatRatio/help',
+					url: '/pages/basalMetabolism/help',
 					animationType: 'slide-in-left',
 					animationDuration: 2000,
 					success: res => {},
@@ -99,16 +113,23 @@
 					getApp().globalData.high = this.high;					
 					getApp().globalData.age = this.age;
 					
+					// if(gender == 0)
+					// {
+					// 	this.bmr = 66+(13.7*this.weight)+(5*this.high)-(6.8*this.age);
+					// }
+					// else
+					// {
+					// 	this.bmr = 655+(9.6*this.weight)+(1.8*this.high)-(4.7*this.age);
+					// }
 					if(gender == 0)
 					{
-						this.bmr = 66+(13.7*this.weight)+(5*this.high)-(6.8*this.age);
+						this.bmr = (655+(9.6*this.weight)+(1.8*this.high)-(4.7*this.age));
 					}
 					else
 					{
-						this.bmr = 655+(9.6*this.weight)+(1.8*this.high)-(4.7*this.age);
+						this.bmr = (66+(13.7*this.weight)+(5*this.high)-(6.8*this.age));
 					}
-					
-					this.result = '你的基础代谢率为： '+ Math.round(this.bmr);
+					this.result = '你的基础代谢率为： '+ Math.round(this.bmr) + '千卡';
 					
 					getApp().globalData.bmr = this.bmr;
 				}
@@ -146,7 +167,6 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
 		width:100%;
 		height: 100vh; 
 	}
@@ -156,36 +176,42 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
 		width: 100%;
-		height: 10%;
-		
+		height: 8%;
 		font-weight: 700;
 		color: white;
-		
+		font-size: 37rpx;
 		background-color: rgb(115,164,164);
 	}
+	
 	.back{
 		position: absolute;
-		
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
-		width: 2%;
-		height: 2%;
-		top: 3%;
-		left: 1%;
+		width: 3%;
+		height: 3%;
+		top: 2%;
+		left: 3%;
 		//testing
 		// border: 1px solid rgb(255,0,0);
 	}
 	
+	.blue{
+		position: absolute;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 7%;
+		height: 7%;
+		top: -1%;
+		right: 3%;
+	}
 	.content{
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
 		width:100%;
 		height:100%;
 	}
@@ -194,13 +220,35 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
-		width:60%;
+		width:90%;
 		height:30%;
 		margin: 1%;
-		
 		border-radius: 25rpx;
 		background-color: rgb(115,164,164);
+		text-align: center;
+		font-size: 44rpx;
+		font-weight: 700;
+		color: #4D857C;
+		image{
+			margin-top: 10%;
+		}
+		.border{
+			border: 2rpx solid #F4F4F4;
+			height: 90%;
+			width: 90%;
+			border-radius: 25rpx;
+			view{
+				margin-top: 5%;
+			}
+		}
+	}
+	
+	.item-logo
+	{
+		z-index: 4;
+		height: 20%;
+		width: 15%;
+		// margin: 1%;
 	}
 	
 	.help{
@@ -208,28 +256,32 @@
 		background-color: rgb(0,0,0);
 	}
 	
+	
 	.input-area{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		
-		width:60%;
+		width:90%;
 		height:60%;
 		margin: 1%;
-		
+		font-size: 46rpx;
+		view{
+			height: 160rpx;
+			line-height: 160rpx;
+		}
 		.weight{
 			display: flex;
 			flex-direction: row;
 			align-items: center;
 			justify-content: center;
-			
 			width:100%;
-			height:100%;
 			margin: 1%;
-			
 			border-radius: 25rpx;
-			background-color: rgb(115,164,164);
+			background: #FEEBEA;
+			color: #7B784E;
+			font-weight: bold;
+			input{
+				width: 75%;
+				background: #FBCDCC;
+				border-radius: 20rpx;
+			}
 		}
 		
 		.high{
@@ -237,13 +289,17 @@
 			flex-direction: row;
 			align-items: center;
 			justify-content: center;
-			
 			width:100%;
-			height:100%;
 			margin: 1%;
-			
 			border-radius: 25rpx;
-			background-color: rgb(115,164,164);
+			background: #FBF0EA;
+			color: #7B784E;
+			font-weight: bold;
+			input{
+				width: 75%;
+				background: #F5DACB;
+				border-radius: 20rpx;
+			}
 		}
 		
 		.age{
@@ -251,13 +307,20 @@
 			flex-direction: row;
 			align-items: center;
 			justify-content: center;
-			
 			width:100%;
-			height:100%;
-			margin: 3%;
-			
 			border-radius: 25rpx;
-			background-color: rgb(115,164,164);
+			background: #EFEEE7;
+			color: #7B784E;
+			font-weight: bold;
+			input{
+				width: 75%;
+				background: #D8D7C5;
+				border-radius: 20rpx;
+			}
+		}
+		.Company{
+			position: absolute;
+			right: 15%;
 		}
 		
 		.input-title{
@@ -265,21 +328,12 @@
 			// border: 1px solid rgb(255,0,0);
 		}
 		.input{
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			background: #F4F4F4;
-			border-radius: 4upx;
-			height: 70upx;
-			font-size: 28upx;
-			line-height: 70upx;
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #848484;
-			
 			text-align:center;
-			
-			margin: 1%;
+			font-size: 46rpx;
+			height: 100rpx;
 		}
 	}
 	
@@ -288,10 +342,14 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
-		width:10%;
-		height:10%;
+		width:90%;
+		height:7%;
 		margin: 1%;
+		background: #B6D4CF;
+		border-radius: 24rpx;
+		color: #4D857C;
+		font-weight: bold;
+		font-size: 49rpx;
 	}
 
 </style>

pages/basalMetabolism/help.vue

@@ -1,18 +1,25 @@
 <template>
 	<view class="container">
-		<view class="navigation-bar">基础代谢率</view>
+		<view class="navigation-bar">每日消耗总热量</view>
 		<view class="back" @click="onBack(0, $event)">
 			<image src="/static/backArrow.png" mode="aspectFit" style="width:100%"></image>
 		</view>
 		<view class="content">
-			<view class="block">
-				基础代谢率是指你一天躺在床上不动，但不睡觉身体维持生命所需消耗的热量
-			</view>
-			<view class="block">
-				男：66+（13.7x体重kg）+（5x身高cm）-（6.8x年龄）= BMR
-			</view>
-			<view class="block">
-				女：655+（9.6x体重kg）+（1.8x身高cm）-（4.7x年龄）= BMR
+			<view class="" style="position: relative; margin-top: 100rpx;">
+				<view class="title">
+					基础代谢简称
+				</view>
+				<view class="explain">
+					<view class="">
+						基础代谢率是指你一天躺在床上不动，但不睡觉身体维持生命所需消耗的热量
+					</view>
+					<view class="">
+						男：66+（13.7x体重kg）+（5x身高cm）-（6.8x年龄）= BMR
+					</view>
+					<view class="">
+						女：655+（9.6x体重kg）+（1.8x身高cm）-（4.7x年龄）= BMR
+					</view>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -45,7 +52,6 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
 		width:100%;
 		height: 100vh; 
 	}
@@ -55,42 +61,60 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
 		width: 100%;
-		height: 10%;
-		
+		height: 6%;
 		font-weight: 700;
 		color: white;
-		
+		font-size: 44rpx;
 		background-color: rgb(115,164,164);
 	}
+	
 	.back{
 		position: absolute;
-		
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
 		width: 2%;
 		height: 2%;
-		top: 3%;
+		top: 2%;
 		left: 1%;
 		//testing
 		// border: 1px solid rgb(255,0,0);
 	}
 	
+	
 	.content{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		
+		// display: flex;
 		width:100%;
 		height:100%;
+		// justify-content: center;
+		color: #A66640;
+		font-weight: bold;
+		font-size: 30rpx;
 	}
-	
-	.block
-	{
-		margin: 2%;
+	.title{
+		text-align: center;
+		background-image: url("../../static/home/title2.png");
+		background-repeat: no-repeat;
+		height: 177rpx;
+		line-height: 177rpx;
+		background-position: center;
+		position: absolute;
+		width: 100%;
+		top: -100rpx;
+		background-size: 70%;
+		font-size: 30rpx;
+	}
+	.explain{
+		width: 85%;
+		border: 10rpx solid #7ABDB1;
+		border-radius: 5rpx;
+		margin: auto;
+		background: #E6EFED;
+		padding: 50rpx 20rpx;
+		color: #4D857C;
+		view{
+			line-height: 50rpx;
+		}
 	}
 </style>

pages/bodyFatRatio/bodyFatRatio.vue

@@ -5,20 +5,40 @@
 			<image src="/static/backArrow.png" mode="aspectFit" style="width:100%"></image>
 		</view>
 		
+		<view class="blue" @click="onHelp(0, $event)">
+			<image src="/static/home/blue.png" mode="aspectFit" style="width:100%"></image>
+		</view>
 		<view class="content">
 			
-			<text class="result-area">{{result}}</text>
-			<button class="help" @click="onHelp(0, $event)">宁哥笔记</button>
+			<!-- <text class="result-area">{{result}}</text> -->
+			
+			<view class="result-area">
+				<view class="border">
+					<image class="item-logo" src="../../static/home/bodyFatRatioLogo.png" mode=""></image>
+					<view class="">
+						{{result1}}
+					</view>
+					<view class="">
+						{{result2}}
+					</view>
+					<!-- <view class="">
+						脂肪总重量/体脂率
+					</view> -->
+				</view>
+			</view>
+			<!-- <button class="help" @click="onHelp(0, $event)">宁哥笔记</button> -->
 			
 			<view class="input-area">
 				<view class="waistline">
 					<view class="input-title">腰围 : </view>
 					<input  class="input" type="number"  placeholder="请输入腰围" v-model="waistline" />
+					<text class="Company">厘米</text>
 				</view>
 				
 				<view class="weight">
 					<view class="input-title">体重 : </view>
 					<input  class="input" type="number"  placeholder="请输入体重" v-model="weight" />
+					<text class="Company">公斤</text>
 				</view>
 			</view>
 			
@@ -34,7 +54,8 @@
 			return {
 				waistline:-1,
 				weight:-1,
-				result:'',
+				result1:'',
+				result2:'',
 			}
 		},
 		onLoad() {
@@ -82,20 +103,36 @@
 					//体脂率=（身体脂肪总量÷体重）
 					let fatRate = -1;
 					
+					// if(getApp().globalData.gender)
+					// {
+					// 	fatWeight = this.waistline - (this.weight*0.082+34.89);
+					// 	fatRate = fatWeight/this.weight * 100;
+					// }
+					// else
+					// {
+					// 	fatWeight = this.waistline - (this.weight*0.082+44.74);
+					// 	fatRate = fatWeight/this.weight * 100;
+					// }
 					if(getApp().globalData.gender)
-					{
-						fatWeight = this.waistline - (this.weight*0.082+34.89);
-						fatRate = fatWeight/this.weight * 100;
+					{//男
+						fatWeight = (Number(this.waistline*0.74) - Number(this.weight*0.082+44.74));
+						fatRate = fatWeight/this.weight* 100;
 					}
 					else
-					{
-						fatWeight = this.waistline - (this.weight*0.082+44.74);
+					{//女
+						fatWeight = (Number(this.waistline*0.74) - Number(this.weight*0.082+34.89));
 						fatRate = fatWeight/this.weight * 100;
 					}
-					
 				
-					this.result = '身体脂肪总重量： '+ Math.round(fatWeight) + '千克\n' + '体脂率： '+ Math.round(fatRate)+'%';
-					
+					console.log('Number(this.waistline*0.74)=',Number(this.waistline*0.74))
+					console.log('Number(this.weight*0.082+34.89)=',Number(this.weight*0.082+34.89));
+					console.log('fatWeight=',fatWeight);
+					console.log('fatRate=',fatRate);
+				
+					// this.result = '身体脂肪总重量： '+ Math.round(fatWeight) + '公斤\n' + '体脂率： '+ Math.round(fatRate*100)/100+'%';
+					this.result1 = '身体脂肪总重量： '+ Math.round(fatWeight) + '公斤';
+					this.result2 = '体脂率： '+ Math.round(fatRate*100)/100+'%';
+					// this.result = '你的最低有氧心率： '+ Math.round(lowestHeartRate) + '(次/分)\n' + '最高有氧心率： '+ Math.round(highestHeartRate)+ '(次/分)';
 					getApp().globalData.fatWeight = this.fatWeight;
 					getApp().globalData.fatRate = this.fatRate;
 				}
@@ -143,30 +180,44 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
 		width: 100%;
-		height: 10%;
-		
+		height: 8%;
 		font-weight: 700;
 		color: white;
-		
-		background-color: rgb(115,164,164);
+		font-size: 37rpx;
+		background-color: #C9C7AF;
+	}
+	
+	.item-logo
+	{
+		z-index: 4;
+		height: 21%;
+		width: 15%;
+		// margin: 1%;
 	}
 	.back{
 		position: absolute;
-		
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
-		width: 2%;
-		height: 2%;
-		top: 3%;
-		left: 1%;
+		width: 3%;
+		height: 3%;
+		top: 2%;
+		left: 3%;
 		//testing
 		// border: 1px solid rgb(255,0,0);
 	}
 	
+	.blue{
+		position: absolute;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 7%;
+		height: 7%;
+		top: -1%;
+		right: 3%;
+	}
 	.content{
 		display: flex;
 		flex-direction: column;
@@ -181,42 +232,59 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
-		width:60%;
+		width:95%;
 		height:30%;
 		margin: 1%;
-		
 		border-radius: 25rpx;
-		background-color: rgb(115,164,164);
+		background-color: #C9C7AF;
+		text-align: center;
+		font-size: 44rpx;
+		font-weight: 700;
+		color: #7B784E;
+		image{
+			margin-top: 10%;
+		}
+		.border{
+			border: 4rpx solid #F4F4F4;
+			height: 90%;
+			width: 90%;
+			border-radius: 25rpx;
+			view{
+				margin-top: 5%;
+			}
+		}
 	}
 	
+	
 	.help{
 		color: azure;
 		background-color: rgb(0,0,0);
 	}
 	
 	.input-area{
-		display: flex;
+		// display: flex;
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
-		width:60%;
+		width:95%;
 		height:60%;
 		margin: 1%;
-		
+		font-size: 40rpx;
+		font-weight: bold;
+			
 		.waistline{
 			display: flex;
 			flex-direction: row;
 			align-items: center;
 			justify-content: center;
-			
 			width:100%;
-			height:100%;
+			height:20%;
 			margin: 1%;
-			
 			border-radius: 25rpx;
-			background-color: rgb(115,164,164);
+			background: #FBF0EA;
+			input{
+				background: #F5DACB;
+			}
 		}
 		
 		.weight{
@@ -224,13 +292,14 @@
 			flex-direction: row;
 			align-items: center;
 			justify-content: center;
-			
 			width:100%;
-			height:100%;
-			margin: 3%;
-			
+			height:20%;
+			margin-top: 3%;
 			border-radius: 25rpx;
-			background-color: rgb(115,164,164);
+			background: #FEEBEA;
+			input{
+				background: #FBCDCC;
+			}
 		}
 		
 		.input-title{
@@ -249,10 +318,13 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #848484;
-			
 			text-align:center;
-			
 			margin: 1%;
+			width: 75%;
+			height: 120rpx;
+			background: #D8D7C5;
+			border-radius: 20rpx;
+			font-size: 46rpx;
 		}
 	}
 	
@@ -261,10 +333,18 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
-		width:10%;
-		height:10%;
+		width:95%;
+		height:7%;
 		margin: 1%;
+		background: #C9C7AF;
+		border-radius: 24rpx;
+		font-size: 49rpx;
+		font-weight: bold;
+		color: #7B784E;
 	}
 
+	.Company{
+		position: absolute;
+		right: 13%;
+	}
 </style>

pages/bodyFatRatio/help.vue

@@ -4,51 +4,15 @@
 		<view class="back" @click="onBack(0, $event)">
 			<image src="/static/backArrow.png" mode="aspectFit" style="width:100%"></image>
 		</view>
-		<view class="content">
-			<view class="block">
-				每日消耗热量计算方法
-			</view>
-			<view class="block">
-				基础代谢简称（BMR）
-			</view>
-			<view class="block">
-				<uni-table border stripe emptyText="暂无更多数据" >
-					<!-- 表头行 -->
-					<uni-tr>
-						<uni-th align="center">运动量/天</uni-th>
-						<uni-th align="center">运动表现描述</uni-th>
-						<uni-th align="left">预估消耗/天</uni-th>
-					</uni-tr>
-					<!-- 表格数据行 -->
-					<uni-tr>
-						<uni-td>久坐</uni-td>
-						<uni-td>办公室久坐没有什么运动</uni-td>
-						<uni-td>BMR x 1.2 = 消耗热量/天</uni-td>
-					</uni-tr>
-					<uni-tr>
-						<uni-td>轻度运动</uni-td>
-						<uni-td>每周轻松1-3次运动</uni-td>
-						<uni-td>BMR x 1.375= 消耗热量/天</uni-td>
-					</uni-tr>
-					<uni-tr>
-						<uni-td>中度运动</uni-td>
-						<uni-td>每周中等强度3-5次</uni-td>
-						<uni-td>BMR x 1.5 = 消耗热量/天</uni-td>
-					</uni-tr>
-					<uni-tr>
-						<uni-td>大强度运动</uni-td>
-						<uni-td>每周大强度运动5-7次以上</uni-td>
-						<uni-td>BMR x 1.725 = 消耗热量/天</uni-td>
-					</uni-tr>
-					<uni-tr>
-						<uni-td>专业运动员强度</uni-td>
-						<uni-td>大强度训练每周8次以上</uni-td>
-						<uni-td>BMR x 1.9 = 消耗热量/天</uni-td>
-					</uni-tr>
-				
-				</uni-table>
-			</view>
-		</view>
+		<view class="content">
+			<view class="" style="position: relative; margin-top: 100rpx;">
+				<view class="title">
+					基础代谢简称（BMR）
+				</view>
+				<view class="explain">
					<view class="block">
						<uni-table border stripe emptyText="暂无更多数据" >
							<!-- 表头行 -->
							<uni-tr>
								<uni-th align="center">运动量/天</uni-th>
								<uni-th align="center">运动表现描述</uni-th>
								<uni-th align="left">预估消耗/天</uni-th>
							</uni-tr>
							<!-- 表格数据行 -->
							<uni-tr>
								<uni-td>久坐</uni-td>
								<uni-td>办公室久坐没有什么运动</uni-td>
								<uni-td>BMR x 1.2 = 消耗热量/天</uni-td>
							</uni-tr>
							<uni-tr>
								<uni-td>轻度运动</uni-td>
								<uni-td>每周轻松1-3次运动</uni-td>
								<uni-td>BMR x 1.375= 消耗热量/天</uni-td>
							</uni-tr>
							<uni-tr>
								<uni-td>中度运动</uni-td>
								<uni-td>每周中等强度3-5次</uni-td>
								<uni-td>BMR x 1.5 = 消耗热量/天</uni-td>
							</uni-tr>
							<uni-tr>
								<uni-td>大强度运动</uni-td>
								<uni-td>每周大强度运动5-7次以上</uni-td>
								<uni-td>BMR x 1.725 = 消耗热量/天</uni-td>
							</uni-tr>
							<uni-tr>
								<uni-td>专业运动员强度</uni-td>
								<uni-td>大强度训练每周8次以上</uni-td>
								<uni-td>BMR x 1.9 = 消耗热量/天</uni-td>
							</uni-tr>
				
						</uni-table>
					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -79,52 +43,69 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
 		width:100%;
 		height: 100vh; 
 	}
 	
-	.navigation-bar
-	{
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		
-		width: 100%;
-		height: 10%;
-		
-		font-weight: 700;
-		color: white;
-		
-		background-color: rgb(115,164,164);
-	}
-	.back{
-		position: absolute;
-		
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		
-		width: 2%;
-		height: 2%;
-		top: 3%;
-		left: 1%;
-		//testing
-		// border: 1px solid rgb(255,0,0);
+	.navigation-bar
+	{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 6%;
+		font-weight: 700;
+		color: white;
+		font-size: 44rpx;
+		background-color: rgb(115,164,164);
+	}
+	
+	.back{
+		position: absolute;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 2%;
+		height: 2%;
+		top: 2%;
+		left: 1%;
+		//testing
+		// border: 1px solid rgb(255,0,0);
 	}
 	
+	
 	.content{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		
+		// display: flex;
 		width:100%;
-		height:100%;
+		height:100%;
+		// justify-content: center;
+		color: #A66640;
+		font-weight: bold;
+		font-size: 30rpx;
+	}
+	.title{
+		text-align: center;
+		background-image: url("../../static/home/title4.png");
+		background-repeat: no-repeat;
+		height: 177rpx;
+		line-height: 177rpx;
+		background-position: center;
+		position: absolute;
+		width: 100%;
+		top: -100rpx;
+		background-size: 70%;
+		font-size: 30rpx;
 	}
-	
-	.block
-	{
-		margin: 2%;
+	.explain{
+		width: 85%;
+		border: 10rpx solid #B7B5A2;
+		border-radius: 5rpx;
+		margin: auto;
+		background: #EEEEE7;
+		padding: 50rpx 20rpx;
+		color: #817E56;
+		view{
+			line-height: 50rpx;
+		}
 	}
 </style>

pages/dayCalorie/dayCalorie.vue

@@ -5,13 +5,28 @@
 			<image src="/static/backArrow.png" mode="aspectFit" style="width:100%"></image>
 		</view>
 		
+		<view class="blue" @click="onHelp(0, $event)">
+			<image src="/static/home/red.png" mode="aspectFit" style="width:100%"></image>
+		</view>
 		<view class="content">
-			<text class="result-area">{{resultStr}}</text>
-			<button class="help" @click="onHelp(0, $event)">宁哥笔记</button>
+			<view class="result-area">
+				<view class="border">
+					<image class="item-logo" src="../../static/home/dayCalorieLogo.png" mode=""></image>
+					<view class="">
+						{{resultStr}}千卡
+					</view>
+					<!-- <view class="">
+						基础代谢率
+					</view> -->
+				</view>
+			</view>
+			
+			<!-- <button class="help" @click="onHelp(0, $event)">宁哥笔记</button> -->
 			
 			<view class="select-area">
-				<view :class="(selected != index)?'block':'block-selected'" v-for="(option,index) in optionArr" @click="onClick(index, $event)">{{option}}</view>
+				<view :class="(selected != index)?'block':'block-selected'":style="{background:backList[index%6]}" v-for="(option,index) in optionArr" @click="onClick(index, $event)">{{option}}</view>
 			</view>
+			
 		</view>
 	</view>
 </template>
@@ -20,7 +35,7 @@
 	export default {
 		data() {
 			return {
-				resultStr:'',
+				resultStr:'0',
 				optionArr:[
 					'办公室久坐没有什么运动',
 					'每周轻松1-3次运动',
@@ -28,6 +43,7 @@
 					'每周大强度运动5-7次以上',
 					'大强度训练每周8次以上',
 				],
+				backList:['#F2CDB7', '#F1F1EC','#E9F2F1','#FDEFEE','#FBF0EA'],
 				selected:0,
 			}
 		},
@@ -98,7 +114,7 @@
 						break;
 				}
 				getApp().globalData.calorie = calorie;
-				this.resultStr = '每天消耗的总热量： ' + Math.round(calorie);
+				this.resultStr = '每天消耗的总热量： ' + Math.round(calorie) + '千卡';
 			},
 		}
 	}
@@ -121,26 +137,41 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
 		width: 100%;
-		height: 10%;
-		
+		height: 8%;
 		font-weight: 700;
 		color: white;
-		
-		background-color: rgb(115,164,164);
+		font-size: 37rpx;
+		background-color: #FABAB9;
+	}
+	
+	.item-logo
+	{
+		z-index: 4;
+		height: 20%;
+		width: 11%;
 	}
 	.back{
 		position: absolute;
-		
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
-		width: 2%;
-		height: 2%;
-		top: 3%;
-		left: 1%;
+		width: 3%;
+		height: 3%;
+		top: 2%;
+		left: 3%;
+		//testing
+		// border: 1px solid rgb(255,0,0);
+	}
+	.blue{
+		position: absolute;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 7%;
+		height: 7%;
+		top: -1%;
+		right: 3%;
 		//testing
 		// border: 1px solid rgb(255,0,0);
 	}
@@ -150,7 +181,6 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
 		width:100%;
 		height:100%;
 	}
@@ -159,15 +189,30 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
-		width:60%;
+		width:90%;
 		height:30%;
 		margin: 1%;
-		
 		border-radius: 25rpx;
-		background-color: rgb(115,164,164);
+		background-color: #FABAB9;
+		text-align: center;
+		font-size: 44rpx;
+		font-weight: 700;
+		color: #4D857C;
+		image{
+			margin-top: 10%;
+		}
+		.border{
+			border: 2rpx solid #F4F4F4;
+			height: 90%;
+			width: 90%;
+			border-radius: 25rpx;
+			view{
+				margin-top: 5%;
+			}
+		}
 	}
 	
+	
 	.help{
 		color: azure;
 		background-color: rgb(0,0,0);
@@ -178,25 +223,45 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
-		width:60%;
+		width:90%;
 		height:60%;
 		margin: 1%;
+		view{
+			height: 142rpx;
+		}
 	}
 	.block{
-		width:60%;
-		height:60%;
+		width:100%;
 		margin: 1%;
-		
+		font-size: 30rpx;
+		font-weight: bold;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 		background-color: rgb(115,164,164);
 	}
 	.block-selected{
-		width:60%;
-		height:60%;
+		width:100%;
 		margin: 1%;
-		
-		box-shadow: 3px 3px 6px 3px rgba(0, 0, 0, 1);
-		
+		font-weight: bold;
+		display: flex;
+		align-items: center;
+		justify-content: center;
 		background-color: rgb(115,164,164);
+		box-shadow: 0rpx 12rpx 16rpx 0rpx rgba(0, 0, 0, 0.22);
+	}
+	.confirm{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		width:90%;
+		height:7%;
+		margin: 1%;
+		background: #FABAB9;
+		border-radius: 24rpx;
+		color: #C65E5C;
+		font-weight: bold;
+		font-size: 49rpx;
 	}
 </style>

pages/dayCalorie/help.vue

@@ -1,33 +1,18 @@
 <template>
 	<view class="container">
-		<view class="navigation-bar">每日消耗总热量</view>
+		<view class="navigation-bar">每日消耗热量</view>
 		<view class="back" @click="onBack(0, $event)">
 			<image src="/static/backArrow.png" mode="aspectFit" style="width:100%"></image>
 		</view>
-		<view class="content">
-			<view class="block">
-				基础代谢率是指你一天躺在床上不动，但不睡觉身体维持生命所需消耗的热量
-			</view>
-			<view class="block">
-				最低有氧心率 = 220-年龄-静态心率x0.55+静态心率
-			</view>
-			<view class="block">
-				最高有氧心率 = 220-年龄-静态心率x0.75+静态心率
-			</view>
-			<view class="">
-				有氧简直运动注意事项：
-			</view>
-			<view class="">
-				1，在运动时心率要控制在最高和最低之间。
-			</view>
-			<view class="">
-				2，持续25分钟以上才开始脂肪供能，前5分钟是糖原供能
-			</view>
-			<view class="">
-				3，整个过程无间歇
-			</view>
-			
-		</view>
+		<view class="content">
+			<view class="" style="position: relative; margin-top: 100rpx;">
+				<view class="title">
+					每日消耗热量
+				</view>
+				<view class="explain">
					<view class="block">
						基础代谢率是指你一天躺在床上不动，但不睡觉身体维持生命所需消耗的热量
					</view>
					<view class="block">
						最低有氧心率 = 220-年龄-静态心率x0.55+静态心率
					</view>
					<view class="block">
						最高有氧心率 = 220-年龄-静态心率x0.75+静态心率
					</view>
					<view class="">
						有氧简直运动注意事项：
					</view>
					<view class="">
						1，在运动时心率要控制在最高和最低之间。
					</view>
					<view class="">
						2，持续25分钟以上才开始脂肪供能，前5分钟是糖原供能
					</view>
					<view class="">
						3，整个过程无间歇
					</view>
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -58,52 +43,67 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
 		width:100%;
 		height: 100vh; 
 	}
 	
-	.navigation-bar
-	{
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		
-		width: 100%;
-		height: 10%;
-		
-		font-weight: 700;
-		color: white;
-		
-		background-color: rgb(115,164,164);
-	}
-	.back{
-		position: absolute;
-		
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		
-		width: 2%;
-		height: 2%;
-		top: 3%;
-		left: 1%;
-		//testing
-		// border: 1px solid rgb(255,0,0);
+	.navigation-bar
+	{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 6%;
+		font-weight: 700;
+		color: white;
+		font-size: 44rpx;
+		background-color: rgb(115,164,164);
+	}
+	
+	.back{
+		position: absolute;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 2%;
+		height: 2%;
+		top: 2%;
+		left: 1%;
+		//testing
+		// border: 1px solid rgb(255,0,0);
 	}
 	
+	
 	.content{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		
+		// display: flex;
 		width:100%;
-		height:100%;
+		height:100%;
+		// justify-content: center;
+		color: #A66640;
+		font-weight: bold;
+		font-size: 30rpx;
+	}
+	.title{
+		text-align: center;
+		background-image: url("../../static/home/title.png");
+		background-repeat: no-repeat;
+		height: 177rpx;
+		line-height: 177rpx;
+		background-position: center;
+		position: absolute;
+		width: 100%;
+		top: -100rpx;
+		background-size: 70%;
+		font-size: 30rpx;
 	}
-	
-	.block
-	{
-		margin: 2%;
+	.explain{
+		width: 85%;
+		border: 10rpx solid #DB9C9A;
+		border-radius: 5rpx;
+		margin: auto;
+		background: #FEF0F0;
+		padding: 50rpx 20rpx;
+		color: #C65E5C;
+		line-height: 30rpx;
 	}
 </style>

pages/heartRhythms/heartRhythms.vue

@@ -1,25 +1,47 @@
 <template>
 	<view class="container">
-		<view class="navigation-bar">有氧运动心率</view>
+		<view class="navigation-bar">有氧运动心率···</view>
 		<view class="back" @click="onBack(0, $event)">
 			<image src="/static/backArrow.png" mode="aspectFit" style="width:100%"></image>
 		</view>
 		
+		<view class="blue" @click="onHelp(0, $event)">
+			<image src="/static/home/blue.png" mode="aspectFit" style="width:100%"></image>
+		</view>
 		<view class="content">
-			<text class="result-area">{{result}}</text>
-			<button class="help" @click="onHelp(0, $event)">宁哥笔记</button>
+			<!-- <text class="result-area">{{result}}</text> -->
+			<view class="result-area">
+				<view class="border">
+					<image class="item-logo" src="../../static/home/heartRhythmsLogo.png" mode=""></image>
+					<view class="">
+						{{result1}}
+					</view>
+					<view class="">
+						{{result2}}
+					</view>
+					<!-- <view class="">
+						最低有氧心率/最高有氧心率
+					</view> -->
+				</view>
+			</view>
+			<!-- <button class="help" @click="onHelp(0, $event)">宁哥笔记</button> -->
 			
 			<view class="input-area">
 				<view class="age">
 					<view class="input-title">年龄 : </view>
 					<input  class="input" type="number"  placeholder="请输入年龄" v-model="age" />
+					<text class="Company">岁</text>
 				</view>
 				
 				<view class="static-heart-rate">
+					<view class="" style="color: #DD9E00;width: 90%;">
+						如何测：早晨起床做起来第一件事，掐脉搏一分钟的心跳次数 = 你的静态心率
+					</view>
 					<view class="input-block">
-						<view class="input-title">静态心率 : </view>
+						<view class="input-title">静态 <br/> 心率</view>
 						<input class="input" type="number"  placeholder="请输入静态心率" v-model="heartRate" />
-						<button class="heart-rate-help" @click="onClickHelp(0, $event)">?</button>
+						<!-- <button class="heart-rate-help" @click="onClickHelp(0, $event)">?</button> -->
+						<text class="Company">次/分</text>
 					</view>
 					
 				</view>
@@ -37,7 +59,8 @@
 			return {
 				age:-1,
 				heartRate:-1,
-				result:'',
+				result1:'',
+				result2:'',
 			}
 		},
 		onLoad() {
@@ -91,10 +114,14 @@
 					getApp().globalData.heartRate = this.heartRate;							
 					getApp().globalData.age = this.age;
 					
-					let lowestHeartRate  = 220 - this.age-(this.heartRate*0.55)+this.heartRate;
-					let highestHeartRate = 220 - this.age-(this.heartRate*0.75)+this.heartRate;
+			
+					let lowestHeartRate  = (220 - Number(this.age)-Number(this.heartRate))*0.55 + Number(this.heartRate);
+					let highestHeartRate = (220 - Number(this.age)-Number(this.heartRate))*0.75 + Number(this.heartRate);
+		
 				
-					this.result = '你的最低有氧心率： '+ Math.round(lowestHeartRate) + '\n' + '最高有氧心率： '+ Math.round(highestHeartRate);
+					// this.result1 = '你的最低有氧心率： '+ Math.round(lowestHeartRate) + '(次/分)\n' + '最高有氧心率： '+ Math.round(highestHeartRate)+ '(次/分)';
+					this.result1 = '你的最低有氧心率： '+ Math.round(lowestHeartRate) + '(次/分)';
+					this.result2 = '最高有氧心率： '+ Math.round(highestHeartRate)+ '(次/分)';
 					
 					getApp().globalData.lowestHeartRate = this.lowestHeartRate;
 					getApp().globalData.highestHeartRate = this.highestHeartRate;
@@ -143,36 +170,51 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
 		width: 100%;
-		height: 10%;
+		height: 8%;
 		
 		font-weight: 700;
 		color: white;
-		
-		background-color: rgb(115,164,164);
+		font-size: 37rpx;
+		background-color: #F2CDB7;
+	}
+	
+	.item-logo
+	{
+		z-index: 4;
+		height: 18%;
+		width: 15%;
+		// margin: 1%;
 	}
 	.back{
 		position: absolute;
-		
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
-		width: 2%;
-		height: 2%;
-		top: 3%;
-		left: 1%;
+		width: 3%;
+		height: 3%;
+		top: 2%;
+		left: 3%;
 		//testing
 		// border: 1px solid rgb(255,0,0);
 	}
 	
+	.blue{
+		position: absolute;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 7%;
+		height: 7%;
+		top: -1%;
+		right: 3%;
+	}
+	
 	.content{
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
 		width:100%;
 		height:100%;
 	}
@@ -181,13 +223,27 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
-		width:60%;
+		width:95%;
 		height:30%;
 		margin: 1%;
-		
 		border-radius: 25rpx;
-		background-color: rgb(115,164,164);
+		background-color: #F2CDB7;
+		text-align: center;
+		font-size: 44rpx;
+		font-weight: 700;
+		color: #BE7F59;
+		image{
+			margin-top: 10%;
+		}
+		.border{
+			border: 4rpx solid #F4F4F4;
+			height: 90%;
+			width: 90%;
+			border-radius: 25rpx;
+			view{
+				margin-top: 5%;
+			}
+		}
 	}
 	
 	.help{
@@ -196,12 +252,6 @@
 	}
 	
 	.input-area{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		
-		width:60%;
 		height:60%;
 		margin: 1%;
 		
@@ -210,22 +260,22 @@
 			flex-direction: row;
 			align-items: center;
 			justify-content: center;
-			
 			width:100%;
-			height:100%;
-			margin: 1%;
-			
+			height:300rpx;
+			margin-top: 3%;
 			border-radius: 25rpx;
-			background-color: rgb(115,164,164);
-			
+			color: #7B784E;
+			font-weight: bold;
+			font-size: 30rpx;
+			flex-wrap: wrap;
+			background: #FDEFEE;
 			.input-block
 			{
 				display: flex;
 				flex-direction: row;
 				align-items: center;
 				justify-content: center;
-				
-				width:40%;
+				width:100%;
 			}
 			.heart-rate-help
 			{
@@ -234,6 +284,11 @@
 				//testing
 				// border: 1px solid rgb(255,0,0);
 			}
+			input{
+				width: 75%;
+				background: #D8D7C5;
+				border-radius: 20rpx;
+			}
 		}
 		
 		.age{
@@ -241,13 +296,16 @@
 			flex-direction: row;
 			align-items: center;
 			justify-content: center;
-			
 			width:100%;
-			height:100%;
-			margin: 3%;
-			
+			height:220rpx;
 			border-radius: 25rpx;
-			background-color: rgb(115,164,164);
+			background-color: #EFEEE7;
+			font-size: 30rpx;
+			color: #7B784E;
+			font-weight: bold;
+			input{
+				height: 120rpx;
+			}
 		}
 		
 		.input-title{
@@ -261,16 +319,18 @@
 			align-items: center;
 			background: #F4F4F4;
 			border-radius: 4upx;
-			height: 70upx;
 			font-size: 28upx;
 			line-height: 70upx;
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #848484;
-			
 			text-align:center;
-			
 			margin: 1%;
+			width: 75%;
+			height: 120rpx;
+			background: #D8D7C5;
+			border-radius: 20rpx;
+			font-size: 46rpx;
 		}
 	}
 	
@@ -279,10 +339,18 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
-		width:10%;
-		height:10%;
+		width:95%;
+		height:7%;
 		margin: 1%;
+		background: #F2CDB7;
+		border-radius: 24rpx;
+		font-size: 49rpx;
+		font-weight: bold;
+		color: #BE7F59;
+	}
+	.Company{
+		position: absolute;
+		right: 13%;
 	}
 
 </style>

pages/heartRhythms/help.vue

@@ -4,36 +4,15 @@
 		<view class="back" @click="onBack(0, $event)">
 			<image src="/static/backArrow.png" mode="aspectFit" style="width:100%"></image>
 		</view>
-		<view class="content">
-			<view class="block">
-				成年女性的体脂率计算公式：
-			</view>
-			<view class="">
-				参数a=腰围（单位：厘米）x0.74；
-			</view>
-			<view class="">
-				身体脂肪总重量（单位:千克）=a-b；
-			</view>
-			<view class="">
-				体脂率=（身体脂肪总量÷体重）x100%；
-			</view>
-			<view class="block">
-				成年男性的体脂率计算公式：
-			</view>
-			<view class="">
-				参数a=腰围（单位：厘米）x0.74；
-			</view>
-			<view class="">
-				参数b=体重（单位：千克）x0.082+44.74；
-			</view>
-			<view class="">
-				身体脂肪总重量（单位:千克）=a-b；
-			</view>
-			<view class="">
-				体脂率=（身体脂肪总量÷体重）x100%；
-			</view>
-			
-		</view>
+		<view class="content">
+			<view class="" style="position: relative; margin-top: 100rpx;">
+				<view class="title">
+					成年女性的体脂率计算公式
+				</view>
+				<view class="explain">
				<view class="">
					参数a=腰围（单位：厘米）x0.74；
				</view>
				<view class="">
					身体脂肪总重量（单位:千克）=a-b；
				</view>
				<view class="">
					体脂率=（身体脂肪总量÷体重）x100%；
				</view>
				<view class="block">
					成年男性的体脂率计算公式：
				</view>
				<view class="">
					参数a=腰围（单位：厘米）x0.74；
				</view>
				<view class="">
					参数b=体重（单位：千克）x0.082+44.74；
				</view>
				<view class="">
					身体脂肪总重量（单位:千克）=a-b；
				</view>
				<view class="">
					体脂率=（身体脂肪总量÷体重）x100%；
				</view>
+					</view>
+				</view>
+		</view>
 	</view>
 </template>
 
@@ -64,52 +43,69 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
 		width:100%;
 		height: 100vh; 
 	}
 	
-	.navigation-bar
-	{
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		
-		width: 100%;
-		height: 10%;
-		
-		font-weight: 700;
-		color: white;
-		
-		background-color: rgb(115,164,164);
-	}
-	.back{
-		position: absolute;
-		
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		
-		width: 2%;
-		height: 2%;
-		top: 3%;
-		left: 1%;
-		//testing
-		// border: 1px solid rgb(255,0,0);
+	.navigation-bar
+	{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 6%;
+		font-weight: 700;
+		color: white;
+		font-size: 44rpx;
+		background-color: rgb(115,164,164);
+	}
+	
+	.back{
+		position: absolute;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 2%;
+		height: 2%;
+		top: 2%;
+		left: 1%;
+		//testing
+		// border: 1px solid rgb(255,0,0);
 	}
 	
+	
 	.content{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		
+		// display: flex;
 		width:100%;
-		height:100%;
+		height:100%;
+		// justify-content: center;
+		color: #A66640;
+		font-weight: bold;
+		font-size: 30rpx;
+	}
+	.title{
+		text-align: center;
+		background-image: url("../../static/home/title5.png");
+		background-repeat: no-repeat;
+		height: 177rpx;
+		line-height: 177rpx;
+		background-position: center;
+		position: absolute;
+		width: 100%;
+		top: -100rpx;
+		background-size: 70%;
+		font-size: 30rpx;
 	}
-	
-	.block
-	{
-		margin: 2%;
+	.explain{
+		width: 85%;
+		border: 10rpx solid #D2A58C;
+		border-radius: 5rpx;
+		margin: auto;
+		background: #FBF0EA;
+		padding: 50rpx 20rpx;
+		color: #AA6C48;
+		view{
+			line-height: 50rpx;
+		}
 	}
 </style>

pages/home/home.vue

@@ -113,7 +113,7 @@
 			onClick: function(id,e) {
 				// console.log(id); // 1
 				// console.log(e); // 事件对象
-		
+				const that = this
 				switch (id){
 					case 0:
 					{
@@ -124,13 +124,18 @@
 						break;
 					case 1:
 					{
-						uni.navigateTo({
-							url: "/pages/dayCalorie/dayCalorie",
-						});
+						if(that.bmr != "0"){
+							uni.navigateTo({
+								url: "/pages/dayCalorie/dayCalorie",
+							});
+						}else{
+							alert("请先测试基础代谢率")
+						}
 					}
 						break;
 					case 2:
 					{
+						
 						uni.navigateTo({
 							url: "/pages/heartRhythms/heartRhythms",
 						});
@@ -138,6 +143,7 @@
 						break;
 					case 3:
 					{
+						
 						uni.navigateTo({
 							url: "/pages/bodyFatRatio/bodyFatRatio",
 						});
@@ -174,14 +180,11 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
 		width:100%;
 		height: 6%;
-		
 		font-weight: 700;
 		color: black;
-		font-size: 75rpx;
-		
+		font-size: 54rpx;
 		 background-color: white;
 		// testing
 		// border: 1px solid rgb(255,0,0);
@@ -272,7 +275,7 @@
 	
 	.item-title
 	{
-		font-size: 100rpx;
+		font-size: 46rpx;
 		font-weight: 700;
 		margin: 2%;
 	}
@@ -288,8 +291,7 @@
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		
-		font-size: 80rpx;
+		font-size: 40rpx;
 		font-weight: 700;
 		
 		width:90%;

pages/login/login.vue

@@ -88,8 +88,7 @@
 		
 		font-weight: 700;
 		color: black;
-		font-size: 75rpx;
-		
+font-size: 54rpx;
 		 background-color: white;
 		// testing
 		// border: 1px solid rgb(255,0,0);
@@ -125,10 +124,8 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
 		width:50%;
-		height:100%;
-		
+		height:50%;
 		z-index: 1;
 		// 测试
 		// margin: 10rpx;
@@ -139,25 +136,26 @@
 		flex-direction: column;
 		align-items: center;
 		justify-content: center;
-		
 		width:50%;
 		height:100%;
 	}
 	.logo
 	{
 		margin: 75rpx;
+		width: 230rpx;
+		height: 230rpx;
 	}
 	.boy-title {
 		color: #4D857C;
 		font-weight: 700;
-		font-size: 95rpx;
+		font-size: 54rpx;
 		z-index: 1;
 	}
 	
 	.girl-title {
 		color: #B35D5C;
 		font-weight: 700;
-		font-size: 95rpx;
+		font-size: 54rpx;
 		z-index: 1;
 	}
 </style>

unpackage/dist/build/h5/index.html

@@ -0,0 +1,2 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>宁哥减脂助手</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.d8360d5d.js></script><script src=./static/js/index.3de2e146.js></script></body></html>

unpackage/dist/build/h5/static/js/pages-register-register.b768faa3.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-register-register"],{4372:function(n,t,r){"use strict";r.r(t);var u=r("5111"),e=r.n(u);for(var c in u)"default"!==c&&function(n){r.d(t,n,(function(){return u[n]}))}(c);t["default"]=e.a},5111:function(n,t){},"8a0b":function(n,t,r){"use strict";var u;r.d(t,"b",(function(){return e})),r.d(t,"c",(function(){return c})),r.d(t,"a",(function(){return u}));var e=function(){var n=this,t=n.$createElement,r=n._self._c||t;return r("div")},c=[]},d81c:function(n,t,r){"use strict";r.r(t);var u=r("8a0b"),e=r("4372");for(var c in e)"default"!==c&&function(n){r.d(t,n,(function(){return e[n]}))}(c);var a,i=r("f0c5"),f=Object(i["a"])(e["default"],u["b"],u["c"],!1,null,"48b1f888",null,!1,u["a"],a);t["default"]=f.exports}}]);