fix

business/pages/classservice/bindex.wxss

@@ -65,7 +65,7 @@ page{
 }
 .tip-box .text{
     font-size: 24rpx;
-    color:000;
+    color:#000;
 }
 .nav-box{
     display: flex;
@@ -73,7 +73,6 @@ page{
 }
 .nav-box .nav-item {
     flex: 1;
-
 }
 .nav-box .nav-item .icon{
     height: 60rpx;
@@ -94,10 +93,11 @@ page{
 }
 .footer-btn{
     position: fixed;
-    left: 168rpx;
+    left: 50%;
+    transform: translateX(-50%);
     bottom: 215rpx;
-    width:414rpx;
-    height:70rpx;
+    width: 414rpx;
+    height: 70rpx;
     background:rgba(101,184,244,1);
     border-radius:35rpx;
     font-size:30rpx;

business/pages/classservice/classlist.wxml

@@ -22,7 +22,7 @@
     </view>
   
     <view class="empty-content" wx:if="{{emptyPage}}">
-      <image class='empty-img' src='{{imageRoot}}2c/rankinglist/empty.png?{{imageVersion}}'></image>
+      <image class='empty-img' src='{{imageRoot}}2c/common/emptyimg.png?{{imageVersion}}'></image>
       <view class="empty-text">咋肥事咧，一个班级也没有~</view>
     </view>
     <view class="has-nomore" wx:if="{{!emptyPage && !hasmore}}">没有更多了</view>

business/pages/classservice/record.js

@@ -30,7 +30,7 @@ Page({
     sid: 0,
     rollcalllist:[],
     page: 1,
-    perPage: 10,
+    perPage: 6,
     hasmore: true,
     rollcallTotal: 0,
     emptyPage: false,
@@ -85,7 +85,7 @@ Page({
       page:1,
       hasmore:true
     },()=>{
-      this.schedulesGet('up')
+      this.schedulesGet('down')
     })
   },
 
@@ -93,14 +93,7 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-    this.schedulesGet('down')
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
-
+    this.schedulesGet('up')
   },
   schedulesGet(type) {
     if (!this.data.hasmore) {
@@ -117,7 +110,7 @@ Page({
       perPage: this.data.perPage,
       my: this.data.my,
       school_id: this.data.sid,
-      status:1
+      status: 1
     }).then((res) => {
       const { code, data } = res;
       this.setData({

business/pages/classservice/record.wxml

 <!--business/pages/classservice/rollcall .wxml-->
 <wxs src="../../../filter/index.wxs" module="filter" />
 <view class="container">
-    <view class="content-box" hover-class="none" hover-stop-propagation="false">
+    <view class="content-box" hover-class="none" hover-stop-propagation="false" wx:if="{{rollcallList.length>0}}">
         <view class="content-item" hover-class="none" hover-stop-propagation="false" wx:for="{{rollcallList}}" wx:key="{{key}}" data-item="{{item}}" bindtap="gorollcallindex">
             <view class="top-box" hover-class="none" hover-stop-propagation="false">
                 <view class="time" hover-class="none" hover-stop-propagation="false">{{filter.matchTime(item.start_time,'month')}} {{filter.matchTime(item.start_time,'hour')}}-{{filter.matchTime(item.end_time,'hour')}}</view>
-                <!-- <view class="status {{item.call_time?'done-status':''}}" hover-class="none" hover-stop-propagation="false">{{item.call_time?'已点名':'未点名'}}</view>   -->
+                <view class="status {{item.call_time?'done-status':''}}" hover-class="none" hover-stop-propagation="false">{{item.call_time?'已点名':'未点名'}}</view>  
             </view>
             <view class="info-box" hover-class="none" hover-stop-propagation="false">
                 <view class="info-item" hover-class="none" hover-stop-propagation="false">
                     <image class="icon" src="{{imageRoot}}2b/classservice/class.png?{{imageVersion}}"></image>
-                    <view class="text" hover-class="none" hover-stop-propagation="false">{{item.class.title}}</view>
+                    <view class="text" hover-class="none" hover-stop-propagation="false">{{item.course.title}}</view>
                 </view>
                 <view class="info-item" hover-class="none" hover-stop-propagation="false">
                     <image class="icon" src="{{imageRoot}}2b/classservice/map.png?{{imageVersion}}"></image>
-                    <view class="text" hover-class="none" hover-stop-propagation="false">{{item.class.title}}</view>
+                    <view class="text" hover-class="none" hover-stop-propagation="false">{{item.class_room.title}}</view>
                 </view>
                 <view class="info-item" hover-class="none" hover-stop-propagation="false">
                     <image class="icon" src="{{imageRoot}}2b/classservice/adress.png?{{imageVersion}}"></image>
@@ -23,8 +23,10 @@
             </view>
         </view>
         <list-loading loading="{{listLoading}}"></list-loading>
-        <view class="empty-content-box"  wx:if="{{emptyPage}}">
-            <empty-content text="暂无数据"></empty-content>
-        </view>  
     </view>
+    <view class="empty-content" wx:if="{{emptyPage}}">
+        <image class='empty-img' src='{{imageRoot}}2c/common/emptyimg.png?{{imageVersion}}'></image>
+        <view class="empty-text">暂无数据~</view>
+    </view>
+    <view class="has-nomore" wx:if="{{!emptyPage && !hasmore && page>1}}">没有更多了</view> 
 </view>

business/pages/classservice/record.wxss

@@ -5,9 +5,8 @@
     overflow: hidden;
 }
 .content-box{
-    padding: 0 24rpx;
+    padding: 30rpx 24rpx 0;
     background:rgba(243,244,246,1);
-    padding-top: 30rpx;
 }
 .content-box .content-item{
     background:rgba(255,255,255,1);
@@ -15,6 +14,9 @@
     margin-bottom: 30rpx;
     padding-bottom: 40rpx;
 }
+.content-box .content-item:last-of-type{
+    margin-bottom: 0;
+}
 .content-box .content-item .top-box{
     display: flex;
     height: 98rpx;
@@ -73,4 +75,30 @@
     color:rgba(0,0,0,1);
     line-height: 1;
     padding-left: 35rpx;
+}
+
+/* 空场景 */
+.empty-content {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    line-height: 45rpx;
+}
+.empty-content .empty-img {
+    width: 263rpx;
+    height: 219rpx;
+}
+.empty-content .empty-text {
+    font-size: 26rpx;
+    color: rgba(0, 0, 0, 0.6);
+}
+.has-nomore{
+    font-size: 26rpx;
+    color: #9C9C9D;
+    padding: 75rpx 0;
+    text-align: center;
 }
\ No newline at end of file

business/pages/classservice/rollcalldetail.wxss

@@ -31,6 +31,9 @@
         transform: translateY(100%);
     }
 }
+.container{
+    padding-bottom: 166rpx;
+}
 .header-card{
     width:680rpx;
     height:293rpx;

business/pages/classservice/rollcallindex.js

@@ -90,7 +90,7 @@ Page({
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-
+    wx.stopPullDownRefresh()
   },
 
   /**

business/pages/classservice/rollcallindex.wxss

 /* business/pages/classservice/rollcallindex.wxss */
 .container{
-    padding-bottom: 90rpx;
+    padding-bottom: 120rpx;
 }
 .bule-box{
     height: 226rpx;
@@ -94,6 +94,8 @@
     height:60rpx;
     line-height: 60rpx;
     text-align: center;
+    border-bottom: 1px solid rgba(0,0,0,.05);
+    border-top: 1px solid rgba(0,0,0,.05);
 }
 .line-16{
     height:16rpx;
@@ -107,10 +109,11 @@
 }
 
 .search-box{
-    padding: 36rpx 25rpx 16rpx 25rpx;
+    padding: 50rpx 24rpx 26rpx;
     display: flex;
     justify-content: space-between;
     align-items: center;
+    background: #fff;
 }
 .search-box .btn{
     width:110rpx;
@@ -152,103 +155,132 @@
     border: none;
     height: 60rpx;
 }
+.student-list{}
 .student-list .title-box{
-    padding: 50rpx 24rpx 24rpx 24rpx;
-    box-shadow:0px 2rpx 16rpx 0px rgba(0, 0, 0, 0.1);
+    padding: 24rpx 0 24rpx 24rpx;
+    box-shadow: 0 2rpx 16rpx 0 rgba(0, 0, 0, 0.1);
     display: flex;
-    font-size:24rpx;
-    font-family:PingFang-SC-Regular;
-    font-weight:400;
+    justify-content: space-between;
+    align-items: center;
+    font-size: 24rpx;
     color:rgba(0,0,0,.7);
-    line-height:1;
+    line-height: 1;
+    z-index: -1;
+    position: relative;
 }
-.student-list .title-box .long-text{
+.student-list .title-box .left-box .long-text{
     font-size:24rpx;
-    font-family:PingFang-SC-Regular;
-    font-weight:400;
     color:rgba(0,0,0,.7);
-    line-height:1;
-    padding-right: 266rpx;
+    line-height: 1;
 }
-.student-list .title-box .text{
-    font-size:24rpx;
-    font-family:PingFang-SC-Regular;
-    font-weight:400;
-    color:rgba(0,0,0,.7);
-    line-height:1;
-    padding-right: 48rpx;
+.student-list .title-box .right-box{
+    display: flex;
+    align-items: center;
+}
+.student-list .title-box .right-box .text{
+    width: 92rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 24rpx;
+    color: rgba(0,0,0,.7);
 }
+
+
 .student-list .list-item{
-    padding: 0 24rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 24rpx 0 24rpx 24rpx;
     height: 110rpx;
-    border-bottom: 1px solid rgba(0,0,0,.05);
+    display: flex;
+    align-items: center;
+    position: relative;
+}
+.student-list .list-item::after{
+    content: '';
+    width: 100%;
+    height: 1px;
+    background: rgba(0,0,0,0.05);
+    position: absolute;
+    left: 0;
+    bottom: 0;
+}
+.student-list .list-item .item-left{
     display: flex;
     align-items: center;
 }
-.student-list .list-item .adavar{
-    width:66rpx;
-    height:66rpx;
+.student-list .list-item .item-left .adavar{
+    width: 66rpx;
+    height: 66rpx;
     border-radius:50%;
+    margin-right: 28rpx;
 }
-.student-list .list-item .content{
-    padding-left: 28rpx;
+.student-list .list-item .item-left .content{
+    
 }
-.student-list .list-item .content .name{
+.student-list .list-item .item-left .content .name{
     font-size:26rpx;
-    font-family:PingFang-SC-Regular;
-    font-weight:400;
     color:rgba(0,0,0,1);
     line-height: 1;
     padding-bottom: 16rpx;
 }
-.student-list .list-item .content .count{
+.student-list .list-item .item-left .content .count{
     display: flex;
     align-items: center;
-    padding-right: 120rpx;
 }
-.student-list .list-item .content .count .count-name{
+.student-list .list-item .item-left .content .count .count-name{
     font-size:24rpx;
-    font-family:PingFang-SC-Regular;
-    font-weight:400;
     color:rgba(119,119,119,1);
     line-height: 1;
 }
-.student-list .list-item .content .count .count-data{
+.student-list .list-item .item-left .content .count .count-data{
     font-size:26rpx;
-    font-family:PingFang-SC-Medium;
     font-weight:500;
-    color:rgba(255,185,122,1);
+    color:#777;
     line-height:1;
 }
-.student-list .icon{
-    width:32rpx;
-    height:32rpx;
-    background:rgba(255,255,255,1);
-    border:2rpx solid rgba(153,153,153,1);
-    border-radius:50%;
-    margin-right: 12rpx;
-    margin-right: 60rpx;
+.student-list .list-item .item-right{
+    display: flex;
+    align-items: center;
+}
+.student-list .list-item .item-right .icon{
+    width: 92rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+}
+
+.student-list .list-item .item-right .icon .inner-icon{
+    width: 32rpx;
+    height: 32rpx;
+    border: 2rpx solid #BDBDBD;
+    border-radius: 50%;
     position: relative;
 }
-.student-list .icon .count{
+.student-list .list-item .item-right .icon .inner-icon.act-icon{
+    border: 2rpx solid #FFB97A;
+}
+.student-list .list-item .item-right .icon .inner-icon.act-icon::after{
+    content: '';
+    width: 20rpx;
+    height: 20rpx;
+    background:#FFB97A;
+    border-radius: 50%;
     position: absolute;
-    left: -8rpx;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+}
+.student-list .list-item .item-right .icon .count{
+    position: absolute;
+    left: 50%;
+    transform: translateX(-50%);
     bottom: -32rpx;
     font-size:24rpx;
-    font-family:PingFang-SC-Regular;
-    font-weight:400;
-    color:rgba(255,133,23,.7);
-    line-height:1;
-}
-.student-list .act-icon{
-    border:2rpx solid #FFB97A;
-}
-.student-list .icon .inner-icon{
-    width:21rpx;
-    height:21rpx;
-    background:rgba(255,185,122,1);
-    border-radius:50%;
-    margin: 5rpx;
+    color:#FF8517;
+    line-height: 1;
 }
 .footer-box{
     width:100%;
@@ -258,33 +290,29 @@
     bottom: 0;
     border-top:1px solid rgba(0,0,0,.05);
     display: flex;
+    background: #fff;
+    z-index: 9;
 }
-.footer-box .count{
+.footer-box .count-box{
     width: 328rpx;
-    padding-top: 16rpx;
-}
-.footer-box .count .count-item{
     display: flex;
-    padding: 0 47rpx 14rpx 26rpx;
-    justify-content: space-between; 
+    flex-wrap: wrap;
 }
-.footer-box .count .count-item .item{
+.footer-box .count-box .count-item{
+    width: 50%;
     display: flex;
+    padding: 0 24rpx;
+    line-height: 1;
+    align-items: center;
 }
-.footer-box .count .count-item .item .name{
-    font-size:24rpx;
-    font-family:PingFang-SC-Regular;
-    font-weight:400;
-    color:rgba(119,119,119,1);
-    line-height:1;
+.footer-box .count-box .count-item .name{
+    font-size: 24rpx;
+    color:#777777;
     padding-right: 20rpx;
 }
-.footer-box .count .count-item .item .data{
-    font-size:24rpx;
-    font-family:PingFang-SC-Regular;
-    font-weight:400;
-    color:rgba(101,184,244,1);
-    line-height:1;
+.footer-box .count-box .count-item .data{
+    font-size: 26rpx;
+    color: #65B8F4;
 }
 .footer-box .btn{
     flex: 1;
@@ -296,6 +324,7 @@
     line-height:90rpx;
     text-align: center;
 }
+
 .dailog{
     width: 100%;
     height: 100%;
@@ -314,12 +343,11 @@
     position: absolute;
     left: 50%;
     top: 50%;
-    margin-left: -300rpx;
-    margin-top: -179rpx;
-    width:600rpx;
-    height:358rpx;
+    transform: translate(-50%,-50%);
+    width: 600rpx;
     background:rgba(255,255,255,1);
-    border-radius:20rpx;
+    border-radius: 20rpx;
+    overflow: hidden;
 }
 .dailog .dailog-content .title{
     font-size:32rpx;
@@ -331,8 +359,6 @@
 }
 .dailog .dailog-content .text{
     font-size:32rpx;
-    font-family:PingFang-SC-Regular;
-    font-weight:400;
     color:rgba(0,0,0,1);
     line-height: 1;
     text-align: center;
@@ -341,27 +367,36 @@
 .dailog .dailog-content .footer{
     height: 96rpx;
     display: flex;
-    border-top:1px solid rgba(0,0,0,.05); 
+    border-top:1px solid rgba(0,0,0,.05);
+    display: flex;
 }
-.dailog .dailog-content .footer .cancle{
+.dailog .dailog-content .footer .btn{
     flex: 1;
-    font-size:30Rpx;
-    font-family:PingFang-SC-Bold;
-    font-weight:bold;
-    color:rgba(67,67,67,1);
-    text-align: center;
-    line-height: 96rpx;
-    border-right:1px solid rgba(0,0,0,.05); 
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #434343;
+    font-weight: bold;
+    font-size: 30rpx;
+    position: relative;
 }
-.dailog .dailog-content .footer .sure{
-    flex: 1;
-    font-size:30Rpx;
-    font-family:PingFang-SC-Bold;
-    font-weight:bold;
-    color:#65B8F4;
-    text-align: center;
-    line-height: 96rpx;
+.dailog .dailog-content .footer .btn::after{
+    content: '';
+    width: 1px;
+    height: 100%;
+    background: rgba(0,0,0,.05);
+    position: absolute;
+    right: 0;
+    top: 0;
 }
+.dailog .dailog-content .footer .btn:last-of-type::after{
+    display: none;
+}
+.dailog .dailog-content .footer .btn.btn-sure{
+    color: #65B8F4;
+}
+
 .dailog .dailog-content .ipt-box{
     display: flex;
     border-radius:10rpx;
@@ -378,16 +413,17 @@
     text-align: center;
     color: #fff;
 }
-.dailog .dailog-content.ipt-box .add-btn{
-    border-radius:0px 10rpx 10rpx 0px;
+.dailog .dailog-content .ipt-box .add-btn{
+    border-radius: 0px 10rpx 10rpx 0px;
 }
 .dailog .dailog-content .ipt-box .cut-btn{
-  
-    border-radius:10rpx 0px 0px 10rpx;
+    border-radius: 10rpx 0px 0px 10rpx;
 }
 .dailog .dailog-content .ipt-box .iteminput{
     width: 66rpx;
     height:60rpx;
     line-height: 60rpx;
     text-align: center;
+    border-bottom: 1px solid rgba(0,0,0,.05);
+    border-top: 1px solid rgba(0,0,0,.05);
 }
\ No newline at end of file

business/pages/classservice/rollcalllist.wxml

@@ -16,7 +16,7 @@
         </view>
 
     </view>
-    <view class="content-box">
+    <view class="content-box" wx:if="{{rollcalllist.length>0}}">
         <view class="content-item" wx:for="{{rollcalllist}}" wx:key="{{key}}" bindtap="gorollcalldetail" data-item="{{item}}"> 
             <view class="top-box">
                 <view class="time">{{filter.matchTime(item.start_time,'hour')}}-{{filter.matchTime(item.end_time,'hour')}}</view>
@@ -32,10 +32,13 @@
                     <view class="text">海创科技中心校区余杭塘路北校区</view>
                 </view>  
             </view>
-        </view>
-        <view class="empty-content-box"  wx:if="{{rollcalllist.length==0}}">
-            <empty-content text="暂无数据"></empty-content>
-        </view>  
+        </view> 
+    </view>
+
+    <view class="empty-content" wx:if="{{rollcalllist.length==0}}">
+        <image class='empty-img' src='{{imageRoot}}2c/common/emptyimg.png?{{imageVersion}}'></image>
+        <view class="empty-text">暂无数据</view>
     </view>
+    <!-- <view class="has-nomore" wx:if="{{!emptyPage && !hasmore}}">没有更多了</view> -->
             
 </view>

business/pages/classservice/rollcalllist.wxss

@@ -147,4 +147,30 @@
     color:rgba(0,0,0,1);
     line-height: 1;
     padding-left: 35rpx;
+}
+
+/* 空场景 */
+.empty-content {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    line-height: 45rpx;
+}
+.empty-content .empty-img {
+    width: 263rpx;
+    height: 219rpx;
+}
+.empty-content .empty-text {
+    font-size: 26rpx;
+    color: rgba(0, 0, 0, 0.6);
+}
+.has-nomore{
+    font-size: 26rpx;
+    color: #9C9C9D;
+    padding: 75rpx 0;
+    text-align: center;
 }
\ No newline at end of file

business/pages/classservice/tindex.wxml

 <!--business/pages/classservice/index.wxml-->
-<view class="nav-header" hover-class="none" hover-stop-propagation="false" style="padding-top: {{statusBarHeight}}px;height: {{titleBarHeight+20}}px;">
-    <view class="nav-custombox">
-        <view class="message" hover-class="none" hover-stop-propagation="false" bindtap="gotodotasks">
-            <image class="icon" src="{{imageRoot}}2b/deskcenter/message.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
+<view class="nav-header" style="padding-top: {{statusBarHeight}}px;">
+    <view class="nav-custombox" style="height: {{titleBarHeight}}px;">
+        <view class="message" bindtap="gotodotasks">
+            <image class="icon" src="{{imageRoot}}2b/deskcenter/message.png" />
             <view class="red-dot" wx:if="{{waitJob>0}}"></view>
         </view>
-        <view class="menu-box" hover-class="none" hover-stop-propagation="false" bindtap="selectSchool">
-            <view class="title" hover-class="none" hover-stop-propagation="false">{{selectSchoolData.title}}</view>
-            <image class="arrowwhite {{schoolShow ? 'up' : 'down'}}" src="{{imageRoot}}2b/common/arrowblack.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
+        <view class="menu-box" bindtap="selectSchool">
+            <view class="title">{{selectSchoolData.title}}</view>
+            <image class="arrowwhite {{schoolShow ? 'up' : 'down'}}" src="{{imageRoot}}2b/common/arrowblack.png?{{imageVersion}}" ></image>
         </view>
     </view>
-   
-    <view class="classselectedmodal" hover-class="none" hover-stop-propagation="false" hidden="{{!schoolShow}}">
-        <view class="modalmask" hover-class="none" hover-stop-propagation="false" bindtap="selectSchool"></view>
-        <view class="classbox" hover-class="none" hover-stop-propagation="false">
-            <view class="classitem" hover-class="none" hover-stop-propagation="false" bindtap="sureSelect" data-item="{{item}}" wx:for="{{schoolList}}" wx:key="{{index}}">
-                <view class="classitemname" selectable="false" space="false" decode="false">{{item.title}}</view>
-                <image class="selecticon" wx:if="{{item.id == selectSchoolData.id}}" src="{{imageRoot}}2b/circleindex/rightblack.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
-            </view>
+</view>
+
+<view class="classselectedmodal" hidden="{{!schoolShow}}">
+    <view class="modalmask" bindtap="selectSchool"></view>
+    <view class="classbox" style="top:{{statusBarHeight+titleBarHeight}}px">
+        <view class="classitem" bindtap="sureSelect" data-item="{{item}}" wx:for="{{schoolList}}" wx:key="{{index}}">
+            <view class="classitemname" selectable="false" space="false" decode="false">{{item.title}}</view>
+            <image class="selecticon" wx:if="{{item.id == selectSchoolData.id}}" src="{{imageRoot}}2b/circleindex/rightblack.png?{{imageVersion}}" ></image>
         </view>
     </view>
-  
 </view>
-<view class="container">
-    <view class="white-box" hover-class="none" hover-stop-propagation="false">
-        <view class="count-box" hover-class="none" hover-stop-propagation="false">
-            <view class="count-item" hover-class="none" hover-stop-propagation="false">
-                <view class="num" hover-class="none" hover-stop-propagation="false">{{statisticalData.expend_count}}</view>
-                <view class="name" hover-class="none" hover-stop-propagation="false">本月课时</view>
+
+<view class="container" style="padding-top: {{statusBarHeight+titleBarHeight+12}}px">
+    <view class="white-box">
+        <view class="count-box">
+            <view class="count-item">
+                <view class="num">{{statisticalData.expend_count}}</view>
+                <view class="name">本月课时</view>
             </view>
-            <view class="count-item" hover-class="none" hover-stop-propagation="false">
-                <view class="num" hover-class="none" hover-stop-propagation="false">{{statisticalData.schedule_count}}</view>
-                <view class="name" hover-class="none" hover-stop-propagation="false">本月课次</view>
+            <view class="count-item">
+                <view class="num">{{statisticalData.call_count}}</view>
+                <view class="name">本月已上课次</view>
             </view>
         </view>
         <view class="tip-wrap" wx:if="{{todocallTotal>0}}">
-            <view class="tip-box" hover-class="none" hover-stop-propagation="false" bindtap="gotodolist">
+            <view class="tip-box" bindtap="gotodolist">
                 <image class="" src="{{imageRoot}}2b/classservice/tips.png?{{imageVersion}}"></image>
-                <view class="text" hover-class="none" hover-stop-propagation="false">本周有{{todocallTotal}}个课次超时未点评，请及时处理</view>  
+                <view class="text">本周有{{todocallTotal}}个课次超时未点评，请及时处理</view>  
             </view>
         </view>
           
-        <view class="nav-box" hover-class="none" hover-stop-propagation="false">
-            <view class="nav-item" hover-class="none" hover-stop-propagation="false" bindtap="goclasslist">
-                <view class="icon" hover-class="none" hover-stop-propagation="false">
+        <view class="nav-box">
+            <view class="nav-item" bindtap="goclasslist">
+                <view class="icon">
                     <image class="" src="{{imageRoot}}2b/classservice/myclass.png?{{imageVersion}}"></image>
                 </view>
-                <view class="text" hover-class="none" hover-stop-propagation="false">我的班级</view>
+                <view class="text">我的班级</view>
             </view>
-            <view class="nav-item" hover-class="none" hover-stop-propagation="false" bindtap="gorollcalllist">
-                <view class="icon" hover-class="none" hover-stop-propagation="false">
+            <view class="nav-item" bindtap="gorollcalllist">
+                <view class="icon">
                     <image class="" src="{{imageRoot}}2b/classservice/classlist.png?{{imageVersion}}"></image>
                 </view>
-                <view class="text" hover-class="none" hover-stop-propagation="false">我的课表</view>
+                <view class="text">我的课表</view>
             </view>
-            <view class="nav-item" hover-class="none" hover-stop-propagation="false" bindtap="goNoComment" >
-                <view class="icon" hover-class="none" hover-stop-propagation="false">
+            <view class="nav-item" bindtap="goNoComment" >
+                <view class="icon">
                     <image class="" src="{{imageRoot}}2b/classservice/work.png?{{imageVersion}}"></image>
                 </view>
-                <view class="text" hover-class="none" hover-stop-propagation="false">作业点评</view>
+                <view class="text">作业点评</view>
             </view>
-            <view class="nav-item" hover-class="none" hover-stop-propagation="false" bindtap="goPointsMgt">
-                <view class="icon" hover-class="none" hover-stop-propagation="false">
+            <view class="nav-item" bindtap="goPointsMgt">
+                <view class="icon">
                     <image class="" src="{{imageRoot}}2b/classservice/data.png?{{imageVersion}}"></image>
                 </view>
-                <view class="text" hover-class="none" hover-stop-propagation="false">积分管理</view>
+                <view class="text">积分管理</view>
             </view>
-            <view class="nav-item" hover-class="none" hover-stop-propagation="false" bindtap="goRecord">
-                <view class="icon" hover-class="none" hover-stop-propagation="false">
+            <view class="nav-item" bindtap="goRecord">
+                <view class="icon">
                     <image class="" src="{{imageRoot}}2b/classservice/record.png?{{imageVersion}}"></image>
                 </view>
-                <view class="text" hover-class="none" hover-stop-propagation="false">上课记录</view>
+                <view class="text">上课记录</view>
             </view>
         </view>
     </view>
-    <view class="footer-btn" hover-class="none" hover-stop-propagation="false" bindtap="gorollcalllist">我要点名</view>
+    <view class="footer-btn" bindtap="gorollcalllist">我要点名</view>
       
     <btabbar
         sid="{{sid}}"

business/pages/classservice/tindex.wxss

@@ -2,7 +2,14 @@
 page{
     background:#F3F4F6;
 }
+.container{
+    background:#fff;
+}
 .nav-header{
+    width: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
     background: #fff;
 }
 .nav-custombox{
@@ -73,19 +80,40 @@ page{
     height: 100%;
     left: 0;
     top: 0;
-    background-color: rgba(0,0,0,0.5);
+    background: linear-gradient(to bottom,transparent 0,transparent 170rpx,rgba(0,0,0,.5) 170rpx ,rgba(0,0,0,.5) 100%)
 }
 .classselectedmodal .classbox {
     position: relative;
     z-index: 1;
-    max-height: 600rpx;
+    max-height: 500rpx;
     overflow-y: auto;
     background-color: #fff;
-    top: 140rpx;
+}
+.classselectedmodal .classbox::after{
+    content: '';
+    width: 100%;
+    height: 1px;
+    background: rgba(0,0,0,.05);
+    position: absolute;
+    left: 0;
+    top: 0;
+    transform: scaleY(.5);
 }
 .classselectedmodal .classbox .classitem {
     position: relative;
-    border-bottom: 2rpx solid rgba(0,0,0,0.05);
+}
+.classselectedmodal .classbox .classitem::after{
+    content: '';
+    width: 100%;
+    height: 1px;
+    background: rgba(0,0,0,.05);
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    transform: scaleY(.5);
+}
+.classselectedmodal .classbox .classitem:last-of-type::after{
+    display: none;
 }
 .classselectedmodal .classbox .classitemname {
     max-width: 600rpx;
@@ -94,7 +122,7 @@ page{
     overflow: hidden;
     text-overflow:ellipsis;
     white-space: nowrap;
-    line-height: 88rpx;
+    line-height: 80rpx;
 }
 .classselectedmodal .classbox .selecticon {
     display: block;
@@ -106,13 +134,7 @@ page{
     transform: translateY(-50%);
 }
 
-.container{
-    padding-top: 50rpx;
-    /* min-height: 100vh; */
-    background:rgba(255,255,255,1);
-}
-.white-box{
-}
+.white-box{}
 .count-box{
     width: 680rpx;
     height: 250rpx;
@@ -120,7 +142,7 @@ page{
     border:1px solid rgba(229,229,229,1);
     box-shadow:0px 8rpx 16rpx 0px rgba(0, 0, 0, 0.06);
     border-radius:20rpx;
-    margin: 0 auto 35rpx;
+    margin: 0 auto;
     display: flex;
     align-items: center;
 }
@@ -169,15 +191,14 @@ page{
 }
 .tip-box .text{
     font-size: 24rpx;
-    color:000;
+    color:#000;
 }
 .nav-box{
     display: flex;
-    padding: 60rpx;
+    padding: 60rpx 0;
 }
 .nav-box .nav-item {
     flex: 1;
-
 }
 .nav-box .nav-item .icon{
     height: 60rpx;
@@ -198,16 +219,17 @@ page{
 }
 .footer-btn{
     position: fixed;
-    left: 168rpx;
+    left: 50%;
+    transform: translateX(-50%);
     bottom: 215rpx;
-    width:414rpx;
-    height:70rpx;
+    width: 414rpx;
+    height: 70rpx;
     background:rgba(101,184,244,1);
     border-radius:35rpx;
     font-size:30rpx;
     font-family:PingFang-SC-Medium;
     font-weight:500;
     color:rgba(255,255,255,1);
-    line-height:70rpx;
+    line-height: 70rpx;
     text-align: center;
 }

business/pages/coursemgt/index.wxml

@@ -11,7 +11,7 @@
     </view>
     
     <view class="empty-content" wx:else>
-        <image class='empty-img' src='{{imageRoot}}2c/rankinglist/empty.png?{{imageVersion}}'></image>
+        <image class='empty-img' src='{{imageRoot}}2c/common/emptyimg.png?{{imageVersion}}'></image>
         <view class="empty-text">暂无数据~</view>
     </view>
     <view class="has-nomore" wx:if="{{!emptyPage && !hasmore}}">没有更多了</view>

business/pages/deskcenter/index.js

 // business/pages/deskcenter/index.js
 import {
-  schoolList
+  schoolList,
+  loginTime
 } from '../../../service/business/ucenter.js';
 import {
   LocalStorage
@@ -25,7 +26,7 @@ Page({
     schoolTotal:0,
     selectSchoolData:{},
     sid: 0,
-    waitJob:0,
+    waitJob: 0,
   },
 
   /**
@@ -108,7 +109,10 @@ Page({
       schoolShow: false,
       selectSchoolData:item
     }, () => {
-      
+      loginTime({
+        id: this.data.sid,
+        type: 1
+      })
     })
    },
    getschoolList(){

business/pages/deskcenter/index.wxml

@@ -7,7 +7,7 @@
         </view>
         <view class="menu-box" bindtap="selectSchool">
             <view class="title">{{selectSchoolData.title}}</view>
-            <image class="arrowwhite {{schoolShow ? 'up' : 'down'}}" src="{{imageRoot}}2b/common/arrowblack.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
+            <image class="arrowwhite {{schoolShow ? 'up' : 'down'}}" src="{{imageRoot}}2b/common/arrowblack.png?{{imageVersion}}" ></image>
         </view>
     </view>
 </view>
@@ -17,7 +17,7 @@
     <view class="classbox" style="top:{{statusBarHeight+titleBarHeight}}px">
         <view class="classitem" bindtap="sureSelect" data-item="{{item}}" wx:for="{{schoolList}}" wx:key="{{index}}">
             <view class="classitemname" selectable="false" space="false" decode="false">{{item.title}}</view>
-            <image class="selecticon" wx:if="{{item.id == selectSchoolData.id}}" src="{{imageRoot}}2b/circleindex/rightblack.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
+            <image class="selecticon" wx:if="{{item.id == selectSchoolData.id}}" src="{{imageRoot}}2b/circleindex/rightblack.png?{{imageVersion}}" ></image>
         </view>
     </view>
 </view>

business/pages/loginregistermgt/teacherlogin.js

@@ -14,7 +14,8 @@ import {
 } from '../../../service/business/ucenter.js';
 import messages from '../../../constants/messages.js';
 import {
-  bTokenExchange
+  bTokenExchange,
+  getMember
 } from '../../../service/common.js'
 
 import {
@@ -296,6 +297,41 @@ Page({
   // 微信登录
   wxLogin(){
     const visitor = LocalStorage.getItem('visitor') || {};
+    let user = LocalStorage.getItem('user');
+    let teacher = LocalStorage.getItem('teacher');
+    let dakarole = LocalStorage.getItem('dakarole');
+    console.log(visitor,user,dakarole)
+
+    // getMember({
+    //   consumer_id: visitor && visitor.id
+    // }).then(res=>{
+    //   const {data,code} = res;
+    //   if(data.teacher.length>0){
+    //     LocalStorage.setItem('user', {
+    //       // expires_in: data.expires_in,
+    //       token: `bearer ${data.token}`,
+    //     })
+    //     LocalStorage.setItem('dakarole', 2);
+        
+    //     wx.redirectTo({
+    //       url: `/business/pages/classservice/tindex?sid=${data.teacher[0].id}`
+    //     })
+    //   }else{
+    //     wx.showModal({
+    //       title: '提示',
+    //       content: '暂未加入校区，如已加入请联系机构确认',
+    //       showCancel: false,
+    //       confirmColor: '#FFD146',
+    //       success(){
+    //         wx.navigateBack({
+    //           delta: 2
+    //         })
+    //       }
+    //     })
+    //   }
+    //   console.log(res)
+    // })
+
     if(this.data.loginStatus){
       const token = visitor.token.replace('bearer ','')
       bTokenExchange({
@@ -319,7 +355,7 @@ Page({
                   mask: true,
                   success(){
                     wx.reLaunch({
-                      url: `/business/pages/organizationalmgt/index?sid=${res.data.list[0].id}`
+                      url: `/business/pages/classservice/tindex?sid=${res.data.list[0].id}`
                     })
                     LocalStorage.setItem('teacher', {
                       expires_in: res2.data.expires_in,

business/pages/nocomment/index.wxml

@@ -49,14 +49,13 @@
         <view class="short-line short-line-right" hover-class="none" hover-stop-propagation="false"></view>
     </view>
   </view>
-  <view class="empty-content" hover-class="none" hover-stop-propagation="false" wx:if="{{emptyPage}}">
-    <view class="empty-img-box" hover-class="none" hover-stop-propagation="false">
-      <image class="empty-icon" src="{{imageRoot}}2b/organizationalmgt/empty-icon.png?{{imageVersion}}" lazy-load="false" binderror="" bindload=""></image>
-    </view>
-    <view class="empty-text" hover-class="none" hover-stop-propagation="false">
-      暂无数据
-    </view>
+
+  <view class="empty-content" wx:if="{{emptyPage}}">
+    <image class='empty-img' src='{{imageRoot}}2c/common/emptyimg.png?{{imageVersion}}'></image>
+    <view class="empty-text">暂无数据~</view>
   </view>
+  <view class="has-nomore" wx:if="{{!emptyPage && !hasmore}}">没有更多了</view>
+
   <view class="videodialog" hover-class="none" hover-stop-propagation="false" wx:if="{{videostatus.videoShow}}" >
       <view class="videodialogmask" hover-class="none" hover-stop-propagation="false" bindtap="closeVideo"></view>
     <video

business/pages/nocomment/index.wxss

@@ -78,28 +78,7 @@ page{
 .nocomment-list .list-right .down-icon.up {
   transform:rotate(-90deg);
 }
-.empty-content {
-  padding-top: 152rpx;
-}
-
-.empty-content .empty-img-box {
-  width: 263rpx;
-  height: 219rpx;
-  margin: 0 auto;
-}
-
-.empty-content .empty-img-box .empty-icon {
-  width: 263rpx;
-  height: 219rpx;
-}
 
-.empty-content .empty-text {
-  padding-top: 47rpx;
-  text-align: center;
-  font-size: 26rpx;
-  color: rgba(0, 0, 0, 0.5);
-  padding-bottom: 217rpx;
-}
 .videodialog {
   position: fixed;
   width: 100%;
@@ -115,4 +94,30 @@ page{
 .videodialog video {
   width: 100%;
   height: 600rpx;
+}
+
+/* 空场景 */
+.empty-content {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%,-50%);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  line-height: 45rpx;
+}
+.empty-content .empty-img {
+  width: 263rpx;
+  height: 219rpx;
+}
+.empty-content .empty-text {
+  font-size: 26rpx;
+  color: rgba(0, 0, 0, 0.6);
+}
+.has-nomore{
+  font-size: 26rpx;
+  color: #9C9C9D;
+  padding: 75rpx 0;
+  text-align: center;
 }
\ No newline at end of file

business/pages/orgpotentialcustomer/index.wxml

@@ -38,11 +38,11 @@
                 <view class="short-line short-line-right"></view>
             </view>
         </view>
-        <view class="empty-content" wx:if="{{!hasData }}">
-            <image class="emptyimg" src="{{imageRoot}}2b/potentialcustomer/emptyimg.png?{{imageVersion}}"></image>
-            <text class="empty-text" >暂无学员线索</text>
-            <button class="submitbtn" wx:if="{{addInfo.status == 1}}" bindtap="goCircleIndex">分享班级，马上拓客</button>
+        <view class="empty-content" wx:if="{{!hasData}}">
+            <image class='empty-img' src='{{imageRoot}}2c/common/emptyimg.png?{{imageVersion}}'></image>
+            <view class="empty-text">暂无学员线索~</view>
         </view>
+
         <go-top wx:if="{{backTopValue}}"></go-top>
         <view class="detail-info-dia" wx:if="{{detailShow}}">
             <view class="detail-info-mask" bindtap="closeInfoDia"></view>
@@ -90,5 +90,6 @@
                   
             </view>
         </view>
+        <button class="form-fixbtn" wx:if="{{addInfo.status == 1}}" bindtap="goCircleIndex">分享班级，马上拓客</button>
     </view>
 </view>

business/pages/orgpotentialcustomer/index.wxss

@@ -200,32 +200,30 @@
     font-weight:500;
     color:rgba(101,184,244,1);
 }
+/* 空场景 */
 .empty-content {
-    text-align: center;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    line-height: 45rpx;
 }
-.empty-content .emptyimg {
-    width: 255rpx;
-    height: 198rpx;
-    margin: 200rpx auto 62rpx;
-    display: block;
+.empty-content .empty-img {
+    width: 263rpx;
+    height: 219rpx;
 }
 .empty-content .empty-text {
-    font-size: 28rpx;
-    color: rgba(0,0,0,0.5);
-}
-.submitbtn {
-    display: block;
-    margin: 133rpx auto 100rpx;
-    width: 372rpx;
-    height: 80rpx;
-    line-height: 80rpx;
-    background:rgba(101,184,244,1);
-    border-radius: 40rpx;
-    font-size: 34rpx;
-    color: #fff;
-    letter-spacing: 2rpx;
+    font-size: 26rpx;
+    color: rgba(0, 0, 0, 0.6);
+}
+.has-nomore{
+    font-size: 26rpx;
+    color: #9C9C9D;
+    padding: 75rpx 0;
     text-align: center;
-    padding: 0;
 }
 @keyframes fadeIn {
     from {

business/pages/studentcenter/index.wxml

 <!--business/pages/studentcenter/index.wxml-->
 <wxs src="../../../filter/index.wxs" module="filter" />
-<view class="container" hover-class="none" hover-stop-propagation="false">
-    <!-- <view class="header-box" hover-class="none" hover-stop-propagation="false">
-        <view class="header-tab" hover-class="none" hover-stop-propagation="false">
-            <view class="left {{coursetabsIndex==0?'act-course-tabs':''}}" hover-class="none" hover-stop-propagation="false" data-index="{{0}}" bindtap="courseTabChange">在读学员</view>
-            <view class="right {{coursetabsIndex==1?'act-course-tabs':''}}" hover-class="none" hover-stop-propagation="false" data-index="{{1}}" bindtap="courseTabChange">历史学员</view>  
+<view class="container" >
+    <!-- <view class="header-box" >
+        <view class="header-tab" >
+            <view class="left {{coursetabsIndex==0?'act-course-tabs':''}}" data-index="{{0}}" bindtap="courseTabChange">在读学员</view>
+            <view class="right {{coursetabsIndex==1?'act-course-tabs':''}}" data-index="{{1}}" bindtap="courseTabChange">历史学员</view>  
         </view>
     </view> -->
-    <view class="search-box" hover-class="none" hover-stop-propagation="false">
-        <view class="ipt-box" hover-class="none" hover-stop-propagation="false">
+    <view class="search-box" >
+        <view class="ipt-box" >
             <image class="ipt-iocn" src="{{imageRoot}}2b/themeindex/w-icon.png" mode="aspectFit|aspectFill|widthFix"
                 lazy-load="false" binderror="" bindload=""></image>
             <input type="text" placeholder-class="placeholderclass" class="search-input" value="{{searchName}}"
                 bindinput="searchinput" placeholder="搜索学员姓名/昵称"></input>
             <image class="close-iocn" src="{{imageRoot}}2b/common/closeicon.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" bindtap="clearSearch" wx:if="{{searchName}}"></image>
         </view>
-        <view class="btn" hover-class="none" hover-stop-propagation="false" bindtap="search">搜索</view>
+        <view class="btn" bindtap="search">搜索</view>
     </view> 
-    <view class="student-list" hover-class="none" hover-stop-propagation="false" wx:if="{{!emptyPage}}">
-        <view class="list-item" hover-class="none" hover-stop-propagation="false" wx:for="{{memberList}}" wx:key="{{index}}" bindtap="godetail" data-item="{{item}}">
-            <image class="adavar" src="{{filter.imagify(item.avatar, 'image/resize,w_160/format,jpg')}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
-            <view class="content" hover-class="none" hover-stop-propagation="false">
-                <view class="name" hover-class="none" hover-stop-propagation="false">{{item.name}}</view>
-                <view class="count" hover-class="none" hover-stop-propagation="false">
-                    <view class="count-name" hover-class="none" hover-stop-propagation="false">剩余课时：</view>
-                    <view class="count-data" hover-class="none" hover-stop-propagation="false">{{item.surplus?item.surplus:0}}</view>   
+    <view class="userlist-box" wx:if="{{!emptyPage}}">
+        <view class="list-item" wx:for="{{memberList}}" wx:key="{{index}}" bindtap="godetail" data-item="{{item}}">
+            <image class="avatar" src="{{filter.imagify(item.avatar, 'image/resize,w_160/format,jpg')}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload=""></image>
+            <view class="item-content" >
+                <view class="name" >{{item.name}}</view>
+                <view class="info-box" >
+                    <view class="info-label" >剩余课时：</view>
+                    <view class="num" >{{item.surplus?item.surplus:0}}</view>   
                 </view>  
             </view>      
         </view>  

business/pages/studentcenter/index.wxss

-/* business/pages/studentcenter/index.wxss */
+@import '../../../style/userlist.wxss';
 .container{
   padding-bottom: 166rpx;
 }
@@ -38,15 +38,8 @@
     background:rgba(101,184,244,1);
     color:rgba(255,255,255,1);
 }
-.search-box {
-    padding: 25rpx 25rpx 40rpx 25rpx;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-}
-
 .search-box{
-    padding: 36rpx 25rpx 16rpx 25rpx;
+    padding: 36rpx 25rpx 28rpx 25rpx;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -91,51 +84,6 @@
     border: none;
     height: 60rpx;
 }
-.student-list{
-    padding-top: 30rpx;
-}
-.student-list .list-item{
-    padding: 0 24rpx;
-    height: 110rpx;
-    border-bottom: 1px solid rgba(0,0,0,.05);
-    display: flex;
-    align-items: center;
-}
-.student-list .list-item .adavar{
-    width:66rpx;
-    height:66rpx;
-    border-radius:50%;
-}
-.student-list .list-item .content{
-    padding-left: 28rpx;
-}
-.student-list .list-item .content .name{
-    font-size:26rpx;
-    font-family:PingFang-SC-Regular;
-    font-weight:400;
-    color:rgba(0,0,0,1);
-    line-height: 1;
-    padding-bottom: 16rpx;
-}
-.student-list .list-item .content .count{
-    display: flex;
-    align-items: center;
-}
-.student-list .list-item .content .count .count-name{
-    font-size:24rpx;
-    font-family:PingFang-SC-Regular;
-    font-weight:400;
-    color:rgba(119,119,119,1);
-    line-height: 1;
-}
-.student-list .list-item .content .count .count-data{
-    font-size:26rpx;
-    font-family:PingFang-SC-Medium;
-    font-weight:500;
-    color:rgba(255,185,122,1);
-    line-height:1;
-}
-
 /* 空场景 */
 .empty-content {
     position: absolute;

business/pages/studentmgt/list.wxml

@@ -19,8 +19,8 @@
 
     <view class="empty-content" wx:if="{{emptyPage}}">
         <image class='empty-img' src='{{imageRoot}}2c/rankinglist/empty.png?{{imageVersion}}'></image>
-            <view class="empty-text">暂无数据~</view>
-        </view>
+        <view class="empty-text">暂无数据~</view>
+    </view>
     <view class="has-nomore" wx:if="{{!emptyPage && !hasmore && page>1}}">没有更多了</view>
 
 </view>
\ No newline at end of file

constants/api.js

@@ -10,6 +10,7 @@ const apis = {
 	judgeJoinAd: `${api}student/website/ad/showMy`,
 	joinAdPost: `${api}student/website/ad`,
 	getMemberId: `${api}common/user/get_member_id`,
+	getMember: `${api}common/user/get_member`,//新 获取B端用户校区信息
 	teacherPcLoginReport: `${api}teacher/common/report`,
 	getVerifyCode: `${api}common/sms`,//发送短信获取验证码
 	customer: {
@@ -277,6 +278,7 @@ const apis = {
 			deletesubjects: `${api}member/subjects`, //删除（作业和日历）,
 			analyzeclasshour: `${api}member/erp/analyze/class_hour`,//课时分析
 			analyzeclasscourse: `${api}member/erp/analyze/class_course`,//课程分析
+			loginTime: `${api}member/erp/stronghold/login_time`,//b端身份 切换校区
 		},
 		shopeditor: {
 			infoGet: `${api}member/clock/address/get`,

service/business/ucenter.js

@@ -25,7 +25,19 @@ function schoolListT ({ page, perPage, needToken, header }) {
 		errorresolve: 1,
 	})
 }
+function loginTime (data) {
+	return wxRequest({
+		url: apis.business.common.loginTime,
+		data,
+		role: '2b',
+		needToken: true,
+		// header: header || null,
+		method: 'POST',
+		errorresolve: 1,
+	})
+}
 export {
 	schoolList,
 	schoolListT,
+	loginTime
 }
\ No newline at end of file

service/common.js

@@ -340,6 +340,14 @@ function getMemberId (data) {
     errorresolve: 1,
   })
 }
+function getMember (data) {
+	return wxRequest({
+    url: apis.getMember,
+    data,
+    method: 'GET',
+    errorresolve: 1,
+  })
+}
 function teacherPcLoginReport (data) {
 	return wxRequest({
     url: apis.teacherPcLoginReport,
@@ -403,6 +411,7 @@ export {
 	joinAdPost,
 	generatePiiic,
 	getMemberId,
+	getMember,
 	teacherPcLoginReport,
 	bTokenExchange,
 	getVerifyCode

src/pages/mycourses/index.js

@@ -91,7 +91,7 @@ Page({
       page: this.data.page,
       perPage: this.data.perPage,
       school_id: this.data.sid,
-      type: this.data.statusType,
+      status: this.data.statusType,
     }).then((res) => {
       const {
         code,

src/pages/mycourses/index.wxml

@@ -7,9 +7,9 @@
             <view class="item {{item.statusType == statusType?'active':''}}" wx:for="{{statusTab}}" wx:key="" bindtap="subjectStatusShift" data-statustype="{{item.statusType}}">{{item.tabname}}</view>
         </view>
     </view>
-    <view class="commonlist-bigwrap" wx:if="{{!emptyPage}}">
+    <view class="commonlist-bigwrap" wx:if="{{courseTatal>0}}">
         <view class="commonlist-box">
-            <block  wx:for="{{courseList}}" wx:for-item="bigitem" wx:key="bigindex" wx:for-index="bigindex">
+            <block wx:for="{{courseList}}" wx:for-item="bigitem" wx:key="bigindex" wx:for-index="bigindex">
                 <view class="commonlist-item" wx:for="{{bigitem}}" wx:for-item="item" data-theme="{{item}}" bindtap="" wx:key="{{index}}">
                     <view class="item-titlebox">
                         <view class="item-title">{{item.course.title}}</view>
@@ -34,7 +34,8 @@
         <list-loading loading="{{listLoading}}"></list-loading>
     </view>
     
-    <view class="empty-content" wx:else>
+    
+    <view class="empty-content" wx:if="{{emptyPage}}">
         <image class='empty-img' src='{{imageRoot}}2c/rankinglist/empty.png?{{imageVersion}}'></image>
         <view class="empty-text">暂无数据~</view>
     </view>

src/pages/mycourses/index.wxss

@@ -36,15 +36,21 @@
 
 
 .commonlist-bigwrap{
-    padding-top: 122rpx;
+    padding-top: 125rpx;
+    background:#fff;
+    padding-bottom: 0;
+    border-bottom: 20rpx solid #F3F4F6;
 }
 .commonlist-item .item-contentbox .content-item .item-label{
     width: 170rpx;
 }
 
 .empty-content {
-    padding: 184rpx 0 43rpx;
-    text-align:center;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+    text-align: center;
     line-height: 45rpx;
 }
 .empty-content .empty-img {

src/pages/setting/index.wxss

 @import '../../../style/commonform.wxss';
-
+page{
+    background: #F7F7F9;
+}
 page::after{
     content: '';
     width: 100%;
@@ -9,4 +11,14 @@ page::after{
     top: 0;
     right: 0;
     transform: scaleY(.5);
+}
+.form-box .form-item:last-of-type::after{
+    content: '';
+    width: 100%;
+    height: 1px;
+    background: transparent;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    transform: scaleY(.5);
 }
\ No newline at end of file

ucenter/index.js

@@ -24,7 +24,8 @@ import {
   formIdCreate,
   getActivities,
   activityLog,
-  getMemberId
+  getMemberId,
+  getMember
 } from '../service/common.js';
 import {
   getClassInfo,
@@ -277,16 +278,57 @@ Page({
     let user = LocalStorage.getItem('user');
     let teacher = LocalStorage.getItem('teacher');
     let dakarole = LocalStorage.getItem('dakarole');
-    console.log(user,dakarole)
+    console.log(visitor,user,dakarole)
 
-    // wx.navigateTo({
-    //   url: `/business/pages/loginregistermgt/login`
-    // })
-    // return 
+    getMember({
+      consumer_id: visitor && visitor.id
+    }).then(res=>{
+      const {data,code} = res;
+      if(data.member.length>0){
+        LocalStorage.setItem('user', {
+          // expires_in: data.expires_in,
+          token: `bearer ${data.token}`,
+        })
+        LocalStorage.setItem('dakarole', 1);
+        
+        wx.redirectTo({
+          url: `/business/pages/deskcenter/index?sid=${data.member[0].id}`
+        })
+      }else{
+        wx.showModal({
+          title: '提示',
+          content: '暂无校区',
+          showCancel: false
+        })
+      }
+      console.log(res)
+    })
 
-    console.log(dakarole,user)
+    return
 
+     
     if (!user) {
+      getMember({
+        consumer_id: visitor && visitor.id
+      }).then(res=>{
+        const {data,code} = res;
+        if(data.last_login_school_id){
+          LocalStorage.setItem('user', {
+            // expires_in: data.expires_in,
+            token: `bearer ${data.token}`,
+          })
+          LocalStorage.setItem('dakarole', 1);
+          
+          wx.redirectTo({
+            url: `/business/pages/deskcenter/index?sid=${data.member[0].id}`
+          })
+        }
+        console.log(res)
+      })
+      return
+
+
+
       getMemberId({
         open_id: visitor && visitor.openid,
       }).then((res) => {

wechatinfoget/index.js

@@ -43,21 +43,6 @@ Page({
   },
   onHide: function () { // Do something when page hide.
 
-  },
-  onUnload: function () { // Do something when page close.
-
-  },
-  onPullDownRefresh: function () { // Do something when pull down.
-
-  },
-  onReachBottom: function () { // Do something when page reach bottom.
-
-  },
-  onShareAppMessage: function () { // return custom share data when user share.
-
-  },
-  onPageScroll: function () { // Do something when page scroll
-
   },
   onTabItemTap(item) {},
   // Event handler.

wechatinfoget/index.wxml

 <view class="container">
     <view class="wechatinfoget-container">
-        <image class="hi-icon" src="{{imageRoot}}2b/common/hi.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
-        <view class="text" hover-class="none" hover-stop-propagation="false">欢迎来到“轻校通”！</view>
+        <view class="hi-box">
+            <image class="hi-icon" src="{{imageRoot}}2b/common/hi.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />
+            <view class="text" hover-class="none" hover-stop-propagation="false">欢迎来到“轻校通”！</view>
+        </view>
         <image class="center-img" src="{{imageRoot}}2b/common/wechatinfoget.png" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" />   
         <button class="btn" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo" hover-class="none" hover-stop-propagation="false">进入轻校通</button>
-          
     </view>
 </view>
\ No newline at end of file

wechatinfoget/index.wxss

+page{
+    min-height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.container{}
 .wechatinfoget-container {
-    height: 100vh;
-
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+.hi-box{
+    padding: 0 96rpx;
 }
-
-.wechatinfoget-container .hi-icon {
+.hi-box .hi-icon {
     width: 105rpx;
     height: 74rpx;
     display: block;
-    margin: 160rpx 0 27rpx 96rpx;
 }
-
-.wechatinfoget-container .text {
+.hi-box .text {
     font-size: 40rpx;
-    font-family: Alibaba-PuHuiTi-R;
-    font-weight: 400;
     color: rgba(0, 0, 0, 1);
     line-height: 1;
-    margin-left: 96rpx;
+    padding-top: 27rpx;
 }
-
 .center-img {
     width: 554rpx;
     height: 512rpx;
-    margin: 148rpx 0 0 128rpx;
+    margin: 148rpx 0 162rpx 128rpx;
 }
-
 .btn {
     width: 561rpx;
     height: 90rpx;
-    margin: 162rpx 0 0 96rpx;
     background: linear-gradient(90deg, rgba(255, 186, 38, 1), rgba(255, 162, 0, 1));
     box-shadow: 0px 8rpx 16rpx 0px rgba(255, 187, 17, 0.4);
     border-radius: 45rpx;
     font-size: 30rpx;
     font-family: PingFang-SC-Bold;
     font-weight: bold;
-    color: rgba(255, 255, 255, 1);
+    color: #fff;
     text-align: center;
     line-height: 90rpx;
 }
\ No newline at end of file