Merge branch 'test' into dev

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.3.14](https://gitlab.aodianyun.com/activities/web-questionnaire/compare/v1.3.13...v1.3.14) (2024-12-23)
+
+
+### Features
+
+* 修复cname登录 ([ef5bc19](https://gitlab.aodianyun.com/activities/web-questionnaire/commit/ef5bc19f4d0216cb2bb5e4e8a125590b793e7736))
+
 ### [1.3.13](https://gitlab.aodianyun.com/activities/web-questionnaire/compare/v1.3.12...v1.3.13) (2024-11-22)
 
 

package.json

 {
   "name": "web-questionnaire",
-  "version": "1.3.13",
+  "version": "1.3.14",
   "private": true,
   "license": "UNLICENSED",
   "scripts": {

store/questionnaire.js

@@ -49,24 +49,21 @@ export const actions = {
           const { title, intro, question, isJoined, status, referUrl } = data
           // 设置网页标题
           document.title = title || '调查问卷'
-          // 如果不是iframe内嵌模式则弹窗
-          if (!isIframe) {
-            // 鉴权成功则转跳接口返回的对应网址
-            if (referUrl && +status === ACTIVITY_STATE.end) {
-              Dialog.alert({
-                message: '活动已结束，点击“确认”可以直接观看直播',
-              }).then(() => {
-                window.location.href = referUrl
-              })
-            }
-            // 鉴权成功则转跳接口返回的对应网址
-            if (referUrl && !!isJoined && +status === ACTIVITY_STATE.start) {
-              Dialog.alert({
-                message: '您已提交过问卷，点击“确认”可以直接观看直播',
-              }).then(() => {
-                window.location.href = referUrl
-              })
-            }
+          // 鉴权成功则转跳接口返回的对应网址
+          if (referUrl && +status === ACTIVITY_STATE.end) {
+            Dialog.alert({
+              message: '活动已结束，点击“确认”可以直接返回',
+            }).then(() => {
+              window.location.href = referUrl
+            })
+          }
+          // 鉴权成功则转跳接口返回的对应网址
+          if (referUrl && !!isJoined && +status === ACTIVITY_STATE.start) {
+            Dialog.alert({
+              message: '您已提交过问卷，点击“确认”可以直接返回',
+            }).then(() => {
+              window.location.href = referUrl
+            })
           }
           commit('SET_QUESTIONNAIREINFO', data)
           const formatQuestion = question.map((item) => {
@@ -142,8 +139,7 @@ export const actions = {
     setQuestionnaire(params).then((res) => {
       const { code, errorCode, errorMessage } = res
       if (code === 200 && errorCode === 0) {
-        // 如果不是iframe内嵌模式则转跳
-        if (referUrl && !isIframe) {
+        if (referUrl) {
           Toast.success({
             message: '提交成功，正在跳转',
             onClose: () => {