feat:接口对接

src/api/index.ts

@@ -3,8 +3,8 @@ import axios from 'axios'
 axios.defaults.headers['Content-Type'] = 'application/json;charset=UTF-8'; 
 
 // 后端地址
-// const baseURL = 'http://192.168.30.239:5000'
-const baseURL = 'https://base.exploring.cn/test-engine-user-center'
+const baseURL = 'http://192.168.30.83:8989'
+//const baseURL = 'https://base.exploring.cn/test-engine-user-center'
 // const baseURL = 'https://base.exploring.cn/wecom-server'
 
 // 创建 axios 实例
@@ -124,4 +124,11 @@ export const updateBaseInfoFromCompanyWx = async (data:any) => {
   const response = await api.post('/user_center/updateBaseInfoFromCompanyWx', data)
   return response.data;
 }
+// 获取订单信息
+export const getOrderInfoByWxId = async (params:any) => {
+  const response = await api.get('/user_center/getOrderInfoByWxId', {
+    params
+  })
+  return response.data;
+}
 export default api

src/pages/Home.tsx

 import React, {FC, useEffect, useState} from "react";
 import Cookies from "js-cookie";
-import {getBaseInfoByWxId,addWxLabel,getWxLabel,deleteWxLabel,updateBaseInfoFromCompanyWx} from "../api";
+import {getBaseInfoByWxId,addWxLabel,getWxLabel,deleteWxLabel,updateBaseInfoFromCompanyWx,getOrderInfoByWxId} from "../api";
 import {Spin,Form, Input, Button, Select,Radio,Tag} from "antd";
 import { SearchOutlined,DownOutlined,UpOutlined,RightOutlined,LeftOutlined } from '@ant-design/icons';
 import './../css/home.css'
 // import jt from './../assets/images/jt.png'
 import {jsSdk} from "../index"
-import {Link} from "react-router-dom";
+import {useHistory,Link ,withRouter} from "react-router-dom";
 // import { spawn } from "child_process";
 
 const Home: FC = () => {
+  const history = useHistory()
   const [loading] = useState<boolean>(false);
   const [userId, setUserId] = useState<any>('');
   const [customInfoEdit,setCustomInfoEdit] = useState<boolean>(false);
@@ -50,14 +51,14 @@ const Home: FC = () => {
       "4":'其它'
     }
 ) 
-const [orderList] = useState<any>(
+const [orderList,setOrderList] = useState<any>(
   [
     {
       name:'戈有好物',
       price:"2345.23"
     },
     {
-      name:'缤纷逍客',
+      name:'纷享销客',
       price:"12.09万"
     },
     {
@@ -79,6 +80,7 @@ const [gyqList] = useState<any>(
   ]
 )
   const { Option } = Select;
+const [orderInfo,setOrderInfo]=useState<any>([])
 
 const layout = {
   labelCol: { span: 8 },
@@ -163,6 +165,7 @@ const layout = {
     if(userInfo.data && userInfo.data.labelList){
       setLabels([...userInfo.data.labelList])
     }
+    getorderInfo(res.userId)
   }
   const getWxLabels = async ()=>{
     let data:any={
@@ -202,12 +205,32 @@ const layout = {
   // const onSearch=()=>{
     
   // }
-
+  //获取订单信息
+  const getorderInfo = async (id:any) => {
+    // const res = await jsSdk.invoke<{ userId?: string }>('getCurExternalContact', {})
+    // if (!res || !res.userId) return
+    // setUserId(res.userId)
+    let data:any = {wxId:id}
+    const orderInfo = await getOrderInfoByWxId(data)
+    let orderItem = [...orderList]
+    orderItem[2].price = orderInfo.data.clientOrderPrice
+    orderItem[1].price = orderInfo.data.fxxkPrice
+    orderItem[0].price = orderInfo.data.gyhwPrice
+    setOrderList(orderItem)
+    setOrderInfo(orderInfo.data)
+    
+  }
+  const Goto = async ()=>{
+    console.log(orderInfo,"ddddddddddddddd")
+    // // 页面跳转方法
+    history.push({pathname: '/Order', state: { orderInfo }})
+  }
   useEffect(() => {
     getUserInfo();
     getExternalUserInfo()
     getWxLabels()
-  }, )
+    
+  },[] )
   // const { getFieldsValue,getFieldDecorator } = this.props.form;
 
   return (
@@ -402,7 +425,7 @@ const layout = {
             <p className='word'>订单信息</p>
             {/* <img src={jt} alt="" className="more" onClick={testClick}/> */}
             
-            <Link to="/order"><div className="more"><RightOutlined /></div></Link>
+            <div className="more" onClick={Goto}><RightOutlined /></div>
           </div>
           <div className="order">
             {
@@ -411,7 +434,7 @@ const layout = {
                       <span className="blackWord">{item.name}</span>
                       <p>
                         <span className='greyWord'>订单总额：</span>
-                        <span className='greenWord mgr50'>{item.price}元</span>
+                        <span className='greenWord mgr50'>{item.price}</span>
                       </p>
                 </div>
               )

src/pages/Order.tsx

 import * as React from 'react'
-import {useState} from 'react'
+import {FC, useEffect, useState}from 'react'
 import {LeftOutlined,DownOutlined,RightOutlined } from '@ant-design/icons';
 import './../css/order.css'
 import { useHistory,Link ,withRouter} from 'react-router-dom'
 
 
 const Order: React.FC = () => {
-  const history = useHistory()
+  const history:any = useHistory()
   const [openFlag, setOpenFlag] = useState<any>([true,false,false,false])
   const [customData, setCustomData] = useState<any>([
     {
@@ -23,17 +23,28 @@ const Order: React.FC = () => {
       team:'AB队'
     }
   ])
+  const [orderInfo,setOrderInfo]=useState<any>([])
   const open = async (index:any)=>{
         let arr = [...openFlag]
         arr[index] = !arr[index]
         setOpenFlag(arr)
     
   }
-  const Goto = async (props:any,id:any)=>{
+  //路由跳转过来携带的数据
+  const GetRouterData = async ()=>{
+    console.log(history, 'props')
+    setOrderInfo(history.location.state.orderInfo)
+    setCustomData(history.location.state.orderInfo.clientOrderInfos)
+    debugger
+  }
+  const Goto = async (props:any,userItem:any)=>{
     // // 页面跳转方法
-    history.push({pathname: '/Person', state: { id }})
+    history.push({pathname: '/Person', state: { userItem }})
   }
-
+  useEffect(() => {
+    GetRouterData();
+    
+  },[] )
   return (
     <div>
       <div className="orderItem"><LeftOutlined/>订单信息</div>
@@ -51,13 +62,13 @@ const Order: React.FC = () => {
             <div className="flex spaceBetween pad20">
               <div className="game">
                 <p className='greyWord'>赛事名称</p>
-                <p>{e.name}</p>
+                <p>{e.gobiName}</p>
               </div>
               <div className="game">
                 <p className='greyWord'>分组</p>
-                <p>{e.team}</p>
+                <p>{e.rolesName}</p>
               </div>
-              <div className="jt" onClick={Goto.bind(this,e.id)}><RightOutlined/></div>
+              <div className="jt" onClick={Goto.bind(this,e)}><RightOutlined/></div>
             </div>
           ):null
         }

src/pages/person.tsx

@@ -8,7 +8,7 @@ import { useHistory} from 'react-router-dom'
 
 const Person: React.FC = () => {
 
-  const location = useHistory()
+  const location:any = useHistory()
   const [customData, setCustomData] = useState<any>({
     id:33599
   })
@@ -18,10 +18,12 @@ const Person: React.FC = () => {
 //路由跳转过来携带的数据
   const GetRouterData = async ()=>{
     console.log(location, 'props')
+    debugger
+    setCustomData(location.location.state.userItem)
   }
   useEffect(() => {
     GetRouterData()
-  }, )
+  }, [])
   return (
     <div>
       {/* <Top text={'dddd'}/> */}
@@ -34,15 +36,15 @@ const Person: React.FC = () => {
         </div>
         <div className="flex spaceBetween">
           <p className='leftword'>证件姓名：</p>
-          <p className='rightword'>{customData.id}</p>
+          <p className='rightword'>{customData.idCardName}</p>
         </div>
         <div className="flex spaceBetween">
           <p className='leftword'>出生日期：</p>
-          <p className='rightword'>{customData.id}</p>
+          <p className='rightword'>{customData.birthDay}</p>
         </div>
         <div className="flex spaceBetween">
           <p className='leftword'>微信号：</p>
-          <p className='rightword'>{customData.id}</p>
+          <p className='rightword'>{customData.wxId}</p>
         </div>
         <div className="flex spaceBetween">
           <p className='leftword'>赛事名称：</p>
@@ -80,11 +82,6 @@ const Person: React.FC = () => {
           <p className='leftword'>昵称：</p>
           <p className='rightword'>{customData.id}</p>
         </div>
-
-        <div className="flex spaceBetween">
-          <p className='leftword'>性别：</p>
-          <p className='rightword'>{customData.id}</p>
-        </div>
         <div className="flex spaceBetween">
           <p className='leftword'>头像：</p>
           <img className='avatar' alt="" src=""></img>