src/views/pages/login.vue

@@ -72,6 +72,7 @@ import { getUUID } from '@/utils'
 import {
   IsAddonAvailable,
   GetSignAndToken,
+  form1T9,
   GetSignAndTokenCb,
 } from './onenethelper'
 export default {
@@ -172,11 +173,13 @@ export default {
               this.$http.post('/webservice/generatorchallenge', {}).then(({ data: res }) => {
           if (res.code == 0) {
              GetSignAndToken(res.msg)
-             console.log(GetSignAndTokenCb(),"GetSignAndTokenCb()")
-              if(GetSignAndTokenCb()) {
+            //  console.log(GetSignAndTokenCb(),"GetSignAndTokenCb()")
+            // console.log(form1T9,"登陆页")
+            setTimeout(() => {
+              if(form1T9.signandtoken) {
                       this.$http.post('/webservice/verifyIdentityTicket', {
                         challenge: res.msg,//随机挑战数
-                        identityTicket:GetSignAndTokenCb(),//组合令牌数据
+                        identityTicket:form1T9.signandtoken,//组合令牌数据
                         appServerID:'0'//服务器ID
                       }).then(({ data: res }) => {
                           if (res.expiresIn==7200) { 
@@ -188,9 +191,15 @@ export default {
                                     return this.$message.error(res.msg)
                                   }
                                 }).catch(() => {})
+                          }else {
+                            this.$message.error(res.msg)
                           }
                       })
               }
+              else {
+                this.$message.error("获取令牌错误 请刷新重试！")
+              }
+            },800)
             // form1.T8.value = res.data.msg//获取随机挑战数
           }
         })

src/views/pages/onenethelper.js

@@ -805,27 +805,30 @@ function AddonAvailableCb(ob)
 }
 function GetSignAndToken(form1T8)
 {
+	console.log(form1T8,"form1T8")
 	
 	oneNetHelper.GetSignAndToken(form1T8, GetSignAndTokenCb);
 }
+var form1T9 =""
 function GetSignAndTokenCb(ob)
 {
 	console.log(ob,'ob');
 	// form1.T10.value=ob.ret;
-	var form1T9 = ""
 	if(ob != undefined) 
 	{
-		form1T9 = ob.signandtoken;//获取组合令牌数据
+		form1T9 = ob;//获取组合令牌数据
 	}
 	else
 	{
 		alert("获取组合令牌出错！")
 		// form1.T11.value=ob.errinfo;
 	}
+    console.log(form1T9,"form1T9")
 	return form1T9
 }
 export {
 	IsAddonAvailable,
+    form1T9,
 	GetSignAndToken,
 	GetSignAndTokenCb,
 }