fix

app.js

@@ -120,16 +120,13 @@ App({
       let version = parseInt(res.version.split('.').join(''));
       let SDKVersion = parseInt(res.SDKVersion.split('.').join(''));
       // if(version>700 && SDKVersion>=243){
-      if(version>600 && SDKVersion>=243){
+      if(version>700 && SDKVersion>=243){
         // this.globalData.nav_custom = true;
         let titleBarHeight = res.model.indexOf('iPhone') !== -1?44: 48;
         let statusBarHeight = res.statusBarHeight || 20;
-        
         this.globalData.statusBarHeight = res.statusBarHeight || 20;
         this.globalData.titleBarHeight = res.model.indexOf('iPhone') !== -1?44: 48;
         this.globalData.navHeight = parseInt(titleBarHeight) + parseInt(statusBarHeight);
-        
-        console.log(this.globalData.navHeight,this.globalData.titleBarHeight)
       }
     } catch (err){
       console.log(err)

components/customheader/index.js

+const {globalData} = getApp()
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+
+  },
+  options: {
+    multipleSlots: true // 在组件定义时的选项中启用多slot支持
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    titleBarHeight : globalData.titleBarHeight,
+    statusBarHeight: globalData.statusBarHeight
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

components/customheader/index.json

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

components/customheader/index.wxml

+<view class="topbar" style="padding-top: {{statusBarHeight}}px">
+    <view class="nav-contentbox" style="height: {{titleBarHeight}}px">
+        <slot name="navcustom"></slot>
+    </view>
+</view>
\ No newline at end of file

components/customheader/index.wxss

+.topbar{
+    position: fixed;
+    width: 100%;
+    top: 0;
+    left: 0;
+    background: #fff;
+    z-index: 99;
+}
+.nav-contentbox{
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center
+}
\ No newline at end of file

constants/api.js

@@ -51,6 +51,7 @@ const apis = {
 			circleDetail: `${api}consumer/clock/circle/show`,
 			themeList: `${api}student/subject/index`,
 			unlockthemeList: `${api}student/unlock_modes`,//解锁课时列表
+			mixedthemeList: `${api}student/subject/mixed`,//主题列表 混合
 			clockList: `${api}common/clock`,
 			newLikeIndex: `${api}common/likes`,
 			newCommentIndex: `${api}common/comments`,

constants/constants.js

 export default {
   imageRoot: 'https://cdn.img.shangjiadao.cn/source/images/dakav4/',
-  host: 'https://wx.m.shangjiadao.cn/daka',
-  host2: 'https://wx.m.shangjiadao.cn',
+  // host: 'https://wx.m.shangjiadao.cn/daka',
+  // host2: 'https://wx.m.shangjiadao.cn',
   storageVersion: '3.0',
   imageVersion: '20190605',
-  // host: 'https://clock.wp53.cn',
-  // host2: 'https://test.wp53.cn',
+  host: 'https://clock.wp53.cn',
+  host2: 'https://test.wp53.cn',
   appId: 'wxc1246ea029394785',
   miniProgram: {
     clock: 'wxdeee20e52a1fd7ee'

service/customer/circleindex.js

@@ -42,6 +42,14 @@ function unlockthemeList (data) {
 		errorresolve: 1,
 	})
 }
+function mixedthemeList (data) {
+	return wxRequest({
+		url: apis.customer.circleIndex.mixedthemeList,
+		data,
+		method: 'GET',
+		errorresolve: 1,
+	})
+}
 function judgeIsClock (data) {
 	return wxRequest({
     url: apis.customer.clockDetail.detailGet,
@@ -204,6 +212,7 @@ function subjectClassStudent (data) {
 export {
 	themeList,
 	unlockthemeList,
+	mixedthemeList,
 	circleDetail,
 	judgeIsClock,
 	clockList,
@@ -219,7 +228,7 @@ export {
 	fingureUpList,
 	newLikeIndex,
 	newCommentIndex,
-  classList,
+  	classList,
 	schoolInfo,
 	customerClass,
 	customerStaticGet,

src/pages/schoolclasslist/index.json

@@ -2,9 +2,11 @@
   "navigationBarTitleText": "课程列表",
   "enablePullDownRefresh": true,
   "onReachBottomDistance": 100,
-  "navigationBarBackgroundColor": "#FFD146",
+  "navigationBarBackgroundColor": "white",
   "navigationBarTextStyle": "black",
   "navigationStyle": "custom",
+  "backgroundColor": "#fff",
+  "backgroundTextStyle": "dark",
   "usingComponents": {
     "empty-content": "../../../components/emptycontent",
     "poster-box": "../../../components/posterbox",
@@ -12,10 +14,7 @@
     "list-loading": "../../../components/listloading",
     "btabbar": "../../../components/ctabbar",
     "activity-bar":"../../../components/activitybar",
-<<<<<<< HEAD
-    "custom-header": "../../../components/customheader"
-=======
+    "custom-header": "../../../components/customheader",
     "sjdbottombar":"../../../components/sjdbottombar"
->>>>>>> cffcf2253140100364f563c9bf53076334f6b976
   }
 }
\ No newline at end of file

src/pages/schoolclasslist/index.wxss

@@ -3,7 +3,9 @@ page{
     display: flex;
     flex-direction: column;
 }
-
+.container{
+    padding-bottom: 100rpx;
+}
 .nav-custombox{
     width: 100%;
     display: flex;
@@ -11,9 +13,9 @@ page{
     justify-content: center;
     position: relative;
 }
-.nav-custombox .nav-back{
-    width: 30rpx;
-    height: 30rpx;
+.nav-custombox .icon-classSelect{
+    width: 29rpx;
+    height: 24rpx;
     position: absolute;
     left: 30rpx;
     top: 50%;
@@ -24,43 +26,26 @@ page{
     align-items: center;
 }
 .nav-title-box .item{
-    padding: 0 20rpx 10rpx;
+    padding: 0 70rpx 10rpx;
     position: relative;
     font-size: 28rpx;
+    font-weight: bold
 }
 .nav-title-box .item.active{
     color: #FFD146;
 }
 .nav-title-box .item.active::after{
     content: '';
-    width: 66rpx;
-    height: 8rpx;
+    width: 78rpx;
+    height: 6rpx;
     background: #FFD146;
     position: absolute;
     bottom: 0;
     left: 50%;
     transform: translateX(-50%);
-    border-radius: 4rpx;
-}
-.container {
-    padding: 0 24rpx 0;
-}
-.pdt104 {
-    padding-top: 104rpx;
-    padding-bottom: 200rpx;
-}
-.select-class {
-    background-color: #FFD146;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 51rpx 0 22rpx;
-    position: fixed;
-    width: 100%;
-    top: 0;
-    left: 0;
-    z-index: 202;
+    border-radius: 3rpx;
 }
+
 @keyframes modalshow {
     from {
         opacity: 0;
@@ -69,14 +54,40 @@ page{
         opacity: 1;
     }
 }
+@keyframes modalhide {
+    from {
+        opacity: 1;
+    }
+    to {
+        opacity: 0;
+    }
+}
+
+@keyframes modalshowFromLeft {
+    from {
+        transform: translateX(-100%)
+    }
+    to {
+        transform: translateX(0)
+    }
+}
+@keyframes modalhideToLeft {
+    from {
+        transform: translateX(0)
+    }
+    to {
+        transform: translateX(-100%)
+    }
+}
+
+
 .classselectedmodal {
     position: fixed;
     top: 0;
     left: 0;
     width: 100%;
     height: 100%;
-    z-index: 201;
-    animation: modalshow 0.1s linear;
+    z-index: 8;
 }
 .classselectedmodal .modalmask {
     position: absolute;
@@ -85,87 +96,53 @@ page{
     left: 0;
     top: 0;
     background-color: rgba(0,0,0,0.5);
+    animation: modalshow .2s linear forwards;
+}
+.classselectedmodal.hide .modalmask{
+    animation: modalhide .2s linear forwards;    
 }
 .classselectedmodal .classbox {
     position: relative;
     z-index: 1;
-    max-height: 600rpx;
-    overflow: auto;
-    background-color: #fff;
-    top: 106rpx;
+    height: 100%;
+    width: 580rpx;
+    overflow-y: auto;
+    background: #fff;
+    z-index: 9;
+    animation: modalshowFromLeft .2s linear forwards;
+}
+.classselectedmodal.hide .classbox{
+    animation: modalhideToLeft .2s linear forwards;
 }
-.classitem {
+.classselectedmodal .classbox .classitem {
     position: relative;
-    border-bottom: 2rpx solid rgba(0,0,0,0.05);
+}
+.classselectedmodal .classbox .classitem::after{
+    content: '';
+    width: 510rpx;
+    height: 1px;
+    background: rgba(0,0,0,.05);
+    position: absolute;
+    left: 24rpx;
+    bottom: 0;
 }
 .classselectedmodal .classbox .classitemname {
-    max-width: 600rpx;
-    margin: 0 auto;
-    text-align: center;
-    overflow: hidden;
-    text-overflow:ellipsis;
-    white-space: nowrap;
-    line-height: 88rpx;
+    line-height: 48rpx;
+    padding: 17rpx 100rpx 17rpx 24rpx;
 }
 .classselectedmodal .classbox .selecticon {
     display: block;
-    width: 33rpx;
-    height: 33rpx;
+    width: 27rpx;
+    height: 27rpx;
     position: absolute;
-    right: 24rpx;
+    right: 32rpx;
     top: 50%;
     transform: translateY(-50%);
 }
-.select-class .class-name {
-    font-size: 26rpx;
-    color: #000;
-    max-width: 300rpx;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-.select-class .arrowwhite {
-    width: 28rpx;
-    height: 16rpx;
-    margin-left: 12rpx;
-    transition: all 0.2s;
-}
-.select-class .arrowwhite.down {
-    transform: rotate(180deg);
-}
-.shiftbox {
-    display: flex;
-    align-content: center;
-    justify-content: space-around;
-    margin-top: 70rpx;
-    margin-bottom: 48rpx;
-}
-.shiftitem .shiftname {
-    color: rgba(0,0,0,0.5);
-    font-size: 28rpx;
-    line-height: 1;
-    margin-bottom: 24rpx;
-    font-weight: 700;
-}
-.shiftitem .shiftline {
-    width: 66rpx;
-    height: 8rpx;
-    background-color: transparent;
-    margin: 0 auto;
-    border-radius: 4rpx;
-}
-.shiftitem.active .shiftname {
-    color: #000000;
-    font-size: 30rpx;
-    font-weight: 700;
-}
-.shiftitem.active .shiftline {
-    width: 66rpx;
-    height: 8rpx;
-    background-color: #FFD146;
-    margin: 0 auto;
-}
 
+.circlelist-content{
+    padding: 0 24rpx;
+}
 .circle-item {
     padding: 32rpx 10rpx 20rpx 33rpx;
     border-radius: 20rpx;
@@ -178,7 +155,6 @@ page{
 }
 .circle-item.rili {
     padding-bottom: 64rpx;
-    /* height: 245rpx; */
 }
 .circle-item .rilibg {
     width: 105rpx;
@@ -221,8 +197,6 @@ page{
     bottom: 0;
     height: 6rpx;
     background-color: #EBEBEB;
-    /* background-color: red; */
-    /* padding-top: 64rpx; */
 }
 .progress {
     height: 6rpx;