柒零 1 rok pred
rodič
commit
c33c888c3e
2 zmenil súbory, kde vykonal 9 pridanie a 9 odobranie
  1. 3 3
      subpages/data/data.js
  2. 6 6
      subpages/data/data.wxml

+ 3 - 3
subpages/data/data.js

@@ -2060,11 +2060,11 @@ Page({
 		durationDataTemp.push(obj);
 		obj = {};
 		obj.name = '浅睡';
-		obj.value = ress.rlight_duration;
+		obj.value = ress.rin_duration;
 		durationDataTemp.push(obj);
 		obj = {};
-		obj.name = '中睡';
-		obj.value = ress.rin_duration;
+		obj.name = '中睡';//REM
+		obj.value = ress.rlight_duration;
 		durationDataTemp.push(obj);
 		obj = {};
 		obj.name = '清醒';

+ 6 - 6
subpages/data/data.wxml

@@ -492,12 +492,12 @@
 							style="width: 16rpx;height: 16rpx;background: linear-gradient( 180deg, #75BDE0 0%, #75BDE0 100%);border-radius: 4rpx;">
 						</view>
 						<text style="flex: 1;margin-left: 20rpx;font-size: 28rpx;color: #3E3D44;">浅睡</text>
-						<text style="font-size: 28rpx;color: #3E3D44;font-weight: 700;">{{rlight_duration_efficiency ||
+						<text style="font-size: 28rpx;color: #3E3D44;font-weight: 700;">{{rin_duration_efficiency ||
 							'0%'}}</text>
 					</view>
 					<text class="title-text-right_c6"
-						style="text-align: left;margin-left: 36rpx;font-size: 28rpx;">{{rlight_durationFormat.formattedHours}}<text
-							class="text-line_c31-units">小时</text>{{rlight_durationFormat.formattedMinutes}}<text
+						style="text-align: left;margin-left: 36rpx;font-size: 28rpx;">{{rin_durationFormat.formattedHours}}<text
+							class="text-line_c31-units">小时</text>{{rin_durationFormat.formattedMinutes}}<text
 							class="text-line_c31-units">分钟</text></text>
 				</view>
 
@@ -526,12 +526,12 @@
 
 
 						<text style="flex: 1;margin-left: 20rpx;font-size: 28rpx;color: #3E3D44;">REM</text>
-						<text style="font-size: 28rpx;color: #3E3D44;font-weight: 700;">{{rin_duration_efficiency ||
+						<text style="font-size: 28rpx;color: #3E3D44;font-weight: 700;">{{rlight_duration_efficiency ||
 							'0%'}}</text>
 					</view>
 					<text class="title-text-right_c6"
-						style="text-align: left;margin-left: 36rpx;font-size: 28rpx;">{{rin_durationFormat.formattedHours}}<text
-							class="text-line_c31-units">小时</text>{{rin_durationFormat.formattedMinutes}}<text
+						style="text-align: left;margin-left: 36rpx;font-size: 28rpx;">{{rlight_durationFormat.formattedHours}}<text
+							class="text-line_c31-units">小时</text>{{rlight_durationFormat.formattedMinutes}}<text
 							class="text-line_c31-units">分钟</text></text>
 				</view>
 			</view>