新增手机端

陈鑫涛
1 parent 559b4992
Showing 52 changed files with 220 additions and 195 deletions
package.json
src/components/Common/BoxShowImgMaterial/indexNew.js
src/components/Common/PrintPdf/PreviewPdf.js
src/components/Common/Typesetting/typesetting.js
src/components/Common/commonBusiness.js
src/components/Common/commonBusiness1.js
src/components/PrintPdf/PreviewPdf.js
src/mobile/common/CommobileBase.js
src/mobile/common/CommobileBill.js
src/mobile/common/CommobileBillEvent.js
src/mobile/common/CommobileClassifyEvent.js
src/mobile/common/CommobileComponent.js
src/mobile/common/CommobileList.js
src/mobile/common/CommobileListEvent.js
src/mobile/common/CommobileModalList.jsx
src/mobile/common/CommobilePrintPdf.js
src/mobile/common/CommobileSearchComponent.js
src/mobile/common/CommobileStep.js
src/mobile/common/CommobileSubBill.js
src/mobile/common/CommobileSubBillEvent.js
@@ -30,6 +30,7 @@
     "lodash-decorators": "^6.0.1",
     "moment": "^2.30.1",
     "numeral": "^2.0.6",
+    "rc-form": "2.4.11",
     "react-dnd": "^14.0.5",
     "react-dnd-html5-backend": "^14.1.0",
     "react-draggable": "4.4.5",
@@ -41,7 +42,8 @@
     "react-resizable": "^3.0.5",
     "react-sortable-hoc": "^2.0.0",
     "react-to-print": "^3.0.5",
-    "umi": "^4.4.11"
+    "umi": "^4.4.11",
+    "weixin-js-sdk": "1.6.0"
   },
   "devDependencies": {
     "@types/react": "^18.0.33",
@@ -170,7 +170,7 @@ const BoxShowImgMaterial = props =&gt; {
   ).toFixed(2);
   useEffect(
     () => {
-      setBoxKey(new Date().getTime());
+      // setBoxKey(new Date().getTime());
       setTimeout(() => {
         //     if (boxRef.current && textRef.current && textRefs.current &&  nTextRef.current && nTextRefs.current)
         if (boxRef.current && textRef.current && textRefs.current && nTextRef.current && nTextRefs.current) {
 /* eslint-disable prefer-destructuring */
 /* eslint no-dupe-keys: 0, no-mixed-operators: 0 */
 import React from 'react';
-import { InputItem, Icon } from 'antd-mobile';
+import { InputItem, Icon } from 'antd-mobile-v2';
 import { Document, Page, pdfjs } from 'react-pdf';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import pdfstyles from './printpdf.less';
@@ -417,7 +417,7 @@ const Typesetting = props =&gt; {
   useEffect(
     () => {
       // 计算缩放比例
-      setBoxKey(new Date().getTime());
+      // setBoxKey(new Date().getTime());
       setTimeout(() => {
         const scaleX = (clientWidth - 50) / (outerWidth + 110);
         const scaleY = (clientHeight - 5) / (outerHeight + 90);
@@ -482,10 +482,11 @@ const Typesetting = props =&gt; {
   if (propsData && L) {
     const sMaterialsName = slaveData.find(x => x.sTreeNodeName === selectedNode.showName && x.sBoxModel === props.boxModel).sMaterialsName;
     const propsDataLeft = Number(propsData.props.style.left.slice(0, -2));
+    // 长需要找出最大的
     const propsDataWidth = Number(propsData.props.style.width.slice(0, -2));
     const propsDataHeight = Number(propsData.props.style.height.slice(0, -2));
     const propsDataTop = Number(propsData.props.style.top.slice(0, -2));
-    const newMaterialLength = propsDataLeft + propsDataWidth; // 原纸长
+    const newMaterialLength = propsDataLeft + innerWidthCombined; // 原纸长
     const newMaterialWidth = propsDataTop + propsDataHeight - dSBLB;
     // 计算开数
     const dSinglePQty = variables
@@ -557,12 +558,11 @@ const Typesetting = props =&gt; {
     }, 0); // 使用 0 延迟，将任务放入事件队列
   }
   const isMax = slaveDataDetail?.dMaxLength && Number(slaveDataDetail?.dMaxLength) >= Number(slaveRowData?.dMachineLength);
-  console.log("🚀 ~ isMax:", isMax,slaveDataDetail?.dMaxLength,slaveRowData?.dMachineLength)
   const isShow = slaveRowData && slaveRowData.dMachineLength && slaveRowData.dMaxWidth && slaveRowData.dMaxLength && isMax && innerDivs.length;
   const onClick = () => {
     setIsModalOpen(true);
-    setBoxKeys(new Date().getTime());
+    // setBoxKeys(new Date().getTime());
     setTimeout(() => {
       const scaleX = 1200 / outerWidth;
       const scaleY = 500 / outerHeight;
@@ -3,7 +3,7 @@
  */
 /* eslint-disable */
 import { Modal } from 'antd-v4';
-import { Modal as mobileModal } from 'antd-mobile';
+import { Modal as mobileModal } from 'antd-mobile-v2';
 import { message } from '@/utils/common/message';
 import moment from 'moment';
@@ -3,7 +3,7 @@
  */
 /* eslint-disable */
 import { Modal } from 'antd';
-import { Modal as mobileModal } from 'antd-mobile';
+import { Modal as mobileModal } from 'antd-mobile-v2';
 import { message } from '@/utils/common/message';
 import moment from 'moment';
 /* eslint-disable prefer-destructuring */
 /* eslint no-dupe-keys: 0, no-mixed-operators: 0 */
 import React from 'react';
-import { InputItem, Icon } from 'antd-mobile';
+import { InputItem, Icon } from 'antd-mobile-v2';
 import { Document, Page, pdfjs } from 'react-pdf';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import * as commonUtils from '@/utils/utils';
@@ -5,7 +5,7 @@
 import React, { Component } from 'react';
 import moment from 'moment';
-import { Modal, Toast } from 'antd-mobile';
+import { Modal, Toast } from 'antd-mobile-v2';
 import { addResult } from '@/utils/common/calcuate';
 import commonConfig from '../../utils/config';
 import * as commonUtils from '../../utils/utils';
 /* eslint-disable */
 import React from 'react';
 import weixin from 'weixin-js-sdk';
-import { Flex, Button, ListView, Toast } from 'antd-mobile';
+import { Flex, Button, ListView, Toast } from 'antd-mobile-v2';
 import { createForm } from 'rc-form';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import CommobileBase from './CommobileBase';
@@ -4,7 +4,7 @@
  * Created by mar105 on 2019-01-08.
  */
 import React, { Component } from 'react';
-import { Toast } from 'antd-mobile';
+import { Toast } from 'antd-mobile-v2';
 import * as commonUtils from '../../utils/utils';
 import * as commonFunc from '../../components/Common/commonFunc';
 import * as commonBusiness from '../../components/Common/commonBusiness';
 /* eslint-disable array-callback-return,no-undef,prefer-destructuring */
 import React, { Component } from 'react';
-import { Modal } from 'antd-mobile';
+import { Modal } from 'antd-mobile-v2';
 import * as commonUtils from '../../utils/utils'; /* 通用方法 */
 import commonConfig from '../../utils/config';
 import * as commonServices from '../../services/services';
 /* eslint-disable */
-import { List, InputItem, Picker, TextareaItem, DatePicker, Checkbox, Toast } from 'antd-mobile';
+import { List, InputItem, Picker, TextareaItem, DatePicker, Checkbox, Toast } from 'antd-mobile-v2';
 import moment from 'moment';
 import React, { Component } from 'react';
 import { debounce } from 'lodash';
@@ -2,7 +2,7 @@
 /* eslint-disable prefer-destructuring */
 /* eslint no-dupe-keys: 0, no-mixed-operators: 0 */
 import React from 'react';
-import { ListView, Checkbox, Modal, Toast, Flex } from 'antd-mobile';
+import { ListView, Checkbox, Modal, Toast, Flex } from 'antd-mobile-v2';
 import { createForm } from 'rc-form';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import commonConfig from '../../utils/config';
@@ -3,7 +3,7 @@
  * Created by mar105 on 2019-03-27.
  */
 import React, { Component } from 'react';
-import { Toast, Modal, TextareaItem, List } from 'antd-mobile';
+import { Toast, Modal, TextareaItem, List } from 'antd-mobile-v2';
 import { history } from 'umi';
 import * as commonUtils from '../../utils/utils'; /* 通用方法 */
 import commonConfig from '../../utils/config';
@@ -3,7 +3,7 @@ import React, { PureComponent } from &#39;react&#39;;
 import { createForm } from 'rc-form';
 import CommobileBase from '../../mobile/common/CommobileBase';
 import CommobileListEvent from './CommobileListEvent';
-import { Checkbox, ListView, TextareaItem } from 'antd-mobile';
+import { Checkbox, ListView, TextareaItem } from 'antd-mobile-v2';
 import * as commonUtils from '../../utils/utils';
 /* eslint-disable prefer-destructuring */
 /* eslint no-dupe-keys: 0, no-mixed-operators: 0 */
 import React from 'react';
-import { InputItem, Icon } from 'antd-mobile';
+import { InputItem, Icon } from 'antd-mobile-v2';
 import { Document, Page, pdfjs } from 'react-pdf';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import * as commonUtils from '../../utils/utils';
@@ -2,7 +2,7 @@
 /* eslint no-dupe-keys: 0, no-mixed-operators: 0 */
 import React from 'react';
 import weixin from 'weixin-js-sdk';
-import { Tabs, Badge, SearchBar, Modal, Button, Menu, ActivityIndicator, Flex, WhiteSpace, Toast, List } from 'antd-mobile';
+import { Tabs, Badge, SearchBar, Modal, Button, Menu, ActivityIndicator, Flex, WhiteSpace, Toast, List } from 'antd-mobile-v2';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import styles from '.././mobile.less';
 import commonConfig from '../../utils/config';
 /* eslint-disable prefer-destructuring */
 /* eslint no-dupe-keys: 0, no-mixed-operators: 0 */
 import React from 'react';
-import { Steps } from 'antd-mobile';
+import { Steps } from 'antd-mobile-v2';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import CommobileBase from '../../mobile/common/CommobileBase';
 import CommobileListEvent from './CommobileListEvent';
 /* eslint-disable */
 import React from 'react';
 import weixin from 'weixin-js-sdk';
-import { Flex, Button, ListView, Toast, Tabs, Badge, Modal} from 'antd-mobile';
+import { Flex, Button, ListView, Toast, Tabs, Badge, Modal} from 'antd-mobile-v2';
 import { createForm } from 'rc-form';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import CommobileBase from './CommobileBase';
@@ -4,7 +4,7 @@
  * Created by mar105 on 2019-01-08.
  */
 import React, { Component } from 'react';
-import { Toast,Modal } from 'antd-mobile';
+import { Toast,Modal } from 'antd-mobile-v2';
 import * as commonUtils from '../../utils/utils';
 import * as commonFunc from '../../components/Common/commonFunc';
 import * as commonBusiness from '../../components/Common/commonBusiness';
 /* eslint-disable */
 import React from 'react';
 import weixin from 'weixin-js-sdk';
-import { Flex, Button, ListView, Toast, Tabs, Badge,} from 'antd-mobile';
+import { Flex, Button, ListView, Toast, Tabs, Badge,} from 'antd-mobile-v2';
 import { createForm } from 'rc-form';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import CommobileBase from './CommobileBase';
 /* eslint-disable */
 import React, { Component } from 'react';
-import { Button, Toast } from 'antd-mobile';
+import { Button, Toast } from 'antd-mobile-v2';
 import * as commonUtils from '../../utils/utils';
 import commonConfig from '../../utils/config';
 import * as commonServices from '../../services/services';
@@ -3,7 +3,7 @@
  */
 /* eslint-disable object-curly-newline,prefer-destructuring */
 import React, { Component } from 'react';
-import { List } from 'antd-mobile';
+import { List } from 'antd-mobile-v2';
 import ShowType from './CommobileComponent';
 import * as commonUtils from '../../utils/utils'; /* 通用方法 */
@@ -3,7 +3,7 @@
  */
 /* eslint-disable object-curly-newline,prefer-destructuring */
 import React, { Component } from 'react';
-import { List, Flex } from 'antd-mobile';
+import { List, Flex } from 'antd-mobile-v2';
 import ShowType from './CommobileComponent';
 import * as commonUtils from '../../utils/utils';
 import styles from '../mobile.less'; /* 通用方法 */
@@ -3,7 +3,7 @@
  */
 /* eslint-disable object-curly-newline,prefer-destructuring */
 import React, { Component } from 'react';
-import { List } from 'antd-mobile';
+import { List } from 'antd-mobile-v2';
 import ShowType from './CommobileComponent';
 import * as commonUtils from '../../utils/utils';
 import styles from '../mobile.less'; /* 通用方法 */
 import React from 'react';
-import { Grid, Result } from 'antd-mobile';
+import { Grid, Result } from 'antd-mobile-v2';
 import { createForm } from 'rc-form';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import styles from '../mobile.less';
 import React from 'react';
-import { ListView } from 'antd-mobile';
+import { ListView } from 'antd-mobile-v2';
 import styles from '../mobile.less';
 // eslint-disable-next-line import/first
 import 'antd-mobile-v2/dist/antd-mobile.css';
 /* eslint-disable prefer-destructuring */
 /* eslint no-dupe-keys: 0, no-mixed-operators: 0 */
 import React from 'react';
-import { Tabs, Badge, SearchBar, ListView, Modal, List, Button } from 'antd-mobile';
+import { Tabs, Badge, SearchBar, ListView, Modal, List, Button } from 'antd-mobile-v2';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import styles from '.././mobile.less';
 import commonConfig from '../../utils/config';
 /* eslint-disable */
 import React from 'react';
-import { Flex, Button, ListView, Toast, TextareaItem, Steps, WhiteSpace, WingBlank } from 'antd-mobile';
+import { Flex, Button, ListView, Toast, TextareaItem, Steps, WhiteSpace, WingBlank } from 'antd-mobile-v2';
 import { DownlandOutline, ArrowDownCircleOutline, CheckCircleFill, ClockCircleFill, HandPayCircleOutline, InformationCircleOutline, } from 'antd-mobile-icons'
 import { Space, Dropdown, Menu } from 'antd';
 import { createForm } from 'rc-form';
 import React from 'react';
-import { Button, Card, TextareaItem, WhiteSpace, WingBlank, ListView } from 'antd-mobile';
+import { Button, Card, TextareaItem, WhiteSpace, WingBlank, ListView } from 'antd-mobile-v2';
 // import { createForm } from 'rc-form';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import CommobileBase from './CommobileBase';
 import React from 'react';
 // eslint-disable-next-line no-unused-vars
-import { Tabs, Badge, ListView, SearchBar } from 'antd-mobile';
-import 'antd-mobile-v2/dist/antd-mobile.css';
+import { Tabs, Badge, ListView, SearchBar } from 'antd-mobile-v2';
+import 'antd-mobile/dist/antd-mobile.css';
 // import ExamineMobile from './ExamineMobile';
 import commonConfig from '../../utils/config';
 import * as commonUtils from '../../utils/utils';
 import React from 'react';
-import { Button, List } from 'antd-mobile';
+import { Button, List } from 'antd-mobile-v2';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 // import ExamineMobile from './ExamineMobile';
 import commonConfig from '../../utils/config';
 import React from 'react';
-import { Flex, Button, ListView, Toast } from 'antd-mobile';
+import { Flex, Button, ListView, Toast } from 'antd-mobile-v2';
 import { createForm } from 'rc-form';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import CommobileBase from './CommobileBase';
 import React from 'react';
-import { List, InputItem, NavBar, Toast } from 'antd-mobile';
+import { List, InputItem, NavBar, Toast } from 'antd-mobile-v2';
 import { createForm } from 'rc-form';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 // import ExamineMobile from './ExamineMobile';
 import React from 'react';
-import { Grid, Toast } from 'antd-mobile';
+import { Grid, Toast } from 'antd-mobile-v2';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import styles from './SceneMobile.less';
 // eslint-disable-next-line import/first
 import React from 'react';
-import { Button, Grid, Toast } from 'antd-mobile';
+import { Button, Grid, Toast } from 'antd-mobile-v2';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import styles from './SceneMobile.less';
 // eslint-disable-next-line import/first
 import React from 'react';
-import { Grid, Toast } from 'antd-mobile';
+import { Grid, Toast } from 'antd-mobile-v2';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import styles from './SceneMobile.less';
 // eslint-disable-next-line import/first
 import React from 'react';
-import { Grid, Toast } from 'antd-mobile';
+import { Grid, Toast } from 'antd-mobile-v2';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import styles from './SceneMobile.less';
 import commonConfig from '../../utils/config';
 /* eslint-disable prefer-destructuring */
 /* eslint no-dupe-keys: 0, no-mixed-operators: 0 */
 import React from 'react';
-import { Button, Modal } from 'antd-mobile';
+import { Button, Modal } from 'antd-mobile-v2';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import * as commonUtils from '../../utils/utils';
 import CommobileClassifyEvent from '../common/CommobileClassifyEvent';
@@ -2,7 +2,7 @@
 /* eslint-disable prefer-destructuring */
 /* eslint no-dupe-keys: 0, no-mixed-operators: 0 */
 import React from 'react';
-import { Button, Toast } from 'antd-mobile';
+import { Button, Toast } from 'antd-mobile-v2';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import weixin from 'weixin-js-sdk';
 import logo from '@/assets/footer_logo.png';
@@ -2,7 +2,7 @@
 /* eslint-disable prefer-destructuring */
 /* eslint no-dupe-keys: 0, no-mixed-operators: 0 */
 import React from 'react';
-import { Button, Modal } from 'antd-mobile';
+import { Button, Modal } from 'antd-mobile-v2';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import * as commonUtils from '../../utils/utils';
 import CommobileClassifyEvent from '../common/CommobileClassifyEvent';
 /*eslint-disable*/
 import React, { PureComponent } from 'react';
-import { Modal } from 'antd-mobile';
+import { Modal } from 'antd-mobile-v2';
 export default class ModalBase extends PureComponent {
     state = {
 import React from 'react';
-import { Carousel, Modal } from 'antd-mobile';
+import { Carousel, Modal } from 'antd-mobile-v2';
 import styles from './preView.less';
 /**
@@ -146,6 +146,8 @@ class LoginMobile extends React.Component {
           type: 'loginMobile/login',
           payload: { ...param, dispatch },
         });
+        console.log('登录成功',param,dispatch);
+        
       } else {
         Toast.fail(dataReturn.msg);
       }
 import React from 'react';
 import { createForm } from 'rc-form';
-import { InputItem, Button, WhiteSpace, Toast, Modal, Picker, List } from 'antd-mobile';
+import { InputItem, Button, WhiteSpace, Toast, Modal, Picker, List } from 'antd-mobile-v2';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import styles from './LoginCss.less';
 import LoginIcon from '../../assets/mobile/logoCss.png';
 import React from 'react';
 import { createForm } from 'rc-form';
-import { InputItem, Button, WhiteSpace, Toast, Modal, Picker, List } from 'antd-mobile';
+import { InputItem, Button, WhiteSpace, Toast, Modal, Picker, List } from 'antd-mobile-v2';
 import 'antd-mobile-v2/dist/antd-mobile.css';
 import styles from './LoginSrm.less';
 import LoginIcon from '../../assets/mobile/logoSrm.png';
@@ -3,7 +3,7 @@ import config from &#39;../utils/config&#39;;
 import * as utils from '../utils/utils';
 import * as services from '../services/services';
 import { message, notification, Modal } from 'antd-v4';
-// import { Toast } from 'antd-mobile';
+// import { Toast } from 'antd-mobile-v2';
 import * as commonFunc from '../components/Common/commonFunc';/* 通用单据方法 */
 const { confirm } = Modal;
 /* eslint-disable */
 import React from 'react';
 import 'antd-mobile-v2/dist/antd-mobile.css';
-import { Icon, NavBar, TabBar, Modal } from 'antd-mobile';
-import { connect,history } from 'umi';
+import { Icon, NavBar, TabBar, Modal } from 'antd-mobile-v2';
+// import { history } from 'dva/router';
+import { connect,history  } from 'umi';
 import styles from './IndexMobile.less';
 import SceneCssMobile from './common/SceneCssMobile';
-import React from 'react';
-import 'antd-mobile-v2/dist/antd-mobile.css';
-import { Icon, NavBar, TabBar, Modal } from 'antd-mobile-v2';
-import { connect,history } from 'umi';
+import React from "react";
+import "antd-mobile-v2/dist/antd-mobile.css";
+import { Icon, NavBar, TabBar, Modal } from "antd-mobile-v2";
+// import { history } from 'dva/router';
+import { connect, history } from "umi";
-import * as commonUtils from '@/utils/utils';
-import styles from './IndexMobile.less';
-import SceneMobile from './common/SceneMobile';
-import MessageMobile from './common/MessageMobile';
-import ContactsMobile from './common/ContactsMobile';
-import WorkBenchMobile from './common/WorkBenchMobile';
-import CommobileList from './commobileList/commobileList';
-import ProcessReportMobile from './common/ProcessReportMobile';
-import MyselfMobile from './common/MyselfMobile';
-import ContactsInfoMobile from './common/ContactsInfoMobile';
-import RevisePasswordMobile from './common/RevisePasswordMobile';
-import CommobileBill from './common/commobileBill';
-import CommobilePrintPdf from './common/commobilePrintPdf';
-import ExamineMobile from './common/ExamineMobile';
-import Icon1 from '../../assets/mobile/1.png';
-import Icon11 from '../../assets/mobile/11.png';
-import Icon2 from '../../assets/mobile/2.png';
-import Icon21 from '../../assets/mobile/21.png';
-import Icon3 from '../../assets/mobile/3.png';
-import Icon31 from '../../assets/mobile/31.png';
+import * as commonUtils from "@/utils/utils";
+import styles from "./IndexMobile.less";
+import SceneMobile from "./common/SceneMobile";
+import MessageMobile from "./common/MessageMobile";
+import ContactsMobile from "./common/ContactsMobile";
+import WorkBenchMobile from "./common/WorkBenchMobile";
+import CommobileList from "./commobileList/commobileList";
+import ProcessReportMobile from "./common/ProcessReportMobile";
+import MyselfMobile from "./common/MyselfMobile";
+import ContactsInfoMobile from "./common/ContactsInfoMobile";
+import RevisePasswordMobile from "./common/RevisePasswordMobile";
+import CommobileBill from "./common/commobileBill";
+import CommobilePrintPdf from "./common/commobilePrintPdf";
+import ExamineMobile from "./common/ExamineMobile";
+import Icon1 from "../../assets/mobile/1.png";
+import Icon11 from "../../assets/mobile/11.png";
+import Icon2 from "../../assets/mobile/2.png";
+import Icon21 from "../../assets/mobile/21.png";
+import Icon3 from "../../assets/mobile/3.png";
+import Icon31 from "../../assets/mobile/31.png";
 // import Icon4 from '../../assets/mobile/4.png';
 // import Icon41 from '../../assets/mobile/41.png';
-import Icon5 from '../../assets/mobile/5.png';
-import Icon51 from '../../assets/mobile/51.png';
+import Icon5 from "../../assets/mobile/5.png";
+import Icon51 from "../../assets/mobile/51.png";
 // import AppUtil from '../../utils/AppUtil';
-import * as commonBusiness from '../../components/Common/commonBusiness';
+import * as commonBusiness from "../../components/Common/commonBusiness";
 // eslint-disable-next-line prefer-destructuring
 const alert = Modal.alert;
@@ -36,8 +37,8 @@ class IndexMobile extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-      selectedTab: 'scene',
-      title: '现场',
+      selectedTab: "scene",
+      title: "现场",
       hidden: false,
       fullScreen: true,
       touchStartPageX: 0, // 滑动开始的Y坐标
@@ -45,13 +46,13 @@ class IndexMobile extends React.Component {
     };
   }
   componentWillMount() {
-    this.props.dispatch(history.push('/indexMobile')); // 刷新时更新路由，避免底部按钮和返回按钮错乱显示
+    this.props.dispatch(history.push("/indexMobile")); // 刷新时更新路由，避免底部按钮和返回按钮错乱显示
     if (this.props.routing && this.props.routing) {
       const { state } = this.props.routing;
       if (state) {
         const { sId } = state;
-        if (sId === 'myself') {
-          this.setState({ selectedTab: 'myself' });
+        if (sId === "myself") {
+          this.setState({ selectedTab: "myself" });
           // this.renderContent('contacts');
         }
       }
@@ -63,50 +64,51 @@ class IndexMobile extends React.Component {
   componentDidUpdate(prevProps) {
     /* eslint-disable */
     if (prevProps?.location.state !== this.props.location.state) {
-      const originTitle = ({
-        message: '消息',
-        scene: '现场',
-        workbench: '工作台',
-        device: '设备',
-        myself: '我的',
-       })[this.state.selectedTab];
-       
+      const originTitle = {
+        message: "消息",
+        scene: "现场",
+        workbench: "工作台",
+        device: "设备",
+        myself: "我的",
+      }[this.state.selectedTab];
+
       try {
-        const path = JSON.parse(this.props.location.state || '{}');
+        const path = JSON.parse(this.props.location.state || "{}");
         this.setState({ title: path.title || originTitle });
-      } catch (error) {  
+      } catch (error) {
         this.setState({ title: originTitle });
       }
     }
   }
-  handleTouchStart = (e) => {
+  handleTouchStart = e => {
     this.setState({
       touchStartPageX: e.changedTouches[0].pageX,
       touchStartPageY: e.changedTouches[0].pageY,
     });
-  }
+  };
-  handleTouchEnd = (e) => {
+  handleTouchEnd = e => {
     const touchEndtPageX = e.changedTouches[0].pageX;
     const touchEndtPageY = e.changedTouches[0].pageY;
     const touchDireactionX = touchEndtPageX - this.state.touchStartPageX; // 滑动横向坐标
     const touchDireactionY = touchEndtPageY - this.state.touchStartPageY; // 滑动横向坐标
-    if (touchDireactionX > 100 && touchDireactionY > -80) { // 滑动一定距离
+    if (touchDireactionX > 100 && touchDireactionY > -80) {
+      // 滑动一定距离
       const { plus } = window;
-      if (location.pathname === '/indexMobile') {
-        alert('确定退出吗?', '', [
-          { text: '取消', onPress: () => {} },
-          { text: '是', onPress: () => plus.runtime.quit() }, // 关闭app
+      if (location.pathname === "/indexMobile") {
+        alert("确定退出吗?", "", [
+          { text: "取消", onPress: () => {} },
+          { text: "是", onPress: () => plus.runtime.quit() }, // 关闭app
         ]);
       } else {
         window.history.back(-1);
       }
     }
-  }
+  };
   renderContent(pageText) {
-    if (pageText === 'message') {
-      if (location.pathname === '/indexMobile/examine') {
+    if (pageText === "message") {
+      if (location.pathname === "/indexMobile/examine") {
         return (
           <div className={styles.demoContainer}>
             <ExamineMobile {...this.props} />
@@ -119,26 +121,26 @@ class IndexMobile extends React.Component {
           </div>
         );
       }
-    } else if (pageText === 'scene') {
-      if (location.pathname === '/indexMobile/commobileList') {
+    } else if (pageText === "scene") {
+      if (location.pathname === "/indexMobile/commobileList") {
         return (
           <div className={styles.demoContainer}>
             <CommobileList {...this.props} />
           </div>
         );
-      } else if (location.pathname === '/indexMobile/printPdf') {
+      } else if (location.pathname === "/indexMobile/printPdf") {
         return (
           <div className={styles.demoContainer}>
             <CommobilePrintPdf {...this.props} />
           </div>
         );
-      } else if (location.pathname === '/indexMobile/processReport') {
+      } else if (location.pathname === "/indexMobile/processReport") {
         return (
           <div className={styles.demoContainer}>
             <ProcessReportMobile {...this.props} />
           </div>
         );
-      } else if (location.pathname === '/indexMobile/commobileBill') {
+      } else if (location.pathname === "/indexMobile/commobileBill") {
         return (
           <div className={styles.demoContainer}>
             <CommobileBill {...this.props} />
@@ -152,14 +154,14 @@ class IndexMobile extends React.Component {
           </div>
         );
       }
-    } else if (pageText === 'workbench') {
-      if (location.pathname === '/indexMobile/commobileList') {
+    } else if (pageText === "workbench") {
+      if (location.pathname === "/indexMobile/commobileList") {
         return (
           <div className={styles.demoContainer}>
             <CommobileList {...this.props} />
           </div>
         );
-      } else if (location.pathname === '/indexMobile/commobileBill') {
+      } else if (location.pathname === "/indexMobile/commobileBill") {
         return (
           <div className={styles.demoContainer}>
             <CommobileBill {...this.props} />
@@ -172,24 +174,22 @@ class IndexMobile extends React.Component {
           </div>
         );
       }
-    } else if (pageText === 'device') {
-      return (
-        <CommobileList {...this.props} sModelsId="101251240115015888433389260" />
-      );
-    } else if (pageText === 'myself') {
-      if (location.pathname === '/indexMobile/contacts') {
+    } else if (pageText === "device") {
+      return <CommobileList {...this.props} sModelsId="101251240115015888433389260" />;
+    } else if (pageText === "myself") {
+      if (location.pathname === "/indexMobile/contacts") {
         return (
           <div className={styles.demoContainer}>
             <ContactsMobile {...this.props} sModelType={pageText} sModelsId="101251240115015888435981690" />
           </div>
         );
-      } else if (location.pathname === '/indexMobile/revisePassword') {
+      } else if (location.pathname === "/indexMobile/revisePassword") {
         return (
           <div className={styles.demoContainer}>
             <RevisePasswordMobile {...this.props} sModelsId="101251240115015888435981690" />
           </div>
         );
-      } else if (location.pathname === '/indexMobile/contactsInfo') {
+      } else if (location.pathname === "/indexMobile/contactsInfo") {
         return (
           <div className={styles.demoContainer}>
             <ContactsInfoMobile {...this.props} sModelsId="101251240115015892479567200" />
@@ -207,8 +207,8 @@ class IndexMobile extends React.Component {
   render() {
     const { hidden } = this.state;
-    const TabBarHidden = location.pathname === '/indexMobile' ? hidden : true;
-    const navbarIconShow = !['/indexMobile/commobileBill'].includes(location.pathname);
+    const TabBarHidden = location.pathname === "/indexMobile" ? hidden : true;
+    const navbarIconShow = !["/indexMobile/commobileBill"].includes(location.pathname);
     const msg = this.props.app.unRead;
     const msgObj = commonUtils.isJSON(msg) ? JSON.parse(msg) : {};
     return (
@@ -216,14 +216,13 @@ class IndexMobile extends React.Component {
         <div className="demoName">
           <NavBar
             // mode="light"
-            style={{ background: '#f0f0f0', color: '#888' }}
+            style={{ background: "#f0f0f0", color: "#888" }}
             icon={TabBarHidden && navbarIconShow ? <Icon type="left" /> : null}
             onLeftClick={() => {
               if (TabBarHidden && navbarIconShow) {
                 window.history.back(-1);
               }
-            }
-            }
+            }}
             className={styles.iconColor}
           >
             {this.state.title}
@@ -231,9 +230,17 @@ class IndexMobile extends React.Component {
         </div>
         <div
           className="demo-preview-item"
-          style={this.state.fullScreen ? {
-            position: 'fixed', width: '100%', top: '40px', bottom: 0, background: '#f0f0f0',
-          } : { height: 400 }}
+          style={
+            this.state.fullScreen
+              ? {
+                  position: "fixed",
+                  width: "100%",
+                  top: "40px",
+                  bottom: 0,
+                  background: "#f0f0f0",
+                }
+              : { height: 400 }
+          }
           onTouchStart={this.handleTouchStart.bind(this)}
           onTouchEnd={this.handleTouchEnd.bind(this)}
         >
@@ -243,139 +250,153 @@ class IndexMobile extends React.Component {
             tintColor="#33A3F4"
             barTintColor="white"
             hidden={TabBarHidden}
-            style={{ display: location.pathname === '/indexMobile' ? 'block' : 'none' }}
+            style={{ display: location.pathname === "/indexMobile" ? "block" : "none" }}
           >
             <TabBar.Item
               title="消息"
               key="message"
-              icon={<div style={{
-                width: '22px',
-                height: '22px',
-                background: `url(${Icon11}) center center /  21px 21px no-repeat`,
-              }}
-              />
+              icon={
+                <div
+                  style={{
+                    width: "22px",
+                    height: "22px",
+                    background: `url(${Icon11}) center center /  21px 21px no-repeat`,
+                  }}
+                />
               }
-              selectedIcon={<div style={{
-                width: '22px',
-                height: '22px',
-                background: `url(${Icon1}) center center /  21px 21px no-repeat`,
-              }}
-              />
+              selectedIcon={
+                <div
+                  style={{
+                    width: "22px",
+                    height: "22px",
+                    background: `url(${Icon1}) center center /  21px 21px no-repeat`,
+                  }}
+                />
               }
-              selected={this.state.selectedTab === 'message'}
+              selected={this.state.selectedTab === "message"}
               badge={msgObj.iCount || 0}
               onPress={() => {
                 const { app } = this.props;
                 const { token } = app;
                 commonBusiness.clearSocketData({ token, value: {}, sModelsId: 100 });
                 this.setState({
-                  selectedTab: 'message', title: '消息',
+                  selectedTab: "message",
+                  title: "消息",
                 });
-                this.props.dispatch(history.push('/indexMobile'));
+                this.props.dispatch(history.push("/indexMobile"));
               }}
               data-seed="logId"
             >
-              {this.state.selectedTab === 'message' ? this.renderContent(this.state.selectedTab) : ''}
+              {this.state.selectedTab === "message" ? this.renderContent(this.state.selectedTab) : ""}
             </TabBar.Item>
             <TabBar.Item
               icon={
-                <div style={{
-                  width: '22px',
-                  height: '22px',
-                  background: `url(${Icon21}) center center /  21px 21px no-repeat`,
-                }}
+                <div
+                  style={{
+                    width: "22px",
+                    height: "22px",
+                    background: `url(${Icon21}) center center /  21px 21px no-repeat`,
+                  }}
                 />
               }
               selectedIcon={
-                <div style={{
-                  width: '22px',
-                  height: '22px',
-                  background: `url(${Icon2}) center center /  21px 21px no-repeat`,
-                }}
+                <div
+                  style={{
+                    width: "22px",
+                    height: "22px",
+                    background: `url(${Icon2}) center center /  21px 21px no-repeat`,
+                  }}
                 />
               }
               title="现场"
               key="scene"
               // badge="new"
-              selected={this.state.selectedTab === 'scene'}
+              selected={this.state.selectedTab === "scene"}
               onPress={() => {
                 const { app } = this.props;
                 const { token } = app;
                 commonBusiness.clearSocketData({ token, value: {}, sModelsId: 100 });
                 this.setState({
-                  selectedTab: 'scene', title: '现场',
+                  selectedTab: "scene",
+                  title: "现场",
                 });
-                this.props.dispatch(history.push('/indexMobile'));
+                this.props.dispatch(history.push("/indexMobile"));
               }}
               data-seed="logId1"
             >
-              {this.state.selectedTab === 'scene' ? this.renderContent(this.state.selectedTab) : ''}
+              {this.state.selectedTab === "scene" ? this.renderContent(this.state.selectedTab) : ""}
             </TabBar.Item>
             <TabBar.Item
               icon={
-                <div style={{
-                  width: '22px',
-                  height: '22px',
-                  background: `url(${Icon31}) center center /  21px 21px no-repeat`,
-                }}
+                <div
+                  style={{
+                    width: "22px",
+                    height: "22px",
+                    background: `url(${Icon31}) center center /  21px 21px no-repeat`,
+                  }}
                 />
               }
               selectedIcon={
-                <div style={{
-                  width: '22px',
-                  height: '22px',
-                  background: `url(${Icon3}) center center /  21px 21px no-repeat`,
-                }}
+                <div
+                  style={{
+                    width: "22px",
+                    height: "22px",
+                    background: `url(${Icon3}) center center /  21px 21px no-repeat`,
+                  }}
                 />
               }
               title="工作台"
               key="workbench"
               // badge="2"
-              selected={this.state.selectedTab === 'workbench'}
+              selected={this.state.selectedTab === "workbench"}
               onPress={() => {
                 const { app } = this.props;
                 const { token } = app;
                 commonBusiness.clearSocketData({ token, value: {}, sModelsId: 100 });
                 this.setState({
-                  selectedTab: 'workbench', title: '工作台',
+                  selectedTab: "workbench",
+                  title: "工作台",
                 });
-                this.props.dispatch(history.push('/indexMobile'));
+                this.props.dispatch(history.push("/indexMobile"));
               }}
             >
-              {this.state.selectedTab === 'workbench' ? this.renderContent(this.state.selectedTab) : ''}
+              {this.state.selectedTab === "workbench" ? this.renderContent(this.state.selectedTab) : ""}
             </TabBar.Item>
             <TabBar.Item
               icon={
-                <div style={{
-                  width: '22px',
-                  height: '22px',
-                  background: `url(${Icon51}) center center /  21px 21px no-repeat`,
-                }}
+                <div
+                  style={{
+                    width: "22px",
+                    height: "22px",
+                    background: `url(${Icon51}) center center /  21px 21px no-repeat`,
+                  }}
                 />
               }
               selectedIcon={
-                <div style={{
-                  width: '22px',
-                  height: '22px',
-                  background: `url(${Icon5}) center center /  21px 21px no-repeat`,
-                }}
+                <div
+                  style={{
+                    width: "22px",
+                    height: "22px",
+                    background: `url(${Icon5}) center center /  21px 21px no-repeat`,
+                  }}
                 />
               }
               title="我的"
               key="contacts"
               // badge="4"
-              selected={this.state.selectedTab === 'myself'}
+              selected={this.state.selectedTab === "myself"}
               onPress={() => {
                 const { app } = this.props;
                 const { token } = app;
                 commonBusiness.clearSocketData({ token, value: {}, sModelsId: 100 });
                 this.setState({
-                  selectedTab: 'myself', title: '我的',
+                  selectedTab: "myself",
+                  title: "我的",
                 });
-                this.props.dispatch(history.push('/indexMobile'));
+                this.props.dispatch(history.push("/indexMobile"));
               }}
             >
-              {this.state.selectedTab === 'myself' ? this.renderContent(this.state.selectedTab) : ''}
+              {this.state.selectedTab === "myself" ? this.renderContent(this.state.selectedTab) : ""}
             </TabBar.Item>
           </TabBar>
         </div>
@@ -383,6 +404,4 @@ class IndexMobile extends React.Component {
     );
   }
 }
-export default connect(({ app, routing }) =>
-  ({ app, routing }))(IndexMobile);
-
+export default connect(({ app, routing }) => ({ app, routing }))(IndexMobile);
 /* eslint-disable */
 import React from 'react';
 import 'antd-mobile-v2/dist/antd-mobile.css';
-import { Icon, NavBar, TabBar, Modal } from 'antd-mobile';
-import { connect,history } from 'dva';
+import { Icon, NavBar, TabBar, Modal } from 'antd-mobile-v2';
+// import { history } from 'dva/router';
+import { connect,history } from 'umi';
 import styles from './IndexMobile.less';
 import SceneSrmMobile from './common/SceneSrmMobile';
@@ -4,7 +4,7 @@
  */
 import React from 'react';
-import { connect } from 'dva';
+import { connect } from 'umi';
 import CommobileListComponent from '../../../mobile/common/CommobileList';
 import * as commonUtils from '../../../utils/utils';
 /* eslint-disable */
 import { Modal, message as antdMessage } from 'antd-v4';
-import { Modal as mobileModal } from 'antd-mobile';
+import { Modal as mobileModal } from 'antd-mobile-v2';
 const { warning } = Modal;
 const antdMobileAlert = mobileModal.alert;