'班级内部设置作业'

business/pages/circleindex/index.js

@@ -1212,6 +1212,7 @@ Page({
       id: this.data.circleInfo.id,
       title: this.data.circleInfo.title
     }])
+    console.log(classes, 'classes');
     url = `/business/pages/themeeditor/index?tid=0&sid=${this.data.sid}&classes=${encodeURIComponent(classes)}&editType=${createtype}`;
     wx.navigateTo({
       url: `${url}`

business/pages/classservice/reviewdetail.js

@@ -123,7 +123,6 @@ Page({
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-    this.innerAudioContext.pause();
     this.resetAudiosPlayStatus()
     clearInterval(this.data.voiceInterval);
   },
@@ -132,7 +131,7 @@ Page({
    * 生命周期函数--监听页面卸载
    */
   onUnload: function () {
-    this.innerAudioContext.pause();
+    this.resetAudiosPlayStatus()
     this.setData({
       audioStorage: {
       }

business/pages/commenteditor/index.js

@@ -1083,7 +1083,8 @@ Page({
     let audioStorage = this.data.audioStorage;
     if (audioStorage[value] && audioStorage[value].play) { // 如果当前是播放状态 删除录音的操作要把录音销毁掉
       delete audioStorage[value]
-      this.innerAudioContext.pause();
+      // this.innerAudioContext.pause();
+      this.resetAudiosPlayStatus();
       clearInterval(this.data.voiceInterval);
     }
     this.setData({

business/pages/commenteditor/index2.js

@@ -95,12 +95,11 @@ Page({
     
   },
   onHide: function() { // Do something when page hide.
-    this.innerAudioContext.pause();
     this.resetAudiosPlayStatus()
     clearInterval(this.data.voiceInterval);
   },
   onUnload: function() { // Do something when page close.
-    this.innerAudioContext.pause();
+    this.resetAudiosPlayStatus()
     this.setData({
       audioStorage: {
       }

business/pages/educenter/growth.js

@@ -118,13 +118,12 @@ Page({
   },
 
   onHide: function () {
-    this.innerAudioContext.pause();
     this.resetAudiosPlayStatus()
     clearInterval(this.data.voiceInterval);
   },
 
   onUnload: function () {
-    this.innerAudioContext.pause();
+    this.resetAudiosPlayStatus()
     this.setData({
       audioStorage: {}
     })

business/pages/morethemeindex/index.js

@@ -170,12 +170,10 @@ Page({
     }
   },
   onHide: function() { // Do something when page hide.
-    // this.innerAudioContext.pause();
     this.resetAudiosPlayStatus();
     clearInterval(this.data.voiceInterval);
   },
   onUnload: function() { // Do something when page close.
-    // this.innerAudioContext.pause();
     this.resetAudiosPlayStatus();
     this.setData({
       audioStorage: {}

business/pages/morethemeindex/studentact.js

@@ -97,13 +97,12 @@ Page({
     }
   },
   onHide: function () {
-    this.innerAudioContext.pause();
     this.resetAudiosPlayStatus()
     clearInterval(this.data.voiceInterval);
     this.data.showRefresh = false;
   },
   onUnload: function () {
-    this.innerAudioContext.pause();
+    this.resetAudiosPlayStatus();
     this.setData({
       audioStorage: {}
     })
@@ -478,19 +477,8 @@ Page({
               that.setData({
                 audioStorage,
               })
-              // setTimeout((e)=>{
-              //   this.data.audioStorage[value].isWaiting = false;
-              //   this.setData({
-              //     audioStorage: this.data.audioStorage
-              //   })
-              // },5000)
             })
-            // audioStorage[value].innerAudioContext.onPlay((e) => {
-            //   console.log('dasdad');
-            //   that.voiceIntervalPlay(value);
-            // })
             audioStorage[value].innerAudioContext.onTimeUpdate((e) => {
-              console.log('sss');
               const { actPalyaudioValue, audioStorage} = this.data
               if (audioStorage[value].isWaiting) {
                 clearInterval(that.data.voiceInterval);

business/pages/nocomment/index.js

@@ -108,12 +108,10 @@ Page({
    * 生命周期函数--监听页面隐藏
    */
   onHide: function() { // Do something when page hide.
-    // this.innerAudioContext.pause();
     this.resetAudiosPlayStatus()
     clearInterval(this.data.voiceInterval);
   },
   onUnload: function() { // Do something when page close.
-    // this.innerAudioContext.pause();
     this.resetAudiosPlayStatus()
     this.setData({
       audioStorage: {

business/pages/themeeditor/index.js

@@ -278,16 +278,22 @@ Page({
         }
         this.setData({
           classes: currentclasses,
-          'params.join_rule_type': currentclasses.length > 0 ? 4 : 1
+          'params.join_rule_type': currentclasses.length > 0 ? 4 : 1,
+          'params.class_ids': currentclasses.map(ele => ele.id).join(',')
         })
+        console.log(this.data.params, 'params');
+        console.log(this.data.classes, 'classes');
       } else if (editType == 2) {
         wx.setNavigationBarTitle({
           title: '新建日历打卡'
         })
         this.setData({
           classes: currentclasses,
-          'calendarparams.join_rule_type': currentclasses.length > 0 ? 4 : 1
+          'calendarparams.join_rule_type': currentclasses.length > 0 ? 4 : 1,
+          'calendarparams.class_ids': currentclasses.map(ele => ele.id).join(',')
         })
+        console.log(this.data.calendarparams, 'calendarparams');
+        console.log(this.data.classes, 'classes');
       } else if (editType == 3) {
         wx.setNavigationBarTitle({
           title: '新建闯关打卡'
@@ -297,7 +303,8 @@ Page({
         })
         this.setData({
           classes: currentclasses,
-          'lockparams.join_rule_type': currentclasses.length > 0 ? 4 : 1
+          'lockparams.join_rule_type': currentclasses.length > 0 ? 4 : 1,
+          'lockparams.class_ids': currentclasses.map(ele => ele.id).join(',')
         })
         this.getSubjectSort();
       }

business/pages/themeeditor/index.wxml

@@ -73,6 +73,7 @@
                     {{params.startDate}} {{params.startTime}}
                   </picker>
                 </view> 
+                <image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"/>
             </view>
           </view>
         </view>
@@ -87,6 +88,7 @@
                     {{params.endDate}} {{params.endTime}}
                   </picker>
                 </view> 
+                <image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"/>
             </view>
           </view>
         </view>
@@ -172,6 +174,7 @@
                     {{calendarparams.startDate}} {{calendarparams.startTime}}
                   </picker>
                 </view> 
+                <image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"/>
             </view>
           </view>
         </view>
@@ -186,6 +189,7 @@
                     {{calendarparams.endDate}} {{calendarparams.endTime}}
                   </picker>
                 </view> 
+                <image class="icon-arr" src="{{imageRoot}}2b/organizationalmgt/right.png?{{imageVersion}}"/>
             </view>
           </view>
         </view>

business/pages/themeeditor/index.wxss

@@ -200,7 +200,7 @@ page{
 }
 .section-item{
   /* border-radius: 20rpx; */
-  padding: 40rpx 21rpx;
+  padding: 40rpx 24rpx;
   background: #fff;
 }
 .section-tip{
@@ -245,7 +245,7 @@ page{
   margin-bottom: 30rpx;
 }
 .section-item .form-item.time {
-  justify-content: flex-start;
+  /* justify-content: flex-start; */
 }
 .section-item .form-item.time .item-r {
   margin-left: 24rpx;

business/pages/themeeditor/setting.js

@@ -270,6 +270,8 @@ Page({
       wx.navigateTo({
         url: `/business/pages/themeeditor/chooseclass?sid=${this.data.sid}&class_ids=${encodeURIComponent(JSON.stringify(class_ids))}`,
       })
+    } else {
+
     }
     if (this.data.join_rule_type == type) {
       return;
@@ -305,13 +307,15 @@ Page({
       push_status,
       join_rule_type,
       join_secret,
-      class_ids,
-      classes,
+      // class_ids,
+      // classes,
       supplement_num,
       editType,
       max_clock_count,
       unlock_limit,
     } = this.data;
+    let class_ids = this.data.class_ids;
+    let classes = this.data.classes;
     if (join_rule_type == 3 && join_secret == '') {
       wx.showToast({
         title: '请输入密码',
@@ -327,7 +331,10 @@ Page({
       })
       return;
     }
-    console.log()
+    if (join_rule_type == 1 || join_rule_type == 3) {
+      class_ids = '';
+      classes = [];
+    }
     let currPage = null; //当前页面
     let prevPage = null; //上一个页面
     if (pages.length >= 2) {

business/pages/themeindex/index.js

@@ -165,12 +165,10 @@ Page({
     }
   },
   onHide: function() { // Do something when page hide.
-    // this.innerAudioContext.pause();
     this.resetAudiosPlayStatus();
     clearInterval(this.data.voiceInterval);
   },
   onUnload: function() { // Do something when page close.
-    // this.innerAudioContext.pause();
     this.resetAudiosPlayStatus();
     this.setData({
       audioStorage: {}