fix

src/pages/morethemeindex/index.js

@@ -136,7 +136,6 @@ Page({
     likesObj: {},
     commentsObj: {},
     schoolInfo: '',
-    auditStatus: 3, // 1未申请2审核中3已通过
     studentStatus: 1,
     noUser: false,
     commenteditor: false, // 评论input框
@@ -222,7 +221,6 @@ Page({
     if (options.scene) {
       let sceneQuery = scenQueryGet(options.scene);
       const {
-        i,
         t,
         c
       } = sceneQuery;
@@ -236,7 +234,6 @@ Page({
         })
       }
       this.setData({
-        id: i,
         tid: t,
         pagefrom: '',
         advertisementshow: true,
@@ -244,7 +241,6 @@ Page({
       })
     } else {
       const {
-        id,
         tid,
         sid,
         pagefrom,
@@ -272,7 +268,6 @@ Page({
         })
       }
       this.setData({
-        id,
         tid,
         sid: sid || 0,
         pagefrom: pagefrom ? pagefrom : '',
@@ -283,7 +278,7 @@ Page({
       })
     }
     app.getCurrentSchoolStudentId({
-      source_id: this.data.id,
+      source_id: this.data.sid,
       source_type: 7,
     }).then(() => {
       this.userShow();
@@ -519,7 +514,7 @@ Page({
   // 跟打卡之后积分获取弹窗有关的操作
   userShow() {
     studentidentity({
-      class_id: this.data.id,
+      school_id: this.data.sid,
     }).then((res) => {
       wx.hideLoading();
       const {
@@ -528,7 +523,6 @@ Page({
       } = res;
       if (code == 200 && data) {
         this.setData({
-          auditStatus: data.audit_status,
           noUser: data.is_visitor,
           studentId: data.student_id,
         })
@@ -537,14 +531,11 @@ Page({
         this.getModesDetail();
       } else {
         this.setData({
-          auditStatus: 1,
           noUser: true
         })
       }
     }).catch(() => {
-      this.setData({
-        auditStatus: 1,
-      })
+     
     })
   },
   judgeIsSchoolStudent (sid) {
@@ -2390,7 +2381,7 @@ Page({
         this.websitehomeGet(data.school_id);
         this.getSubjects(refresh);
         this.schoolInfoGet(data.school_id)
-        this.getCircleDetail(data.class_id);
+        // this.getCircleDetail(data.class_id);
         const visitor = LocalStorage.getItem('visitor');
         activityLog({
           type: 22,

src/pages/morethemeindex/index.wxml

@@ -52,8 +52,7 @@
                     <view class="time">{{themeSelect.created_at}}</view>
                       
                 </view>
-                <view class="" 
-                    wx:if="{{(!noUser && auditStatus == 3) || themeSelect.is_encrypt == 0}}">
+                <view wx:if="{{noUser || themeSelect.is_encrypt == 0}}">
                     <view class="{{detailExpand ? 'sjd-media-show-box noheight' : 'sjd-media-show-box'}}"
                          wx:if="{{themeSelect.content.length > 0}}">
                         <sjd-media-show content="{{themeSelect.content}}" bind:playvoice="playvoice"

src/pages/mytask/index.json

@@ -7,9 +7,5 @@
   },
   "navigationBarTitleText": "我的作业",
   "enablePullDownRefresh": true,
-  "onReachBottomDistance": 100,
-  "navigationBarBackgroundColor": "#FFFFFF",
-  "navigationBarTextStyle": "black",
-  "backgroundColor": "#fff",
-  "backgroundTextStyle": "dark"
+  "onReachBottomDistance": 100
 }
\ No newline at end of file

src/pages/mytask/index.wxml

-<!--business/pages/mytask/index.wxml-->
-
 <wxs src="../../../filter/index.wxs" module="filter" />
 <view class="nav-custombox">
     <view class="nav-title-box">
@@ -23,18 +21,11 @@
                                 <view class="title">{{item.title}}</view>
                             </view>
                             <view class="static-box">
-                                <text class="" >共{{item.class_students_count}}学员</text>
+                                <text>共{{item.class_students_count}}学员</text>
                                 <text class="divideline" >|</text>
-                                <text class="" >已提交{{item.clock_record_count}}人</text>
-                            </view>
-                            <!-- <view class="clockstatus wait" wx:if="{{!item.is_clock}}">
-                                <image class="dianpinicon" src="{{imageRoot}}2c/circleindex/notclock.png?{{imageVersion}}"></image>
-                                <text class="clockstatic" >未提交</text>
+                                <text>已提交{{item.clock_record_count}}人</text>
                             </view>
-                            <view class="clockstatus success" wx:if="{{item.is_clock}}">
-                                <image class="dianpinicon" src="{{imageRoot}}2c/circleindex/isclock.png?{{imageVersion}}"></image>
-                                <text class="clockstatic" >已提交</text>
-                            </view> -->
+
                             <view class="clockstatus" wx:if="{{statusType==1}}">去提交</view>
                             <view class="clockstatus disabled" wx:if="{{statusType==2 && !item.is_clock}}">已结束</view>
                             <view class="clockstatus disabled" wx:if="{{statusType==2 && item.is_clock}}">已打卡</view>
@@ -47,27 +38,18 @@
                                 <view class="title">{{item.title}}</view>
                             </view>
                             <view class="static-box">
-                                <text class="">共{{item.days}}天</text>
+                                <text>共{{item.days}}天</text>
                                 <text class="divideline" >|</text>
-                                <text class="" >{{item.all_record_count}}人参与</text>
+                                <text>{{item.all_record_count}}人参与</text>
                                 <text class="divideline" >•</text>
-                                <text class="" >已打卡{{item.today_record_count}}次</text>
-                            </view>
-                            <!-- <view class="clockstatus wait" wx:if="{{!item.is_clock}}">
-                                <image class="dianpinicon" src="{{imageRoot}}2c/circleindex/notclock.png?{{imageVersion}}"></image>
-                                <text class="clockstatic" >未打卡</text>
+                                <text>已打卡{{item.today_record_count}}次</text>
                             </view>
-                            <view class="clockstatus success" wx:if="{{item.is_clock}}">
-                                <image class="dianpinicon" src="{{imageRoot}}2c/circleindex/isclock.png?{{imageVersion}}"></image>
-                                <text class="clockstatic" >已打卡</text>
-                            </view> -->
+
                             <view class="clockstatus" wx:if="{{statusType==1}}">去提交</view>
                             <view class="clockstatus disabled" wx:if="{{statusType==2 && !item.is_clock}}">已结束</view>
                             <view class="clockstatus disabled" wx:if="{{statusType==2 && item.is_clock}}">已打卡</view>
-
                             <view class="themestatus" wx:if="{{item.days <= item.today_days}}">已完成</view>
                             
-
                             <view class="progress-box">
                                 <view class="progress" style="width: {{filter.calculateRate(item.today_days, item.days)}}%"></view>
                                 <view class="progressdesc" wx:if="{{item.days > item.today_days}}" style="left: {{filter.calculateRate(item.today_days, item.days)}}%">
@@ -84,14 +66,11 @@
                                 <view class="title">{{item.title}}</view>
                             </view>
                             <view class="static-box">
-                                <text class="" >共{{item.class_student_count}}名学员</text>
+                                <text>共{{item.class_student_count}}名学员</text>
                                 <text class="divideline" >|</text>
-                                <text class="">已闯{{item.my_clock_count}}个关卡</text>
+                                <text>已闯{{item.my_clock_count}}个关卡</text>
                             </view>
                             <view class="clockstatus" wx:if="{{statusType==1}}">去提交</view>
-                            <!-- <view class="clockstatus" wx:if="{{statusType==2 && item.unlock_limit - item.my_today_unlock_count>0}}">
-                                剩余闯关次数：{{item.unlock_limit - item.my_today_unlock_count}}
-                            </view> -->
                             <view class="clockstatus disabled" wx:if="{{statusType==2}}">已结束</view>
                         </block>
                     </view>
@@ -100,12 +79,10 @@
             <list-loading loading="{{listLoading}}"></list-loading>
         </view>
         <view class="empty-content-box" wx:else>
-            <empty-content text="还没有更多哦" emptyimg="common/empty/empty_no.png" width="263" height="219"></empty-content>
+            <empty-content text="暂无作业~" emptyimg="common/empty/empty_no.png" width="263" height="219"></empty-content>
         </view>
 
-        <!-- <view class="tasklistbtn" bindtap="goTaskList">任务列表</view> -->
-
-        <view class="" wx:if="{{sid == activtySchoolInfo.sid}}">
+        <view wx:if="{{sid == activtySchoolInfo.sid}}">
             <activity-bar
                 classid="{{activtySchoolInfo.id}}"
                 sid="{{activtySchoolInfo.sid}}"

src/pages/mytask/index.wxss

 page{
-  height: 100%;
+  min-height: 10vh;
 }
 .container{
   padding: 110rpx 0 70rpx;
@@ -196,26 +196,6 @@ page{
   box-shadow: 0 6rpx 0 0 rgba(224,224,224,1);
   color: #AAAAAA;
 }
-/* .clockstatus image{
-  width: 23rpx;
-  height: 23rpx;
-  margin-right: 10rpx;
-}
-.clockstatus.wait text {
-  font-size: 24rpx;
-  color: #FF9797;
-  letter-spacing: 2rpx;
-}
-.clockstatus.success text {
-  font-size: 24rpx;
-  color: #898A88;
-  letter-spacing: 2rpx;
-}
-.clockstatus.warn text {
-  font-size: 24rpx;
-  color: #FFC02A;
-  letter-spacing: 2rpx;
-} */
 .static-box text.divideline {
   margin: 0 20rpx;
   background-color: #fff;