fix

business/pages/deskcenter/clocklist.wxml

@@ -143,7 +143,7 @@
                             <image class="dianpinicon" src="{{imageRoot}}2b/circleindex/dianpin.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
                             <text class="clockstatic">待点评{{item.unreview_clock_record_count}}</text>
                         </view>
-                        <view class="clockstatus success"  wx:else>
+                        <view class="clockstatus success"  wx:if="{{item.clock_record_count >0 && item.unreview_clock_record_count == 0}}">
                             <image class="dianpinicon" src="{{imageRoot}}2b/circleindex/right.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false"></image>
                             <text class="clockstatic">已全部点评</text>
                         </view>

src/pages/calendarthemeindex/index.js

@@ -496,50 +496,6 @@ Page({
       })
     }, 2500)
   },
-  // 跟打卡之后积分获取弹窗有关的操作
-  getCircleDetail(id) {
-    circleDetail({
-      class_id: id
-    }).then((res) => {
-      if (res.code == 200) {
-        let content = [];
-        try {
-          content = JSON.parse(res.data.content);
-        } catch (e) {
-          content = []
-        }
-        if (res.code == 40000) {
-          if (res.msg) {
-            wx.showModal({
-              title: '提示',
-              content: '班级已被删除，点击确定返回机构首页',
-              showCancel: false,
-              confirmText: "确定",
-              success(r) {
-                if (r.confirm) {
-                  wx.reLaunch({
-                    url: `/src/pages/shopindex/index?mid=${res.data.member_id}`
-                  })
-                }
-              }
-            })
-          }
-          return;
-        }
-        res.data.content = content;
-        // this.queryActivtySchoolInfo(res.data.school_id);
-        // this.judgeIsSchoolStudent(res.data.school_id);
-        this.setData({
-          circleInfo: res.data,
-          // sid: res.data.school_id
-        })
-      }
-      // setTimeout(()=>{
-      //   this.judgeIsClock(this.data.tid);
-      // },500)
-      
-    })
-  },
   themeDetail() {
     themeDetail({
       subject_id: this.data.tid,
@@ -602,9 +558,9 @@ Page({
           // isExpire:new Date(data.homework_set.end_time.replace(/-/g,'/')).getTime() - new Date().getTime()>0?false:true
         })
         // this.getWeeksDay(new Date(res.datetime),data.calendar_set.rest_dates.split(','),null);
-        if(data.class_id) {
-          this.getCircleDetail(data.class_id);
-        }
+        // if(data.class_id) {
+        //   this.getCircleDetail(data.class_id);
+        // }
         activityLog({
           type:22,
           open_id: visitor && visitor.openid,
@@ -887,56 +843,56 @@ Page({
       })
     })
   },
-  joinClass() {
-    const visitor = LocalStorage.getItem('visitor');
-    if (this.data.auditStatus == 1) { // 点击审核
-      joinCircle({
-        consumer_id: visitor && visitor.id,
-        student_id: this.data.studentId,
-        school_id: this.data.sid,
-        member_id: this.data.circleInfo.member_id,
-        union_id: visitor && visitor.unionid,
-        nickname: visitor && visitor.userInfo && visitor.userInfo.nickName,
-        remark: ''
-      }).then((res) => {
-        if (res.code == 200) {
-          if (this.data.circleInfo.need_audit == 1) {
-            let studentCount = this.data.circleInfo.class_statistic && this.data.circleInfo.class_statistic.student_total || 0;
-            wx.showToast({
-              title: '加入成功',
-              icon: 'success',
-              duration: 2000
-            })
-            this.setData({
-              auditStatus: 3,
-              'circleInfo.class_statistic.student_total': studentCount + 1
-            })
-          } else if (this.data.circleInfo.need_audit == 2) {
-            this.setData({
-              auditStatus: 2
-            })
-            wx.showModal({
-              title: '提示',
-              content: '加入该班级需要审核，请等待老师审核',
-              showCancel: false
-            })
-          }
-        } else {
-          wx.showToast({
-            title: res.msg,
-            icon: 'none',
-            duration: 2000
-          })
-        }
-      })
-    } else if (this.data.auditStatus == 2) { // 老师正在审核
-      wx.showModal({
-        title: '提示',
-        content: '老师正在审核，请稍后...',
-        showCancel: false
-      })
-    }
-  },
+  // joinClass() {
+  //   const visitor = LocalStorage.getItem('visitor');
+  //   if (this.data.auditStatus == 1) { // 点击审核
+  //     joinCircle({
+  //       consumer_id: visitor && visitor.id,
+  //       student_id: this.data.studentId,
+  //       school_id: this.data.sid,
+  //       member_id: this.data.circleInfo.member_id,
+  //       union_id: visitor && visitor.unionid,
+  //       nickname: visitor && visitor.userInfo && visitor.userInfo.nickName,
+  //       remark: ''
+  //     }).then((res) => {
+  //       if (res.code == 200) {
+  //         if (this.data.circleInfo.need_audit == 1) {
+  //           let studentCount = this.data.circleInfo.class_statistic && this.data.circleInfo.class_statistic.student_total || 0;
+  //           wx.showToast({
+  //             title: '加入成功',
+  //             icon: 'success',
+  //             duration: 2000
+  //           })
+  //           this.setData({
+  //             auditStatus: 3,
+  //             'circleInfo.class_statistic.student_total': studentCount + 1
+  //           })
+  //         } else if (this.data.circleInfo.need_audit == 2) {
+  //           this.setData({
+  //             auditStatus: 2
+  //           })
+  //           wx.showModal({
+  //             title: '提示',
+  //             content: '加入该班级需要审核，请等待老师审核',
+  //             showCancel: false
+  //           })
+  //         }
+  //       } else {
+  //         wx.showToast({
+  //           title: res.msg,
+  //           icon: 'none',
+  //           duration: 2000
+  //         })
+  //       }
+  //     })
+  //   } else if (this.data.auditStatus == 2) { // 老师正在审核
+  //     wx.showModal({
+  //       title: '提示',
+  //       content: '老师正在审核，请稍后...',
+  //       showCancel: false
+  //     })
+  //   }
+  // },
   caculateArrLength(array) {
     let _length = 0;
     array.forEach(ele => {
@@ -2017,7 +1973,7 @@ Page({
     const schoolInfo = this.data.schoolInfo;
     const date = dateDetail(this.data.datetime);
     const clockDetail = this.data.selfClockDetail;
-
+    const themeSelect = this.data.themeSelect;
     let qrcode = '';
     wx.showLoading({
       title: '日签生成中...'
@@ -2157,7 +2113,7 @@ Page({
               },
               { // 打卡详情
                 type: 'text',
-                content: `在〔${circleInfo.title && circleInfo.title.length > 15 ? circleInfo.title.substr(0,15) + '...' : circleInfo.title || ''}〕完成打卡`,
+                content: `在〔${themeSelect.title}〕完成打卡`,
                 fontSize: 24,
                 color: '#4F4F4F',
                 textAlign: 'left',
@@ -2324,7 +2280,7 @@ Page({
             },
             { // 打卡详情
               type: 'text',
-              content: `在〔${circleInfo.title && circleInfo.title.length > 15 ? circleInfo.title.substr(0,15) + '...' : circleInfo.title || ''}〕完成打卡`,
+              content: `在〔${themeSelect.title}〕完成打卡`,
               fontSize: 24,
               color: '#4F4F4F',
               textAlign: 'left',
@@ -2713,7 +2669,7 @@ Page({
         activityLog({
           type: 23,
           open_id: visitor && visitor.openid,
-          school_id: this.data.circleInfo.school_id,
+          school_id: this.data.sid,
           remark: ''
         })
       }

src/pages/calendarthemeindex/index.wxml

@@ -196,12 +196,12 @@
         <view class="round-btn" bindtap="generateNewPoster" wx:if="{{!activeDay.isRise && activeDay.isClock}}">去分享</view>
         <view class="round-btn round-btn-disabled" wx:if="{{activeDay.isRise}}">休息日</view>
 
-        <block wx:if="{{auditStatus!==3 && themeSelect.is_encrypt == 0 && force_status == 1}}">
+        <!-- <block wx:if="{{auditStatus!==3 && themeSelect.is_encrypt == 0 && force_status == 1}}">
             <view class="round-btn {{auditStatus==1? '': 'round-btn-disabled'}}" bindtap="joinClass">
                 <view class="tip">加入班级后才可打卡</view>
                 {{auditStatus==1?'加入班级':'审核中'}}
             </view>
-        </block>
+        </block> -->
     </view>
 
     <psd-editor bind:closepsddia="closepsddia" circleid="{{id}}" wx:if="{{showPsdDia}}" bind:checkPsd="checkPsd">
@@ -245,7 +245,7 @@
         </video>
     </view>
     <canvasdrawer painting="{{painting}}" bind:getImage="eventGetImage"/>
-    <view  wx:if="{{circleInfo.school_id == activtySchoolInfo.sid}}">
+    <view  wx:if="{{sid == activtySchoolInfo.sid}}">
         <activity-bar
             classid="{{activtySchoolInfo.id}}"
             sid="{{activtySchoolInfo.sid}}"
@@ -256,9 +256,9 @@
         >
         </activity-bar>
     </view>
-    <view wx:if="{{circleInfo.school_id != 0}}" >
+    <!-- <view wx:if="{{sid != 0}}" >
         <advertisement
-            sid="{{circleInfo.school_id}}"
+            sid="{{sid}}"
             bind:resetretract="resetretract"
             retract="{{retract}}"
             classId="{{id}}"
@@ -266,7 +266,7 @@
             tType="{{2}}"
         >
         </advertisement> 
-    </view>
+    </view> -->
 </view>
 <view class="calender-box" wx:if="{{calenderShow}}" bindtap="hiddeCalender" data-id="hidde">
     <view class="content-box">
@@ -280,7 +280,7 @@
     </view>
 </view>
 <scoregetfeedback
-    sid="{{circleInfo.school_id}}"
+    sid="{{sid}}"
     scoretype="{{scoreFeedBackStatus.scoretype}}"
     scorefeedbackshow="{{scoreFeedBackStatus.show}}"
     integral="{{scoreFeedBackStatus.integral}}"

src/pages/themeindex/index.js

@@ -626,7 +626,7 @@ Page({
     //   concatDiaShow: true
     // })
     wx.navigateTo({
-      url: `/src/pages/contactindex/index?sid=${this.data.circleInfo.school_id}`,
+      url: `/src/pages/contactindex/index?sid=${this.data.sid}`,
     })
   },
   // 联系方式弹窗相关
@@ -1334,7 +1334,7 @@ Page({
     const schoolInfo = this.data.schoolInfo;
     const date = dateDetail(this.data.datetime);
     const clockDetail = this.data.selfClockDetail;
-    
+    const themeSelect = this.data.themeSelect;
     let qrcode = '';
     wx.showLoading({
       title: '日签生成中...'
@@ -1471,7 +1471,7 @@ Page({
               },
               { // 打卡详情
                 type: 'text',
-                content: `在〔${circleInfo.title && circleInfo.title.length > 15 ? circleInfo.title.substr(0,15) + '...' : circleInfo.title || ''}〕完成打卡`,
+                content: `在〔${themeSelect.title}〕完成打卡`,
                 fontSize: 24,
                 color: '#4F4F4F',
                 textAlign: 'left',
@@ -1660,7 +1660,7 @@ Page({
               },
               { // 打卡详情
                 type: 'text',
-                content: `在〔${circleInfo.title && circleInfo.title.length > 15 ? circleInfo.title.substr(0,15) + '...' : circleInfo.title || ''}〕完成打卡`,
+                content: `在〔${themeSelect.title}〕完成打卡`,
                 fontSize: 24,
                 color: '#4F4F4F',
                 textAlign: 'left',
@@ -2340,7 +2340,7 @@ Page({
         activityLog({
           type: 23,
           open_id: visitor && visitor.openid,
-          school_id: this.data.circleInfo.school_id,
+          school_id: this.data.sid,
           remark: ''
         })
       }