[fix]小区列表

(cherry picked from commit 58f9d5f0)

config/config.ts

@@ -151,7 +151,10 @@ export default defineConfig({
                 {
                   path: './AccessCardApplication',
                   name: 'accessCardapplication',
-                  component:'./CommercialService/PropertyServices'
+                  routes:[
+                    { path: './', component: './CommercialService/Card' },
+                    {path: './Detail',component:'./CommercialService/CardDetail'},
+                  ]
                 },
                 {
                   path: './ReportOnline',
@@ -206,7 +209,8 @@ export default defineConfig({
                   name: 'celllist',
                   routes:[
                     { path: './', component: './CommunityManagement/CellList/CellList' },
-                    {path:'./Add',component:'./CommunityManagement/CellList/Add'},
+                    { path: './Add', component: './CommunityManagement/CellList/Add' },
+                    {path:'./Detail',component:'./CommunityManagement/CellList/Detail'},
                   ]
                 },
                 {

src/components/SearchOptions/SearchOptions.jsx

@@ -28,12 +28,16 @@ class SearchOptions extends React.Component {
       // console.log(this.state.list)
       if(this.state.list!=null){
         var tmp=new Array()
-    
+        var rest=new Array()
         this.state.list.map((item,index)=>{
           if((item.toLowerCase()).indexOf(value.toLowerCase())>-1){
-            tmp.push(item)
-          }
-          this.setState({ data: tmp });
+            if(item[0]==value[0]){
+              tmp.push(item)
+            }else{
+              rest.push(item)
+            }
+          }          
+          this.setState({ data: tmp.concat(rest.sort()) });
         })            
       }
     } else {

src/components/SearchOptions/SearchOptionsCommnity.tsx

@@ -17,11 +17,13 @@ const SearchOptionsCommnity = (props: any) => {
   
   const extendName = (values: any) => {
 
-    onChange(values);
+    props.alone==true ?
+    props.onSubmit(values):
+    onChange(values)
   }
   return (
     <>{CommunityList!=null?
-      <SearchOptions disabled={disabled} placeholder={placeholder} defaultValue={value} list={CommunityList} onSubmit={extendName} />
+      <SearchOptions disabled={disabled} placeholder={placeholder} defaultValue={props.defaultValue!=null?props.defaultValue:value} list={CommunityList} onSubmit={extendName} />
       :null
       }
     </>

src/components/TitleBack/TitleBack.tsx

@@ -5,7 +5,7 @@ import BackButton from '../BackButton/BackButton';
 import TitleGet from '../TitleGet/TitleGet';
 
 const TitleBack = (props:any) => {
-
+//   <TitleBack sublist={['Handle Status : '+CurDataDetail.status,'Create Time : '+CurDataDetail.time]} title={headTitle} />
   const backData = (values:any) => {
     props.titleBack(values)
   }
@@ -15,9 +15,9 @@ const TitleBack = (props:any) => {
       {
         props.sublist!=null
         ?
-        (props.sublist).map(  (item:any)=>{
+        (props.sublist).map(  (item:any,index:any)=>{
           return (
-            <div className={styles.item1}>{item}</div>
+            <div key={index} className={styles.item1}>{item}</div>
           )
         })
           :

src/locales/en-US/menu.ts

@@ -66,8 +66,8 @@ export default {
   'menu.ordermanagement': 'Order Management',
   'menu.contractmanagement': 'Contract Management',
   'menu.communitymanagement': 'Community Management',
-  'menu.communitymanagement.celllist': 'Cell List',
-  'menu.communitymanagement.communityannouncement': 'Community Announcement',
+  'menu.communitymanagement.celllist': 'Community',
+  'menu.communitymanagement.communityannouncement': 'Announcement',
   'menu.communitymanagement.facilitybookings': 'Facility Bookings',
   'menu.communitymanagement.visitorrecord': 'Visitor Record',
   'menu.accountmanagement': 'Account Management',

src/models/CommunityManagement/CommunityService.ts

@@ -11,20 +11,28 @@ export default {
   namespace: 'CommunityService',
   state: {
     Data: null,
+    DataSave:null,
     CurData: null,
-    CurDataDetail:{},
+    CurDataDetail: {},
+    Data7:null,
   },
 
   reducers: {
     returnPage(state, { Data }) {
       return { ...state, Data };
     },
+    returnDataSave(state, { DataSave }) {
+      return { ...state, DataSave }
+    },
     returnCurData(state, { CurData }) {
       return { ...state, CurData };
     },
     returnCurDataDetail(state, { CurDataDetail }) {
       return { ...state, CurDataDetail };
     },
+    returnPage7(state, { Data7 }) {
+      return { ...state, Data7 };
+    },
   },
 
   effects: {
@@ -66,7 +74,7 @@ export default {
             console.log("请求错误码:"+"("+playload.index+")" + resp.error_code)
             console.log(playload)    
           }    
-          else {      
+   
             switch (playload.index) {
     
               case 21:
@@ -101,9 +109,13 @@ export default {
                 let Data = resp.data.rows;
                 yield put({ type: 'returnPage', Data, });
               } break;
+              case 31: {
+                let Data7 = resp;
+                yield put({type:'returnPage7',Data7})
+              }
             }
     
-          }
+    
     },
         
     // *TosCommunityServiceGetDetail({ playload }, { call, put }) {
@@ -131,6 +143,10 @@ export default {
     //     yield put({ type: 'returnCurDataDetail', CurDataDetail, });
     //   }
     // },
+    *SA({ playload }, { call, put }) {
+      var DataSave = playload;
+        yield put({ type: 'returnDataSave', DataSave, });
+    },
 
     *setCurData({ playload }, { call, put }) {
       var CurData = playload;

src/models/login.ts

@@ -6,6 +6,7 @@ import { setAuthority } from '@/utils/authority';
 import { getPageQuery } from '@/utils/utils';
 
 import { setCookie, getCookie } from '@/utils/method';
+import { message } from 'antd';
 export interface StateType {
   status?: 'ok' | 'error';
   type?: string;
@@ -59,14 +60,18 @@ const Model: LoginModelType = {
         type: 'changeLoginStatus',
         payload: response,
       });
-      // Login successfully
-      if (response.status === 'ok') {
+      // Login successfully response.status === 'ok'
+      if (response.token !=null) {
         console.log("用户名密码登录成功") 
         console.log(response)        
         const userMessage = yield call(AccountCheckLogin, payload);//请求时间网络
         console.log(userMessage)
         console.log(userMessage.token)
-        setCookie("token",userMessage.token)
+        setCookie("token", userMessage.token)
+        // tosUserName: "admin"
+        // tosUserPhone: "18818881888"
+        setCookie("name", response.token.tosUserName)
+        setCookie("phone",response.token.tosUserPhone)
         console.log("获取到Token:" + getCookie("token"))
         yield put({type: 'saveToken',token: userMessage.token,userName:payload.userName,password:payload.password});
         const urlParams = new URL(window.location.href);
@@ -85,6 +90,8 @@ const Model: LoginModelType = {
           }
         }
         history.replace(redirect || '/');
+      } else {
+        message.error("Login Error! Username or Password is wrong!",3)
       }
     },
 

src/pages/CommercialService/Card.tsx

@@ -4,22 +4,81 @@ const { TabPane } = Tabs;
 
 import {connect,history} from 'umi';
 
+// apply_name: "我的人生就"
+// apply_reason_content: "H4sIAAAAAAAAACXJOwqDQBQF0N5VjyLRRsI0xs+AIjFoEMXC8e9q3n2Zzi0opDnNgapoEmYYf4nL↵Lw0Rsy9pbYz3xdjTnNGWWFAVWk3L49xs2nOOOpqCvwgVN8VdKHc8OxYKUlj4OEgPvOsLeuxP/F8A↵AAA="
+// apply_relation_owner: 0
+// apply_status: 0
+// build_number: "01"
+// communityId: "12ffe9ed60054af9a67c036af92e03f9"
+// community_name: "A4"
+// community_owner: "jack-小雄"
+// community_owner_phone: "13143391751"
+// create_time: {date: 10, day: 4, hours: 16, minutes: 27, month: 8, …}
+// deleted: 0
+// floor_number: "05"
+// id: "977494600245575680"
+// ownerId: "770da9de6b6c43f6b61bc3d671fa2e89"
+// room_number: "569"
+// update_time: 
 
-import { RA } from '@/utils/method';
-const module="XXX"
-const XXX = (props:any) => {
 
-  const { dispatch, Data } = props;
+
+import { RA, SA } from '@/utils/method';
+import { objectColumns } from '@/utils/string';
+import { timestampToTime } from '@/utils/time';
+import Login from '../user/login/components/Login';
+const module="CommunityService"
+const Card = (props:any) => {
+
+  const { dispatch, Data7 } = props;
   const formRef = useRef(null)
 
+  const columns = objectColumns([
+    ["所在小区", "community_name"],
+    ["所在单元", null, (text: any, record: any) => (<Space size="middle">{record.build_number+"#"+record.floor_number+"-"+record.room_number}</Space>)],
+    ["用户名", "community_owner"],
+    ["申请时间", null, (text: any, record: any) => (<Space size="middle">{timestampToTime(record.create_time.time)}</Space>)],
+    ["申请状态",  null, (text: any, record: any) => (<Space size="middle">{record.apply_status}</Space>)],
+    ["Actions",null, (text: any, record: any) => (<Space size="middle"> <a onClick={goToDetail.bind(this,record)}>Detail</a></Space>)],
+  ])
+
+  useEffect(() => {
+    RA(31, { serviceType: "7", id: "" }, module, dispatch)
+    
+  }, [])
+
+  useEffect(() => {
+    if (Data7 != null) {
+      console.log("首页信息")
+      console.log(Data7)
+    }
+  }, [Data7])
+  
+  const goToDetail = (values: any, e: any) => {
+    SA(values,module,dispatch)
+    history.push('./AccessCardApplication/Detail')
+  }
+
   return (
     <div style={{ width: "100%", minWidth: 1020, padding: 34, backgroundColor: "#ffffff" }}>       
+      
+      {
+        Data7 != null ?
+          <>
+            <Table loading={false} rowKey="id" style={{ marginTop: 16 }}
+            dataSource={Data7.data.rows}
+            columns={columns}
+            pagination={{ current: 1, total: Data7.total }} />    
+          </>
+          :null
+      }
     </div>
   );
 };
 
 function map(state:any) {
-  const { Data} = state[module]
-  return { Data}
+  const { Data7} = state[module]
+  return { Data7}
 }
-export default connect(map)(XXX);
\ No newline at end of file
+export default connect(map)(Card);
+

src/pages/CommercialService/CardDetail.tsx

+import React, { useState, useEffect,useRef} from 'react';
+import { Input ,Tabs,Row,Col, Button} from 'antd';
+const { TabPane } = Tabs;
+
+import {connect,history} from 'umi';
+
+
+import { RA } from '@/utils/method';
+import TitleBack from '@/components/TitleBack/TitleBack';
+import Line from '@/components/Line/Line';
+import TextArea from 'antd/lib/input/TextArea';
+const module="CommunityService"
+const CardDetail = (props:any) => {
+
+  const { dispatch, Data,DataSave } = props;
+  const formRef = useRef(null)
+
+  useEffect(()=>{
+    if (DataSave != null) {
+      console.log("初始化页面参数")
+      console.log(DataSave);
+      
+/*       apply_name: "jack-小白白"
+      apply_reason_content: "H4sIAAAAAAAAAHuyo/fJnlkAljbS9QYAAAA="
+      apply_relation_owner: 0
+      apply_status: 0
+      build_number: "01"
+      communityId: "7e5c6fd2f4ba497a90e64535df6e9088"
+      community_name: "A4"
+      community_owner: "jack-小白白"
+      community_owner_email: "3290098379@qq.com"
+      create_time: {date: 10, day: 4, hours: 19, minutes: 51, month: 8, …}
+      deleted: 0
+      floor_number: "00"
+      id: "977597589971009536"
+      ownerId: "c4da40676d044487b37e7a1bdc6dd045"
+      room_number: "767"
+      update_time:  */
+      
+    } else {
+      history.go(-1)
+    }    
+  },[])
+  return (
+    <div style={{ width: "100%", minWidth: 1020, padding: 34, backgroundColor: "#ffffff" }}>  
+      {
+        DataSave != null ? <>
+        <TitleBack sublist={['Status : ' + "1", 'Time : ' + '12']} title="Apply Card" ></TitleBack>        
+          <Row gutter={8}>
+            <Col>Community:</Col> 
+            <Col span={1}>{DataSave.community_name}</Col>         
+            <Col>unit:</Col> 
+            <Col>{DataSave.build_number}#{DataSave.floor_number}-{DataSave.room_number}</Col>   
+          </Row>
+
+          <Row gutter={8} style={{marginTop:16}}>      
+            <Col>Address:</Col> 
+            <Col>{DataSave.build_number}#{DataSave.floor_number}-{DataSave.room_number}</Col>   
+          </Row>      
+          
+          <Row gutter={8} style={{marginTop:16}}>
+            <Col>Owner Name:</Col> 
+            <Col span={3}>{DataSave.community_owner}</Col>         
+            <Col>Phone:</Col> 
+            <Col>13169646231</Col>   
+          </Row>
+          <Line></Line>
+          <Row gutter={8} style={{marginTop:16}}>
+            <Col span={3}>Apply Name:</Col> 
+            <Col span={3}>{DataSave.apply_name}</Col>         
+            <Col>Phone:</Col> 
+            <Col>13169646231</Col>   
+          </Row>
+          <Row gutter={8} style={{marginTop:16}}>
+            <Col span={3}>Relationship:</Col> 
+            <Col >{DataSave.apply_relation_owner}</Col>         
+          </Row>
+          <Row gutter={8} style={{marginTop:16}}>
+            <Col span={3}>Reason:</Col> 
+            <Col><TextArea disabled value={DataSave.apply_reason_content} ></TextArea></Col>         
+          </Row>
+          <Line></Line>
+        </>:null
+      }
+
+
+    </div>
+  );
+};
+
+function map(state:any) {
+  const { Data,DataSave} = state[module]
+  return { Data,DataSave}
+}
+export default connect(map)(CardDetail);
\ No newline at end of file

src/pages/CommunityManagement/CellList/CellList.tsx

@@ -5,24 +5,25 @@ const { TabPane } = Tabs;
 import {connect,history} from 'umi';
 
 
-const columns = objectColumns([
-  ["Community", "residentialName"],
-  ["Administrator", "residentialManagerUserName"],  
-  ["Operation Hours", null, (text: any, record: any) => (<div></div>)],
-  ["Office Tel", "residentialPhone"],
-  ["Address", "residentialAddress"],    
-  ["Actions",null, (text: any, record: any) => (<Space size="middle"> <a>Detail</a></Space>)],
-])
 
 
 import TitleSearch from '@/components/TitleSearch/TitleSearch'
 import SearchOptionsCommnity from '@/components/SearchOptions/SearchOptionsCommnity'
-import { RA } from '@/utils/method';
+import { RA, SA } from '@/utils/method';
 import { objectColumns } from '@/utils/string'; 
 import { timestampToTime } from '@/utils/time';
 const module="CellList"
 const CellList = (props:any) => {
 
+  const columns = objectColumns([
+    ["Community", "residentialName"],
+    ["Administrator", "residentialManagerUserName"],  
+    ["Operation Hours", null, (text: any, record: any) => (<div></div>)],
+    ["Office Tel", "residentialPhone"],
+    ["Address", "residentialAddress"],    
+    ["Actions",null, (text: any, record: any) => (<Space size="middle"> <a onClick={goToDetail.bind(this,record)}>Detail</a></Space>)],
+  ])
+  
 
   const { dispatch, Data } = props;
   const Pagechange = () => {
@@ -43,12 +44,16 @@ const CellList = (props:any) => {
   const goToAdd = () => {
     history.push("./CellList/Add");
   }
+  const goToDetail = (values: any, e: any) => {
+    SA(values,module,dispatch)
+    history.push("./CellList/Detail");
+  }
   return (
     <div style={{ width: "100%", minWidth: 1020, padding: 34, backgroundColor: "#ffffff" }}> 
     {
         Data != null ? <>
           {/* <TitleSearch listkey={['communityName']}   list={['Community Name']}  onSubmit={CallBackTitleSearch}/> */}
-          <SearchOptionsCommnity onSubmit={CallbackSearch} />
+          <SearchOptionsCommnity alone={true} onSubmit={CallbackSearch} />
           <div style={{height:80,position:"relative"}}>
             <div style={{ position: "absolute", right: 0 }}>
               <Button type="primary" onClick={goToAdd}>Create new Community</Button>

src/pages/CommunityManagement/CellList/Detail.tsx

+import React, { useState, useEffect,useRef} from 'react';
+import { Input ,Tabs,Row,Col, Button} from 'antd';
+const { TabPane } = Tabs;
+
+import {connect,history} from 'umi';
+
+
+import { RA } from '@/utils/method';
+import TitleBack from '@/components/TitleBack/TitleBack';
+const module="CellList"
+const Detail = (props:any) => {
+
+  const { dispatch, Data,DataSave} = props;
+  const formRef = useRef(null)
+
+  useEffect(()=>{
+    if (DataSave != null) {
+      console.log("初始化页面参数")      
+      console.log(DataSave);
+/*       
+      balouscheduleUrl: "Shelf_life_service.pdf"
+      cdkCode: 154952
+      cdkStatus: "0"
+      communityName: ""
+      count: 0
+      createTime: {date: 10, day: 4, hours: 22, minutes: 36, month: 8, …}
+      deleted: 0
+      description: ""
+      enable: 0
+      extend: ""
+      id: "a71a67d8ba0a43c0a46e73bf166d3484"
+      lifeServiceUrl: "小课堂课程表2020.08.07.pdf"
+      residentialAddress: "Tianhe"
+      residentialEmail: "sales@huahui.com"
+      residentialEndWorking: null
+      residentialFeeMethod: 0
+      residentialHotline: "2222-8888"
+      residentialHotlineName: "2222-8888"
+      residentialHotlineServieEndTime: null
+      residentialHotlineServieStartTime: null
+      residentialManagerUserName: "张主任"
+      residentialName: "ZERO Community"
+      residentialPhone: "2222-8888"
+      residentialStartWorking: null
+      residentialZipCode: "589647"
+      serviceGuideUrl: "propertyServiceGuide.pdf"
+      serviceProviderId: ""
+      serviceProviderName: ""
+      updateTime: */
+    }
+  }, [])
+  
+  // 小区名称，
+  // 详细地址，
+  // 工作时间 休息时间
+  // 小区联系电话 小区邮箱
+  // 小区管理员
+  // 物业费
+  // 楼巴时刻表 物业办事指南 保质期服务
+  // 帮助中心
+  // 临时到访码下载
+
+  return (
+    <div style={{ width: "100%", minWidth: 1020, padding: 34, backgroundColor: "#ffffff" }}>       
+      {
+        DataSave != null ?
+          <>
+            <TitleBack title="Community Detail"></TitleBack>
+            <Row gutter={8}>
+              <Col span={3}>小区名称:</Col>
+              <Col>{DataSave.residentialName}</Col>
+            </Row>
+
+            <Row gutter={8} style={{marginTop:16}}>
+              <Col span={3}>详细地址:</Col>
+              <Col>{DataSave.residentialAddress}</Col>
+            </Row>
+
+            <Row gutter={8} style={{marginTop:16}}>
+              <Col span={3}>小区联系电话:</Col>
+              <Col span={3}>{DataSave.residentialPhone}</Col>
+              <Col>小区邮箱:</Col>
+              <Col>{DataSave.residentialEmail}</Col>
+            </Row>
+
+            <Row gutter={8} style={{marginTop:16}}>
+              <Col span={3}>小区管理员:</Col>
+              <Col>{DataSave.residentialManagerUserName}</Col>
+            </Row>
+            <Row gutter={8} style={{marginTop:16}}>
+              <Col span={3}>物业费:</Col>
+              <Col>{DataSave.residentialAddress}</Col>
+            </Row>
+            <Row gutter={8} style={{marginTop:16}}>
+              <Col span={3}>楼巴时刻表:</Col>
+              <Col span={3}><a>{DataSave.balouscheduleUrl}</a></Col>
+              <Col>物业办事指南:</Col>
+              <Col span={3}><a>{DataSave.serviceGuideUrl}</a></Col>
+              <Col>保质期服务:</Col>
+              <Col span={3}><a>{DataSave.lifeServiceUrl}</a></Col>
+            </Row>     
+            <Row gutter={8} style={{marginTop:16}}>
+              <Col span={3}>帮助中心:</Col>
+              <Col>{DataSave.residentialHotline}</Col>
+              <Col>{DataSave.residentialHotlineName}</Col>
+            </Row> 
+            <Row gutter={8} style={{marginTop:16}}>
+              <Col span={3}>临时到访码:</Col>
+              <Col>{DataSave.residentialZipCode}</Col>
+            </Row> 
+
+            
+          </> : null
+      }
+    </div>
+  );
+};
+
+function map(state:any) {
+  const { Data,DataSave} = state[module]
+  return { Data,DataSave}
+}
+export default connect(map)(Detail);
\ No newline at end of file

src/pages/CommunityManagement/FacilityBookings/Bookings.tsx

@@ -17,6 +17,7 @@ const Bookings = (props:any) => {
   const { dispatch, Data3,Result,DataSave,token} = props;
   const RA = (index:any,values: any) => { dispatch({ type: 'FacilityBookings/RA', playload: { index: index, body: values } }) };
   const IA = () => { dispatch({ type: 'FacilityBookings/IA' }) };
+  const SAClear = () => { dispatch({ type: 'FacilityBookings/SA',playload:null }) };
   const ResultClear = () => { dispatch({ type: 'FacilityBookings/ResultClear' }) };
   
   const [comminityValues, setComminityValues] = useState(null);
@@ -58,6 +59,7 @@ const Bookings = (props:any) => {
 
 
   const getFacility = (values: any) => {
+    SAClear()
     setComminityValues(values)
     console.log(values)
     RA(1, { userToken: token, communityName: values })
@@ -146,7 +148,7 @@ const Bookings = (props:any) => {
         <div className={styles.box1item1}>Project</div>
         <div className={styles.box1item2}>
         <Spin spinning={loading} tip="Finding...">
-            <SearchOptionsCommnity placeholder={"Community Name"} defaultValue={DataSave != null ? DataSave.communityName : null} onSubmit={getFacility} />  
+            <SearchOptionsCommnity alone={true} placeholder={"Community Name"} defaultValue={DataSave != null ? DataSave.communityName : null} onSubmit={getFacility} />  
           </Spin>
           {/* <Input.Search style={{ width: 200, height: 32 }} onSearch={getFacility} loading={loading} defaultValue={}/> */}
         </div>

src/pages/CommunityManagement/FacilityBookings/FacilityBookings.tsx

@@ -73,8 +73,8 @@ const FacilityBookings = (props:any) => {
       ["Booking Schedule", "subscribeDate"],
       ["Fee", "managerFeeStatus",(text: any) => (<div>{managerFeeStatusDes[text]}</div>)],
       ["Deposit", "marginFeeStatus",(text: any) => (<div>{marginFeeStatusDes[text]}</div>)],
-      ["Status", "status",(text: any) => (<div>{statusDes[text]}</div>)],
-
+      ["Status", "status", (text: any) => (<div>{statusDes[text]}</div>)],
+      
       ["Actions",null, (text: any, record: any) => (<Space size="middle"> <a onClick={goToDetail.bind(this,record)}>Detail</a></Space>)],
     ]
     const key2 = [

src/pages/OrderManagement/Order.tsx

@@ -4,22 +4,25 @@ const { TabPane } = Tabs;
 
 import { connect, history } from 'umi';
 
-const orderStatus=[[0,"已发单"],[1,"待上门"],[2,"进行中"],[3,"已完成"],[4,"已取消"]]
+const orderStatus = [[0, "已发单"], [1, "待上门"], [2, "进行中"], [3, "已完成"], [4, "已取消"]]
+const goToDetail = () => {
+  
+}
 const columns = objectColumns([
   ["OrderNumber", "orderNumber"],
   ["Community", "communityName"],
   ["Owner Name", "ownerName"], 
   ["type", null, (text: any, record: any) => (<div>{orderStatus[record.orderStatus][1]}</div>)],
   ["Content", "serviceContent"], 
-  ["Order Time", null, (text: any, record: any) => (<div>{(record.order_send_time)}</div>)],  
-  ["Booking Time", null, (text: any, record: any) => (<div>{(record.order_reserve_time)}</div>)],  
-  ["Actions",null, (text: any, record: any) => (<Space size="middle"> <a>Detail</a></Space>)],
+  ["Order Time", null, (text: any, record: any) => (<div>{getStringToTime(record.orderSendTime)}</div>)],  
+  ["Booking Time", null, (text: any, record: any) => (<div>{getStringToTime(record.orderReserveTime)}</div>)],  
+  ["Actions",null, (text: any, record: any) => (<Space size="middle"> <a onClick={goToDetail.bind(this,record)}>Detail</a></Space>)],
 ])
 
 import { RA } from '@/utils/method';
 import { objectColumns } from '@/utils/string';
 import TitleSearch from '@/components/TitleSearch/TitleSearch';
-import { timestampToTime } from '@/utils/time';
+import { timestampToTime, getStringToTime } from '@/utils/time';
 
 
 const module="OrderManagement"
@@ -29,7 +32,19 @@ const Order = (props:any) => {
   const formRef = useRef(null)
   useEffect(() => {
     RA(30, {orderNumber:"",serviceType:"0"}, module, dispatch)
-  },[])
+  }, [])
+  // useEffect(() => {
+  //   if (Data != null) {
+  //     console.log("首页信息")
+  //     console.log(Data)
+  //   }
+  // },[Data])
+  const CallBackTitleSearch = (value: any) => {
+    
+    if (value.orderNumber != null || value.serviceType != null) {
+      RA(30, value, module, dispatch)
+    }
+  }
   return (
     <div style={{ width: "100%", minWidth: 1020, padding: 34, backgroundColor: "#ffffff" }}>      
 
@@ -37,11 +52,12 @@ const Order = (props:any) => {
         Data != null ? <>
           <TitleSearch
             status={[{
-              name: ["status", "订单状态"],
+              name: ["serviceType", "订单状态"],
               data: orderStatus
             }]}
-            listkey={['A', 'C']}
-            list={['Hello', 'world']}
+            listkey={['orderNumber']}
+            list={['订单号']}
+            onSubmit={CallBackTitleSearch}
           ></TitleSearch>
 
              <Table loading={false} rowKey="id" style={{ marginTop: 16 }}

src/pages/UserManagement/LIFEUserManagement/UsersDetail.tsx

@@ -111,7 +111,7 @@ const UsersDetail = (props:any) => {
         communityName: DataSave.communityName,
         unit: values
       }
-      RA(16, tmp);
+      RA(16, tmp);      
     }
   }
   const DeleteMember = () => {

src/pages/runTest/Template.tsx

@@ -33,9 +33,11 @@ const Guard = (props:any) => {
   return (
     <div className={styles.base}>
     
-        <TitleGet title={"Version 1.0.7"} />
+        <TitleGet title={"Version 1.0.9"} />
         <p>
         token:{page.token}
+        name:{getCookie("name")}
+        phone:{getCookie("phone")}
         </p>
       {/* <TableShow /> */}
       {/* <div>{token}</div>

src/services/tos.ts

@@ -93,7 +93,9 @@ const requestList = [
   ["/tos/contract/add", "27 合同新增和编辑"],
   ["/tos/tosCommunityNotic/add", "28 新增小区公告接口"],
   ["/tos/tosManageCommunity/save", "29 新建一个小区"],
-  ["/tos/tosOrder/get","30 获取订单详情"],
+  ["/tos/tosOrder/get", "30 获取订单详情"],
+  ["/tos/property/community/houseCard/query", "31 获取住户卡列表"],
+  ["/tos/tosManageCommunity/get/detail", "32 获取小区详情"],
 ]
 
 const params = [
@@ -111,6 +113,7 @@ export function RA(playload: any) {
   console.log(playload.index + "》【发送请求】" + url + " " + (requestList[playload.index])[1])
   console.log("参数如下：")
   console.log(playload.body)
+  console.log(JSON.stringify(playload.body))
   return requestAuto(url,playload.body)
 }
 

src/utils/method.ts

@@ -55,7 +55,7 @@ export const setCookie=(key:string,value: string)=>{
 
 
 export const RA = (index: any, values: any, module: string, dispatch: any) => { dispatch({ type: module + '/RA', playload: { index: index, body: values } }) };
-
+export const SA = (values: any, module: string, dispatch: any) => { dispatch({ type: module + '/SA', playload: values }) };
 // const reg = [["url", "categoriesImageUrl"], ["name", "categoriesName"]]
 // const values = [{ categoriesImageUrl: "http://url", categoriesName: "A9" },{ categoriesImageUrl: "http://url...", categoriesName: "A8" }]
 export const Fromate = (values:any,reg:any) => {

src/utils/time.ts

@@ -17,6 +17,22 @@ function addZero(time) {
   let tmp = time + 1 < 10 ? '0' + time : time
   return tmp
 }
+const month = ("Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sept,Oct,Nov,Dec").split(",")
+const MonthTurnNum = (values:any) => {
+  var i = 0;
+  month.map((item, index) => {
+    if (values == item) {
+      i=index+1
+    }
+  })  
+  return i
+}
+export const getStringToTime = (time:any) => {
+  var date = time.split(" ")
+  var result = addTZero(MonthTurnNum(date[0])) + "-" + addZero(parseInt(date[1].slice(0, date[1].length - 1))) + " " + date[2]
+  return result
+}
+
 // 03-06 13:26
 export const  timestampToTime3=(timestamp:any)=>{
   var date = new Date(timestamp);//*1000//getHours getMinutes getSeconds