Merge branch 'feature/postinfo' into test

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 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.4.0](https://gitlab.aodianyun.com/activities/web-questionnaire/compare/v1.3.14...v1.4.0) (2025-02-25)
+
+
+### Features
+
+* 代码优化 ([35184cc](https://gitlab.aodianyun.com/activities/web-questionnaire/commit/35184ccae91e1083ea0c040e780516b36907c0e1))
+* 适配活动绑定 ([2ad6f63](https://gitlab.aodianyun.com/activities/web-questionnaire/commit/2ad6f63efeeea12762d318571da9ea07ba256fb1))
+* 修复登录相关问题 ([5a7bbd9](https://gitlab.aodianyun.com/activities/web-questionnaire/commit/5a7bbd9723252f875b13fa89ccacc29cde421feb))
+* 修复问题 ([ff8638a](https://gitlab.aodianyun.com/activities/web-questionnaire/commit/ff8638a163da6acc4bd30d508fb588096a2cea6e))
+* csr改造 ([15a210e](https://gitlab.aodianyun.com/activities/web-questionnaire/commit/15a210e114fe689f0a21e913b85e808bf33d4c26))
+* csr改造 ([848fe65](https://gitlab.aodianyun.com/activities/web-questionnaire/commit/848fe65000ddc94256ca52cadb6649fed295dbda))
+
 ### [1.3.14](https://gitlab.aodianyun.com/activities/web-questionnaire/compare/v1.3.13...v1.3.14) (2024-12-23)
 
 

package.json

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

public/test/config.js

 /*!
- * Global Config for Guangdianyun v1.6.0
+ * Global Config for Guangdianyun v1.6.4
  * https://guangdianyun.tv/
  *
  * Copyright belongs to Guangdianyun Corporation and other contributors
  * Released under the Proprietary License
  *
- * Date: 2024-05-16 15:01:07
+ * Date: 2024-07-26 15:51:44
  */
 (function () {
   if (!!window.__GDY_ENV_CONFIG__) return;
@@ -30,6 +30,7 @@
       "ROP_DOMAIN": "aodianyun.com",
       "CNAME_DOMAIN": "guangdianyun.tv",
       "HELPER_DOMAIN": "help-dev.guangdianyun.tv",
+      "BACKUP_DOMAIN": "",
       "AODIAN_OSS_DOMAIN": "cdn.aodianyun.com",
       "CONSOLES_DOMAIN": "consoles.dev.guangdianyun.tv",
       "CHANNEL_DOMAIN": "pindao.dev.guangdianyun.tv",

src/App.vue

@@ -10,7 +10,6 @@ export default {
   mounted() {
     setTimeout(() => {
       const { uin } = this.$route.query
-      console.log(123123, uin, !Number(uin));
       if (!Number(uin)) {
         this.$router.push('/error')
       }

src/pages/index.vue

@@ -101,6 +101,14 @@ export default {
       },
     },
   },
+  watch: {
+    userInfo: {
+      handler(nVal) {
+        const { id } = this.$route.params
+        this.postInfo(id)
+      }
+    }
+  },
   mounted() {
     this.dataInit()
     this.eventBusInit()
@@ -129,12 +137,11 @@ export default {
     },
     dataInit() {
       const { uin } = this.$route.query
-      const { id } = this.$route.params
       if (uin && uin !== 0) {
         // 用户数据加载
         this.getUerInfo({ uin })
         // pv统计
-        this.postInfo(id)
+        // this.postInfo(id)
         // 加载列表
         this.loadData()
       } else {

src/store/modules/users.js

@@ -31,6 +31,8 @@ export const actions = {
       } else {
         commit('SET_ISLOGIN', false)
       }
+    } else {
+      commit('SET_USERINFO', null)
     }
     return new Promise((resolve, reject) => {
       if (isReqSuccess) {
@@ -44,7 +46,7 @@ export const actions = {
     const params = {
       channelId: id, // 资源id
       uin: state.uin,
-      userId: 0,
+      userId: state.userInfo?.id || 0,
       type: 10, // todo 问卷
       deviceid: QuickStorage.localGet('DEVICE_ID')
     }