处理：成绩页面，课程表页面，图书馆页面

bufuchangfeng · Nov 21, 2019 · 5f3d4eb · 5f3d4eb
1 parent 9cb4248
commit 5f3d4eb
Show file tree

Hide file tree

Showing 21 changed files with 392 additions and 274 deletions.
diff --git a/app.json b/app.json
@@ -10,7 +10,6 @@
     "pages/calendar/calendar",
     "pages/library/library",
     "pages/librarylogin/librarylogin",
-    "pages/lessoninfo/lessoninfo",
     "pages/liblecture/liblecture",
     "pages/score/score",
     "pages/liblectureinfo/liblectureinfo"

diff --git a/app.wxss b/app.wxss
@@ -14,3 +14,23 @@ Page{
       opacity: 1;
    }
 }
+.text-index{
+   color: #6f89c5;
+}
+.bg-index{
+   background: #6f89c5;
+}
+.functions_title{
+   font-size: 50rpx;
+   font-weight: bolder;
+   margin-left: 5%;
+   margin-top: 20rpx;
+   margin-bottom: 20rpx;
+}
+.truncate{
+   text-wrap: normal;
+   white-space: nowrap;
+   -ms-text-overflow: ellipsis;
+   text-overflow: ellipsis;
+   overflow: hidden;
+}
diff --git a/pages/curriculum/curriculum.js b/pages/curriculum/curriculum.js
@@ -1,11 +1,13 @@
 // pages/curriculum/curriculum.js
-var util = require("../../utils/util.js")
+var util = require("../../utils/util.js");
+let tips = null;
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    selectClassInfo:null,
     colorArrays: ["#85B8CF", "#90C652", "#D8AA5A", "#FC9F9D", "#0A9A84", "#61BC69", "#12AEF3", "#E29AAD"],
     wlist: [],
     months: [],
@@ -98,11 +100,27 @@ Page({
   },
 
   showCardView: function(e){
-    console.log(e.currentTarget.dataset.index)
-    wx.navigateTo({
-      url: "/pages/lessoninfo/lessoninfo?lesson=" + JSON.stringify(this.data.wlist[e.currentTarget.dataset.index])
-    })
+    console.log(e.currentTarget.dataset.index);
+      var _time = [];
+      let lesson = this.data.wlist[e.currentTarget.dataset.index];
+      for(var i = 0; i < lesson['time'].length; i++){
+          var _t = {};
+          _t['time'] = lesson['time'][i]['上课时间'];
+          _t['week'] = lesson['time'][i]['上课周次'];
+          _t['place'] = lesson['time'][i]['上课地点'];
+          _time.push(_t);
+      }
+
+      this.setData({
+          selectClassInfo:true,
+          time: _time
+      });
   },
+    close_classInfo(e){
+    this.setData({
+        selectClassInfo:false
+    })
+    },
 
   /**
    * 生命周期函数--监听页面加载
@@ -122,10 +140,12 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onLoad: function () {
-
-    this.timeInit()
+    tips = wx.showLoading({
+        title:"加载中.."
+    });
+    this.timeInit();
 
-    var that = this
+    var that = this;
 
     var ifbind = wx.getStorageSync("ifbind")
     if(ifbind == ""){
@@ -169,6 +189,8 @@ Page({
 
             that.setData({
               wlist: _wlist
+            },()=>{
+              wx.hideLoading(tips)
             })
           }
        })

diff --git a/pages/curriculum/curriculum.wxml b/pages/curriculum/curriculum.wxml
@@ -35,3 +35,20 @@
     </view>
   </view>
 </scroll-view>
+<view class="class_info_box" hidden="{{!selectClassInfo}}">
+  <view class="class_info">
+    <view class="close_btn" bindtap="close_classInfo">+</view>
+    <view wx:for="{{time}}" class="class_item">
+
+        <view class="class_item padding-xl radius shadow bg-index text-white margin-top">
+          <view>上课时间： {{item.time}}</view>
+          <view>上课周次： {{item.week}}</view>
+          <view>上课地点： {{item.place}}</view>
+        </view>
+
+    </view>
+
+  </view>
+
+
+</view>
diff --git a/pages/curriculum/curriculum.wxss b/pages/curriculum/curriculum.wxss
@@ -1,4 +1,7 @@
 /* pages/curriculum/curriculum.wxss */
+page{
+  background: #fff;
+}
 .flex-item {
   width: 95rpx;
   height: 100px;
@@ -70,4 +73,74 @@
 .pre_box image,.next_box image{
   width: 50rpx;
   height: 50rpx;
-}
+}
+.class_info_box{
+  z-index: 9999!important;
+  position: fixed;
+  width: 100%;
+  border-radius: 10rpx 10rpx 0 0;
+  -webkit-box-shadow: 0 1px 3px 3px rgba(0,0,0,0.1);
+  -moz-box-shadow: 0 1px 3px 3px rgba(0,0,0,0.1);
+  box-shadow: 0 1px 3px 3px rgba(0,0,0,0.1) ;
+  left: 0;
+
+  -webkit-animation-name: toTop;
+  -moz-animation-name: toTop;
+  -o-animation-name: toTop;
+  animation-name: toTop;
+  background: #fff;
+  animation-fill-mode: forwards;
+  -webkit-animation-duration: 1000ms;
+  -moz-animation-duration: 1000ms;
+  -o-animation-duration: 1000ms;
+  animation-duration: 1000ms;
+}
+.close_btn{
+
+  -webkit-animation-name: scale;
+
+  animation-fill-mode: forwards;
+
+  -moz-animation-name: scale;
+  -o-animation-name: scale;
+  animation-name: scale;
+  position: absolute;
+  right: 5%;
+  -webkit-animation-duration:2000ms;
+  -moz-animation-duration: 2000ms;
+  -o-animation-duration: 2000ms;
+  animation-duration: 2000ms;
+  margin-top: 20rpx;
+  font-size: 30rpx;
+
+
+}
+@keyframes scale {
+  from{
+    -webkit-transform: rotate(0);
+    -moz-transform:  rotate(0);
+    -ms-transform:  rotate(0);
+    -o-transform:  rotate(0);
+    transform:  rotate(0);
+  }
+  to{
+    -webkit-transform: rotate(404deg) scale(1.7);
+    -moz-transform: rotate(404deg) scale(1.7);
+    -ms-transform: rotate(404deg) scale(1.7);
+    -o-transform: rotate(404deg) scale(1.7);
+    transform: rotate(404deg) scale(1.7);
+  }
+}
+@keyframes toTop {
+  from{
+    bottom: -100%
+  }
+  to{
+    bottom: 0;
+  }
+}
+.class_item{
+  width: 90%;
+  margin-left: 5%;
+
+}
diff --git a/pages/function/function.js b/pages/function/function.js
@@ -38,67 +38,6 @@ Page({
     ]
   },
 
-  openLecture:function(){
-    var ifbind = wx.getStorageSync("ifbind")
-    if(ifbind == ""){
-      wx.showToast({
-        title: '未登录！',
-        icon: "none",
-        duration: 2000
-      })
-      return;
-    }
-    var openid = wx.getStorageSync("openid")
-    wx.request({
-          data: util.json2Form({
-            openid: openid,
-            state: "1"
-          }),
-          header: {
-            "Content-Type": "application/x-www-form-urlencoded"
-          },
-          url: 'https://www.neumark.top/user/update_lecture_state',
-          method: "POST",
-          success: (res) => {
-             wx.showToast({
-        title: '开启人文邮件通知服务！',
-        icon: "none",
-        duration: 2000
-        })
-      }
-    })
-  },
-  closeLecture:function(){
-     var ifbind = wx.getStorageSync("ifbind")
-    if(ifbind == ""){
-      wx.showToast({
-        title: '未登录！',
-        icon: "none",
-        duration: 2000
-      })
-      return;
-    }
-    var openid = wx.getStorageSync("openid")
-       wx.request({
-          data: util.json2Form({
-            openid: openid,
-            state: "0"
-          }),
-          header: {
-            "Content-Type": "application/x-www-form-urlencoded"
-          },
-          url: 'https://www.neumark.top/user/update_lecture_state',
-          method: "POST",
-          success: (res) => {
-             wx.showToast({
-        title: '关闭人文邮件通知服务！',
-        icon: "none",
-        duration: 2000
-        })
-      }
-    })
-
-  },
 
 
   /**
@@ -192,6 +131,17 @@ Page({
           });
           return
       }
+      if(type === 'library'){
+        if(wx.getStorageSync('ifbindlibrary') !== 'yes'){
+          wx.showToast({
+            title:"未登录"
+          });
+          wx.navigateTo({
+             url:`/pages/librarylogin/librarylogin`
+          })
+          return
+        }
+      }
       wx.navigateTo({
           url:`/pages/${type}/${type}`
       })

diff --git a/pages/function/function.wxss b/pages/function/function.wxss
@@ -2,13 +2,7 @@
 page{
     background: #fff;
 }
-.functions_title{
-    font-size: 40rpx;
-    font-weight: bolder;
-    margin-left: 5%;
-    margin-top: 20rpx;
-    margin-bottom: 20rpx;
-}
+
 
 .function_list{
     width: 100%;

diff --git a/pages/lessoninfo/lessoninfo.js b/pages/lessoninfo/lessoninfo.js