From 4319ea97e18a5d6ede0d96204d75696bc6b54b7b Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Sat, 15 Jul 2023 22:20:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Subscribe/components/Bind.vue  | 52 +++++++++----------
 .../Subscribe/components/Wechat.vue           | 37 +++++++++++++
 2 files changed, 61 insertions(+), 28 deletions(-)
 create mode 100644 src/views/account/Center/components/Subscribe/components/Wechat.vue

diff --git a/src/views/account/Center/components/Subscribe/components/Bind.vue b/src/views/account/Center/components/Subscribe/components/Bind.vue
index 853a4e36..9bad82ba 100644
--- a/src/views/account/Center/components/Subscribe/components/Bind.vue
+++ b/src/views/account/Center/components/Subscribe/components/Bind.vue
@@ -3,7 +3,7 @@
         <template v-if="getType === 'notifier-weixin'">
             <j-spin :spinning="loading">
                 <div class="code" style="height: 450px">
-                    <iframe
+                    <!-- <iframe
                         id="notifier_iframe"
                         class="code-item"
                         width="100%"
@@ -11,13 +11,14 @@
                         :src="url"
                         sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
                         v-if="!loading"
-                    ></iframe>
+                    ></iframe> -->
+                    <Wechat :data="_current" />
                 </div>
             </j-spin>
         </template>
         <template v-else-if="getType === 'notifier-dingTalk'">
             <j-spin :spinning="loading">
-                <div class="code" style="height: 600px;">
+                <div class="code" style="height: 600px">
                     <iframe
                         id="notifier_iframe"
                         class="code-item"
@@ -29,7 +30,7 @@
                 </div>
             </j-spin>
         </template>
-        
+
         <template #footer>
             <j-button @click="emit('close')">关闭</j-button>
             <!-- <j-button type="primary" @click="emit('close')">确定</j-button> -->
@@ -44,6 +45,7 @@ import {
     getUserBind,
     getWechatOAuth2,
 } from '@/api/account/notificationSubscription';
+import Wechat from './Wechat.vue';
 
 const emit = defineEmits(['close', 'save']);
 
@@ -67,6 +69,8 @@ const getType = computed(() => {
     return props.current?.channelProvider;
 });
 
+const _current = ref<any>({})
+
 const onBindHandle = (
     type: 'notifier-weixin' | 'notifier-dingTalk',
     code: string,
@@ -107,26 +111,15 @@ const updateIframeStyle = () => {
     ) as HTMLIFrameElement;
     iframe.onload = () => {
         const currentUrl = iframe?.contentWindow?.location?.search || '';
+        const _url = new URLSearchParams(currentUrl);
+        const params = Object.fromEntries(_url?.entries());
         let authCode = '';
-        if (currentUrl.startsWith('?')) {
-            currentUrl
-                .substring(1)
-                .split('&')
-                .map((item) => {
-                    if (
-                        props.current?.channelProvider === 'notifier-dingTalk'
-                    ) {
-                        if (item.split('=')?.[0] === 'authCode') {
-                            authCode = item.split('=')?.[1] || '';
-                        }
-                    } else {
-                        if (item.split('=')?.[0] === 'code') {
-                            authCode = item.split('=')?.[1] || '';
-                        }
-                    }
-                });
+        if (props.current?.channelProvider === 'notifier-dingTalk') {
+            authCode = params?.authCode
+        } else {
+            authCode = params?.code
         }
-
+        
         if (authCode) {
             loading.value = true;
             onBindHandle(props.current?.channelProvider, authCode);
@@ -137,18 +130,21 @@ const updateIframeStyle = () => {
 const handleSearch = async () => {
     if (props.current?.channelProvider === 'notifier-weixin') {
         loading.value = true;
-        const resp = await getWechatOAuth2(
+        const resp: any = await getWechatOAuth2(
             props.current?.channelConfiguration.notifierId,
             props.current?.channelConfiguration.templateId,
-            location.href
+            location.href,
         ).finally(() => {
             loading.value = false;
         });
         if (resp.status === 200) {
-            url.value = resp.result as string;
-            nextTick(() => {
-                updateIframeStyle();
-            });
+            const _url = new URLSearchParams(resp?.result);
+            const params = Object.fromEntries(_url?.entries());
+            _current.value = params;
+            // url.value = resp.result as string;
+            // nextTick(() => {
+            //     updateIframeStyle();
+            // });
         }
     }
     if (props.current?.channelProvider === 'notifier-dingTalk') {
diff --git a/src/views/account/Center/components/Subscribe/components/Wechat.vue b/src/views/account/Center/components/Subscribe/components/Wechat.vue
new file mode 100644
index 00000000..01cf82dd
--- /dev/null
+++ b/src/views/account/Center/components/Subscribe/components/Wechat.vue
@@ -0,0 +1,37 @@
+<template><div id="login_container"></div></template>
+
+<script lang="ts" setup>
+import { createScript } from '@/utils/document';
+
+const props = defineProps({
+    data: {
+        type: Object,
+        default: () => {}
+    }
+})
+
+const initData = async (appid: string) => {
+    const _script = await createScript(
+        'http://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js',
+    );
+    if(_script) {
+        console.log(props.data)
+        const obj = new WxLogin({
+            id: 'login_container',
+            appid: props.data.appid,
+            redirect_uri: props.data.redirect_uri,
+            state: props.data.state,
+            scope: 'snsapi_login',
+            style: 'white'
+        });
+        console.log(obj)
+    }
+};
+
+watchEffect(() => {
+    if(props.data?.appid) {
+        initData(props.data?.appid)
+    }
+    
+})
+</script>
\ No newline at end of file