更新代码11-05

dorm-manager-wx/pages/login/login.js

@@ -33,15 +33,12 @@ Page({
         loginPwd:e.detail.value.password
       },
       success(res){
-        debugger
         if (res.data.status =='success'){//10001：老师，10002：学生
           wx.setStorageSync('user', res.data.data)
           wx.setStorageSync('loginId', e.detail.value.account)
-          if (res.data.data.roleType=='10002'){
-              wx.switchTab({
-                url: '/pages/student/menu/menu',
-              })
-          }
+          wx.switchTab({
+            url: '/pages/student/menu/menu',
+          })
         }else{
           wx.showToast({
             title: res.data.message,

dorm-manager-wx/pages/student/pass/pass.wxml

@@ -25,11 +25,11 @@
       <view class="line-top">
         <view class="line-ps" style="background:#3e61fd"></view>
         <view class="line-data">{{item.openTime}}</view>
-        <view class="line-title">{{item.state}}</view>
+        <view class="line-title">{{item.state==1?'出寝':'归寝'}}</view>
       </view>
       <view class="line-bottom">
         <image src="/images/dizhi.png"></image>
-        <view>{{item.deviceName}}</view>
+        <view>{{item.name}}</view>
       </view>
     </view>
   </block>

dorm-manager-wx/pages/student/statistics/statistics.js

@@ -21,13 +21,7 @@ Page({
     console.log(ringChart.getCurrentDataIndex(e));
   },
   onLoad(options){
-    let that=this
-    this.data.startdata = data.getDateStr(data.formatDate(), -30)
-    this.data.enddata = data.formatDate()
-    this.req(this.data.startdata, this.data.enddata)
-    this.setData({
-      user:wx.getStorageSync('user')
-    })
+
   },
   req: function (start,end){
     let that = this
@@ -143,5 +137,11 @@ Page({
     setTimeout(() => {
       ringChart.stopAnimation();
     }, 500);
+    this.data.startdata = data.getDateStr(data.formatDate(), -30)
+    this.data.enddata = data.formatDate()
+    this.req(this.data.startdata, this.data.enddata)
+    this.setData({
+      user: wx.getStorageSync('user')
+    })
   }
 });

dorm-manager-wx/pages/student/statistics/statistics.wxss

@@ -22,6 +22,8 @@ page{
   display: flex;
   justify-content: flex-end;
   align-items: center;
+  font-size: 30rpx;
+  color: #333;
 }
 .top-content{
   height: 60rpx;