test

_src/components/chatGroudMgr/index.vue

@@ -23,6 +23,7 @@
           {{$t('group.relateTelegram')}}<i class="el-icon-arrow-right"></i>
         </div>
       </div>
+      <a href="https://smartsignature.io/article/QmNrsHp36CTCQp5ggsy6dzSUuhzBKom7u53mtVf2JJoH3N" target="_blank" class="link-guide">群管理教程-&gt;</a>
     </template>
     <template v-else>
       <div class="groudMgr-top">
@@ -59,6 +60,7 @@
       </div>
       <p>{{$t('group.teleStep1')}}</p>
       <p>{{$t('group.teleStep2')}}</p>
+      <p><a href="https://smartsignature.io/article/QmNrsHp36CTCQp5ggsy6dzSUuhzBKom7u53mtVf2JJoH3N" target="_blank" class="link-guide">Telegram同步教程-&gt;</a></p>
     </div>
   </div>
 </template>

_src/components/chatGroudMgr/style.scss

@@ -172,4 +172,9 @@
     padding: 10px 10px;
     line-height: 24px;
   }
+}
+
+.link-guide{
+  font-size: 12px;
+  color: #2ca0f7;
 }

_src/components/chatSet/index.vue

@@ -50,6 +50,9 @@
         {{limitHeight ? $t('group.showAll') : $t('group.hideAll')}} <i :class="`el-icon-arrow-${limitHeight ? 'down' : 'up'}`"></i>
       </div>
     </div>
+    <div class="setting-item cursor" v-if="isCreator" @click="handleGroudMgr">
+      <div class="title">{{$t('group.admin')}}<i class="el-icon-arrow-right team-arrow-icon"></i></div>
+    </div>
     <div class="setting-item" v-if="isAdmin || isCreator">
       <div class="title">{{$t('group.groupName')}}</div>
       <input class="edit-full-input" type="text" v-model="newGroupName" v-focus v-if="isEdit" @blur="handleTitleBlur">
@@ -122,9 +125,6 @@
       </el-switch>
       </p>
     </div>
-    <div class="setting-item cursor" v-if="isCreator" @click="handleGroudMgr">
-      <div class="title">{{$t('group.admin')}}<i class="el-icon-arrow-right team-arrow-icon"></i></div>
-    </div>
     <div class="setting-bottom" v-show="group.isJoin">
       <button class="delete-btn" @click="leaveGroup">{{$t('group.quitGroup')}}</button>
     </div>

_src/mixins/login.js

@@ -151,7 +151,6 @@ export const accountLoginMixin = {
         // 连接scatter
         ScatterJS.scatter.connect('MEE_CHAT').then(async connected => {
           if (connected) {
-            alert('connected')
             // 设置scatter
             this.setScatter(ScatterJS.scatter)
 
@@ -165,7 +164,6 @@ export const accountLoginMixin = {
             try {
               // 调起scatter授权登录
               await this.doScatterLogin(this.$router)
-              alert('doScatterLogin')
 
               if (this.meechatType == 'mini') {
                 localStorage.setItem('account', JSON.stringify(this.account))
@@ -179,10 +177,7 @@ export const accountLoginMixin = {
                   userId: ctLoginRes.data ? ctLoginRes.data.user_id : ctLoginRes.user_id,
                   token: ctLoginRes.data ? ctLoginRes.data.token : ctLoginRes.token
                 })
-
-                alert('doContractLogin loginSuccCallBack')
               } catch (e) {
-                alert('doScatterLogin error')
                 reject(e)
                 let err = e
                 if (typeof e == 'string') {

_src/store/actions.js

@@ -22,56 +22,60 @@ export const actions = {
         localStorage.setItem('accounts', '')
         setUserOpt('isChangeIndentity', 0)
       }
-      alert('networkConfig before')
       // 获取最快主网
       let networkConfig = await getNetwork()
-      alert('networkConfig next')
 
-      return new Promise((resolve, reject) => {
-        state.scatter.getIdentity({
+      // 调用getIdentity方法获取用户名
+      try {
+        var identity = await state.scatter.getIdentity({
           accounts: [networkConfig]
-        }).then(async (identity) => {
-          let accounts = identity.accounts.find(x => x.blockchain === 'eos')
-
-          let lastAccounts = localStorage.getItem('accounts')
-
-          if (lastAccounts && JSON.parse(lastAccounts).name !== accounts.name) {
-            await actions.doScatterLogout(...arguments)
-            h5Router.push({ path: '/login' })
-            commit('setUserInfo', null)
-            commit('initChatData')
-            commit('initGroupData')
-            commit('chatAppLogin', false)
-            commit('toApp', false)
-          }
-
-          commit('setAccount', accounts)
-          localStorage.setItem('accounts', JSON.stringify(accounts))
-
-          // 如果当前登录的用户名和cookie中保存的account不一致
-          // 则删除cookie中保存的account
-          // 避免某些用户在移动端钱包中切换账号时跳过注销流程导致账号不一致的问题
-          // if (Cookie.getCookie('account') !== accounts.name) {
-          //   Cookie.delCookie('account')
-          // }
-          // 设置全局EOS对象
-          window.EOS = state.scatter.eos(networkConfig, Eos, {})
-
-          // 调用scatter登录成功后获取用户EOS、GT
-          // dispatch('getUserEOS')
-          // dispatch('getUserGT')
-          await dispatch('getAccount')
-
-          // 每分钟刷新一次
-          // this.limitTimer = setInterval(() => {
-          //   dispatch('getAccount')
-          // }, 60000)
-
-          resolve(true)
-        }).catch(e => {
-          reject(e)
         })
-      })
+        alert('identity next')
+      } catch (error) {
+        alert('identity error', error)
+        if (error.type !== 'identity_rejected') {
+          showError(error.message)
+        }
+        return Promise.reject(error)
+      }
+
+      let accounts = identity.accounts.find(x => x.blockchain === 'eos')
+
+      let lastAccounts = localStorage.getItem('accounts')
+
+      if (lastAccounts && JSON.parse(lastAccounts).name !== accounts.name) {
+        await actions.doScatterLogout(...arguments)
+        h5Router.push({ path: '/login' })
+        commit('setUserInfo', null)
+        commit('initChatData')
+        commit('initGroupData')
+        commit('chatAppLogin', false)
+        commit('toApp', false)
+      }
+
+      commit('setAccount', accounts)
+      localStorage.setItem('accounts', JSON.stringify(accounts))
+
+      // 如果当前登录的用户名和cookie中保存的account不一致
+      // 则删除cookie中保存的account
+      // 避免某些用户在移动端钱包中切换账号时跳过注销流程导致账号不一致的问题
+      // if (Cookie.getCookie('account') !== accounts.name) {
+      //   Cookie.delCookie('account')
+      // }
+      // 设置全局EOS对象
+      window.EOS = state.scatter.eos(networkConfig, Eos, {})
+
+      // 调用scatter登录成功后获取用户EOS、GT
+      // dispatch('getUserEOS')
+      // dispatch('getUserGT')
+      await dispatch('getAccount')
+
+      // 每分钟刷新一次
+      // this.limitTimer = setInterval(() => {
+      //   dispatch('getAccount')
+      // }, 60000)
+
+      return Promise.resolve(true)
     }
   },
   /**
@@ -226,7 +230,8 @@ export const actions = {
     commit('setAccount', '')
     setUserOpt('isChangeIndentity', 0)
 
-    return state.scatter && state.scatter.identity ? state.scatter.forgetIdentity && state.scatter.forgetIdentity() : true
+    // return state.scatter && state.scatter.identity ? state.scatter.forgetIdentity && state.scatter.forgetIdentity() : true
+    return (state.scatter && state.scatter.identity && state.scatter.forgetIdentity && state.scatter.forgetIdentity()) || true
   },
 
   /**