111

channel-access/src/views/fqembed/companylist.vue

@@ -139,12 +139,7 @@
       </el-tab-pane>
       <el-tab-pane label="云上公司注册" name="2">
         <el-dialog title="云上公司注册方案" :visible.sync="cloudCompanyAddDialog" width="60%" center>
-          <<<<<<< HEAD
-          <Cloudcompany @cloudAddDone="closeCloudCompanyAddDialog"></Cloudcompany>=======
-          <Cloudcompany></Cloudcompany>
-        </el-dialog>
-        <el-dialog title="云上公司注册方案" :visible.sync="cloudDetailDialog" width="60%" center>
-          <Clouddetails :no="detailsNeedNo"></Clouddetails>>>>>>>> f76e22315d3770da5c3fcd6e691517a2bf887691
+          <Cloudcompany @cloudAddDone="closeCloudCompanyAddDialog" :no="detailsNeedNo"></Cloudcompany>
         </el-dialog>
         <div class="company-find">
           <div class="box">
@@ -644,7 +639,7 @@ export default {
       //生产环境
       this.baseURL = "/web/action/icapi/springBoard";
     }
-    console.log(JSON.parse(this.$route.query.data));
+    // console.log(JSON.parse(this.$route.query.data));
   },
   mounted() {
     this.getListData();