|
@@ -47,15 +47,9 @@
|
47
|
47
|
|
48
|
48
|
<script>
|
49
|
49
|
import BreadCrumb from "../components/bread-crumb";
|
50
|
|
-<<<<<<< .mine
|
51
|
50
|
import QRCode from 'qrcodejs2';
|
52
|
51
|
// import {GetDefaultData,GetUserOrgid} from '@/api/site/site';
|
53
|
52
|
import Vue from 'vue';
|
54
|
|
-=======
|
55
|
|
-import QRCode from "qrcodejs2";
|
56
|
|
-import { GetDefaultData, GetUserOrgid } from "@/api/site/site";
|
57
|
|
-import Vue from "vue";
|
58
|
|
->>>>>>> .theirs
|
59
|
53
|
export default {
|
60
|
54
|
name: "site",
|
61
|
55
|
components: {
|
|
@@ -67,13 +61,9 @@ export default {
|
67
|
61
|
codeImg: require("../../assets/home/wei.jpg"),
|
68
|
62
|
usreOrgID: "",
|
69
|
63
|
// url:"http://microweb.kuyicloud.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
|
70
|
|
-<<<<<<< .mine
|
71
|
64
|
url:"http://jk.test.sgjyun.com/#/microHome?orgid="+this.$store.getters.xt_user.org_id,
|
72
|
65
|
// url:"http://microweb.kuyicloud.com/#/microHome?orgid=3877",
|
73
|
|
-=======
|
74
|
|
- url: "http://microweb.kuyicloud.com/#/microHome?orgid=3877"
|
75
|
66
|
|
76
|
|
->>>>>>> .theirs
|
77
|
67
|
};
|
78
|
68
|
},
|
79
|
69
|
methods: {
|
|
@@ -81,15 +71,8 @@ export default {
|
81
|
71
|
let qrcode = new QRCode("qrcode", {
|
82
|
72
|
width: 100,
|
83
|
73
|
height: 100, // 高度
|
84
|
|
-<<<<<<< .mine
|
85
|
74
|
// text: 'http://microweb.kuyicloud.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id // 二维码内容
|
86
|
75
|
text:'http://jk.test.sgjyun.com/#/microHome?orgid='+this.$store.getters.xt_user.org_id,// 二维码内容
|
87
|
|
-
|
88
|
|
-=======
|
89
|
|
- text:
|
90
|
|
- "http://microweb.kuyicloud.com/#/microHome?orgid=" +
|
91
|
|
- this.$store.getters.xt_user.org_id // 二维码内容
|
92
|
|
->>>>>>> .theirs
|
93
|
76
|
// render: 'canvas' // 设置渲染方式(有两种方式 table和canvas,默认是canvas)
|
94
|
77
|
// background: '#f0f'
|
95
|
78
|
// foreground: '#ff0'
|
|
@@ -129,14 +112,9 @@ export default {
|
129
|
112
|
this.qrcode();
|
130
|
113
|
this.OK();
|
131
|
114
|
},
|
132
|
|
-<<<<<<< .mine
|
133
|
|
- // created(){
|
134
|
|
- // // this.GetUserOrgid();
|
135
|
|
-=======
|
136
|
115
|
created() {
|
137
|
116
|
// this.GetUserOrgid();
|
138
|
|
->>>>>>> .theirs
|
139
|
|
- // }
|
|
117
|
+ }
|
140
|
118
|
};
|
141
|
119
|
</script>
|
142
|
120
|
|