合并代码

src/views/yqrange/create-range.vue

@@ -110,9 +110,13 @@
         vm.POST("circle/circle/save", req).then(res => {
           if (res.code == "000000") {
             // console.log(res);
+<<<<<<< HEAD
             this.formData.id = res.id
             this.active = 1
             this.stepData = [false, true];
+=======
+            this.formData.id = res.data
+>>>>>>> 483bda123beb0544ca13309ee13897a8908d2820
           } else {
             //
           }

src/views/yqrange/live-manage.vue

@@ -142,6 +142,10 @@
       editLive(row) {
         this.$router.push({
           path: '/create-live',
+          query: {
+            // rtcId: "1"
+            rtcId: row.id
+          }
         })
       },
       //删除直播