From ace4b1c57a4f31d633c58cbcd2699e4d83159fce Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Sun, 29 Sep 2024 16:41:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20dingtalk-jsapi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- src/main.jsx | 1 - src/views/dingding/Login.jsx | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8c66e86..9ff476a 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "antd": "^5.14.0", "crypto-js": "^4.2.0", "dayjs": "^1.11.10", + "dingtalk-jsapi": "^3.0.38", "emoji-picker-react": "^4.8.0", "react": "^18.2.0", "react-chat-elements": "^12.0.11", @@ -28,6 +29,7 @@ "@types/react": "^18.2.15", "@types/react-dom": "^18.2.7", "@vitejs/plugin-react": "^4.2.1", + "@vonage/client-sdk": "^1.6.0", "autoprefixer": "^10.4.17", "eslint": "^8.45.0", "eslint-plugin-react": "^7.32.2", @@ -35,7 +37,6 @@ "eslint-plugin-react-refresh": "^0.4.3", "postcss": "^8.4.33", "tailwindcss": "^3.4.1", - "@vonage/client-sdk": "^1.6.0", "vite": "^4.5.1", "vite-plugin-css-modules": "^0.0.1", "vite-plugin-windicss": "^1.9.3", diff --git a/src/main.jsx b/src/main.jsx index d1db7c7..f849f4e 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -8,7 +8,6 @@ import MobileApp from '@/views/MobileApp' import Standlone from '@/views/Standlone' import OrderFollow from '@/views/orders/Follow' import ChatHistory from '@/views/ChatHistory' -import SalesManagement from '@/views/SalesManagement' import DingdingCallback from '@/views/dingding/Callback' import DingdingLogout from '@/views/dingding/Logout' import AccountProfile from '@/views/accounts/Profile' diff --git a/src/views/dingding/Login.jsx b/src/views/dingding/Login.jsx index 004cc3d..f220468 100644 --- a/src/views/dingding/Login.jsx +++ b/src/views/dingding/Login.jsx @@ -1,11 +1,16 @@ import { Flex, Result, Spin } from 'antd' import { isNotEmpty } from '@/utils/commons' +// import * as dd from 'dingtalk-jsapi' function Login() { const urlSearch = new URLSearchParams(location.search) const originUrl = urlSearch.get('origin_url') + // dd.ready(function() { + // console.info('dd.ready()') + // }) + if (isNotEmpty(originUrl)) { window.location = 'https://login.dingtalk.com/oauth2/auth?redirect_uri=https%3A%2F%2Fsales.mycht.cn%2Fp%2Fdingding%2Fcallback%3Forigin_url%3D' + originUrl + '&response_type=code&client_id=dingwgdx6emlxr3fcrg8&scope=openid&state=global-saels&prompt=consent' } else {