fix

business/pages/circleindex/index.wxss

@@ -37,7 +37,7 @@ page{
 }
 .header-box .coursename{
     font-size: 24rpx;
-    color: rgba(0,0,0,.7);
+    color: rgba(0,0,0,.5);
     padding-top: 42rpx;
 }
 .header-box .circlename{
@@ -142,7 +142,7 @@ page{
     position: relative;
 }
 .shiftitem .shiftname {
-    color: rgba(0,0,0,.7);
+    color: rgba(0,0,0,.5);
     font-size: 26rpx;
 }
 .shiftitem .shiftline {

business/pages/classservice/classdetail.js

@@ -1201,7 +1201,7 @@ Page({
   },
   goindex() {
     wx.reLaunch({
-      url: `/business/pages/classservice/bindex?sid=${this.data.sid}`,
+      url: `/business/pages/classservice/tindex?sid=${this.data.sid}`,
     })
   },
   // 防止悬浮窗滚动页面滚动，无特殊意义

business/pages/classservice/classdetail.wxss

@@ -37,7 +37,7 @@ page{
 }
 .header-box .coursename{
     font-size: 24rpx;
-    color: rgba(0,0,0,.7);
+    color: rgba(0,0,0,.5);
     padding-top: 42rpx;
 }
 .header-box .circlename{
@@ -142,7 +142,7 @@ page{
     position: relative;
 }
 .shiftitem .shiftname {
-    color: rgba(0,0,0,.7);
+    color: rgba(0,0,0,.5);
     font-size: 26rpx;
 }
 .shiftitem .shiftline {
@@ -268,7 +268,7 @@ page{
     position: absolute;
     right: 24rpx;
     top: 107rpx;
-    width: 180px;
+    width: 180rpx;
     background:#fff;
     box-shadow: 0 0 10px 0 rgba(0, 0, 0, .1);
     border-radius: 10rpx;

business/pages/nocomment/index.wxss

@@ -5,16 +5,14 @@ page{
 .container{}
 .nocomment-listbox {
   margin-top: 24rpx;
-  border-top: 1px solid rgba(207,208,221,1);
-  border-bottom: 1px solid rgba(207,208,221,1);
+  border-top: 1px solid rgba(207,208,221,.3);
+  border-bottom: 1px solid rgba(207,208,221,.3);
   background:#fff;
 }
 
 .nocomment-list{
   height:158rpx;
   background:rgba(255,255,255,1);
-  /* border-top:2rpx solid rgba(207,208,221,1);
-  border-bottom:2rpx solid rgba(207,208,221,1); */
   display: flex;
   padding: 0 24rpx 0 24rpx;
   align-items: center;

business/pages/studentcenter/studentdetail.js

@@ -156,6 +156,16 @@ Page({
     if (_actBigTabsIndex === index) {
       return
     }
+    if(index == 3){
+      this.setData({
+        page: 1,
+        emptyClockPage: false,
+        clockhasmore: true,
+        clockListLoading: false
+      },()=>{
+        this.clockListGet('init');
+      })
+    }
     if (index != 3) {
       this.setData({
         circleSelecting: false
@@ -311,10 +321,10 @@ Page({
       if (code == 200) {
         this.setData({
           studentClass: data.list,
-          actStudentClass: data.list[0],
+          // actStudentClass: data.list[0] || '',
         },()=>{
           console.log(this.data.actStudentClass)
-          this.clockListGet('init');
+          // this.clockListGet('init');
         })
       }
     }).catch(() => {
@@ -374,7 +384,7 @@ Page({
       page: this.data.page,
       perPage: this.data.perPage,
       school_id: this.data.sid,
-      class_id: this.data.actStudentClass.id,
+      class_id: this.data.actStudentClass?this.data.actStudentClass.id:'',
       // now_consumer_id: visitor && visitor.id
     }).then((res) => {
       const {
@@ -524,7 +534,7 @@ Page({
       circle
     } = e.currentTarget.dataset;
     this.setData({
-      actStudentClass: circle,
+      actStudentClass: circle || '',
       circleSelecting: false,
       page: 1,
       clockhasmore: true,

business/pages/studentcenter/studentdetail.wxml

@@ -185,18 +185,24 @@
              </view>
          </view>
          <view class="growthrecord-info" wx:if="{{actBigTabsIndex==3}}"> 
-             <view class="class-tab">
+            <view class="class-tab" wx:if="{{studentClass.length==0}}" style="padding: 0 24rpx;">
                 <view class="title">
-                    <view class="text">{{actStudentClass.title}}</view>  
-                    <view class="change-btn" bindtap="changClassShow">切换班级 <image class="icon {{circleSelecting?'':'down-icon'}}" src="{{imageRoot}}2b/studentdetail/blue-down.png"/>    </view>
+                    <view class="text">全部班级</view>
+                </view>
+            </view>
+            <view class="class-tab" wx:if="{{studentClass.length>0}}">
+                <view class="title">
+                    <view class="text">{{actStudentClass?actStudentClass.title:'全部班级'}}</view>  
+                    <view class="change-btn" bindtap="changClassShow" wx:if="{{studentClass.length>1}}">切换班级 <image class="icon {{circleSelecting?'':'down-icon'}}" src="{{imageRoot}}2b/studentdetail/blue-down.png"/>    </view>
                 </view>
                 <view class="circle-list-box" hidden="{{!circleSelecting}}">
-                    <view class="circle-list-item" wx:for="{{studentClass}}" wx:key="index" data-circle="{{item}}" bindtap="circleClick">{{item.title}}</view>
+                    <view class="circle-list-item {{actStudentClass.id?'':'active'}}" data-circle="" bindtap="circleClick" style="font-weight: bold;">全部班级</view>
+                    <view class="circle-list-item {{item.id==actStudentClass.id?'active':''}}" wx:for="{{studentClass}}" wx:key="index" data-circle="{{item}}" bindtap="circleClick">{{item.title}}</view>
                 </view>
              </view>
              <view class="content">
-                <view class="" wx:if="{{!emptyClockPage}}">
-                    <view class="" wx:for="{{clockList}}" wx:key="index">
+                <view class="clock-list" wx:if="{{!emptyClockPage}}">
+                    <view class="clock-item" wx:for="{{clockList}}" wx:key="index">
                         <clock-item clock="{{item}}" bind:clocksplacetop="clocksplacetop" bind:delClock="delClock" bind:expandAccessment="expandAccessment" bind:fingureUp="fingureUp" cindex="{{index}}" tid="{{tid}}" cid="{{id}}" bind:expandLikes="expandLikes" bind:expandContent="expandContent" bind:delComments="delComments" bind:playvoice="playvoice" bind:pausevoice="pausevoice" bind:voiceslide="voiceslide" audioStorage="{{audioStorage}}" bind:slidestart="slidestart" bind:slideend="slideend" bind:playvideo="playvideo" bind:showcommenteditor="showcommenteditor"></clock-item>
                     </view>
                     <list-loading loading="{{clockListLoading}}"></list-loading>

business/pages/studentcenter/studentdetail.wxss

@@ -95,7 +95,7 @@
     position: relative;
 }
 .shiftitem .shiftname {
-    color: rgba(0,0,0,.7);
+    color: rgba(0,0,0,.5);
     font-size: 26rpx;
 }
 .shiftitem .shiftline {
@@ -155,7 +155,7 @@
     font-size:26rpx;
     font-family:PingFang-SC-Regular;
     font-weight:400;
-    color:rgba(0,0,0,.7);
+    color:rgba(0,0,0,.5);
     line-height:1;
     padding: 0 40rpx 0 24rpx;
 }
@@ -414,4 +414,16 @@
     position: absolute;
     left: 0;
     top: 0;
+}
+.circle-list-box .circle-list-item.active{
+    color: rgba(101,184,244,1)
+}
+
+.clock-list{}
+.clock-list .clock-item{
+    position: relative;
+    border-bottom: 15rpx solid #F7F7F9;
+}
+.clock-list .clock-item:last-of-type{
+    border-bottom: none;
 }
\ No newline at end of file

components/emptypage/index.js

+// component/emptyScene/index.js
+var app = getApp();
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    emptytext: {
+      type: Array,
+      value: ['暂无数据']
+    },
+    emptyimg: {
+      type: String,
+      value: `${app.globalData.localImageRoot}/images/common/empty/empty_no.png`
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

components/emptypage/index.json

+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file

components/emptypage/index.wxml

+<view class="empty-wrap">
+    <image class="empty-img" src="{{emptyimg}}"></image>
+    <view class="empty-textbox">
+        <text class="empty-text" wx:for="{{emptytext}}" wx:key="{{index}}">{{item}}</text>
+    </view>
+</view>
\ No newline at end of file

components/emptypage/index.wxss

+.empty-wrap{
+    width: 100%;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%,-50%);
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    box-sizing: border-box;
+}
+.empty-wrap .empty-img{
+    width: 50rpx;
+    height: 50rpx;
+}
+.empty-wrap .empty-textbox{
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    font-size: 24rpx;
+    align-items: center;
+    color: #A7A7A7;
+    padding-top: 50rpx;
+}
+.empty-wrap .empty-textbox .empty-text{
+    padding-bottom: 20rpx;
+}
+.empty-wrap .empty-textbox .empty-text:last-of-type{
+    padding-bottom: 0;
+}

service/customer/coursemgt.js

@@ -7,7 +7,7 @@ function myclassrecord (data) {//上课记录
 		url: apis.customer.courseMgt.courserecord,
 		data,
 		method: 'GET',
-		errorresolve: 1,
+		errorresolve: 2,
 	})
 }
 function myschedule(data){//我的课表
@@ -15,7 +15,7 @@ function myschedule(data){//我的课表
 		url: apis.customer.courseMgt.myschedule,
 		data,
 		method: 'GET',
-		errorresolve: 1,
+		errorresolve: 2,
 	})
 }
 function mycourses(data){//我的课程
@@ -23,7 +23,7 @@ function mycourses(data){//我的课程
 		url: apis.customer.courseMgt.mycourses,
 		data,
 		method: 'GET',
-		errorresolve: 1,
+		errorresolve: 2,
 	})
 }
 

src/pages/myclassrecord/index.js

@@ -89,16 +89,8 @@ Page({
         listLoading: false
       })
       if(code == 40000){
-        wx.showModal({
-          title: '提示',
-          content: '没有查到该学员信息',
-          showCancel: false,
-          confirmColor: '#FFD146',
-          success(){
-            wx.navigateBack({
-              delta: 1
-            })
-          }
+        this.setData({
+          emptyPage: true
         })
         return
       }

src/pages/myclassrecord/index.wxml

 <wxs src="./../../../filter/index.wxs" module="filter" />
 <view class="container">
-    <view class="commonlist-bigwrap" wx:if="{{courseList}}">
+    <view class="commonlist-bigwrap" wx:if="{{courseList.length>0}}">
         <block class="commonlist-partwrap" wx:for="{{courseList}}" wx:key="">
             <view class="commonlist-header">{{item.month}}</view>
             <view class="commonlist-box">

src/pages/myclassrecord/index.wxss

 @import "../../../style/commonlist.wxss";
 .empty-content {
-    padding: 84rpx 0 43rpx;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%,-50%);
     text-align:center;
     line-height: 45rpx;
 }

src/pages/mycourses/index.js

@@ -101,16 +101,8 @@ Page({
         listLoading: false
       })
       if(code == 40000){
-        wx.showModal({
-          title: '提示',
-          content: '没有查到该学员信息',
-          showCancel: false,
-          confirmColor: '#FFD146',
-          success(){
-            wx.navigateBack({
-              delta: 1
-            })
-          }
+        this.setData({
+          emptyPage: true
         })
         return
       }

src/pages/mycourses/index.wxml

@@ -32,9 +32,8 @@
         <list-loading loading="{{listLoading}}"></list-loading>
     </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}}2b/potentialcustomer/emptyimg.png?{{imageVersion}}'></image>
         <view class="empty-text">暂无数据~</view>
     </view>
     <view class="has-nomore" wx:if="{{!emptyPage && !hasmore}}">没有更多了</view>

src/pages/myschedule/index.js

@@ -82,16 +82,8 @@ Page({
         listLoading: false
       })
       if(code == 40000){
-        wx.showModal({
-          title: '提示',
-          content: '没有查到该学员信息',
-          showCancel: false,
-          confirmColor: '#FFD146',
-          success(){
-            wx.navigateBack({
-              delta: 1
-            })
-          }
+        this.setData({
+          emptyPage: true
         })
         return
       }

src/pages/setting/bindmobile.wxss

@@ -10,7 +10,16 @@ page::after{
     right: 0;
     transform: scaleY(.5);
 }
-
+.form-box .form-item:last-of-type::after{
+    content: '';
+    width: 100%;
+    height: 1px;
+    background: rgba(0,0,0,.05);
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    transform: scaleY(.5);
+}
 .btn-getcode,button.btn-getcode[disabled]{
     font-size: 24rpx;
     line-height: 50rpx;
@@ -19,7 +28,9 @@ page::after{
     padding: 0;
     margin: 0;
 }
-
+.form-item input{
+    width: 550rpx;
+}
 .formBtn{
     font-size: 30rpx;
     font-weight: 500;

src/pages/setting/index.js

@@ -66,15 +66,15 @@ Page({
   },
   tobindmobile(){
     // 已经绑定
-    if(this.data.hasBindErp){
-      wx.showModal({
-        title: '提示',
-        content: '暂不支持修改手机号',
-        showCancel: false,
-        confirmColor: '#FFD146'
-      })
-      return
-    }
+    // if(this.data.hasBindErp){
+    //   wx.showModal({
+    //     title: '提示',
+    //     content: '暂不支持修改手机号',
+    //     showCancel: false,
+    //     confirmColor: '#FFD146'
+    //   })
+    //   return
+    // }
     // 没有绑定，但非erp学员，需先erp添加
     // if(!this.data.hasBindErp && !this.data.mobile){
     //   wx.showModal({

style/userlist.wxss

@@ -48,6 +48,7 @@
     color: #777;
     display: flex;
     align-items: center;
+    padding-top: 10rpx;
 }
 .userlist-box .list-item .item-content .info-box .info-label{
     font-size: 24rpx;