From d45408250b48b30e2fbdb2f32e33f6026502d42a Mon Sep 17 00:00:00 2001
From: DaxPay <xxm1995@outlook.com>
Date: Thu, 26 Sep 2024 14:40:59 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E8=87=AA=E5=8A=A8=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E6=9A=97=E9=BB=91=E6=A8=A1=E5=BC=8F,=20=E8=81=94=E8=B0=83?=
 =?UTF-8?q?=E9=80=9A=E9=81=93=E8=AE=A4=E8=AF=81=E5=8A=9F=E8=83=BD,=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=99=9A=E6=8B=9F=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +
 .env.production                               |  3 +
 build/vite/plugin/index.ts                    | 10 ++-
 index.html                                    |  5 +-
 package.json                                  |  2 +
 pnpm-lock.yaml                                | 50 ++++++++++++++
 src/main.ts                                   |  1 -
 .../channel/alipay/AlipayAuthCallback.vue     | 65 +++++++++++++++++--
 .../channel/wechat/WechatAuthCallback.vue     | 33 ++++++++--
 types/global.d.ts                             |  1 +
 vite.config.ts                                |  2 +-
 11 files changed, 161 insertions(+), 13 deletions(-)

diff --git a/.env.development b/.env.development
index 6bbcda6..d6a5e2c 100644
--- a/.env.development
+++ b/.env.development
@@ -13,5 +13,7 @@ VITE_GLOB_API_URL=
 # 接口前缀
 VITE_GLOB_API_URL_PREFIX=/server
 
+# 虚拟控制台
+VITE_V_CONSOLE=true
 
 
diff --git a/.env.production b/.env.production
index 5e25a52..fdfc2b2 100644
--- a/.env.production
+++ b/.env.production
@@ -11,6 +11,9 @@ VITE_GLOB_API_URL_PREFIX = /api
 # 是否删除console
 VITE_DROP_CONSOLE=true
 
+# 虚拟控制台
+VITE_V_CONSOLE=false
+
 # 是否启用gzip压缩或brotli压缩, 可选: gzip | brotli | none, 如果你需要多种形式，你可以用','来分隔
 VITE_BUILD_COMPRESS='none'
 
diff --git a/build/vite/plugin/index.ts b/build/vite/plugin/index.ts
index 7e565f8..0d71aa1 100644
--- a/build/vite/plugin/index.ts
+++ b/build/vite/plugin/index.ts
@@ -1,14 +1,15 @@
+import * as path from 'node:path'
 import type { PluginOption } from 'vite'
 import Components from 'unplugin-vue-components/vite'
 import { VantResolver } from 'unplugin-vue-components/resolvers'
 import vue from '@vitejs/plugin-vue'
 import UnoCSS from 'unocss/vite'
 import AutoImport from 'unplugin-auto-import/vite'
+import { viteVConsole } from 'vite-plugin-vconsole'
 import { configHtmlPlugin } from './html'
 import { configCompressPlugin } from './compress'
 import { configVisualizerConfig } from './visualizer'
 import { configSvgIconsPlugin } from './svgSprite'
-
 /**
  * 配置 vite 插件
  * @param viteEnv vite 环境变量配置文件键值队 object
@@ -26,6 +27,13 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
   const vitePlugins: (PluginOption | PluginOption[])[] = [
     // have to
     vue(),
+    viteVConsole({
+      entry: path.resolve('src/main.ts'), // 或者可以使用这个配置: [path.resolve('src/main.ts')]
+      enabled: viteEnv.VITE_V_CONSOLE, // 可自行结合 mode 和 command 进行判断
+      config: {
+        theme: 'dark',
+      },
+    }),
     // 按需引入VantUi且自动创建组件声明
     Components({
       dts: true,
diff --git a/index.html b/index.html
index e0099b1..a93e310 100644
--- a/index.html
+++ b/index.html
@@ -10,14 +10,15 @@
     <div id="app">
       <script>
         ;(() => {
-          const { darkMode = 'dark', appTheme = '#5d9dfe' } =
+          const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)')
+          const darkMode = mediaQuery.matches ? 'dark' : 'light'
+          const { appTheme = '#5d9dfe' } =
             JSON.parse(window.localStorage.getItem('DESIGN-SETTING')) || {}
 
           let htmlRoot = document.getElementById('htmlRoot')
           if (htmlRoot) {
             htmlRoot.classList.add(darkMode)
           }
-
           // 设置主题色变量
           document.documentElement.style.setProperty('--app-theme-color', appTheme)
         })()
diff --git a/package.json b/package.json
index 9c8e8ca..e11f653 100644
--- a/package.json
+++ b/package.json
@@ -76,6 +76,8 @@
     "unocss": "^0.58.9",
     "unplugin-auto-import": "^0.17.8",
     "unplugin-vue-components": "^0.26.0",
+    "vconsole": "^3.15.1",
+    "vite-plugin-vconsole": "^2.1.1",
     "vite": "5.2.6",
     "vite-plugin-compression": "^0.5.1",
     "vite-plugin-html": "^3.2.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0154978..3d322a5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -159,6 +159,9 @@ importers:
       unplugin-vue-components:
         specifier: ^0.26.0
         version: 0.26.0(@babel/parser@7.25.6)(rollup@4.22.4)(vue@3.5.8(typescript@5.6.2))(webpack-sources@3.2.3)
+      vconsole:
+        specifier: ^3.15.1
+        version: 3.15.1
       vite:
         specifier: 5.2.6
         version: 5.2.6(@types/node@20.16.5)(less@4.2.0)(terser@5.33.0)
@@ -174,6 +177,9 @@ importers:
       vite-plugin-svg-icons:
         specifier: ^2.0.1
         version: 2.0.1(vite@5.2.6(@types/node@20.16.5)(less@4.2.0)(terser@5.33.0))
+      vite-plugin-vconsole:
+        specifier: ^2.1.1
+        version: 2.1.1
       vue-tsc:
         specifier: ^1.8.27
         version: 1.8.27(typescript@5.6.2)
@@ -357,6 +363,10 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/runtime@7.25.6':
+    resolution: {integrity: sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/template@7.25.0':
     resolution: {integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==}
     engines: {node: '>=6.9.0'}
@@ -1615,9 +1625,16 @@ packages:
     resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
     engines: {node: '>=0.10.0'}
 
+  copy-text-to-clipboard@3.2.0:
+    resolution: {integrity: sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q==}
+    engines: {node: '>=12'}
+
   core-js-compat@3.38.1:
     resolution: {integrity: sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==}
 
+  core-js@3.38.1:
+    resolution: {integrity: sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==}
+
   cors@2.8.5:
     resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
     engines: {node: '>= 0.10'}
@@ -3137,6 +3154,9 @@ packages:
   muggle-string@0.3.1:
     resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==}
 
+  mutation-observer@1.0.3:
+    resolution: {integrity: sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==}
+
   nanoid@3.3.7:
     resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -3519,6 +3539,9 @@ packages:
     resolution: {integrity: sha512-J8rn6v4DBb2nnFqkqwy6/NnTYMcgLA+sLr0iIO41qpv0n+ngb7ksag2tMRl0inb1bbO/esUwzW1vbJi7K0sI0g==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
 
+  regenerator-runtime@0.14.1:
+    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
+
   regex-not@1.0.2:
     resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
     engines: {node: '>=0.10.0'}
@@ -4134,6 +4157,9 @@ packages:
     resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
     engines: {node: '>= 0.8'}
 
+  vconsole@3.15.1:
+    resolution: {integrity: sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g==}
+
   vite-plugin-compression@0.5.1:
     resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
     peerDependencies:
@@ -4156,6 +4182,9 @@ packages:
     peerDependencies:
       vite: '>=2.0.0'
 
+  vite-plugin-vconsole@2.1.1:
+    resolution: {integrity: sha512-369FlBnQhzR5pF2+nsmbMeF5qNO6MzUIk3l+DHa8In15cscyk4eXT5pWfExoSLn41dgeI1FPP+kgAKViePYPdQ==}
+
   vite@5.2.6:
     resolution: {integrity: sha512-FPtnxFlSIKYjZ2eosBQamz4CbyrTizbZ3hnGJlh/wMtCrlp1Hah6AzBLjGI5I2urTfNnpovpHdrL6YRuBOPnCA==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -4549,6 +4578,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/runtime@7.25.6':
+    dependencies:
+      regenerator-runtime: 0.14.1
+
   '@babel/template@7.25.0':
     dependencies:
       '@babel/code-frame': 7.24.7
@@ -5853,10 +5886,14 @@ snapshots:
 
   copy-descriptor@0.1.1: {}
 
+  copy-text-to-clipboard@3.2.0: {}
+
   core-js-compat@3.38.1:
     dependencies:
       browserslist: 4.23.3
 
+  core-js@3.38.1: {}
+
   cors@2.8.5:
     dependencies:
       object-assign: 4.1.1
@@ -7509,6 +7546,8 @@ snapshots:
 
   muggle-string@0.3.1: {}
 
+  mutation-observer@1.0.3: {}
+
   nanoid@3.3.7: {}
 
   nanomatch@1.2.13:
@@ -7888,6 +7927,8 @@ snapshots:
     dependencies:
       '@eslint-community/regexpp': 4.11.1
 
+  regenerator-runtime@0.14.1: {}
+
   regex-not@1.0.2:
     dependencies:
       extend-shallow: 3.0.2
@@ -8586,6 +8627,13 @@ snapshots:
 
   vary@1.1.2: {}
 
+  vconsole@3.15.1:
+    dependencies:
+      '@babel/runtime': 7.25.6
+      copy-text-to-clipboard: 3.2.0
+      core-js: 3.38.1
+      mutation-observer: 1.0.3
+
   vite-plugin-compression@0.5.1(vite@5.2.6(@types/node@20.16.5)(less@4.2.0)(terser@5.33.0)):
     dependencies:
       chalk: 4.1.2
@@ -8640,6 +8688,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  vite-plugin-vconsole@2.1.1: {}
+
   vite@5.2.6(@types/node@20.16.5)(less@4.2.0)(terser@5.33.0):
     dependencies:
       esbuild: 0.20.2
diff --git a/src/main.ts b/src/main.ts
index 9fd0030..4c23e61 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -25,5 +25,4 @@ async function bootstrap() {
   // 路由准备就绪后挂载APP实例
   app.mount('#app', true)
 }
-
 void bootstrap()
diff --git a/src/views/daxpay/channel/alipay/AlipayAuthCallback.vue b/src/views/daxpay/channel/alipay/AlipayAuthCallback.vue
index 96f8920..32344e5 100644
--- a/src/views/daxpay/channel/alipay/AlipayAuthCallback.vue
+++ b/src/views/daxpay/channel/alipay/AlipayAuthCallback.vue
@@ -1,19 +1,76 @@
 <template>
-  <div>
-    获取中
-  </div>
+  <van-overlay v-show="show" :show="true">
+    <div class="wrapper" @click.stop>
+      <van-loading size="24px">
+        获取中...
+      </van-loading>
+    </div>
+  </van-overlay>
 </template>
 
 <script setup lang="ts">
 import { useRoute } from 'vue-router'
+import { ref } from 'vue'
+import { showDialog } from 'vant'
+import type { AuthCodeParam } from '@/views/daxpay/channel/ChannelAuth.api'
+import { authAndSet } from '@/views/daxpay/channel/ChannelAuth.api'
+
+const script = document.createElement('script')
+script.setAttribute(
+  'src',
+  'https://gw.alipayobjects.com/as/g/h5-lib/alipayjsapi/3.1.1/alipayjsapi.min.js',
+)
+document.head.appendChild(script)
 
 const route = useRoute()
+const { appId, channel, queryCode, aliAppId } = route.params
 
-const {appId, channel, queryCode, aliAppId} = route.params
+const show = ref(true)
 
+setTimeout(() => {
+  init()
+}, 300)
+
+/**
+ * 页面初始化
+ */
+async function init() {
+  ap.getAuthCode ({
+    appId: aliAppId,
+    scopes: ['auth_base'],
+  }, (res) => {
+    const authCode = res.authCode
+    const param = ref<AuthCodeParam>({
+      appId: appId as string,
+      queryCode: queryCode as string,
+      authCode: authCode as string,
+      channel: channel as string,
+    })
+    authAndSet(param.value).then(() => {
+      show.value = false
+      showDialog({
+        message: '已成功获取用户信息!',
+        confirmButtonText: '关闭',
+      }).then(() => {
+        AlipayJSBridge.call('closeWebview')
+      })
+    })
+  })
+}
 console.log(appId, channel)
 </script>
 
 <style scoped lang="less">
+.wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+}
 
+.block {
+  width: 120px;
+  height: 120px;
+  background-color: #fff;
+}
 </style>
diff --git a/src/views/daxpay/channel/wechat/WechatAuthCallback.vue b/src/views/daxpay/channel/wechat/WechatAuthCallback.vue
index 15d4a4a..333783f 100644
--- a/src/views/daxpay/channel/wechat/WechatAuthCallback.vue
+++ b/src/views/daxpay/channel/wechat/WechatAuthCallback.vue
@@ -1,12 +1,19 @@
 <template>
-  <div />
+  <van-overlay :show="true" v-show="show">
+    <div class="wrapper" @click.stop>
+      <van-loading size="24px">
+        获取中...
+      </van-loading>
+    </div>
+  </van-overlay>
 </template>
 
 <script setup lang="ts">
 import { useRoute } from 'vue-router'
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import type { AuthCodeParam } from '@/views/daxpay/channel/ChannelAuth.api'
 import { authAndSet } from '@/views/daxpay/channel/ChannelAuth.api'
+import { showDialog } from "vant";
 
 const route = useRoute()
 const { appId, channel, queryCode } = route.params
@@ -17,6 +24,7 @@ const param = ref<AuthCodeParam>({
   authCode: code as string,
   channel: channel as string,
 })
+const show = ref(true)
 
 onMounted(() => {
   init()
@@ -26,12 +34,29 @@ onMounted(() => {
  * 页面初始化
  */
 async function init() {
-  authAndSet(param.value).then((res) => {
-    console.log(res)
+  authAndSet(param.value).then(() => {
+    show.value = false
+    showDialog({
+      message: '已成功获取用户信息!',
+      confirmButtonText: '关闭',
+    }).then(() => {
+      WeixinJSBridge.call('closeWindow')
+    })
   })
 }
 </script>
 
 <style scoped lang="less">
+.wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+}
 
+.block {
+  width: 120px;
+  height: 120px;
+  background-color: #fff;
+}
 </style>
diff --git a/types/global.d.ts b/types/global.d.ts
index 9edc09a..3fa51b6 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -61,6 +61,7 @@ declare global {
     VITE_GLOB_APP_TITLE: string
     VITE_GLOB_APP_SHORT_NAME: string
     VITE_DROP_CONSOLE: boolean
+    VITE_V_CONSOLE: boolean
     VITE_PROXY: [string, string][]
     VITE_BUILD_COMPRESS: 'gzip' | 'brotli' | 'none'
     VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE: boolean
diff --git a/vite.config.ts b/vite.config.ts
index 1fc4a25..57ab509 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -132,7 +132,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
     server: {
       host: true,
       // 服务启动时是否自动打开浏览器
-      open: true,
+      open: false,
       // 服务端口号
       port: Number(VITE_PORT),
       proxy: createProxy(VITE_PROXY),