last version

pages/basalMetabolism/basalMetabolism.vue

@@ -5,7 +5,7 @@
 			<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>
+			<image src="../../static/home/blue.png" mode=""></image>
 		</view>
 		
 		<view class="content">
@@ -63,9 +63,9 @@
 			}
 		},
 		onLoad() {
-			this.weight = 0;
-			this.high = 0;
-			this.age = 0;
+			this.weight = "";
+			this.high = "";
+			this.age = "";
 			// console.log('gender=',getApp().globalData.gender)
 			// console.log('weight=',getApp().globalData.weight)
 			// console.log('high=',getApp().globalData.high)
@@ -198,8 +198,17 @@
 		justify-content: center;
 		width: 7%;
 		height: 7%;
-		top: -1%;
+		top: 1%;
 		right: 3%;
+		border-radius: 50%;
+		width: 75rpx;
+		height: 75rpx;
+		border-radius: 50%;
+		overflow: hidden;
+		image{
+			width: 100%;
+			height: 75rpx;
+		}
 	}
 	.content{
 		display: flex;
@@ -255,7 +264,7 @@
 		width:90%;
 		height:60%;
 		margin: 1%;
-		font-size: 46rpx;
+		font-size: 36rpx;
 		view{
 			height: 160rpx;
 			line-height: 160rpx;
@@ -325,9 +334,11 @@
 			font-family: PingFang SC;
 			font-weight: 500;
 			color: #848484;
-			text-align:center;
+			// text-align:center;
 			font-size: 46rpx;
 			height: 100rpx;
+			padding-left: 20rpx;
+			margin-left: 15rpx;
 		}
 	}
 	

pages/basalMetabolism/help.vue

@@ -1,13 +1,13 @@
 <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="" style="position: relative; margin-top: 100rpx;">
 				<view class="title">
-					基础代谢简称
+					基础代谢
 				</view>
 				<view class="explain">
 					<view class="">

pages/bodyFatRatio/bodyFatRatio.vue

@@ -6,7 +6,7 @@
 		</view>
 		
 		<view class="blue" @click="onHelp(0, $event)">
-			<image src="/static/home/blue.png" mode="aspectFit" style="width:100%"></image>
+			<image src="../../static/home/blue.png" mode=""></image>
 		</view>
 		<view class="content">
 			
@@ -59,8 +59,8 @@
 			}
 		},
 		onLoad() {
-			this.waistline = 0;
-			this.weight = 0;
+			this.waistline = "";
+			this.weight = "";
 			
 			// console.log('waistline=',getApp().globalData.waistline);
 			// console.log('weight=',getApp().globalData.weight);
@@ -204,8 +204,17 @@
 		justify-content: center;
 		width: 7%;
 		height: 7%;
-		top: -1%;
+		top: 1%;
 		right: 3%;
+		border-radius: 50%;
+		width: 75rpx;
+		height: 75rpx;
+		border-radius: 50%;
+		overflow: hidden;
+		image{
+			width: 100%;
+			height: 75rpx;
+		}
 	}
 	.content{
 		display: flex;
@@ -258,9 +267,8 @@
 		width:95%;
 		height:60%;
 		margin: 1%;
-		font-size: 40rpx;
+		font-size: 36rpx;
 		font-weight: bold;
-			
 		.waistline{
 			display: flex;
 			flex-direction: row;

pages/bodyFatRatio/help.vue

@@ -1,15 +1,45 @@
 <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="" 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 class="explain">
+					<view class="">
+						参数a=腰围（单位：厘米）x0.74；
+					</view>
+					<view class="">
+						身体脂肪总重量（单位:千克）=a-b；
+					</view>
+					<view class="">
+						体脂率=（身体脂肪总量÷体重）x100%；
+					</view>
+				</view>
+			</view>
+			<view class="" style="position: relative; margin-top: 100rpx;">
+				<view class="title">
+					成年男性的体脂率计算公式：
+				</view>
+				<view class="explain">
+					<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>

pages/dayCalorie/dayCalorie.vue

@@ -6,7 +6,7 @@
 		</view>
 		
 		<view class="blue" @click="onHelp(0, $event)">
-			<image src="/static/home/red.png" mode="aspectFit" style="width:100%"></image>
+			<image src="../../static/home/blue.png" mode=""></image>
 		</view>
 		<view class="content">
 			<view class="result-area">
@@ -170,10 +170,19 @@
 		justify-content: center;
 		width: 7%;
 		height: 7%;
-		top: -1%;
+		top: 1%;
 		right: 3%;
 		//testing
 		// border: 1px solid rgb(255,0,0);
+		border-radius: 50%;
+		width: 75rpx;
+		height: 75rpx;
+		border-radius: 50%;
+		overflow: hidden;
+		image{
+			width: 100%;
+			height: 75rpx;
+		}
 	}
 	
 	.content{
@@ -219,15 +228,12 @@
 	}
 	
 	.select-area{
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
 		width:90%;
 		height:60%;
 		margin: 1%;
 		view{
 			height: 142rpx;
+			margin-top: 30rpx;
 		}
 	}
 	.block{
@@ -249,6 +255,7 @@
 		justify-content: center;
 		background-color: rgb(115,164,164);
 		box-shadow: 0rpx 12rpx 16rpx 0rpx rgba(0, 0, 0, 0.22);
+		font-size: 50rpx;
 	}
 	.confirm{
 		display: flex;

pages/dayCalorie/help.vue

@@ -7,11 +7,47 @@
 		<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 class="explain">
					<view class="block">
+						基础代谢简称（BMR）
					</view>
					<view class="block">
+						BMRx运动表现=消耗热量/天
					</view>
					
 				</view>
 			</view>
+			<view class="">
+				<table border="1">
+				    <tr>
+				        <td>运动量/天</td>
+				        <td>运动表现描述</td>
+				        <td>预估消耗/天</td>
+				    </tr>
+				    <tr>
+				        <td>久坐</td>
+				        <td>办公室久坐没有什么运动</td>
+				        <td>BMR x 1.2 = 消耗热量/天</td>
+				    </tr>
+				    <tr>
+				        <td>轻度运动</td>
+				        <td>每周轻松1-3次运动</td>
+				        <td>BMR x 1.375= 消耗热量/天</td>
+				    </tr>
+				    <tr>
+				        <td>中度运动</td>
+				        <td>每周中等强度3-5次</td>
+				        <td>BMR x 1.5 = 消耗热量/天</td>
+				    </tr>
+				    <tr>
+				        <td>大强度运动</td>
+				        <td>每周大强度运动5-7次以上</td>
+				        <td>BMR x 1.725 = 消耗热量/天</td>
+				    </tr>
+				    <tr>
+				        <td>专业运动员强度</td>
+				        <td>大强度训练每周8次以上</td>
+				        <td>BMR x 1.9 = 消耗热量/天</td>
+				    </tr>
+				</table>
+			</view>
 		</view>
 	</view>
 </template>
@@ -105,5 +141,20 @@
 		padding: 50rpx 20rpx;
 		color: #C65E5C;
 		line-height: 30rpx;
+	}
+	table{
+		width: 92%;
+		margin: 20rpx auto;
+        border-collapse: collapse;
+		font-size: 24rpx;
+		text-align: center;
+		background: #FEF0F0;
+		color: #C65E5C;
+		border-color: #DB9C9A;
+		border: 10rpx solid #DB9C9A;
+		tr td{
+			padding: 10rpx 0rpx;
+			border: 10rpx solid #DB9C9A;
+		}
 	}
 </style>

pages/heartRhythms/heartRhythms.vue

@@ -6,7 +6,7 @@
 		</view>
 		
 		<view class="blue" @click="onHelp(0, $event)">
-			<image src="/static/home/blue.png" mode="aspectFit" style="width:100%"></image>
+			<image src="../../static/home/blue.png" mode=""></image>
 		</view>
 		<view class="content">
 			<!-- <text class="result-area">{{result}}</text> -->
@@ -64,8 +64,8 @@
 			}
 		},
 		onLoad() {
-			this.heartRate = 0;
-			this.age = 0;
+			this.heartRate = "";
+			this.age = "";
 			
 			// console.log('heartRate=',getApp().globalData.heartRate);
 			// console.log('age=',getApp().globalData.age);
@@ -203,8 +203,17 @@
 		justify-content: center;
 		width: 7%;
 		height: 7%;
-		top: -1%;
+		top: 1%;
 		right: 3%;
+		border-radius: 50%;
+		width: 75rpx;
+		height: 75rpx;
+		border-radius: 50%;
+		overflow: hidden;
+		image{
+			width: 100%;
+			height: 75rpx;
+		}
 	}
 	
 	.content{

pages/heartRhythms/help.vue

@@ -1,17 +1,39 @@
 <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="" 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 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>

unpackage/dist/build/h5/index.html

@@ -1,2 +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.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.0fd31bab.js></script><script src=./static/js/index.d2efc21e.js></script></body></html>
+            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.2772579d.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.af3c24da.js></script><script src=./static/js/index.557a6735.js></script></body></html>

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

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

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

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