Merge remote-tracking branch 'origin/main' into dev/chat

src/stores/AuthStore.js

@@ -1,5 +1,6 @@
 import { create } from 'zustand'
 import { fetchJSON } from '@/utils/request'
+import { isNotEmpty } from '@/utils/commons'
 
 const useAuthStore = create((set, get) => ({
 
@@ -27,9 +28,7 @@ const useAuthStore = create((set, get) => ({
 
     const json = await fetchJSON(`https://p9axztuwd7x8a7.mycht.cn/dingtalk/dingtalkwork/WhatsAppAuth`, { authCode })
 
-    if (json.errcode === 0) {
-
-
+    if (json.errcode === 0 && isNotEmpty(json.result.opisn)) {
       set(() => ({
         loginUser: {
           userId: json.result.opisn,
@@ -91,6 +90,13 @@ const useAuthStore = create((set, get) => ({
     window.sessionStorage.setItem('GLOBAL_SALES_LOGIN_USER', JSON.stringify(loginUser))
   },
 
+  copyUserSession: () => {
+    const sessionData = window.sessionStorage.getItem('GLOBAL_SALES_LOGIN_USER')
+    if (sessionData !== null) {
+      navigator.clipboard.writeText(sessionData)
+    }
+  }
+
 }))
 
 export default useAuthStore

src/views/AccountProfile.jsx

@@ -1,13 +1,14 @@
 import { useEffect } from 'react'
 import {
-  Row, Col, Space, Descriptions, Avatar, Tag
+  Row, Col, Space, Descriptions, Avatar, Tag, FloatButton, App
 } from 'antd'
-import { UserOutlined } from '@ant-design/icons'
+import { UserOutlined, BugOutlined } from '@ant-design/icons'
 import useAuthStore from '@/stores/AuthStore'
 
 function AccountProfile() {
 
-  const { loginUser } = useAuthStore()
+  const { message } = App.useApp()
+  const { loginUser, copyUserSession } = useAuthStore()
 
   useEffect(() => {
     // 测试错误捕获：
@@ -17,6 +18,10 @@ function AccountProfile() {
   return (    
     <Row> 
       <Col span={12} offset={6}>
+        <FloatButton icon={<BugOutlined />} onClick={() => {
+          message.success('复制成功，请粘贴给开发人员，谢谢😀')
+          copyUserSession()
+        }} />
         <Descriptions title='个人资料' layout='vertical' column={2}>
           <Descriptions.Item label='名字'><Space size='middle'><Avatar src={loginUser.avatarUrl}>{loginUser.username.substring(1)}</Avatar>{loginUser.username}​</Space></Descriptions.Item>
           <Descriptions.Item label='HT 账号'>

src/views/OrderFollow.jsx

@@ -1,17 +1,17 @@
 import {
   App, Badge, Button, DatePicker, Tabs, Flex, Form, Input,
-  Radio, Row, Col, Select, Space, Switch, Table, Tag, Collapse
+  Radio, Row, Col, Select, Space, Switch, Table, Tag, Tooltip
 } from 'antd'
+import { InfoCircleTwoTone, MessageTwoTone, PhoneTwoTone, MailTwoTone, WhatsAppOutlined } from '@ant-design/icons'
 import { memo, useCallback, useEffect, useState } from 'react'
 import { Link } from 'react-router-dom'
 import dayjs from 'dayjs'
 import { Conditional } from '@/components/Conditional'
 import useOrderStore from '@/stores/OrderStore'
 import useAuthStore from '@/stores/AuthStore'
-import { copy } from '@/utils/commons'
+import { copy, isNotEmpty } from '@/utils/commons'
 import useFormStore from '@/stores/FormStore';
-import { useShallow } from 'zustand/react/shallow';
-import { WhatsAppOutlined } from '@ant-design/icons';
+import { useShallow } from 'zustand/react/shallow'
 
 const { RangePicker } = DatePicker
 
@@ -168,9 +168,9 @@ function OrderGroupTable({ formValues }) {
         if (record.buytime > 0) regularText = '(R' + record.buytime + ')'
         return (
           <Space>
+            {isNotEmpty(record.coli_guest_WhatsApp) && <WhatsAppOutlined className={['pl-1', record.last_received_time ? 'text-whatsapp' : 'text-neutral-500']} />}
             <Link to={`/order/chat/${record.COLI_SN}`} state={record} title={record.coli_guest_WhatsApp}>
               {text + regularText}
-              {record.coli_guest_WhatsApp && <WhatsAppOutlined className={['pl-1', record.last_received_time ? 'text-whatsapp' : 'text-neutral-500']} />}
             </Link>
             <Badge
               count={record.unread_msg}
@@ -187,11 +187,20 @@ function OrderGroupTable({ formValues }) {
       dataIndex: 'COLI_State',
       width: 150,
       render: (text, record) => {
-        let extra = ''
-        if (record.RemindState === 1) extra = '(一催)'
-        if (record.RemindState === 2) extra = '(二催)'
-        if (record.RemindState === 3) extra = '(三催)'
-        return text + extra
+        // 1新订单<InfoCircleTwoTone />；2未读消息<MessageTwoTone />；3需一催；4需二催；5需三催<PhoneTwoTone />；6未处理邮件<MailTwoTone />
+        const needTo = '要催信' + (record.coli_ordertype - 2)
+        let statusIcon = ''
+        if (record.coli_ordertype === 1) statusIcon = <Tooltip title='新订单'><InfoCircleTwoTone /></Tooltip>
+        else if (record.coli_ordertype === 2) statusIcon = <Tooltip title='新消息'><MessageTwoTone /></Tooltip>
+        else if (record.coli_ordertype === 3 || record.coli_ordertype === 4 || record.coli_ordertype === 5) statusIcon = <Tooltip title={needTo}><PhoneTwoTone /></Tooltip>
+        else if (record.coli_ordertype === 6) statusIcon = <Tooltip title='老邮件'><MailTwoTone /></Tooltip>
+
+        return (          
+          <Space>
+            {text}
+            {statusIcon}
+          </Space>
+        )
       }
     },
     {