Merge branch 'dev-liveSix-20200817' of...

Merge branch 'dev-liveSix-20200817' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-liveSix-20200817

src/views/yqrange/create-live.vue

@@ -112,9 +112,9 @@
 
           </el-form-item>
 
-<!--          <el-form-item label="直播开始通知">-->
-<!--                <el-checkbox size="small" v-model="checked" :disabled="styleEditFlag">App通知</el-checkbox>-->
-<!--          </el-form-item>-->
+         <el-form-item label="直播开始通知">
+               <el-checkbox size="small" v-model="checked" :disabled="styleEditFlag">App通知</el-checkbox>
+         </el-form-item>
 
 
           <el-form-item label="直播中人数显示规则" prop="streamType">
@@ -1622,7 +1622,7 @@
 
         this.changeSign();
 
-        // this.checked = this.formData.isAppPush == 1 ? true: false;
+        this.checked = this.formData.isAppPush == 1 ? true: false;
 
 
         if(this.formData.signMinute == 0 || this.formData.signMinute == undefined){
@@ -1716,7 +1716,7 @@
           }
         }
 
-        // this.formData.isAppPush = this.checked == true ? 1: 0;
+        this.formData.isAppPush = this.checked == true ? 1: 0;
 
         if(this.formData.signMinute == "" || this.formData.signMinute == undefined){
           this.formData.signMinute = 0;

src/views/yqrange/live-manage.vue

@@ -1047,8 +1047,7 @@ export default {
               createTime: res.data.pageContents[i].createdTime,
               startTime: res.data.pageContents[i].openTime,
               endTime: res.data.pageContents[i].endTime,
-              rtcId: res.data.pageContents[i].id,
-              isSign: res.data.pageContents[i].isSign
+              rtcId: res.data.pageContents[i].id
             };
             listData.push(obj);
           }