fix conflict

src/views/yqrange/live-manage.vue

@@ -163,15 +163,15 @@ export default {
         }
       ],
       tableData: [
-        {
-          liveName: "浙江医学大会第二场",
-          liveScope: 1, //直播范围 1-非公开 2-公开
-          liveStatus: 1, //直播状态 1-未开始 2-直播中 3-暂停中 4-已结束 5-回放中目前只能用到1，2，4
-          createTime: "",
-          startTime: "",
-          endTime: "",
-          rtcId: 0
-        }
+        // {
+        //   liveName: "浙江医学大会第二场",
+        //   liveScope: 1, //直播范围 1-非公开 2-公开
+        //   liveStatus: 1, //直播状态 1-未开始 2-直播中 3-暂停中 4-已结束 5-回放中目前只能用到1，2，4
+        //   createTime: "",
+        //   startTime: "",
+        //   endTime: "",
+        //   rtcId: 0
+        // }
       ],
       dialogStatisticsData: [
         {
@@ -210,7 +210,10 @@ export default {
     //新建直播
     createLive() {
       this.$router.push({
-        path: "/create-live?circleId=" + this.circleId,
+        path: "/create-live",
+        query: {
+          circleId: this.circleId
+        }
       });
     },
     //弹出直播链接弹窗
@@ -305,7 +308,7 @@ export default {
         query: {
           // rtcId: "16"
           rtcId: row.id,
-          
+
         }
       });
     },

src/views/yqrange/yq-range.vue

@@ -49,12 +49,14 @@
         </el-table-column>
         <el-table-column label="操作" min-width="370" align="center">
           <template slot-scope="scope">
-            <el-button @click="publishRange(scope.row)" v-if="scope.row.status == 2" type="text" size="small">上线</el-button>
-            <el-button @click="unPublishRange(scope.row)" v-if="scope.row.status == 1" type="text" size="small">下线</el-button>
-            <el-button @click="liveManage(scope.row)" type="text" size="small">直播管理</el-button>
-            <el-button @click="roleManage(scope.row)" type="text" size="small">成员管理</el-button>
-            <el-button @click="editRange(scope.row)" type="text" size="small">编辑</el-button>
-            <el-button @click="deleteRange(scope.row)" type="text" size="small" v-if="showAllFlag">解散圈子</el-button>
+            <div v-if="scope.row.status != 50">
+              <el-button @click="publishRange(scope.row)" v-if="scope.row.status != 30" type="text" size="small">上线</el-button>
+              <el-button @click="unPublishRange(scope.row)" v-if="scope.row.status == 30" type="text" size="small">下线</el-button>
+              <el-button @click="liveManage(scope.row)" type="text" size="small">直播管理</el-button>
+              <el-button @click="roleManage(scope.row)" type="text" size="small">成员管理</el-button>
+              <el-button @click="editRange(scope.row)" type="text" size="small">编辑</el-button>
+              <el-button @click="deleteRange(scope.row)" type="text" size="small" v-if="showAllFlag">解散圈子</el-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -211,7 +213,7 @@ export default {
         customClass: 'range-make-box',
       }).then(() => {
         //  confirm
-        this.updateStatus(row.id, "3");
+        this.updateStatus(row.id, "30");
         this.$message.success("上线成功");
       }).catch(() => {
         //  cancel
@@ -226,7 +228,7 @@ export default {
         type: 'warning',
         customClass: 'range-make-box',
       }).then(() => {
-        this.updateStatus(row.id, "1");
+        this.updateStatus(row.id, "40");
         //  confirm
       }).catch(() => {
         //  cancel
@@ -239,17 +241,17 @@ export default {
       updateRangeStatus(params).then((res) => {
         closeLoading(this);
         if(res.code == "000000") {
-          if(status == "1"){
+          if(status == "40"){
             this.$message.success("下线成功");
           }
-          else if(status == "2") {
+          else if(status == "30") {
             this.$message.success("上线成功");
           }
         } else {
-          if(status == "1"){
+          if(status == "40"){
             this.$message.success("下线失败，请重试");
           }
-          else if(status == "2") {
+          else if(status == "30") {
             this.$message.success("上线失败，请重试");
           }