Merge branch 'release' into 1.1

src/App.vue

@@ -50,8 +50,8 @@ import Debug from '@/components/debug.vue'
 export default {
   name: 'App',
   components: {
-    Debug,
-    bindUserList
+    bindUserList,
+    Debug
   },
   data() {
     return {

src/views/components/bindGameAccount/addUser.vue

@@ -219,7 +219,7 @@
       }
     },
     computed: {
-      ...mapState('game', ['chatUserInfo']),
+      ...mapState('game', ['chatUserInfo','userid','external_userid']),
     },
     watch: {
       show(newVal, oldVal) {
@@ -369,8 +369,8 @@
       },
       submit() {
         const data = {
-          userid: this.chatUserInfo.userid, 
-          external_userid: this.chatUserInfo.external_userid,
+          userid: this.chatUserInfo.userid || this.userid, 
+          external_userid: this.chatUserInfo.external_userid || this.external_userid,
           member_id: this.userDetails.id && this.userDetails.id != '' ? this.userDetails.id : this.checkoutUser.member_id,
           username: this.userDetails.username,
           reg_game_id: this.userDetails.reg_game_id,

src/views/login.vue

@@ -343,9 +343,6 @@ export default {
   align-items: center;
   justify-content: center;
 }
-
-
-
 .qr-contain {
   margin: 0 auto;
   /*  margin-top: 20px; */