Commit c4ca16cc authored by hanfeng zhang's avatar hanfeng zhang

321

parent cf23efb6
...@@ -20,7 +20,7 @@ Vue.use(utils).use(service) ...@@ -20,7 +20,7 @@ Vue.use(utils).use(service)
Vue.prototype.$dsbridge = dsbridge Vue.prototype.$dsbridge = dsbridge
Vue.prototype.$global = global Vue.prototype.$global = global
new VConsole() // new VConsole()
new Vue({ new Vue({
router, router,
......
...@@ -19,6 +19,9 @@ export default new Vuex.Store({ ...@@ -19,6 +19,9 @@ export default new Vuex.Store({
setSelectedDep(state, payload) { setSelectedDep(state, payload) {
state.selectedDep = payload state.selectedDep = payload
}, },
setAcceptJoin(state, payload) {
state.acceptJoin = payload
}
}, },
actions: { actions: {
}, },
......
...@@ -93,8 +93,9 @@ export default Vue.extend({ ...@@ -93,8 +93,9 @@ export default Vue.extend({
async created() { async created() {
// console.log(Mock, 'mock') // console.log(Mock, 'mock')
this.joinInfo = this.$store.state.acceptJoin this.joinInfo = this.$store.state.acceptJoin
const urloutput = this.outputUrl(this.joinInfo) console.log(this.joinInfo);
const urloutput = await this.outputUrl(this.joinInfo)
this.qrCodeText = JSON.stringify(this.joinInfo) this.qrCodeText = JSON.stringify(this.joinInfo)
let url = window.location.origin + '/team/confirm-join' let url = window.location.origin + '/team/confirm-join'
this.qrCodeText = `${url}?${urloutput}` this.qrCodeText = `${url}?${urloutput}`
...@@ -116,7 +117,6 @@ export default Vue.extend({ ...@@ -116,7 +117,6 @@ export default Vue.extend({
string = `${i[0]}=${encodeURIComponent(i[1])}` string = `${i[0]}=${encodeURIComponent(i[1])}`
} }
res += string res += string
}) })
return res return res
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment