@kevisual/kv-login 0.0.1 → 0.0.3

package/src/modules/login-handle.ts

@@ -3,7 +3,7 @@ import { createMessage } from '../pages/kv-message.ts';
 import { WX_MP_APP_ID } from '../pages/kv-login.ts';
 export const message = createMessage();
 type LoginOpts = {
-  loginMethod: 'password' | 'phone' | 'wechat' | 'wechat-mp',
+  loginMethod: 'password' | 'phone' | 'wechat' | 'wechat-mp' | 'wechat-mp-ticket',
   data: any,
   el: HTMLElement
 }
@@ -38,7 +38,11 @@ export const loginHandle = async (opts: LoginOpts) => {
       console.warn('未知的登录方式:', loginMethod)
   }
 }
-
+/**
+ * 使用用户名和密码登录
+ * @param data 
+ * @returns 
+ */
 const loginByPassword = async (data: { username: string, password: string }) => {
   console.log('使用用户名密码登录:', data)
   let needLogin = true; // 这里可以根据实际情况决定是否需要登录, 只能判断密码登录和手机号登录
@@ -185,4 +189,49 @@ const checkMpWechatInWx = async () => {
 
 setTimeout(() => {
   checkMpWechat();
-}, 100);
+}, 100);
+
+export const getQrCode = async () => {
+  const res = await query.post({
+    path: 'wx',
+    key: 'get-qrcode-ticket'
+  })
+  if (res.code !== 200) {
+    message.error('获取二维码失败');
+    return null;
+  }
+  return res?.data as { ticket: string, url: string }
+}
+
+export const checkMpQrCodeLogin = (ticket: string) => {
+  let run = true;
+  const fetchLoginStatus = async () => {
+    const res = await query.post({
+      path: 'wx',
+      key: 'check-qrcode-login',
+      payload: { ticket }
+    })
+    if (res.code === 200) {
+      message.success('登录成功');
+      clearTimeout(timer);
+      redirectHome();
+    } else {
+      // message.error(res.message || '登录失败');
+      if (res.code === 401) {
+        console.log('等待扫码登录...');
+      } else {
+        console.log('扫码登录状态:', res);
+      }
+      if (run) {
+        setTimeout(fetchLoginStatus, 2000);
+      }
+    }
+  }
+  const timer = setTimeout(fetchLoginStatus, 2000);
+  const close = () => {
+    console.log('停止检测扫码登录状态');
+    clearTimeout(timer);
+    run = false
+  }
+  return close;
+}

package/src/pages/kv-login.ts

@@ -1,21 +1,35 @@
 import { render, html } from 'lit-html'
-import { loginHandle, checkWechat } from '../modules/login-handle.ts'
+import { unsafeHTML } from 'lit-html/directives/unsafe-html.js'
+import { loginHandle, checkWechat, getQrCode, checkMpQrCodeLogin } from '../modules/login-handle.ts'
 import { setWxerwma } from '../modules/wx/ws-login.ts';
 import { useCreateLoginQRCode } from '../modules/wx-mp/qr.ts';
 export const WX_MP_APP_ID = "wxff97d569b1db16b6";
 interface LoginMethod {
   id: LoginMethods
   name: string
-  icon: string
+  icon: any
   appid?: string
 }
+const wxmpSvg = `<svg t="1764510467010" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1958" width="32" height="32"><path d="M615.904 388.48c8.8 0 17.536 0.64 26.176 1.6-23.52-109.536-140.608-190.912-274.272-190.912C218.4 199.2 96 301.056 96 430.4c0 74.656 40.736 135.936 108.768 183.488l-27.2 81.792 95.04-47.648c33.984 6.72 61.28 13.632 95.2 13.632 8.544 0 16.992-0.416 25.376-1.088a202.496 202.496 0 0 1-8.384-56.96c0-118.752 101.984-215.136 231.104-215.136zM469.76 314.784c20.48 0 34.016 13.472 34.016 33.92 0 20.352-13.536 34.016-34.016 34.016-20.384 0-40.832-13.664-40.832-34.016 0-20.448 20.448-33.92 40.832-33.92zM279.52 382.72c-20.384 0-40.928-13.664-40.928-34.016 0-20.448 20.544-33.92 40.928-33.92 20.352 0 33.92 13.472 33.92 33.92 0 20.384-13.568 34.016-33.92 34.016z" fill="" p-id="1959"></path><path d="M864 600.352c0-108.672-108.736-197.28-230.88-197.28-129.344 0-231.2 88.576-231.2 197.28 0 108.864 101.856 197.248 231.2 197.248 27.072 0 54.368-6.816 81.568-13.632l74.56 40.8-20.448-67.904C823.328 715.936 864 661.664 864 600.352z m-305.856-34.016c-13.536 0-27.2-13.44-27.2-27.2 0-13.568 13.664-27.2 27.2-27.2 20.576 0 34.016 13.632 34.016 27.2 0 13.76-13.44 27.2-34.016 27.2z m149.536 0c-13.44 0-27.008-13.44-27.008-27.2 0-13.568 13.568-27.2 27.008-27.2 20.352 0 34.016 13.632 34.016 27.2 0 13.76-13.664 27.2-34.016 27.2z" fill="" p-id="1960"></path></svg>`
+const wxOpenSvg = `<svg t="1764511395617" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3882" width="32" height="32"><path d="M256 259.584c-29.184 0-51.2 14.848-51.2 44.032s29.184 44.032 51.2 44.032c29.184 0 44.032-14.848 44.032-44.032s-22.016-44.032-44.032-44.032zM541.184 303.616c0-29.184-14.848-44.032-44.032-44.032-29.184 0-51.2 14.848-51.2 44.032s29.184 44.032 51.2 44.032c29.696 0 44.032-22.016 44.032-44.032zM614.4 508.416c-14.848 0-36.352 14.848-36.352 36.352 0 14.848 14.848 36.352 36.352 36.352 29.184 0 44.032-14.848 44.032-36.352 0-14.336-14.848-36.352-44.032-36.352z" p-id="3883"></path><path d="M1024 625.152c0-138.752-124.416-256-285.184-270.848-29.184-153.6-189.952-263.168-373.248-263.168C160.768 91.648 0 230.4 0 406.016c0 95.232 44.032 175.616 138.752 241.152L109.568 742.4c0 7.168 0 14.848 7.168 22.016h14.848l117.248-58.368h14.848c36.352 7.168 66.048 14.848 109.568 14.848 14.848 0 44.032-7.168 44.032-7.168C460.8 822.784 578.048 896 716.8 896c36.352 0 73.216-7.168 102.4-14.848l87.552 51.2h14.848c7.168-7.168 7.168-7.168 7.168-14.848l-22.016-87.552c80.896-58.368 117.248-131.584 117.248-204.8z m-621.568 51.2h-36.352c-36.352 0-66.048-7.168-95.232-14.848l-22.016-7.168h-7.168L153.6 698.368l22.016-66.048c0-7.168 0-14.848-7.168-14.848C80.384 559.616 36.352 486.4 36.352 398.848 36.352 245.248 182.784 128 358.4 128c160.768 0 300.032 95.232 329.216 226.816-168.448 0-300.032 117.248-300.032 263.168 7.168 22.016 14.848 44.032 14.848 58.368z m467.968 132.096c-7.168 7.168-7.168 7.168-7.168 14.848l14.848 51.2L819.2 844.8h-14.848c-29.184 7.168-66.048 14.848-95.232 14.848-146.432 0-270.848-102.4-270.848-226.816 0-131.584 124.416-233.984 270.848-233.984s270.848 102.4 270.848 226.816c0 65.536-36.352 123.904-109.568 182.784z" p-id="3884"></path><path d="M804.352 508.416c-14.848 0-36.352 14.848-36.352 36.352 0 14.848 14.848 36.352 36.352 36.352 29.184 0 44.032-14.848 44.032-36.352 0-14.336-14.336-36.352-44.032-36.352z" p-id="3885"></path></svg>`
+const phone = `<svg t="1764511425462" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5097" width="32" height="32"><path d="M820.409449 797.228346q0 25.19685-10.07874 46.866142t-27.716535 38.299213-41.322835 26.204724-50.897638 9.574803l-357.795276 0q-27.212598 0-50.897638-9.574803t-41.322835-26.204724-27.716535-38.299213-10.07874-46.866142l0-675.275591q0-25.19685 10.07874-47.370079t27.716535-38.80315 41.322835-26.204724 50.897638-9.574803l357.795276 0q27.212598 0 50.897638 9.574803t41.322835 26.204724 27.716535 38.80315 10.07874 47.370079l0 675.275591zM738.771654 170.330709l-455.559055 0 0 577.511811 455.559055 0 0-577.511811zM510.992126 776.062992q-21.165354 0-36.787402 15.11811t-15.622047 37.291339q0 21.165354 15.622047 36.787402t36.787402 15.622047q22.173228 0 37.291339-15.622047t15.11811-36.787402q0-22.173228-15.11811-37.291339t-37.291339-15.11811zM591.622047 84.661417q0-8.062992-5.03937-12.598425t-11.086614-4.535433l-128 0q-5.03937 0-10.582677 4.535433t-5.543307 12.598425 5.03937 12.598425 11.086614 4.535433l128 0q6.047244 0 11.086614-4.535433t5.03937-12.598425z" p-id="5098"></path></svg>`
+const pwd = `<svg t="1764511500570" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10511" width="32" height="32"><path d="M768.9216 422.72768 372.06016 422.72768C378.88 365.21984 329.37984 131.42016 512.2048 125.72672c173.83424-6.59456 146.78016 213.34016 146.78016 213.34016l85.13536 0.57344c0 0 24.73984-294.4-231.91552-295.8336C232.09984 58.01984 297.82016 377.18016 289.28 422.72768c1.98656 0 4.56704 0 7.29088 0-55.88992 0-101.21216 45.34272-101.21216 101.21216l0 337.38752c0 55.88992 45.34272 101.21216 101.21216 101.21216l472.35072 0c55.88992 0 101.21216-45.34272 101.21216-101.21216L870.13376 523.93984C870.13376 468.0704 824.79104 422.72768 768.9216 422.72768zM566.4768 717.02528l0 76.84096c0 18.57536-15.1552 33.73056-33.73056 33.73056-18.57536 0-33.73056-15.1552-33.73056-33.73056l0-76.84096c-20.09088-11.69408-33.73056-33.21856-33.73056-58.12224 0-37.2736 30.208-67.4816 67.4816-67.4816 37.2736 0 67.4816 30.208 67.4816 67.4816C600.22784 683.80672 586.58816 705.3312 566.4768 717.02528z" fill="#272636" p-id="10512"></path></svg>`
+
+const icons: any = {
+  pwd,
+  phone,
+  wxmpSvg,
+  wxOpenSvg
+}
 const DefaultLoginMethods: LoginMethod[] = [
-  { id: 'password', name: '密码登录', icon: '🔒' },
-  { id: 'wechat', name: '微信登录', icon: '💬', appid: "wx9378885c8390e09b" },
-  { id: 'wechat-mp', name: '微信公众号登录', icon: '💬', appid: WX_MP_APP_ID },
-  { id: 'phone', name: '手机号登录', icon: '📱' }
+  { id: 'password', name: '密码登录', icon: 'pwd' },
+  { id: 'wechat', name: '微信登录', icon: 'wxmpSvg', appid: "wx9378885c8390e09b" },
+  { id: 'wechat-mp', name: '微信公众号', icon: 'wxOpenSvg', appid: WX_MP_APP_ID },
+  { id: 'wechat-mp-ticket', name: '微信公众号', icon: 'wxOpenSvg' },
+  { id: 'phone', name: '手机号登录', icon: 'phone' }
 ]
-type LoginMethods = 'password' | 'phone' | 'wechat' | 'wechat-mp'
+type LoginMethods = 'password' | 'phone' | 'wechat' | 'wechat-mp' | 'wechat-mp-ticket';
+
 const getLoginMethodByDomain = (): LoginMethod[] => {
   const domain = window.location.hostname
   let methods: LoginMethods[] = []
@@ -24,10 +38,10 @@ const getLoginMethodByDomain = (): LoginMethod[] => {
       methods = ['password', 'wechat-mp']
       break;
     case 'kevisual.cn':
-      methods = ['password', 'wechat']
+      methods = ['password', 'wechat', 'wechat-mp-ticket']
       break;
     default:
-      methods = ['password', 'phone', 'wechat', 'wechat-mp']
+      methods = ['password', 'phone', 'wechat', 'wechat-mp', 'wechat-mp-ticket']
       break;
   }
   return DefaultLoginMethods.filter(method => methods.includes(method.id))
@@ -224,6 +238,31 @@ class KvLogin extends HTMLElement {
       </div>
     `
   }
+  private renderWechatMpTicketForm() {
+    const that = this;
+    setTimeout(async () => {
+      const data = await getQrCode();
+      if (!data) return;
+      const imgEl = that.shadowRoot!.querySelector('.qrcode') as HTMLImageElement;
+      if (data.url) {
+        imgEl.src = data.url;
+        // TODO: 轮询检测登录状态
+        const clear = checkMpQrCodeLogin(data.ticket)
+        // 当切换登录方式时，停止轮询
+        that.#clearTimer = clear
+      }
+    }, 0)
+    return html`
+      <div class="wechat-login">
+        <div class="qr-container">
+          <div class="qr-placeholder">
+            <img class="qrcode" width="300" height="300" data-appid="" data-size="200" data-ticket=""></img>
+            <p class="qr-desc">请使用微信扫描二维码登录</p>
+          </div>
+        </div>
+      </div>
+    `
+  }
 
   private sendVerificationCode() {
     console.log('发送验证码')
@@ -248,6 +287,8 @@ class KvLogin extends HTMLElement {
         return this.renderWechatForm()
       case 'wechat-mp':
         return this.renderWechatMpForm()
+      case 'wechat-mp-ticket':
+        return this.renderWechatMpTicketForm()
       default:
         return this.renderPasswordForm()
     }
@@ -256,6 +297,22 @@ class KvLogin extends HTMLElement {
   render() {
     if (!this.shadowRoot) return
 
+    const renderIcon = (icon: any) => {
+      // 如果是emoji字符，直接返回
+      if (typeof icon === 'string' && !icons[icon]) {
+        return html`<span class="method-icon-emoji">${icon}</span>`
+      }
+      // 如果是SVG引用，从icons对象获取
+      if (typeof icon === 'string' && icons[icon]) {
+        return html`<span class="method-icon-svg">${unsafeHTML(icons[icon])}</span>`
+      }
+      // 如果直接是SVG内容
+      if (typeof icon === 'string' && (icon.includes('<svg') || icon.includes('<?xml'))) {
+        return html`<span class="method-icon-svg">${unsafeHTML(icon)}</span>`
+      }
+      // 默认情况
+      return html`<span class="method-icon-emoji">${icon}</span>`
+    }
     const template = html`
       <style>
         :host {
@@ -298,7 +355,7 @@ class KvLogin extends HTMLElement {
 
         .login-method.active {
           background: white;
-          color: #007bff;
+          color: #000000;
         }
 
         .login-method.active::after {
@@ -308,11 +365,33 @@ class KvLogin extends HTMLElement {
           left: 0;
           right: 0;
           height: 2px;
-          background: #007bff;
+          background: #000000;
         }
 
         .method-icon {
           font-size: 20px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          width: 24px;
+          height: 24px;
+        }
+
+        .method-icon-emoji {
+          font-size: 20px;
+          line-height: 1;
+        }
+
+        .method-icon-svg {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+
+        .method-icon-svg svg {
+          width: 32px;
+          height: 32px;
+          display: block;
         }
 
         .method-name {
@@ -348,7 +427,7 @@ class KvLogin extends HTMLElement {
 
         .form-group input:focus {
           outline: none;
-          border-color: #007bff;
+          border-color: #000000;
         }
 
         .code-group {
@@ -378,7 +457,7 @@ class KvLogin extends HTMLElement {
 
         .login-button {
           padding: 12px;
-          background: #007bff;
+          background: #000000;
           color: white;
           border: none;
           border-radius: 8px;
@@ -389,7 +468,7 @@ class KvLogin extends HTMLElement {
         }
 
         .login-button:hover {
-          background: #0056b3;
+          background: #333333;
         }
 
         .wechat-login {
@@ -400,9 +479,9 @@ class KvLogin extends HTMLElement {
         }
 
         .qr-container {
-          width: 400px;
-          height: 400px;
-          border: 2px dashed #e9ecef;
+          width: 340px;
+          height: 340px;
+          border: 2px dashed #cccccc;
           border-radius: 8px;
           display: flex;
           align-items: center;
@@ -438,6 +517,10 @@ class KvLogin extends HTMLElement {
         .refresh-button:hover {
           background: #5a6268;
         }
+        .method-icon svg {
+          width: 24px;
+          height: 24px;
+        }
       </style>
 
       <div class="login-sidebar">
@@ -447,7 +530,7 @@ class KvLogin extends HTMLElement {
               class="login-method ${this.selectedMethod === method.id ? 'active' : ''}"
               data-method="${method.id}"
             >
-              <span class="method-icon">${method.icon}</span>
+              ${renderIcon(method.icon)}
               <span class="method-name">${method.name}</span>
             </button>
           `)}