Merge remote-tracking branch 'origin/master'

_src/components/popup/packetSend/index.vue

@@ -21,7 +21,7 @@
                   <div class="cur-unit has-arrow">{{symbol}}</div>
                   <div class="code-menu">
                     <div :class="['code-item',{'disabled':loginType!='eos'}]" @click="changeSymbol('EOS')">EOS</div>
-                    <div :class="['code-item',{'disabled':loginType!='meetone'}]"  @click="changeSymbol('MEETONE')">MEETONE</div>
+                    <div :class="['code-item',{'disabled':loginType!='meetone'}]"  @click="changeSymbol('MEETONE')" v-if="loginType=='meetone'">MEETONE</div>
                     <!-- <div :class="['code-item',{'disabled':loginType!='eth'}]"  @click="changeSymbol('ETH')">ETH</div> -->
                     <div class="code-item" @click="changeSymbol(group.eosInfo.token)" v-if="group.eosInfo">{{group.eosInfo.token}}</div>
                   </div>

_src/mixins/group.js

@@ -416,7 +416,6 @@ export const groupInviteMixins = {
           .then(({ data }) => {
             let groupId = data.data.session_id
             this.$showTips(this.$t('group.createSuccess'))
-            this.$store.commit('addSessionItem', data.data)
 
             if (this.ext && this.ext.tgGroupId) {
               // 同步tele

_src/store/module/group/actions.js

@@ -92,6 +92,7 @@ const actions = {
    */
   async commonGetNewMsg (store, params = {}) {
     let { rootState, state } = store
+    let lastSession = rootState.curSession
     let msg
     // 然后再请求网上的数据，来渲染
     if (params.isPrivate) {
@@ -106,6 +107,9 @@ const actions = {
       }).catch(() => {})
     }
 
+    // 若请求回来数据不在当前会话,则弃掉
+    if (lastSession != rootState.curSession) return []
+
     if (msg && msg.data.code === 0 && msg.data.data.list.length > 0) {
       params.fromdb = false