框架修改

componets/authorized-login-dialog/authorizedLoginDialog.js

@@ -0,0 +1,26 @@
+// componets/authorized-login-dialog/authorizedLoginDialog.js
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    showDialog:false
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    onCloseDialog() {
+      this.setData({ showDialog: false });
+    },
+  }
+})

componets/authorized-login-dialog/authorizedLoginDialog.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

componets/authorized-login-dialog/authorizedLoginDialog.wxml

@@ -0,0 +1,4 @@
+<!--componets/authorized-login-dialog/authorizedLoginDialog.wxml-->
+<van-popup show="{{ showDialog }}" close-on-click-overlay="{{false}}" z-index="10086" overlay bind:close="onCloseDialog"
+    custom-style="background-color: transparent;">
+</van-popup>

componets/authorized-login-dialog/authorizedLoginDialog.wxss

@@ -0,0 +1 @@
+/* componets/authorized-login-dialog/authorizedLoginDialog.wxss */

pages/data/data.js

@@ -2007,8 +2007,8 @@ Page({
 			onInit: initApneaLine
 		},
 		ecTimeWaterfall: {
-			// lazyLoad: true, // 懒加载
-			onInit: initChartTimeWaterfall
+			lazyLoad: true, // 懒加载
+			// onInit: initChartTimeWaterfall
 		},
 		header: false,
 		nowDate: [{ //日历的初始化数据
@@ -4334,7 +4334,7 @@ Page({
 		updateTimeWaterfall(startTime, timePeriods, that)
 		// console.log("睡眠数据最终=>", dateString);
 		// console.log("睡眠数据最终=>", startTime);
-		// console.log("睡眠数据最终=>", JSON.stringify(timePeriods));
+		console.log("睡眠数据最终=>", JSON.stringify(timePeriods));
 	},
 	onReady() {
 		var that = this;

pages/data/data.json

@@ -1,8 +1,9 @@
 {
   "usingComponents": {
-    "ec-canvas": "../../ec-canvas/ec-canvas"
+    "ec-canvas": "../../ec-canvas/ec-canvas",
+    "authorized-login-dialog": "../../componets/authorized-login-dialog/authorizedLoginDialog"
   },
-  "navigationBarBackgroundColor":"#ffffff",
+  "navigationBarBackgroundColor": "#ffffff",
   "navigationBarTextStyle": "black",
   "navigationBarTitleText": "舒眠睡眠测试"
 }

pages/data/data.wxss

@@ -1,5 +1,4 @@
 /* subpages/data/data.wxss */
-@import "/pages/setTime/setTime.wxss";
 
 page {
   background-repeat: no-repeat;

pages/index/index.json

@@ -1,7 +1,10 @@
 {
   "usingComponents": {
-  "ec-canvas": "../../ec-canvas/ec-canvas"
+    "ec-canvas": "../../ec-canvas/ec-canvas",
+    "authorized-login-dialog": "../../componets/authorized-login-dialog/authorizedLoginDialog"
+  },
+  "navigationBarRightButton": {
+    "hide": true
   },
-  "navigationBarRightButton": {"hide": true},
   "navigationStyle": "custom"
 }

pages/mine/mine.json

@@ -1,5 +1,9 @@
 {
-  "usingComponents": {},
-  "navigationBarRightButton": {"hide": true},
+  "usingComponents": {
+    "authorized-login-dialog": "../../componets/authorized-login-dialog/authorizedLoginDialog"
+  },
+  "navigationBarRightButton": {
+    "hide": true
+  },
   "navigationStyle": "custom"
 }

pages/scan/scan.json

@@ -1,5 +1,7 @@
 {
   "navigationBarTitleText": "扫描二维码",
-  "usingComponents": {},
+  "usingComponents": {
+    "authorized-login-dialog": "../../componets/authorized-login-dialog/authorizedLoginDialog"
+  },
   "navigationStyle": "custom"
 }

pages/setTime/setTime.wxss

@@ -1,66 +0,0 @@
-/* pages/setTime/setTime.wxss */
-
-.switch-view {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  width: 600rpx;
-  margin: 30rpx;
-  color: #62c4d9;
-}
-switch{
-  zoom: .7;
-}
-.picker-view {
-  width: 500rpx;
-  height: 300rpx;
-}
-
-.indicator-class {
-  height: 100rpx;
-  display: flex;
-  flex-direction: row;
-}
-
-.mask-class {
-  opacity: 0;
-}
-
-.picker-item {
-  line-height: 100rpx;
-  color: #62c4d9;
-  width: 100%;
-  text-align: center;
-}
-
-.list {
-  width: 670rpx;
-  margin: 30rpx 40rpx 30rpx 40rpx;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  font-size: 32rpx;
-  color: #62c4d9;
-}
-
-.content {
-  font-size: 28rpx;
-  color: #62c4d9;
-  width: 420rpx;
-  display: flex;
-  justify-content: flex-end;
-}
-
-.list image {
-  width: 30rpx;
-  height: 30rpx;
-}
-
-.foot-text {
-  line-height: 50rpx;
-  font-size: 30rpx;
-  margin: 34rpx;
-  color: #62c4d9;
-}