计算正确

App.vue

@@ -8,7 +8,22 @@
 		},
 		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>
 

pages/basalMetabolism/basalMetabolism.vue

@@ -113,24 +113,18 @@
 					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 = (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;
+						
 					}
 					else
 					{
-						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;
 					}
 					this.result = '你的基础代谢率为： '+ Math.round(this.bmr) + '千卡';
-					
+			
 					getApp().globalData.bmr = this.bmr;
 				}
 				else

pages/bodyFatRatio/bodyFatRatio.vue

@@ -103,36 +103,25 @@
 					//体脂率=（身体脂肪总量÷体重）
 					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)
+					let num1 = 0;
+					let num2 = 0;
+					if(getApp().globalData.gender == 0)
 					{//男
-						fatWeight = (Number(this.waistline*0.74) - Number(this.weight*0.082+44.74));
+						num1 = this.waistline*0.74;
+						num2 = this.weight*0.082+44.74;
+						fatWeight = Number(num1) - Number(num2);
 						fatRate = fatWeight/this.weight* 100;
 					}
 					else
 					{//女
-						fatWeight = (Number(this.waistline*0.74) - Number(this.weight*0.082+34.89));
+						num1 = this.waistline*0.74;
+						num2 = (this.weight*0.082)+Number(34.89);
+						fatWeight = num1 - num2;
 						fatRate = fatWeight/this.weight * 100;
 					}
 				
-					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;
 				}

pages/heartRhythms/heartRhythms.vue

@@ -1,6 +1,6 @@
 <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>
@@ -114,12 +114,9 @@
 					getApp().globalData.heartRate = this.heartRate;							
 					getApp().globalData.age = this.age;
 					
-			
-					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);
+					let lowestHeartRate  = ((220 - this.age-this.heartRate)*0.55 + Number(this.heartRate));
+					let highestHeartRate = ((220 - this.age-this.heartRate)*0.75 + Number(this.heartRate));
 		
-				
-					// this.result1 = '你的最低有氧心率： '+ Math.round(lowestHeartRate) + '(次/分)\n' + '最高有氧心率： '+ Math.round(highestHeartRate)+ '(次/分)';
 					this.result1 = '你的最低有氧心率： '+ Math.round(lowestHeartRate) + '(次/分)';
 					this.result2 = '最高有氧心率： '+ Math.round(highestHeartRate)+ '(次/分)';
 					

pages/login/login.vue

@@ -14,14 +14,6 @@
 				<view class="girl-title">我是女生</view>
 			</view>
 		</view>
-		<!-- <view class="gender">
-			<view class="boy" @click="onClick(0, $event)">
-				<image class="logo" src="/static/login/Beard.png" mode="aspectFit"></image>
-			</view>
-			<view class="girl" @click="onClick(1, $event)">
-				<image class="logo" src="/static/login/Lips.png" mode="aspectFit"></image>
-			</view>
-		</view> -->
 	</view>
 </template>
 
@@ -38,7 +30,7 @@
 		methods: {
 			onClick: function(id,e) {
 				getApp().globalData.gender = id;
-			
+				console.log('getApp().globalData.gender=',getApp().globalData.gender)
 				uni.navigateTo({
 					url: '/pages/home/home',
 					animationType: 'slide-in-left',

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.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>
+            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>

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

@@ -1 +0,0 @@
-(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}}]);

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

@@ -0,0 +1 @@
+(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){}}]);