Merge branch 'fix/loginZFB' into dev

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.3.13](https://gitlab.aodianyun.com/activities/web-questionnaire/compare/v1.3.12...v1.3.13) (2024-11-22)
+
+
+### Features
+
+* 优化postinfo时机 ([00d487d](https://gitlab.aodianyun.com/activities/web-questionnaire/commit/00d487d06d40b7848e7af0c56c3a28d515655dce))
+
+
+### Bug Fixes
+
+* 修复登录 ([a8fcca9](https://gitlab.aodianyun.com/activities/web-questionnaire/commit/a8fcca922cc7f8c280645d6716b9b19e328d3e74))
+
 ### [1.3.12](https://gitlab.aodianyun.com/activities/web-questionnaire/compare/v1.3.3...v1.3.12) (2024-09-18)
 
 

package.json

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

pages/index.vue

@@ -173,6 +173,16 @@ export default {
     // 云平台登录模块初始化
     initLoginCenter() {
       if (!window.LoginCenter) return
+      const isCname = !window.location.href.includes(
+        `//${process.env.CUSTOMER_DOMAIN}`
+      )
+      const state = isCname ? document.domain : ''
+      const wxPcRedirect = isCname
+        ? window.location.href.replace(
+          /[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62}|(:[0-9]{1,4}))+\.?/,
+          `${process.env.CUSTOMER_DOMAIN}`
+        )
+        : window.location.href
       // eslint-disable-next-line no-undef
       this.loginInstance = LoginCenter({
         target: document.body,
@@ -180,6 +190,8 @@ export default {
           uin: this.$route.query.uin,
           zIndex: 100000,
           backUrl: encodeURIComponent(window.location.href),
+          wxPcRedirect,
+          state,
           serviceAgreement: `//${process.env.OSS_DOMAIN}/staticPages/agreement_user.html`,
           privacyAgreement: `//${process.env.OSS_DOMAIN}/staticPages/agreement_privacy.html`,
           successCallback: ({ type, response }) => {