问问

src/scrm_pages/site/index.vue

@@ -47,15 +47,9 @@
 
 <script>
 import BreadCrumb from "../components/bread-crumb";
-<<<<<<< .mine
 import QRCode from 'qrcodejs2';
 // import {GetDefaultData,GetUserOrgid} from '@/api/site/site';
 import Vue from 'vue';
-=======
-import QRCode from "qrcodejs2";
-import { GetDefaultData, GetUserOrgid } from "@/api/site/site";
-import Vue from "vue";
->>>>>>> .theirs
 export default {
   name: "site",
   components: {
@@ -67,13 +61,9 @@ export default {
       codeImg: require("../../assets/home/wei.jpg"),
       usreOrgID: "",
       // url:"http://microweb.kuyicloud.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
-<<<<<<< .mine
        url:"http://jk.test.sgjyun.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
       // url:"http://microweb.kuyicloud.com/#/microHome?orgid=3877",
-=======
-      url: "http://microweb.kuyicloud.com/#/microHome?orgid=3877"
 
->>>>>>> .theirs
     };
   },
   methods: {
@@ -81,15 +71,8 @@ export default {
       let qrcode = new QRCode("qrcode", {
         width: 100,
         height: 100, // 高度
-<<<<<<< .mine
         // text: 'http://microweb.kuyicloud.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id // 二维码内容
         text:'http://jk.test.sgjyun.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id,// 二维码内容
-
-=======
-        text:
-          "http://microweb.kuyicloud.com/#/microHome?orgid=" +
-          this.$store.getters.xt_user.org_id // 二维码内容
->>>>>>> .theirs
         // render: 'canvas' // 设置渲染方式（有两种方式 table和canvas，默认是canvas）
         // background: '#f0f'
         // foreground: '#ff0'
@@ -129,14 +112,9 @@ export default {
     this.qrcode();
     this.OK();
   },
-<<<<<<< .mine
-  // created(){
-  //   // this.GetUserOrgid();
-=======
   created() {
     // this.GetUserOrgid();
->>>>>>> .theirs
-  // }
+   }
 };
 </script>
 

src/scrm_pages/site/preview.vue

@@ -5447,11 +5447,7 @@ export default {
   .macgic{
      @include border-top;
     position: absolute;
-<<<<<<< .mine
-    min-width: 316px;
-=======
     width: 319px;
->>>>>>> .theirs
     height:60px;
     background-color: white;
     // border: solid 1px #333333;