首页修改

PageComponents/scheduleList/scheduleList.acss

-.index{
+.index {
     background: #FFFFFF;
 }
-.scheduleHeader{
-    position: fixed;
+
+.scheduleHeader {
+    /* position: fixed;
     top: 0;
-    left: 0;
+    left: 0; */
     width: 100%;
     height: 88rpx;
     background: #FFFFFF;
@@ -12,17 +13,20 @@
     padding: 0 32rpx;
     display: flex;
     justify-content: space-between;
-    box-shadow: 0 1rpx 8rpx 0 rgba(0,0,0,0.04);
+    box-shadow: 0 1rpx 8rpx 0 rgba(0, 0, 0, 0.04);
     z-index: 9;
 }
-.scheduleHeader view:nth-of-type(1){
+
+.scheduleHeader view:nth-of-type(1) {
     flex: 1;
 }
-.scheduleHeader view:nth-of-type(2){
+
+.scheduleHeader view:nth-of-type(2) {
     width: 40rpx;
     height: 40rpx;
 }
-.sidebar{
+
+.sidebar {
     position: fixed;
     left: -750rpx;
     top: 0;
@@ -31,75 +35,89 @@
     /* background: rgba(0, 0, 0, 0.19); */
     z-index: 99;
 }
+
 .siderbarShow {
-    transform:  translateX(750rpx);
+    transform: translateX(750rpx);
     transition: all 400ms linear 0s;
 }
+
 .siderbarHidden {
-    transform:  translateX(-750rpx);
+    transform: translateX(-750rpx);
     transition: all 400ms linear 0s;
 }
-.sidebarContent{
+
+.sidebarContent {
     background: #FFFFFF;
     width: 640rpx;
     height: 100%;
     padding: 32rpx 0 32rpx 32rpx;
 }
-.sidebarLogo{
+
+.sidebarLogo {
     margin-bottom: 18rpx;
     line-height: 64rpx;
     font-size: 26rpx;
-    color: rgba(27,38,61,.56);
+    color: rgba(27, 38, 61, .56);
     display: flex;
 }
-.sidebarLogo view:nth-of-type(1){
+
+.sidebarLogo view:nth-of-type(1) {
     margin-right: 34rpx;
     width: 64rpx;
     height: 64rpx;
     background: yellow;
     border-radius: 50%;
 }
-.hasAssociated, .unAssociated{
+
+.hasAssociated, .unAssociated {
     margin-top: 48rpx;
 }
-.associated{
-    font-size:24rpx;
-    color:rgba(25,31,37,.56);
-    line-height:34px;
+
+.associated {
+    font-size: 24rpx;
+    color: rgba(25, 31, 37, .56);
+    line-height: 34px;
     margin-bottom: 16rpx;
 }
-.applicationList{
+
+.applicationList {
     height: 104rpx;
     display: flex;
     align-items: center;
 }
+
 .applicationLogo {
     width: 72rpx;
     height: 72rpx;
     margin-right: 24rpx;
 }
-.applicationMsg{
+
+.applicationMsg {
     flex: 1;
     display: flex;
-    border-bottom: 1px solid rgba(241,243,249,1);
+    border-bottom: 1px solid rgba(241, 243, 249, 1);
     height: 104rpx;
     align-items: center;
     padding-right: 32rpx;
 }
-.applicationMsg>view:nth-of-type(1){
+
+.applicationMsg>view:nth-of-type(1) {
     flex: 1;
 }
+
 .applicationMsg>view:nth-of-type(1)>view:nth-of-type(1) {
     font-size: 28rpx;
     color: #191F25;
     margin-bottom: 8rpx;
 }
+
 .applicationMsg>view:nth-of-type(1)>view:nth-of-type(2) {
     opacity: 0.56;
     font-size: 20rpx;
     color: #191F25;
 }
-.operateIcon{
+
+.operateIcon {
     width: 32rpx;
     height: 32rpx;
 }
@@ -114,7 +132,7 @@
     line-height: 48rpx;
     margin-bottom: 50rpx;
     font-weight: bold;
-    font-family:'DINAlternate-Bold';
+    font-family: 'DINAlternate-Bold';
 }
 
 .manyWeeks {
@@ -167,7 +185,8 @@
     background: rgba(10, 10, 10, 0.05);
     margin-bottom: 16rpx;
 }
-.NoSchedule{
+
+.NoSchedule {
     width: 604rpx;
     border-radius: 8rpx;
     font-size: 26rpx;
@@ -177,25 +196,32 @@
     margin-bottom: 16rpx;
     line-height: 0.9rem;
 }
-.NoSchedule > view:nth-of-type(1) text:nth-of-type(1) {
-    color: rgba(25,31,37,0.56);
+
+.NoSchedule>view:nth-of-type(1) text:nth-of-type(1) {
+    color: rgba(25, 31, 37, 0.56);
 }
-.NoSchedule > view:nth-of-type(1) text:nth-of-type(2) {
+
+.NoSchedule>view:nth-of-type(1) text:nth-of-type(2) {
     color: #3296FA;
 }
+
 .dataSchedule {
     position: relative;
 }
+
 .dataSchedule .overdue {
     background: rgba(10, 10, 10, .034);
     color: rgba(10, 10, 10, .353);
 }
-.thisDay > view{
+
+.thisDay>view {
     color: rgb(50, 150, 250);
 }
-.thisDay > text{
+
+.thisDay>text {
     color: rgb(50, 150, 250);
 }
+
 .thisDayLine {
     position: relative;
     height: 2rpx;
@@ -203,6 +229,7 @@
     width: 100%;
     overflow: visible;
 }
+
 .dataSchedule .thisDayHavaMeeting {
     height: 2rpx !important;
     background: #F25643 !important;
@@ -211,6 +238,7 @@
     left: 0;
     top: -8rpx;
 }
+
 .thisDayLine::after {
     content: '';
     position: absolute;
@@ -232,8 +260,8 @@
     color: rgba(25, 31, 37, 0.56);
 }
 
-.dataSchedule .cancel text{
-    text-decoration:line-through;
+.dataSchedule .cancel text {
+    text-decoration: line-through;
 }
 
 .dataSchedule>view>view {
@@ -269,14 +297,16 @@
     background: #3296FA;
     box-shadow: 0 8px 14px 0 rgba(50, 150, 250, 0.30);
 }
+
 .startPage {
     position: fixed;
     height: 100%;
     top: 0;
     width: 100%;
-    background:#fff;
+    background: #fff;
     z-index: 99;
 }
+
 .startPage>image {
     width: 603rpx;
     height: 444rpx;
@@ -285,11 +315,17 @@
     margin-left: 82rpx;
     z-index: 9999999;
 }
+
 .startText {
     margin-top: 80rpx;
     text-align: center;
     font-size: 46rpx;
 }
+
 .text1 {
     margin-right: 32rpx;
+}
+
+.indexScrollView {
+    height: calc( 100vh - 88rpx);
 }
\ No newline at end of file

PageComponents/scheduleList/scheduleList.axml

@@ -4,9 +4,9 @@
 </view>
 <view class="index">
   <view a:if="{{true}}">
-    <scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" onScroll="onScroll" onScrollToUpper="onScrollToUpper" lower-threshold="100" onScrollToLower="loadMoreDate" style="height: 100vh;" scroll-into-view="{{todayStr}}">
-      <block a:for="{{scheduleList}}" a:for-item="list">
-        <block a:for="{{list}}">
+    <scroll-view class="indexScrollView" a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="1000" onScrollToLower="lower" onScroll="onScroll" scroll-into-view="{{todayStr}}">
+      <block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
+        <block a:for="{{scheduleYearList}}">
           <block a:if="{{item.type == 'year'}}">
             <view class="month">
               {{item.value}}年
@@ -20,7 +20,7 @@
           <block a:elif="{{item.type == 'week'}}">
             <view class="week" id="{{item.dayStr}}">
               <view class="manyWeeks"> 
-                {{item.value}}
+                  {{item.value}}
               </view>
             </view>
           </block>
@@ -28,7 +28,7 @@
             <view class="date">
               <view class="dateTime {{item.isThisDay}}">
                 <view>
-                  {{item.value.week}}
+                      {{item.value.week}}
                 </view>
                 <text>{{item.value.day}}</text>
               </view>
@@ -50,10 +50,10 @@
           <block a:elif="{{item.type == 'today'}}">
             <view class="date" id="{{item.value.dateStr}}">
               <view class="dateTime {{item.isThisDay}}">
-                <view style="color: rgb(50, 150, 250)">
-                            {{item.value.week}}
+                <view>
+                  今天
                 </view>
-                <text style="color: rgb(50, 150, 250)">{{item.value.day}}</text>
+                <text>{{item.value.day}}</text>
               </view>
               <view class="dataSchedule">
                 <!--<view class="thisDayLine thisDayHavaMeeting" style="margin-bottom: 7.5rpx"></view> -->
@@ -75,7 +75,7 @@
             <view class="date" id="{{item.value.dateStr}}">
               <view class="dateTime thisDay">
                 <view>
-                            {{item.value.week}}
+                      {{item.value.week}}
                 </view>
                 <text>{{item.value.day}}</text>
               </view>
@@ -91,7 +91,6 @@
         </block>
       </block>
     </scroll-view>
-    <!--<view class="createSchedule iconfont iconjiahao " onTap="nextPage"></view> -->
   </view>
   <view class="startPage" a:else>
     <image mode="scaleToFill" src="../../assests/startPage.png"/>

app.json

 {
     "pages": [
-        "pages/index/index",
         "demo/index/index",
+        "pages/index/index",
         "pages/meetingDetail/meetingDetail",
         "pages/excutorList/excutorList",
-        "demo/sideslipping/sideslipping",
         "pages/editMeeting/editMeeting",
         "pages/createMeeting/createMeeting",
         "pages/outLookContact/outLookContact",

demo/sideslipping/sideslipping.acss

-.item{
-    width: 100%;
-    position: relative;
-    background: #ffffff;
-    height: 200rpx;
-}
\ No newline at end of file

demo/sideslipping/sideslipping.axml

-<view a:for="{{itemList}}" class="item" data-index="1" onTouchStart="touchstart" onTouchMove="touchmove" onTouchEnd="touchend">
-  {{item.name}}
-</view>
\ No newline at end of file

demo/sideslipping/sideslipping.js

-Page({
-  data: {
-    isTouchMove: false,
-    startX: 0,
-    startY: 0,
-    itemList: [{
-      name: '测试1',
-      isTop: false
-    },{
-      name: '测试1',
-      isTop: false
-    },{
-      name: '测试1',
-      isTop: false
-    },{
-      name: '测试1',
-      isTop: false
-    },{
-      name: '测试1',
-      isTop: false
-    },{
-      name: '测试1',
-      isTop: false
-    }]
-  },
-  onLoad() {},
-  touchstart(e){
-    this.setData({
-      startX: e.changedTouches[0].clientX,
-      startY: e.changedTouches[0].clientY,
-      isTouchMove : this.data.isTouchMove ? !this.data.isTouchMove : this.data.isTouchMove
-    })
-  },
-  touchend(e) {
-    console.log(e)
-  },
-  touchmove(e) {
-    var that = this,
-    startX = that.data.startX,//开始X坐标
-    startY = that.data.startY,//开始Y坐标
-    touchMoveX = e.changedTouches[0].clientX,//滑动变化坐标
-    touchMoveY = e.changedTouches[0].clientY,//滑动变化坐标
-    //获取滑动角度
-    angle = that.angle({ X: startX, Y: startY }, { X: touchMoveX, Y: touchMoveY });
-    var isTouchMove 
-    //滑动超过30度角 return
-    if (Math.abs(angle) > 30) return;
-      if (touchMoveX > startX){ //右滑
-          isTouchMove = false 
-      }else{ //左滑
-        isTouchMove = true
-      }
-    //更新数据
-    that.setData({
-      isTouchMove : isTouchMove 
-    })
-  },
-  angle (start, end) {
-    var _X = end.X - start.X,
-      _Y = end.Y - start.Y
-    //返回角度 /Math.atan()返回数字的反正切值
-    return 360 * Math.atan(_Y / _X) / (2 * Math.PI);
-  }        
-});

demo/sideslipping/sideslipping.json

-{}
\ No newline at end of file

pages/index/index.axml

@@ -2,7 +2,7 @@
 版本号：151 版本
 <view class="index">
     <view >
-        <scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" onScroll="onScroll" style="height: 100vh;" scroll-into-view="{{todayStr}}">
+        <scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="1000" onScrollToLower="lower" onScroll="onScroll" style="height: 100vh;" scroll-into-view="{{todayStr}}">
             <block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
                 <block a:for="{{scheduleYearList}}">
                     <block a:if="{{item.type == 'year'}}">