From 68f2e5967fa088f3b29d712d8fab2a23e334df9a 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, 15 Jul 2022 14:33:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E8=AE=B0=E5=BD=95=EF=BC=8C=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/interfaces/gout.js          |   7 ++--
 pages.json                       |   8 ++---
 pages/index/index.vue            |   4 +--
 pages/uricacid/index.vue         |  54 ++++++++++++++++++++++++-------
 pages/uricacid/list.vue          |  48 ++++++++++++++++++++++-----
 static/icons/tool_icon_00.png    | Bin 2671 -> 7386 bytes
 static/icons/tool_icon_01.png    | Bin 2807 -> 4661 bytes
 static/tabBar/tabBar_show_00.png | Bin 2385 -> 2979 bytes
 static/tabBar/tabBar_show_01.png | Bin 3062 -> 3858 bytes
 static/tabBar/tabBar_show_02.png | Bin 2738 -> 3541 bytes
 10 files changed, 93 insertions(+), 28 deletions(-)

diff --git a/apis/interfaces/gout.js b/apis/interfaces/gout.js
index c20175f..86fafea 100644
--- a/apis/interfaces/gout.js
+++ b/apis/interfaces/gout.js
@@ -41,9 +41,12 @@ const goutCover = (case_id, data) => {
 }
 
 // 查看尿酸
-const lastLog = () => {
+const lastLog = type => {
 	return request({
-		url: 'gout/result/last_log'
+		url: 'gout/result/last_log',
+		data: {
+			type
+		}
 	})
 }
 
diff --git a/pages.json b/pages.json
index 32d6f48..bfb0b6f 100644
--- a/pages.json
+++ b/pages.json
@@ -40,7 +40,7 @@
 		"aliasPath": "/purine/index",
 		"name": "purineIndex",
         "style":{
-            "navigationBarTitleText":"嘌呤列表"
+            "navigationBarTitleText":"健康饮食"
         }
 	}, {
 		"path": "pages/purine/details",
@@ -55,7 +55,7 @@
 		"name": "uricacidIndex",
         "auth": true,
         "style":{
-            "navigationBarTitleText":"尿酸值"
+            "navigationBarTitleText":"记录"
         }
 	}, {
 		"path": "pages/uricacid/list",
@@ -63,7 +63,7 @@
 		"name": "uricacidList",
         "auth": true,
         "style":{
-            "navigationBarTitleText":"尿酸列表"
+            "navigationBarTitleText":"记录列表"
         }
 	}, {
 		"path": "pages/attestation/index",
@@ -137,7 +137,7 @@
 		}],
 		"borderStyle": "white",
 		"backgroundColor": "#FFFFFF",
-		"selectedColor": "#6a7df3",
+		"selectedColor": "#4490ff",
 		"color": "#9d9d9d",
 		"iconWidth": "26px",
 		"spacing": "0",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 650f76c..c92e162 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -7,8 +7,8 @@
 			<view class="tools-box tools-flex">
 				<view class="item item-sm" @click="$Router.push({name: 'purineIndex'})">
 					<view class="item-content">
-						<view class="title">嘌呤查询</view>
-						<view class="submit">知识小科普</view>
+						<view class="title">健康饮食</view>
+						<view class="submit">食品知识小科普</view>
 					</view>
 					<image class="item-icon" src="@/static/icons/tool_icon_00.png" mode="widthFix"></image>
 				</view>
diff --git a/pages/uricacid/index.vue b/pages/uricacid/index.vue
index 682a2b3..0924abb 100644
--- a/pages/uricacid/index.vue
+++ b/pages/uricacid/index.vue
@@ -1,9 +1,14 @@
 <template>
-    <view class="content">
+    <view class="content">
+		<view class="tabs">
+			<view class="tabs-item" :class="tabType == 'hyperglycemia' ? 'active': ''" @click="onTab('hyperglycemia')">血糖记录</view>
+			<view class="tabs-item" :class="tabType == 'hyperlipidemia' ? 'active': ''" @click="onTab('hyperlipidemia')">血脂记录</view>
+			<view class="tabs-item" :class="tabType == 'hypertension' ? 'active': ''" @click="onTab('hypertension')">血压记录</view>
+		</view>
         <view class="While">
             <view class="top">
                 <view class="top-time">
-                    {{ lastData.log ? lastData.log.created_at : '您还没有上传过尿酸值' }} 
+                    {{ lastData.log ? lastData.log.created_at : '您还没有上传过血糖值' }} 
                 </view>
                 <view v-if="lastData.log" class="top-record" @click="$Router.push({name: 'uricacidList', params: {id: lastData.caseId}})">
                     所有记录
@@ -19,17 +24,17 @@
                     </block>
                 </view>
                 <view class="uricacid-tips">
-                    <text>男性尿酸指标 {{ lastData.Newscope.man }}</text>
-                    <text>女性尿酸指标 {{ lastData.Newscope.woman }}</text>
+                    <text>男性血糖指标 {{ lastData.Newscope.man }}</text>
+                    <text>女性血糖指标 {{ lastData.Newscope.woman }}</text>
                 </view>
             </view>
         </view>
         <view class="While analyse">
             <view class="analyse-title">
-                尿酸趋势分析
+                血糖趋势分析
             </view>
             <view class="analyse-text" v-if="lastData.log">
-                当前尿酸值为{{ lastData.log.quantity }}umol, 
+                当前血糖值为{{ lastData.log.quantity }}umol, 
                 <block v-if="lastData.Newscope.scope">
                     {{ lastData.log.quantity > lastData.Newscope.scope.max ? '高于' : '低于' }}{{ lastData.Newscope.scope.max }}umol
                     {{ lastData.log.quantity > lastData.Newscope.scope.max ? '您的尿酸水平偏高，根据治疗指南需要进行治疗干预。需要生活控制（多喝水，饮食控制、并发症危险因素的控制、碱化尿液），配合药物治疗。具体情况请遵循医嘱。' : '您的尿酸水平控制很棒，请继续保持' }}
@@ -104,17 +109,23 @@
 				cover		: {
 					showpath: '',
 					path	: ''
-				}
+				},
+				tabType		: 'hyperglycemia'
     		}
     	},
     	onShow() {
     	    // 获取尿酸数据
     	    this.lastInfo();
     	},
-    	methods: {
+    	methods: {
+			// 切换数据
+			onTab(e){
+				this.tabType = e;
+				this.lastInfo()
+			},
             // 尿酸数据
             lastInfo() {
-            	lastLog().then(res => {
+            	lastLog(this.tabType).then(res => {
                     this.lastData.Newscope  = res.scope
                     this.lastData.log       = res.log
                     this.lastData.caseId    = res.case.gout_case_id
@@ -188,8 +199,27 @@
 <style lang="scss" scoped>
     .content{
     	overflow: hidden;
-    	background: #f3f4f6;
-    }
+    	background: #f3f4f6;
+		min-height: 100vh;
+    }
+	
+	.tabs{
+		background-color: white;
+		border-radius: 0 0 10rpx 10rpx;
+		box-shadow: 0 0 10rpx rgba($color: #000000, $alpha: .05);
+		margin-bottom: 30rpx;
+		padding: 0 30rpx;
+		display: flex;
+		justify-content: space-around;
+		.tabs-item{
+			line-height: 100rpx;
+			color: #888;
+			&.active{
+				font-weight: bold;
+				color: $mian-color;
+			}
+		}
+	}
     
     .While {
         border-radius: 10rpx;
@@ -246,7 +276,7 @@
             font-size: 26rpx;
         }
         .analyse-btn {
-            background-color: #6e79ec;
+            background-color: #4490ff;
             color: #FFFFFF;
             text-align: center;
             border-radius: 80rpx;
diff --git a/pages/uricacid/list.vue b/pages/uricacid/list.vue
index 7c4c742..d1eb13a 100644
--- a/pages/uricacid/list.vue
+++ b/pages/uricacid/list.vue
@@ -1,5 +1,10 @@
 <template>
-    <view class="content">
+    <view class="content">
+		<view class="tabs">
+			<view class="tabs-item" :class="tabType == 'hyperglycemia' ? 'active': ''" @click="onTab('hyperglycemia')">血糖记录</view>
+			<view class="tabs-item" :class="tabType == 'hyperlipidemia' ? 'active': ''" @click="onTab('hyperlipidemia')">血脂记录</view>
+			<view class="tabs-item" :class="tabType == 'hypertension' ? 'active': ''" @click="onTab('hypertension')">血压记录</view>
+		</view>
         <block v-if="LogArr.length > 0">
             <view class="While list">
                 <view class="list-label" v-for="(item, index) in LogArr" :key="index" @click="showSee(item.gout_case_log_id)">
@@ -84,19 +89,27 @@
                 LogId       : '',  //记录id
                 recordShow  : false,
                 page        : {},     //分页信息
-                lodingStats : false   //加载状态
+                lodingStats : false   ,//加载状态
+				tabType		: 'hyperglycemia'
     		}
     	},
     	onLoad() {
             // 获取尿酸记录列表
             this.lastInfo();
     	},
-    	methods: {
+    	methods: {
+			// 切换数据
+			onTab(e){
+				this.tabType = e;
+				this.page    = {};
+				this.lastInfo()
+			},
             // 尿酸数据
-            lastInfo(page) {
+            lastInfo(page) {
             	ListLog(this.$Route.query.id,{
-                    page : page || '' 
-                }).then(res => {
+                    page : page || 1,
+					type : this.tabType
+                }).then(res => {
                     let listArr = this.LogArr,
                         newData = []
                         if(page == 1 || page == undefined) listArr = []
@@ -184,8 +197,27 @@
 <style lang="scss" scoped>
     .content{
     	overflow: hidden;
-    	background: #f3f4f6;
-    }
+    	background: #f3f4f6;
+		min-height: 100vh;
+    }
+	
+	.tabs{
+		background-color: white;
+		border-radius: 0 0 10rpx 10rpx;
+		box-shadow: 0 0 10rpx rgba($color: #000000, $alpha: .05);
+		margin-bottom: 30rpx;
+		padding: 0 30rpx;
+		display: flex;
+		justify-content: space-around;
+		.tabs-item{
+			line-height: 100rpx;
+			color: #888;
+			&.active{
+				font-weight: bold;
+				color: $mian-color;
+			}
+		}
+	}
     
     .While {
         border-radius: 10rpx;
diff --git a/static/icons/tool_icon_00.png b/static/icons/tool_icon_00.png
index 02e7249583a399dcd492f53b6499fccabdf12a8b..41246ddf077c411047bd05cee30dcf2830cfaf7e 100644
GIT binary patch
literal 7386
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
ak7-+!fwhV0#^{rOAN6&Nv`aMaV*dkSfNW|2

literal 2671
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

diff --git a/static/icons/tool_icon_01.png b/static/icons/tool_icon_01.png
index 72d1eaac392ca590efb544dfa8fa759195eb5d52..23bd89f2c095fb94501f72d2a18e0f320e405ae1 100644
GIT binary patch
literal 4661
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

literal 2807
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

diff --git a/static/tabBar/tabBar_show_00.png b/static/tabBar/tabBar_show_00.png
index d55792e3d4bbc89abb5f1a399e7efea0be64d1bb..c1816da89fda9e3c68c69e1d83ddaf7908ceceb9 100644
GIT binary patch
delta 1677
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

delta 1136
zcmV-$1dscp7ts=sIRP4xI*cbZE;cP=F*G<JH#sgbHZ(9ZHY^}AFflnVFgPzUGc7PN
zIxsdmH8-*C(*Y1MEio`HF*sB)H99giIx{wt&;lJ0F)cALEipJ$F*Q0eH99jkll=mE
zlX(Osvz!BC0h7)JS%27C{4W3i1KmkPK~#9!?c7^P6j2<<afzaQ@U4WfBJ94JV0qUp
z(lkn3v63>hqR2}rMPiinkWmzp5NKsLBPhyzk_t_;8&;H5YL_RovU`c8SeelD8=0kT
zo7p+z?mD;s!xs^EXV3Y#?#$Vp(Tn3aFUqwDfe;Ci5Gg_=M1MjgM2Zjz(ZGlni^UUV
zpfYp=wV*1r4~4k<v5bhAf*v5wNtI|CA^zV8bW{e<z8+*H#J^2Jw-o@|S3-yu%Odo3
zh=8_gkgr)0w=)3!Lhl%E_X@?B32`Jk#Q<{-%|heQ3iMg#_5*0684&$Z69eE*k^B0g
zI)?imF*0Ht!+*2sCrXmpPB{Z)BbsD1#C(Q{-$gSSx3^08^L4hp4=B+nh$k5U&kC=V
zN}kz4!fHlt+XZ??oQm!+OfuhvJ^UDShT$=)h1=>1F&=fvOzb0?@1_;cHU`Kx6s{M<
zLWT*|qls=_ck{=IZy6qYot6<tql*laIP9T!e)z_tD}M}QI3}#uHH8>}ni&p;Gdu`r
z-vI_le!V_fD~O9xzs!I;P~<QH+TvF^-7@3)gyyM=hyg?~{KhXKpJ4{H#V;El$&Bwe
znym_=@R}lboVH&jJjb<qh0HjwtA&{CWKchb@%4|jJegHav>J%#B?i+jtR}oP82=f~
zONnuxP=5pQzQ{oM9ZaxB0qr5h5S!INY!ewstHuFswTr#6s|Mmzk%8RP0ie_l@r@dY
zPsIKtbbvTY;tBAY5DAeG2~h`#-h?>x0?}2}i5k!hLR6NI$UEcj-SkF=X%N#TRuyT4
z$lg{7#5{K(1_T5?Hv?j>1Y(w}+g@ML9yB*Bv45Wshgj~e-VHfL-F=}EOF2SRj^~T2
z5eGz$5S0V2MqhY9LR5$dFbk@+;Sr(&L_m#2<!HbWkPu}M0py2D&^IwWGa_!1K+G1w
z3qq$+zcV~DB5sjD+$_LNM}_Di3!GUI6T}cxGcVKuqC+X1DG)I^Z!`f#p_OPySfurz
ztA7Tf7pwt759bP?E)YW_lKL>vCRC4VP?bZq!p|B}3+hDQ#U`6w)Ws#Gl>u)pzLpPu
z?<$}!5W}NW-7-;6Mu>z+h=k}N#Al8JiHJ$lJR-k`4~tCZv~mW-W5<Ea30bHE#NNSi
ziXgsF1M#NV0r8S$rJ4q`rdLXxpV+DfVt=XB36rt$Ib4Eu50{W!jCO0FVlFXdFBcn^
z<?L+PLuw!fyLhp;*78^D#P<q=03KBP5{w3&176n3#Xyxh1w5{`%hEE@E#dz*Xc><G
z%=sExu9?fyC_*GeLL@|r5DAeG36Ua1LL@|k_XqtQ-c<I#X@~#-002ovPDHLkU;%=&
C5bJmV

diff --git a/static/tabBar/tabBar_show_01.png b/static/tabBar/tabBar_show_01.png
index 851d6b857c92e607794342ccd12e641de6b14116..e648f923a5fb0ab76f16f95e12e5368aa1e63821 100644
GIT binary patch
delta 2564
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

delta 1818
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
IM6N<$g6`KXcK`qY

diff --git a/static/tabBar/tabBar_show_02.png b/static/tabBar/tabBar_show_02.png
index 6dc98044f0452316da8389826695fdb1fe029d33..0a897241fd3a0f9b7453c8ab5ab2a1545e3ba34c 100644
GIT binary patch
delta 2244
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
E4`+xN1poj5

delta 1491
zcmV;^1uXj28?qIUIRP4xI*cbZE;cP=F*G<JH#sgbHZ(9ZHY^}AFflnVFgPzUGc7PN
zIxsdmH8-*C(*Y1MEio`HF*sB)H99giIx{en&;lJ0F)cALEipJ$F*Q0eH99jell=mD
zlXwIsvz!BC0h7)JS$}(>=lK8t1wKhcK~#9!?VL@BTU8W*2fB%yb|cwXvh=|)wLEKW
zNHwjc)ySaEltv<@VQOj>ix4UlTk0yC0VPnuMG&S6ana(4=pf?YKzD;Ug2aVHP{&ya
z9fc|4z~JI~PB?FPgxvf7Zr(l5-o>|@dAa#=?>XoGy$K=2gnuO&R)UpiC0dCVE73}{
z60Jmwm1reeiB_VD$;nBbI6xU_04<;mbby61(<SgT3t5wxBXLy{b_du1b^u|BB_N*#
ziFp!-zy6j%VKNptOWX%Efi;HW{QSmMVm$-$Jo?-uIuvI_hG=q<Si@g6#+TTkSh+?2
zzm^i1*czO&bAL0UILyk+RAyAE)Nv>Y<<fv#oft*nBGrYC=9)7UT#M~ygnF!ELL7IA
zVFa#Gtjw7f=qvb}RI}pjrEF4SErdV}+yy4`Jb~?@HexcXn2_jDVo(X}Qn5Y3h_dX*
zHX(62K;U&|@`6TB>NA#lfWQt@fjlHq4W}B$%ZvrGk$-qSAPeWM#Nb}oQ%I~Z7sx_l
zEnpTBW?`bJIb*x@%v@F^E=n4(O<zP+o3-fgyxP&xRPXKhW<xG(iS(tnV`k&li2qql
zID;AW%zlWNY*b=HF_dQldQ4w)49zEarcsF<#d205;0w!2qI!ZI!VS$5e;KPpYIHAV
zLQzSqC4Z3E&zi)FA|5sqNW8ClVpEZoD<QJzMvPb*HzrD-`TE;`@0qT?_oXR`ZOI33
zhAdS&l31E#cC#?znOm~>3<CE8U!0lyRG5+|ODgLjMeL(xF~7ia!a6ZORJZnJqXOhj
z0zU!5q{Ob|gQM1Z721$;G%m1u&y@AR3&1}p5Pzwj|IC;~*-T}H>l_(`<$+H;c^({l
zVvo_jiC^GZ;Ll-!$n!6KVCDowKujz!l83SHt5Nbio_?VvUB(-?#Cb(_b{WWf5O^Q>
zS0xa6s&ZKv*<(>`2W%&(^>oO42zUp$7bMT)=<zw}rrNkAmZ{gV*pLDlj{qM6J7MJ^
z7k{q&F5E-MWfI%tmYAn<##n|12@eBTfbXM-^Ydb3NlZ;0lu2x)v5GUFaMlt<*dAaC
zI1k(eevK>6&&la)GJ!bLang`DqgYRD#1QoWupcM^HQ*}n5%8_QIM&5$*ZvZR9)Cu)
zLzzoMVnG%cj~qR-_3G8T-#}wO2W}66C4a{<umb!5YyjK3B?U2i?qh8SJd^IR$m&IL
zx_(QfEha1%-}*xwDa~pd%1I^4&asHY#pec%<tR}xONm_C=-Rwrku?Y#%T3_RZ~m-`
zg(B){FkKR*d(Tq`Tv5CDH7kivo_IwB9C^u^keE~T#)EE2%r$>xAy6?-PSgu^oqq~*
z6?-m&_=vLu#&IxqEYy8Iv8`%k>DW1AA_K~q-ECeD5|zUmDLzpZ^*6ptO&%81&z^oa
z%mMs5r-SdVVqs!8M&g`x+yb%JA3Jp^jKCJh+XKZQk(jk{-a3wigS`)jZ$KHdyHdmX
z9!sD|uUBHm)Fl%)ol51iVJ{%Hxqn{<3M~?O^sy6z6=uw!QH0`*2<y<w?EE0!M!3P%
z&ccl<zsO#c`+e9uQ3wuql!Ib1hN3JSrqk6MgWikr4u>p;hKTnE+gZ7mHhfN|o8;Oo
zii#m?)H-J)OLzNZ_x;ul-Cgdg7K*d>Hj)A@pKYcj?@pNGdRcv?i#ukSOJq^bI%fU7
zI1X*UE@}|EN;{3ksHZUgFE1C$(NLeE4X`dvA$t@@H;HvR?X^ncI}~f(B-c3XYp(3O
t!mLD#m1reeiB_V;O0*KKL@Ut}z<&^?(GS~3i5CC>002ovPDHLkV1n?Wsoeko


From 3d03979622a91aae17b89dcfec45ca657a64bc5c 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, 15 Jul 2022 15:49:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/details.vue  | 37 ++++++++++++++++++++-----------------
 pages/uricacid/index.vue |  2 +-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/pages/index/details.vue b/pages/index/details.vue
index 6faa65b..9d00cc0 100644
--- a/pages/index/details.vue
+++ b/pages/index/details.vue
@@ -4,17 +4,12 @@
              <rich-text :nodes="detailsImg"></rich-text>
         </view>
         <view class="exhibition-receive">
-            <view class="exhibition-receive-btn" @click="popLogin" v-if="!detailsData.hasLogin">
-                参与活动
-            </view>
-            <block v-else>
-                <view class="exhibition-receive-btn" @click="popClick" v-if="canSample">
-                    参与活动
-                </view>
-                <view class="exhibition-receive-btn active" v-else>
-                    已参与
-                </view>
-            </block>
+			<view class="exhibition-receive-btn exhibition-receive-btn-50" @click="popClick">
+				记录三高
+			</view>
+			<view class="exhibition-receive-btn exhibition-receive-btn-50">
+				活动分享
+			</view>
         </view>
         
         <view class="popBack" v-if="popShow"></view>
@@ -123,8 +118,11 @@
         },
         methods: {
             // 商品详情数据
-            detailsInfo() {
-            	goods(this.$Route.query.id).then(res => {
+            detailsInfo() {
+            	goods(2).then(res => {
+					
+					console.log(res)
+					
                     this.detailsData = res
                     this.detailsImg = res.content.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:block;"')
                     this.canSample = res.canSample
@@ -314,17 +312,18 @@
     }
     
     .exhibition-receive {
-        position: fixed;
+        position: fixed;
+		display: flex;
         bottom: 0;
         left: 0;
         width: 100%;
         height: 120rpx;
         background-color: #FFFFFF;
-        padding: 17rpx 30rpx;
+        padding: 17rpx 20rpx;
         box-sizing: border-box;
         z-index: 9;
         .exhibition-receive-btn {
-            background-color: #ff8260;
+            background-color: $mian-color;
             color: #FFFFFF;
             height: 88rpx;
             line-height: 88rpx;
@@ -334,7 +333,11 @@
                 background-color: #d5d5d5;
                 color: #a9a9a9;
             }
-        }
+        }
+		.exhibition-receive-btn-50{
+			width: 50%;
+			margin: 0 10px;
+		}
     }
     
     .site-btn button[size="mini"] {
diff --git a/pages/uricacid/index.vue b/pages/uricacid/index.vue
index 0924abb..56c4093 100644
--- a/pages/uricacid/index.vue
+++ b/pages/uricacid/index.vue
@@ -200,7 +200,7 @@
     .content{
     	overflow: hidden;
     	background: #f3f4f6;
-		min-height: 100vh;
+		min-height: calc(100vh - 60px);
     }
 	
 	.tabs{