更新

src/hooks/useSecureAnth/secureAnth.vue

@@ -36,13 +36,13 @@
                   <div class="stepNum">03</div>
                   <div class="titleCon">
                      输入证书密码：
-                     <span class="colorTwo">{{ userStoreHook.roles === "GYM" ? "dayaedu.com" : "lexiaoya.cn" }}</span>
+                     <span class="colorTwo">{{ userType === "GYM" ? "dayaedu.com" : "lexiaoya.cn" }}</span>
                      ，点击
                      <span class="colorOne">【好】</span>
                   </div>
                </div>
                <div class="contentBox">
-                  <img class="mac3Img" :src="userStoreHook.roles === 'GYM' ? require('./img/mac3_1.png') : require('./img/mac3.png')" />
+                  <img class="mac3Img" :src="userType === 'GYM' ? require('./img/mac3_1.png') : require('./img/mac3.png')" />
                </div>
             </div>
             <div class="stepCon" v-if="stepNum === 3">
@@ -69,7 +69,7 @@
                   </div>
                </div>
                <div class="contentBox">
-                  <img class="mac5Img" :src="userStoreHook.roles === 'GYM' ? require('./img/mac5_1.png') : require('./img/mac5.png')" />
+                  <img class="mac5Img" :src="userType === 'GYM' ? require('./img/mac5_1.png') : require('./img/mac5.png')" />
                </div>
             </div>
             <div class="stepCon" v-if="stepNum === 5">
@@ -186,7 +186,7 @@
                   <div class="titleCon">在【选择证书】弹窗中点击【确定】按钮，证书安装完成，开始使用乐教通吧！</div>
                </div>
                <div class="contentBox">
-                  <img class="win8Img" :src="userStoreHook.roles === 'GYM' ? require('./img/win8_1.png') : require('./img/win8.png')" />
+                  <img class="win8Img" :src="userType === 'GYM' ? require('./img/win8_1.png') : require('./img/win8.png')" />
                </div>
             </div>
          </template>
@@ -202,9 +202,10 @@
 import { ref } from "vue"
 import { ElScrollbar } from "element-plus"
 import { URL_MAC_GYM_SECUREANTH, URL_MAC_GYT_SECUREANTH, URL_WIN_SECUREANTH } from "@/config"
-import userStore from "@/store/modules/user"
+import { getUserType } from "@/libs/auth"
 
-const userStoreHook = userStore()
+// 因为没有登录页面没有获取用户信息也会弹窗，所以这里取cookie里面的 userType
+const userType = getUserType()
 const emits = defineEmits<{
    (e: "onCancel"): void
 }>()
@@ -220,7 +221,7 @@ const elScrollbarDom = ref<InstanceType<typeof ElScrollbar>>()
 // 下载证书
 function handleDownload() {
    if (isMac) {
-      window.open(userStoreHook.roles === "GYM" ? URL_MAC_GYM_SECUREANTH : URL_MAC_GYT_SECUREANTH)
+      window.open(userType === "GYM" ? URL_MAC_GYM_SECUREANTH : URL_MAC_GYT_SECUREANTH)
    } else {
       window.open(URL_WIN_SECUREANTH)
    }

src/store/modules/user.ts

@@ -34,7 +34,6 @@ const useStore = defineStore("user", {
          // GYM 和 GYT 区分   获取token的区分
          setToken(appKey === "GYM" ? data : data.access_token)
          setUserType(appKey)
-         this.roles = appKey as any
          return Promise.resolve()
       },
       /** 获取用户信息 */