Browse Source

update style

dayu 2 years ago
parent
commit
73e0e69332
2 changed files with 36 additions and 7 deletions
  1. 7 7
      sleep/pages/home/index.vue
  2. 29 0
      sleep/pages/my/index.vue

+ 7 - 7
sleep/pages/home/index.vue

@@ -12,7 +12,7 @@
 					<text class="font_3 text_3 home-header-subtitle">我是小U,您的健康智慧管家。</text>
 					<text class="font_3 text_3 home-header-subtitle">我是小U,您的健康智慧管家。</text>
 				</view>
 				</view>
 
 
-				<view class="flex-row items-center home_add_devive space-x-10" @click="addBindDevice">
+				<view class="flex-row justify-center items-center home_add_devive space-x-10" @click="addBindDevice">
 				  <image
 				  <image
 				    class="image_4"
 				    class="image_4"
 					src="../../static/home/homeIconAdd.png"
 					src="../../static/home/homeIconAdd.png"
@@ -205,12 +205,12 @@
 		        class="shrink-0 image_10"
 		        class="shrink-0 image_10"
 				src="../../static/home/homeIconHeart.png"
 				src="../../static/home/homeIconHeart.png"
 		      />
 		      />
-		      <text class="font_1 text_14">心率</text>
+		      <view class="font_1 text_14">心率</view>
 		    </view>
 		    </view>
 		    <text class="self-start font_5 text_15">{{ pjxl }}</text>
 		    <text class="self-start font_5 text_15">{{ pjxl }}</text>
 		    <text class="self-start font_6 text_16">次/分</text>
 		    <text class="self-start font_6 text_16">次/分</text>
 		  </view>
 		  </view>
-		  <view class="flex-col justify-start shrink-0 relative home-data-chart content">
+		  <view class="flex-col flex-auto justify-start shrink-0 relative home-data-chart content">
 			<view class="echarts-wrap">
 			<view class="echarts-wrap">
 			  <mpvue-echarts class="ec-canvas" canvasId="canvasChart-1" ref="xinlvRefChart" @onInit="onInit1"></mpvue-echarts>
 			  <mpvue-echarts class="ec-canvas" canvasId="canvasChart-1" ref="xinlvRefChart" @onInit="onInit1"></mpvue-echarts>
 			</view>
 			</view>
@@ -229,7 +229,7 @@
 		    <text class="self-start font_5 text_15">{{ pjhx }}</text>
 		    <text class="self-start font_5 text_15">{{ pjhx }}</text>
 		    <text class="self-start font_6 text_16">次/分</text>
 		    <text class="self-start font_6 text_16">次/分</text>
 		  </view>
 		  </view>
-		  <view class="flex-col justify-start shrink-0 relative home-data-chart content">
+		  <view class="flex-col flex-auto justify-start shrink-0 relative home-data-chart content">
 			<view class="echarts-wrap">
 			<view class="echarts-wrap">
 			  <mpvue-echarts class="ec-canvas" canvasId="canvasChart-2" ref="huxiRefChart" @onInit="onInit2"></mpvue-echarts>
 			  <mpvue-echarts class="ec-canvas" canvasId="canvasChart-2" ref="huxiRefChart" @onInit="onInit2"></mpvue-echarts>
 			</view>
 			</view>
@@ -850,10 +850,8 @@ export default {
 	  background-color: #0233c699;
 	  background-color: #0233c699;
 	  border-radius: 1rem;
 	  border-radius: 1rem;
 	  backdrop-filter: blur(0.63rem);
 	  backdrop-filter: blur(0.63rem);
-	  width: 20.94rem;
 
 
 	  .image_4 {
 	  .image_4 {
-	    margin-left: 6.38rem;
 	    width: 1.5rem;
 	    width: 1.5rem;
 	    height: 1.5rem;
 	    height: 1.5rem;
 	  }
 	  }
@@ -1448,6 +1446,7 @@ export default {
       }
       }
     }
     }
     .home-data-left-title {
     .home-data-left-title {
+		width: max-content;
     }
     }
     .font_5 {
     .font_5 {
       font-size: 2.5rem;
       font-size: 2.5rem;
@@ -1470,7 +1469,8 @@ export default {
   }
   }
   .home-data-chart {
   .home-data-chart {
     overflow-x: hidden;
     overflow-x: hidden;
-    width: 17.19rem;
+    width: 100%;
+	
     .group_10 {
     .group_10 {
       padding-left: 2.06rem;
       padding-left: 2.06rem;
       padding-bottom: 2.25rem;
       padding-bottom: 2.25rem;

+ 29 - 0
sleep/pages/my/index.vue

@@ -72,6 +72,17 @@
                 />
                 />
               </view>
               </view>
             </view>
             </view>
+			<!-- device = 0 -->
+			<view v-if="deviceList.length == 0">
+				<view class="flex-row justify-center items-center home_add_devive space-x-10" @click="addBindDevice">
+				  <image
+				    class="image_4"
+					src="../../static/home/homeIconAdd.png"
+				  />
+				  <view class="text_5">添加设备</view>
+				</view>
+			</view>
+			
             <view v-if="deviceList.length > 0" v-for="(item, index) in deviceList" :key="index"
             <view v-if="deviceList.length > 0" v-for="(item, index) in deviceList" :key="index"
                   class="flex-col my_device_default space-y-6">
                   class="flex-col my_device_default space-y-6">
               <view class="flex-row justify-between items-end">
               <view class="flex-row justify-between items-end">
@@ -473,6 +484,24 @@ export default {
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+.home_add_devive {
+	padding: 2.75rem 0;
+	background-color: rgba(14, 52, 147, 1);
+	border-radius: 1rem;
+	backdrop-filter: blur(0.63rem);
+
+	.image_4 {
+	    width: 1.5rem;
+	    height: 1.5rem;
+	  }
+	  .text_5 {
+	    color: #ffffff;
+	    font-size: 1.3rem;
+	    font-family: PingFangSC;
+	    line-height: 1.38rem;
+		margin-left: 0.5rem	  
+		}
+	}	  
 .power-module {
 .power-module {
   position: absolute;
   position: absolute;
   right: 1.63rem;
   right: 1.63rem;