Merge remote-tracking branch 'origin/lvtz_clock' into wxl-user-optimize

business/pages/calendarthemeindex/index.wxml

@@ -35,9 +35,8 @@
                 <view class="top-detail" bindtap="goLoodDetail">查看详情</view>
             </view>
         </view>
-        <view class="greybox"></view>
-
-        <view class="card-middle-box">
+        <!-- 打卡率 及未打卡学员 -->
+        <!-- <view class="card-middle-box">
             <view class="clock-rate-box">
                 <view class="title-box">
                     <image class="icon-label" src="{{imageRoot}}2b/themeindex/icon_clockrate.png"></image>
@@ -73,9 +72,7 @@
                     </block>
                 </view>
             </view>
-        </view>
-        <view class="greybox"></view>
-
+        </view> -->
 
         <view class="shift-box" >
             <view class="small-sort-item" data-onesmallsort="1" bindtap="onesmallsortselect" >
@@ -102,7 +99,6 @@
                     <view class="clock-item" wx:for="{{listItem}}" wx:key="index">
                         <clock-item 
                             clock="{{item}}" 
-                            permission="{{permission}}" 
                             bind:clocksplacetop="clocksplacetop" 
                             bind:delClock="delClock" 
                             bind:expandAccessment="expandAccessment" 

business/pages/deskcenter/clocklist.js

@@ -472,26 +472,19 @@ Page({
     } = e.currentTarget;
     if (theme.subject_type == 2) {
       wx.navigateTo({
-        url: `/business/pages/calendarthemeindex/index?id=${
-          this.data.selectClass ? this.data.selectClass.id : 0
-        }&tid=${theme.id}&sid=${this.data.sid}`
+        url: `/business/pages/calendarthemeindex/index?tid=${theme.id}&sid=${this.data.sid}`
       });
     } else if (theme.subject_type == 1) {
       wx.navigateTo({
-        url: `/business/pages/themeindex/index?id=${
-          this.data.selectClass ? this.data.selectClass.id : 0
-        }&tid=${theme.id}&sid=${this.data.sid}`
+        url: `/business/pages/themeindex/index?tid=${theme.id}&sid=${this.data.sid}`
       });
     } else if (theme.subject_type == 3) {
       wx.navigateTo({
-        url: `/business/pages/morethemeindex/index?id=${
-          this.data.selectClass ? this.data.selectClass.id : 0
-        }&tid=${theme.id}&sid=${this.data.sid}&sort=1`
+        url: `/business/pages/morethemeindex/index?tid=${theme.id}&sid=${this.data.sid}&sort=1`
       });
     }
   },
 
-  //复制主题
   //复制主题
   copytheme(e) {
     const that = this;

business/pages/deskcenter/clocklist.wxml

@@ -29,18 +29,12 @@
             <view class="item-title">{{ selectThemeType.title }}</view>
             <image class="icon-arr {{modalThemeType? 'active': ''}}" src="{{imageRoot}}2c/shopindex/arrowdown.png?{{imageVersion}}"></image>
         </view>
-        <view class="select-item" bindtap="showClassSelectModal">
+        <view class="select-item" bindtap="showClassSelectModal" wx:if="{{tag!=1}}">
             <view class="item-title">{{selectClass? selectClass.title: '全部班级'}}</view>
             <image class="icon-arr {{modalClass? 'active': ''}}" src="{{imageRoot}}2c/shopindex/arrowdown.png?{{imageVersion}}"></image>
         </view>
     </view>
 
-    <!-- <view class="class-select-box" bindtap="showClassSelectModal" wx:if="{{tag!=1}}">
-        <view class="label">班级:</view>
-        <view class="title">{{selectClass.title}}</view>
-        <view class="exchang-btn">切换班级 <image class="icon" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"/></view>
-    </view> -->
-
     <view class="content-topbox">
         <view class="tab-box">
             <view class="tab-item {{item.themeStatus == themeStatus?'active':''}}" data-themestatus="{{item.themeStatus}}" wx:for="{{themeTab}}" bindtap="subjectStatusShift" wx:key="index">

business/pages/deskcenter/clocklist.wxss

@@ -79,39 +79,6 @@
     transform: rotate(180deg);
 }
 
-.class-select-box{
-    padding: 40rpx 24rpx;
-    display: flex;
-    line-height: 1;
-}
-.class-select-box .label{
-    width: 82rpx;
-    font-size: 26rpx;
-    font-weight: 400;
-    color:#757575;
-
-}
-.class-select-box .title{
-    flex: 1;
-    font-size:30rpx;
-    font-weight:500;
-    color:rgba(0,0,0,1);
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    padding-right: 31rpx;
-} 
-.class-select-box .exchang-btn{
-    font-size: 26rpx;
-    color: #8E8E8E;
-    display: flex;
-    align-items: center;
-}
-.class-select-box .exchang-btn .icon{
-    width: 12rpx;
-    height: 20rpx;
-    margin-left: 20rpx;
-}
 
 /* 弹框 选择班级 作业列表 */
 .modal{

business/pages/themead/landpage.wxss

@@ -98,7 +98,6 @@ page {
     transform: translateY(-50%);
 } */
 .instro-bx .media-box {
-  margin-top: -12rpx;
 }
 .mediabox .title-wrapper{
   text-align: center;

constants/api.js

@@ -213,15 +213,15 @@ const apis = {
 			commonclock: `${api}common/clock`, //获取打卡记录
 			websitecourseshow: `${api}common/website/course/show`, //体验课详情
 			momentlist: `${api}common/moment`, //C端-课堂瞬间列表
-			momentdetail: `${api}student/moment/detail`, //C端-课堂瞬间详情
+			momentdetail: `${api}common/moment/detail`, //C端-课堂瞬间详情
 			newslist: `${api}common/news`, //C端-机构新鲜事列表创
 			newsdetail: `${api}student/news/detail`, //C端-机构新鲜详情
-			onlinecourseslist: `${api}student/online_courses`, //C端-在线课列表
-			onlinecoursesdetail: `${api}student/online_courses/detail`, //C端-在线课列表详情
+			onlinecourseslist: `${api}common/online_courses`, //C端-在线课列表
+			onlinecoursesdetail: `${api}common/online_courses/detail`, //C端-在线课列表详情
 			onlinesubcourses: `${api}student/online_courses/sub_courses`, //C端-线上课专栏对应的单课列表
 			onlinecoursesverifypwd: `${api}student/online_courses/verify_pwd`, //C端-线上课堂验证密码接口
 			websiteBarrage: `${api}common/odd_job/school_barrage`, //微官网弹幕
-			websitesubject: `${api}student/website/subject/index`, //主题列表
+			websitesubject: `${api}common/website/subject/index`, //主题列表
 		},
 		papersquare: {
 			lastwall: `${api}common/clock/last_wall`, //最新一次精选作品