From 307dc32d372fe9e55b6c8ca590228be6ca79f4fa Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Sun, 29 Sep 2024 17:02:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=20React,=20Router,?=
 =?UTF-8?q?=20Ant=20Design=20=E7=89=88=E6=9C=AC=EF=BC=9B=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=98=AF=E9=92=89=E9=92=89=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                 | 14 +++++++-------
 src/views/dingding/Login.jsx | 18 ++++++++++--------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 9ff476a..ad71f9a 100644
--- a/package.json
+++ b/package.json
@@ -11,19 +11,19 @@
   },
   "dependencies": {
     "@vonage/client-sdk": "^1.6.0",
-    "antd": "^5.14.0",
+    "antd": "^5.21.0",
     "crypto-js": "^4.2.0",
-    "dayjs": "^1.11.10",
+    "dayjs": "^1.11.13",
     "dingtalk-jsapi": "^3.0.38",
     "emoji-picker-react": "^4.8.0",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-router-dom": "^6.26.2",
+    "zustand": "^4.5.5",
     "react-chat-elements": "^12.0.11",
-    "react-dom": "^18.2.0",
-    "react-router-dom": "^6.21.1",
     "rxjs": "^7.8.1",
     "uuid": "^9.0.1",
-    "vite-plugin-pwa": "^0.19.6",
-    "zustand": "^4.5.0"
+    "vite-plugin-pwa": "^0.19.6"
   },
   "devDependencies": {
     "@types/react": "^18.2.15",
diff --git a/src/views/dingding/Login.jsx b/src/views/dingding/Login.jsx
index f220468..a71c5d2 100644
--- a/src/views/dingding/Login.jsx
+++ b/src/views/dingding/Login.jsx
@@ -1,20 +1,22 @@
 import { Flex, Result, Spin } from 'antd'
 import { isNotEmpty } from '@/utils/commons'
-// import * as dd from 'dingtalk-jsapi'
+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'
+  if (dd.env.platform === 'notInDingTalk') {
+    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 {
+      window.location = 'https://login.dingtalk.com/oauth2/auth?redirect_uri=https%3A%2F%2Fsales.mycht.cn%2Fp%2Fdingding%2Fcallback%3Forigin_url%3D&response_type=code&client_id=dingwgdx6emlxr3fcrg8&scope=openid&state=global-saels&prompt=consent'
+    }
   } else {
-    window.location = 'https://login.dingtalk.com/oauth2/auth?redirect_uri=https%3A%2F%2Fsales.mycht.cn%2Fp%2Fdingding%2Fcallback%3Forigin_url%3D&response_type=code&client_id=dingwgdx6emlxr3fcrg8&scope=openid&state=global-saels&prompt=consent'
+    dd.ready(function() {
+      console.info('dd.ready()')
+    })
   }
 
   return (