提交 ce44cd2a 编写于 作者: guangjun.yang's avatar guangjun.yang

Merge branch 'dev-protocol-1101' into release

* dev-protocol-1101:
  去掉alert和打印日志
  添加alert进行测试token
  添加alert来测试参数传递
  为了测试添加alert
  修复签署协议后的跳转bug1
  查看进入工作站时链接有无token
  获取从工作站登录后传递的token
  跳转协议添加token参数
...@@ -423,7 +423,8 @@ ...@@ -423,7 +423,8 @@
localStorage.setItem("mobilePhone", paramsObj.mobile); localStorage.setItem("mobilePhone", paramsObj.mobile);
sessionStorage.setItem("mobile",paramsObj.mobile); sessionStorage.setItem("mobile",paramsObj.mobile);
// this.$router.push('/'); // this.$router.push('/');
console.log('token',localStorage.getItem('token'))
console.log('storageToken',localStorage.getItem('storageToken'))
// alert('登录成功') // alert('登录成功')
//新增协议校验 //新增协议校验
this.checkAgreement(); this.checkAgreement();
...@@ -571,9 +572,9 @@ ...@@ -571,9 +572,9 @@
if (res.code == '000000') { if (res.code == '000000') {
const arr = res.data; const arr = res.data;
if (arr.length && arr.length == 1) { if (arr.length && arr.length == 1) {
window.location.href = getSaasDomain(`pica-base/pica_do_agree.html?agreementType=${arr[0]}`); window.location.href = getSaasDomain(`pica-base/pica_do_agree.html?agreementType=${arr[0]}&token=${localStorage.getItem("storageToken")}`);
} else if (arr.length && arr.length == 2) { } else if (arr.length && arr.length == 2) {
window.location.href = getSaasDomain(`pica-base/pica_do_agree.html?agreementType=${arr[0]}&agreementType2=${arr[1]}`); window.location.href = getSaasDomain(`pica-base/pica_do_agree.html?agreementType=${arr[0]}&agreementType2=${arr[1]}&token=${localStorage.getItem("storageToken")}`);
} else { } else {
this.$router.push('/'); this.$router.push('/');
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册