fix: 加工物流单， 修改密码页自适应，

src/layouts/components/AvatarDropdown.tsx

-import { LogoutOutlined, SettingOutlined, UserOutlined } from '@ant-design/icons';
+import { LogoutOutlined, LockOutlined } from '@ant-design/icons';
 import { Avatar, Menu, Spin } from 'antd';
 import React from 'react';
-import { history } from 'umi';
+import { history, Link } from 'umi';
 import PersonDropdown from './PersonDropdown'
 import styles from '../styles/RightContent.less';
 import { removeAuth, removeRouters, getAuth } from '@/utils/auth';
@@ -30,6 +30,9 @@ const AvatarDropdown = () => {
           个人设置
         </Menu.Item>
       <Menu.Divider /> */}
+      <Menu.Item>
+        <Link to="/memberCenter/systemSetting/accountSetting"><LockOutlined />修改密码</Link>
+      </Menu.Item>
       <Menu.Item onClick={logout} key="logout">
         <LogoutOutlined />
         退出登录

src/layouts/components/RightContent.tsx

@@ -30,7 +30,6 @@ const GlobalHeaderRight: React.FC<{}> = (props) => {
 
   const ws = useRef<WebSocket | null>(null);
   const webSocketInit = useCallback(() => {
-    console.log(ws.current)
     if (SOCKET_URL && (!ws.current || ws.current.readyState === 3) && userInfo) {
       const url = `${SOCKET_URL}/report/websocket?memberId=${userInfo.memberId}&roleId=${userInfo.memberRoleId}&token=${userInfo.token}&source=${1}`;
       ws.current = new WebSocket(url);
@@ -39,8 +38,9 @@ const GlobalHeaderRight: React.FC<{}> = (props) => {
       }
       ws.current.onmessage = (e) => {
         console.log(e)
-        if(e.data.type === NOT_READ_MESSAGE) {
-          setMessage(e.data.data);
+        const data = JSON.parse(e.data);
+        if(data.type === NOT_READ_MESSAGE) {
+          setMessage(data.data);
         }
       };
       ws.current.onclose = (e) => {

src/pages/accountSetting/components/EditDataComponent/index.tsx

@@ -7,7 +7,6 @@ import GetCaptchaCode from '../GetCaptchaCode';
 import classNames from 'classnames'
 import { PublicApi } from '@/services/api';
 import phoneRegExp from './utils';
-import options from '@/pages/editor/settingsPanel/propsSettings/Animate/config';
 const Option  = Select.Option;
 
 const EditDataComponent = (props) => {

src/pages/accountSetting/components/TypeVerify/index.less

@@ -5,12 +5,14 @@
   align-items: center;
   background-color: #fff;
   padding: 36px 24px;
-  width: 610px;
   height: 156px;
+  width: 100%;
+  overflow: hidden;
 
   .infos {
     display: flex;
     flex-direction: row;
+    align-items: center;
 
     .image {
       margin-right: 22px;

src/pages/accountSetting/components/VerifyPanel/Panel/PaycodeVerifyPanel.tsx

@@ -7,6 +7,7 @@ import { PublicApi } from '@/services/api';
 import { history } from 'umi'
 import { encryptedByAES } from '@/utils/cryptoAes'
 
+
 const layout = {
   labelCol: { span: 3 },
   wrapperCol: { span: 13 },

src/pages/accountSetting/components/VerifyPanel/Panel/PhoneVerifyPanel.tsx

@@ -129,8 +129,6 @@ const PhoneVerifyPanel: React.FC<IProps> = (props) => {
             </>
           : null
         }
-        
-     
       {
         visible
         ? <>

src/pages/accountSetting/components/VerifyPanel/Panel/ResetPayCode.tsx

@@ -5,7 +5,7 @@ import GetCaptchaCode from '../../GetCaptchaCode';
 import SafeVerification from '../../SafeVerification';
 import TypeForHeader from '../../TypeForHeader';
 import { history } from 'umi'
-
+import { encryptedByAES } from '@/utils/cryptoAes'
 const layout = {
   labelCol: { span: 3 },
   wrapperCol: { span: 13 },
@@ -27,7 +27,7 @@ const ResetPayCode: React.FC<IProps> = (props) => {
   const { phone, pageType } = props;
   const onFinish = (values) => {
     const postData = {
-      payPassword: values.password
+      payPassword: encryptedByAES(values.password)
     }
     // /member/security/pay/update
     const service = PublicApi.postMemberSecurityPayUpdate;

src/pages/accountSetting/index.tsx

 import React, { useEffect, useState } from 'react';
-import { Card } from 'antd';
+import { Row, Col } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import TypeVerify from './components/TypeVerify';
-import styles from './index.less';
 import { PublicApi } from '@/services/api';
 
 const getData = async () => {
@@ -22,22 +21,23 @@ const AccountSetting = () => {
   const TYPES = ['loginPwd', 'email', 'phone', 'paycode']
   return (
     <PageHeaderWrapper>
-      <div className={styles.page}>
+      <div >
+        <Row gutter={[24,24]}>
         {
           TYPES.map((item) => {
             return (
-              <div className={styles.item} key={item}>
+              <Col xxl={12} xl={12} lg={24} md={24} sm={24} xs={24}  key={item}>
                 <TypeVerify
                   type={item}
                   phone={account.phone}
                   email={account.email}
                   paycode={account.hasPayPassword}
                 />
-              </div>
+              </Col>
             )
           })
         }
-        
+        </Row>
       </div>
     </PageHeaderWrapper>
 

src/pages/handling/assign/processStock/index.tsx

@@ -60,7 +60,7 @@ enum OuterAndInnerStatus {
   /**
    * 待确认物流单
    */
-  pending_confirm_logistics = '待确认物流单',
+  pending_confirm_logistics = '4_17',
   /**
    * 待确认发货
    */
@@ -174,8 +174,8 @@ const processStock: React.FC<{}> = () => {
               <a onClick={() => handleVisible(record.id)}>审核</a>
             </Popconfirm>
           ),
-          [OuterAndInnerStatus.pending_add_logistics]: <Link to={`${ADD_LOGISTICS_PATH}`}>新增</Link>,
-          [OuterAndInnerStatus.pending_confirm_logistics]: <a>查看</a>,
+          [OuterAndInnerStatus.pending_add_logistics]: <Link to={`${ADD_LOGISTICS_PATH}?createType=3&shipmentOrderId=${record.deliveryId}&shipmentOrderCode=${record.deliveryNo}&relevanceOrderId=${record.id}`}>新增物流单</Link>,
+          [OuterAndInnerStatus.pending_confirm_logistics]: <Link to={`${ADD_LOGISTICS_PATH}?createType=3&shipmentOrderId=${record.deliveryId}&shipmentOrderCode=${record.deliveryNo}&relevanceOrderId=${record.id}&isPreview=1`}>查看物流单</Link>,
           [OuterAndInnerStatus.pending_confirm_deliver]: <Link to={`${PENDING_DELIVERD_PATH}/detail?id=${record.id}`}>发货</Link>,
           [OuterAndInnerStatus.pending_add_process_in_warehouse]: (
             <Link
@@ -201,7 +201,7 @@ const processStock: React.FC<{}> = () => {
           [OuterAndInnerStatus.pending_confirm_receive]: <Link to={`${ASSIGN_PENDING_RECEIVE}/detail?id=${record.id}`}>收货</Link>,
           [OuterAndInnerStatus.pending_confirm_receipt]: <Link to={`${PENDING_RECEIPT_PATH}/detail?id=${record.id}`}>确认回单</Link>
         }
-        return MAP[`${outerStatus}_${innerStatus}`] || MAP[record.innerStatusName]
+        return MAP[`${outerStatus}_${innerStatus}`]
       }
     }
   ]