优化请求

.gitignore

@@ -4,6 +4,7 @@ node_modules/
 **/unpackage
 /unpackage
 /sleep/unpackage
+sleep/unpackage/
 dist/
 build/
 /node_modules

sleep/pages/home/index.vue

@@ -358,8 +358,7 @@ export default {
       bindShow: false,
       modalName: false,
       activeBreak: false,
-      isConnect: false,
-      showCount: 0
+      isConnect: false
 		};
 	},
   // onLoad() {
@@ -413,9 +412,7 @@ export default {
   //   }
   // },
   onShow() {
-    this.showCount ++
-    if (this.showCount === 3 && this.memberId) {
-      this.showCount = 0
+    if (this.memberId) {
       this.API_getDeviceList()
     }
     const imei = Storage.getItem('nowChangeDevice')
@@ -425,7 +422,7 @@ export default {
     } else {
       this.deviceAdded = false
     }
-    if (Storage.getItem('uid')) {
+    if (this.memberId) {
       if (this.connected) {
         console.log('发送确认在线消息...')
         this.mySocketTask.send({data: '1'})
@@ -434,7 +431,11 @@ export default {
         setTimeout(() => {
           if (_this.isConnect === false) {
             console.log('没有正常返回...')
-            _this.connect()
+            if (_this.chartObj1) {
+              _this.connect()
+            } else {
+              _this.init()
+            }
           }
         }, 1000)
       } else {

sleep/pages/report/report.vue

@@ -565,7 +565,8 @@
         bindSn: '',
         memberId: '',
         userInfo: null,
-        errCount: 0
+        errCount: 0,
+        showCount: 0
 			}
 		},
     // mounted() {
@@ -585,6 +586,12 @@
           if (Storage.getItem('refreshSleepReport')) {
             Storage.removeItem('refreshSleepReport')
             this.getNewSleepReport()
+          } else {
+            this.showCount ++
+            if (this.showCount === 3) {
+              this.showCount = 0
+              this.getNewSleepReport()
+            }
           }
         }
       } else {
@@ -595,7 +602,7 @@
 		handleMonthClick() {
 			uni.navigateTo({
 				url: '/pages/monthReport/monthReport'
-			})	
+			})
 		},
 		handleWeekClick() {
 			uni.navigateTo({
@@ -1786,7 +1793,7 @@
 	      .report_score {
 			padding-top: 1rem;
 			z-index: 100;
-			
+
 	        .report_period {
 				margin-left: 1.2rem;
 	        }
@@ -1842,7 +1849,7 @@
 	    }
 	    .report_analysis {
 	      padding-top: 0.63rem;
-		  
+
 	      .font_4 {
 	        font-size: 1.13rem;
 	        font-family: PingFangSC;

sleep/unpackage/dist/dev/mp-weixin/app.json

@@ -1,75 +0,0 @@
-{
-  "pages": [
-    "pages/home/index",
-    "pages/monthReport/monthReport",
-    "pages/weekReport/weekReport",
-    "pages/alertSetting/alertSetting",
-    "pages/report/report",
-    "pages/login/index",
-    "pages/my/index",
-    "pages/search/index",
-    "pages/searchList/index",
-    "pages/play/index",
-    "pages/songDetail/index",
-    "pages/dayRecommend/index",
-    "pages/songList/index",
-    "pages/singer/index",
-    "pages/index/index",
-    "pages/shareUser/shareUser",
-    "pages/singerPlayList/index",
-    "pages/auth/auth"
-  ],
-  "subPackages": [],
-  "window": {
-    "navigationStyle": "custom",
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "",
-    "navigationBarBackgroundColor": "#ffffff",
-    "backgroundColor": "#ffffff"
-  },
-  "tabBar": {
-    "color": "#ffffff",
-    "selectedColor": "#ffffff",
-    "borderStyle": "black",
-    "backgroundColor": "#167DF2",
-    "list": [
-      {
-        "pagePath": "pages/home/index",
-        "iconPath": "static/tabBar/home.png",
-        "selectedIconPath": "static/tabBar/homeSel.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/report/report",
-        "iconPath": "static/tabBar/report.png",
-        "selectedIconPath": "static/tabBar/reportSel.png",
-        "text": "报告"
-      },
-      {
-        "pagePath": "pages/index/index",
-        "iconPath": "static/tabBar/discover.png",
-        "selectedIconPath": "static/tabBar/discoverSel.png",
-        "text": "发现"
-      },
-      {
-        "pagePath": "pages/my/index",
-        "iconPath": "static/tabBar/my.png",
-        "selectedIconPath": "static/tabBar/mySel.png",
-        "text": "我的"
-      }
-    ]
-  },
-  "requiredBackgroundModes": [
-    "audio"
-  ],
-  "permission": {},
-  "usingComponents": {
-    "music-control": "/components/musicControl/index",
-    "box-title": "/components/boxTitle/index",
-    "tab-bar": "/components/tabBar/index",
-    "cu-custom": "/colorui/components/cu-custom",
-    "uni-steps": "/uni_modules/uni-steps/components/uni-steps/uni-steps",
-    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
-    "time-slot": "/components/wanghexu-timeslot/wanghexu-timeslot"
-  }
-}

sleep/unpackage/dist/dev/mp-weixin/components/musicControl/playList.json

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

sleep/unpackage/dist/dev/mp-weixin/pages/alertSetting/alertSetting.json

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

sleep/unpackage/dist/dev/mp-weixin/pages/alertSetting/alertSetting.wxss

@@ -1,400 +0,0 @@
-@charset "UTF-8";
-/**
- * 这里是uni-app内置的常用样式变量
- *
- * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
- * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
- *
- */
-/**
- * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
- *
- * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
- */
-/* 颜色变量 */
-/* 行为相关颜色 */
-/* 文字基本颜色 */
-/* 背景颜色 */
-/* 边框颜色 */
-/* 尺寸变量 */
-/* 文字尺寸 */
-/* 图片尺寸 */
-/* Border Radius */
-/* 水平间距 */
-/* 垂直间距 */
-/* 透明度 */
-/* 文章场景相关 */
-.page.data-v-0fb9c086 {
-  background-color: #000000;
-  width: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
-  height: 100%;
-}
-.page .section.data-v-0fb9c086 {
-  background-image: url("https://codefun-proj-user-res-1256085488.cos.ap-guangzhou.myqcloud.com/649415135a7e3f0310661c1e/649415b654fe0000116ae544/16878800827323657149.png");
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-}
-.page .section .section_2.data-v-0fb9c086 {
-  padding-bottom: 1.25rem;
-  background-image: linear-gradient(180deg, #1e1ef7f2 0%, #1dbff79c 100%);
-  -webkit-backdrop-filter: blur(0.19rem);
-          backdrop-filter: blur(0.19rem);
-}
-.page .section .section_2 .section_3.data-v-0fb9c086 {
-  padding: 1.13rem 0.44rem 0.38rem;
-  background-color: #ffffff4d;
-}
-.page .section .section_2 .section_3 .group.data-v-0fb9c086 {
-  padding: 0 0.5rem;
-}
-.page .section .section_2 .section_3 .group .image.data-v-0fb9c086 {
-  width: 1.06rem;
-  height: 0.69rem;
-}
-.page .section .section_2 .section_3 .group .image_2.data-v-0fb9c086 {
-  width: 0.94rem;
-  height: 0.69rem;
-}
-.page .section .section_2 .section_3 .group .image_3.data-v-0fb9c086 {
-  width: 1.5rem;
-  height: 0.72rem;
-}
-.page .section .section_2 .section_3 .space-x-6-reverse > view.data-v-0fb9c086:not(:last-child),
-.page .section .section_2 .section_3 .space-x-6-reverse > text.data-v-0fb9c086:not(:last-child),
-.page .section .section_2 .section_3 .space-x-6-reverse > image.data-v-0fb9c086:not(:last-child) {
-  margin-right: 0.38rem;
-}
-.page .section .section_2 .section_3 .group_2.data-v-0fb9c086 {
-  padding: 0.63rem 0 0.38rem;
-}
-.page .section .section_2 .section_3 .group_2 .text.data-v-0fb9c086 {
-  font-size: 1.16rem;
-  line-height: 1.06rem;
-}
-.page .section .section_2 .section_3 .group_2 .section_4.data-v-0fb9c086 {
-  padding: 0.38rem 0.75rem;
-  background-color: #ffffff99;
-  border-radius: 1rem;
-  border: solid 0.031rem #00000014;
-}
-.page .section .section_2 .section_3 .group_2 .section_4 .image-wrapper.data-v-0fb9c086 {
-  width: 1.19rem;
-}
-.page .section .section_2 .section_3 .group_2 .section_4 .image-wrapper .image_5.data-v-0fb9c086 {
-  width: 1.19rem;
-  height: 0.44rem;
-}
-.page .section .section_2 .section_3 .group_2 .section_4 .image-wrapper .image_4.data-v-0fb9c086 {
-  width: 1.13rem;
-  height: 1.06rem;
-}
-.page .section .section_2 .section_3 .group_2 .section_4 .section_5.data-v-0fb9c086 {
-  background-color: #00000033;
-  width: 0.063rem;
-  height: 1.16rem;
-}
-.page .section .section_2 .section_3 .group_2 .space-x-11 > view.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .section_3 .group_2 .space-x-11 > text.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .section_3 .group_2 .space-x-11 > image.data-v-0fb9c086:not(:first-child) {
-  margin-left: 0.69rem;
-}
-.page .section .section_2 .section_3 .group_2 .pos.data-v-0fb9c086 {
-  position: absolute;
-  right: 0;
-  top: 50%;
-  -webkit-transform: translateY(-50%);
-          transform: translateY(-50%);
-}
-.page .section .section_2 .space-y-22 > view.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .space-y-22 > text.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .space-y-22 > image.data-v-0fb9c086:not(:first-child) {
-  margin-top: 1.38rem;
-}
-.page .section .section_2 .font_1.data-v-0fb9c086 {
-  font-size: 1.13rem;
-  font-family: PingFangSC;
-  line-height: 1.03rem;
-  color: #ffffff;
-}
-.page .section .section_2 .text_2.data-v-0fb9c086 {
-  margin-left: 1.25rem;
-  margin-top: 1.38rem;
-}
-.page .section .section_2 .section_6.data-v-0fb9c086 {
-  padding: 0.94rem 0.63rem 0.13rem;
-  background-color: #ffffff33;
-  border-radius: 1rem;
-}
-.page .section .section_2 .view.data-v-0fb9c086 {
-  margin: 0.88rem 1.25rem 0;
-}
-.page .section .section_2 .space-y-10 > view.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .space-y-10 > text.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .space-y-10 > image.data-v-0fb9c086:not(:first-child) {
-  margin-top: 0.63rem;
-}
-.page .section .section_2 .group_5.data-v-0fb9c086 {
-  padding: 0 1.25rem;
-}
-.page .section .section_2 .group_5 .group_6.data-v-0fb9c086 {
-  padding-bottom: 0.88rem;
-}
-.page .section .section_2 .group_5 .group_6 .text_4.data-v-0fb9c086 {
-  line-height: 0.59rem;
-}
-.page .section .section_2 .group_5 .space-x-30 > view.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .group_5 .space-x-30 > text.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .group_5 .space-x-30 > image.data-v-0fb9c086:not(:first-child) {
-  margin-left: 0.3rem;
-}
-.page .section .section_2 .group_5 .section_7.data-v-0fb9c086 {
-  padding: 0.94rem 0.63rem 0;
-  background-color: #ffffff33;
-  border-radius: 1rem;
-}
-.page .section .section_2 .group_5 .section_7 .group_7.data-v-0fb9c086 {
-  border-bottom: solid 0.063rem #ffffff1a;
-}
-.page .section .section_2 .group_5 .section_7 .group_7 .group_8.data-v-0fb9c086 {
-  padding-bottom: 0.88rem;
-  border-bottom: solid 0.063rem #ffffff1a;
-}
-.page .section .section_2 .group_5 .section_7 .group_7 .group_8 .group_9.data-v-0fb9c086 {
-  margin-right: 0.19rem;
-}
-.page .section .section_2 .group_5 .section_7 .group_7 .group_8 .space-x-20 > view.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .group_5 .section_7 .group_7 .group_8 .space-x-20 > text.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .group_5 .section_7 .group_7 .group_8 .space-x-20 > image.data-v-0fb9c086:not(:first-child) {
-  margin-left: 1.25rem;
-}
-.page .section .section_2 .group_5 .section_7 .group_7 .group_10.data-v-0fb9c086 {
-  padding: 0.88rem 0;
-}
-.page .section .section_2 .group_5 .section_7 .group_7 .group_10 .group_11.data-v-0fb9c086 {
-  margin-right: 0.19rem;
-}
-.page .section .section_2 .group_5 .space-y-24 > view.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .group_5 .space-y-24 > text.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .group_5 .space-y-24 > image.data-v-0fb9c086:not(:first-child) {
-  margin-top: 1.5rem;
-}
-.page .section .section_2 .group_5 .section_8.data-v-0fb9c086 {
-  padding: 0.63rem 0;
-  background-color: #ffffff33;
-  border-radius: 1rem;
-}
-.page .section .section_2 .group_5 .space-y-12 > view.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .group_5 .space-y-12 > text.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .group_5 .space-y-12 > image.data-v-0fb9c086:not(:first-child) {
-  margin-top: 0.75rem;
-}
-.page .section .section_2 .group_5 .space-y-12 .text_5.data-v-0fb9c086 {
-  line-height: 1.06rem;
-}
-.page .section .section_2 .group_5 .space-y-12 .space-y-4 > view.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .group_5 .space-y-12 .space-y-4 > text.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .group_5 .space-y-12 .space-y-4 > image.data-v-0fb9c086:not(:first-child) {
-  margin-top: 0.55rem;
-}
-.page .section .section_2 .group_5 .space-y-12 .space-y-4 .text_6.data-v-0fb9c086 {
-  line-height: 0.75rem;
-}
-.page .section .section_2 .group_5 .space-y-12 .space-y-4 .section_9.data-v-0fb9c086 {
-  padding: 0 0.63rem;
-  background-color: #ffffff33;
-  border-radius: 1rem;
-}
-.page .section .section_2 .group_5 .font_5.data-v-0fb9c086 {
-  font-size: 0.63rem;
-  font-family: PingFangSC;
-  color: red;
-}
-.page .section .section_2 .group_5 .space-x-8 > view.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .group_5 .space-x-8 > text.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .group_5 .space-x-8 > image.data-v-0fb9c086:not(:first-child) {
-  margin-left: 0.5rem;
-}
-.page .section .section_2 .group_5 .space-x-8 .text_7.data-v-0fb9c086 {
-  color: #ffffff80;
-}
-.page .section .section_2 .group_5 .space-x-8 .image_8.data-v-0fb9c086 {
-  width: 1.13rem;
-  height: 1.13rem;
-}
-.page .section .section_2 .group_5 .button.data-v-0fb9c086 {
-  padding: 0.5rem 0;
-  background-image: linear-gradient(90deg, #5611f780 0%, #1e1ef7f2 100%);
-  border-radius: 1rem;
-  width: 8.69rem;
-}
-.page .section .section_2 .group_5 .button .text_9.data-v-0fb9c086 {
-  color: #ffffff;
-  font-size: 1rem;
-  font-family: PingFangSC;
-  line-height: 0.94rem;
-}
-.page .section .section_2 .space-y-14 > view.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .space-y-14 > text.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .space-y-14 > image.data-v-0fb9c086:not(:first-child) {
-  margin-top: 0.88rem;
-}
-.page .section .section_2 .equal-division.data-v-0fb9c086 {
-  width: 12.5rem;
-}
-.page .section .section_2 .font_2.data-v-0fb9c086 {
-  font-size: 0.88rem;
-  font-family: PingFangSC;
-  line-height: 0.81rem;
-  color: #ffffff;
-}
-.page .section .section_2 .text_3.data-v-0fb9c086 {
-  opacity: 0.8;
-}
-.page .section .section_2 .font_3.data-v-0fb9c086 {
-  font-size: 1.13rem;
-  font-family: PingFangSC;
-  line-height: 0.81rem;
-  color: #ffffff;
-}
-.page .section .section_2 .image_7.data-v-0fb9c086 {
-  width: 0.38rem;
-  height: 0.69rem;
-}
-.page .section .section_2 .font_4.data-v-0fb9c086 {
-  font-size: 0.75rem;
-  font-family: PingFangSC;
-  line-height: 0.69rem;
-  color: #ffffff;
-}
-.page .section .section_2 .space-x-6 > view.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .space-x-6 > text.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .space-x-6 > image.data-v-0fb9c086:not(:first-child) {
-  margin-left: 0.38rem;
-}
-.page .section .section_2 .space-x-6 .equal-division-item.data-v-0fb9c086 {
-  padding: 0.25rem 0.63rem;
-  width: 6.84rem;
-}
-.page .section .section_2 .space-x-4 > view.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .space-x-4 > text.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .space-x-4 > image.data-v-0fb9c086:not(:first-child) {
-  margin-left: 0.25rem;
-}
-.page .section .section_2 .image_6.data-v-0fb9c086 {
-  width: 1.38rem;
-  height: 0.88rem;
-}
-.page .section .section_2 .space-y-20 > view.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .space-y-20 > text.data-v-0fb9c086:not(:first-child),
-.page .section .section_2 .space-y-20 > image.data-v-0fb9c086:not(:first-child) {
-  margin-top: 1.25rem;
-}
-.page .section .section_2 .list-item.data-v-0fb9c086 {
-  padding: 0.88rem 0;
-  border-bottom: solid 0.063rem #ffffff1a;
-}
-.page .section .section_2 .list-item .group_3.data-v-0fb9c086 {
-  margin-right: 0.19rem;
-}
-.page .section .section_2 .list-item .text_8.data-v-0fb9c086 {
-  line-height: 0.78rem;
-}
-.page .section .section_2 .list-item .image_9.data-v-0fb9c086 {
-  width: 0.88rem;
-  height: 0.88rem;
-}
-.page .section .space-y-32 > view.data-v-0fb9c086:not(:first-child),
-.page .section .space-y-32 > text.data-v-0fb9c086:not(:first-child),
-.page .section .space-y-32 > image.data-v-0fb9c086:not(:first-child) {
-  margin-top: 2rem;
-}
-.box.data-v-0fb9c086 {
-  display: flex;
-  flex-direction: row;
-}
-.button.data-v-0fb9c086 {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  flex: 1;
-  height: 35px;
-  margin: 0 5px;
-  border-radius: 5px;
-}
-.example-body.data-v-0fb9c086 {
-  background-color: #fff;
-  padding: 10px 0;
-}
-.button-text.data-v-0fb9c086 {
-  color: #fff;
-  font-size: 12px;
-}
-.popup-content.data-v-0fb9c086 {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  padding: 15px;
-  height: 50px;
-  background-color: #fff;
-}
-.popup-height.data-v-0fb9c086 {
-  height: 100%;
-  width: 200px;
-}
-.text.data-v-0fb9c086 {
-  font-size: 12px;
-  color: #333;
-}
-.popup-success.data-v-0fb9c086 {
-  color: #fff;
-  background-color: #e1f3d8;
-}
-.popup-warn.data-v-0fb9c086 {
-  color: #fff;
-  background-color: #faecd8;
-}
-.popup-error.data-v-0fb9c086 {
-  color: #fff;
-  background-color: #fde2e2;
-}
-.popup-info.data-v-0fb9c086 {
-  color: #fff;
-  background-color: #f2f6fc;
-}
-.success-text.data-v-0fb9c086 {
-  color: #09bb07;
-}
-.warn-text.data-v-0fb9c086 {
-  color: #e6a23c;
-}
-.error-text.data-v-0fb9c086 {
-  color: #f56c6c;
-}
-.info-text.data-v-0fb9c086 {
-  color: #909399;
-}
-.dialog.data-v-0fb9c086,
-.share.data-v-0fb9c086 {
-  display: flex;
-  flex-direction: column;
-}
-.dialog-box.data-v-0fb9c086 {
-  padding: 10px;
-}
-.dialog .button.data-v-0fb9c086,
-.share .button.data-v-0fb9c086 {
-  width: 100%;
-  margin: 0;
-  margin-top: 10px;
-  padding: 3px 0;
-  flex: 1;
-}
-.dialog-text.data-v-0fb9c086 {
-  font-size: 14px;
-  color: #333;
-}
-

sleep/unpackage/dist/dev/mp-weixin/pages/report/report.json

@@ -1,7 +0,0 @@
-{
-  "enablePullDownRefresh": true,
-  "usingComponents": {
-    "uni-calendar": "/components/uni-calendar/uni-calendar",
-    "mpvue-echarts": "/components/mpvue-echarts/src/echarts"
-  }
-}

sleep/utils/request.js

@@ -11,7 +11,7 @@ const api_mode = 'prod'
 export const API = {
 	base: 'https://api.base.wdklian.com',
 	buyer: 'https://api.buyer.wdklian.com',
-	// base: 'http://wdkl.natapp1.cc',
+	// base: 'http://192.168.1.199:7000',
 	// buyer: 'http://192.168.1.199:7002'
 }