Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0 into develop

src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx

@@ -88,8 +88,8 @@ function ArrearsCar() {
                 <>
                     <span type="primary" style={{ display: 'block', textAlign: 'center' }} onClick={() => {
                         openModal();
-                        setCarId(record.car_id)
-                        searchDetail(record.car_id)
+                        setCarId(record.carId)
+                        searchDetail(record.carId)
                     }}>
                         <a>欠费详情</a>
                     </span>
@@ -278,7 +278,7 @@ function ArrearsCar() {
         },
     ];
     const [resultData, setResultData] = useState([])
-    const [detailData, setDetailData] = useState([{ index: '1' }])
+    const [detailData, setDetailData] = useState([])
     const [modalVisible, setModalVisible] = useState(false);
     const [total, setTotal] = useState(0);
     const [pageData, setPageData] = useState({
@@ -318,7 +318,7 @@ function ArrearsCar() {
         ajax({
             url: "/api/ope/record/get_arrearage_car_info",
             type: "get",
-            data: { carId: e },
+            data: { carId: e||carId },
         }).then((res) => {
             let { status, data, total } = res
             if (status == 20000) {

src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx

@@ -553,11 +553,11 @@ function CarInfo() {
         })
     }
     //基本信息详情
-    function searchDetail() {
+    function searchDetail(e) {
         ajax({
-            url: "/ope/car/get_base_info",
+            url: "/api/ope/car/get_base_info",
             type: "get",
-            data: { carId: carId },
+            data: { carId: e?.carId||carId },
         }).then((res) => {
             let { status, data, total } = res
             if (status == 20000) {
@@ -570,7 +570,7 @@ function CarInfo() {
         ajax({//绑定
             url: "/api/ope/car/get_bind_records",
             type: "get",
-            data: { carId: carId },
+            data: { carId: e?.carId||carId },
         }).then((res) => {
             let { status, data, total } = res
             if (status == 20000) {

src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx

@@ -539,6 +539,7 @@ function UserInfo() {
         setDetailVisible(true);
     }
     function changeKey(key) {
+        setResultData([])
         setTabKey(key);
     }
     //历史处理详情
@@ -602,7 +603,7 @@ function UserInfo() {
         ajax({//绑定认证
             url: "/api/ope/user/get_bind_car",
             type: "get",
-            data: { memberId: e.memberId },
+            data: { memberId: e?.memberId||memberId },
         }).then((res) => {
             let { status, data, total } = res
             if (status == 20000) {
@@ -669,10 +670,11 @@ function UserInfo() {
             if (status == 20000) {
                 if (data.list) {
                     setResultData(data.list)
+                    setTotal(data.total)
                 } else {
                     setResultData(data)
+                    setTotal(total)
                 }
-                //setTotal(total)
             } else {
                 setResultData([])
                 message.error(res.message)
@@ -864,7 +866,7 @@ function UserInfo() {
                     <div className="ltc-box-title"><div className="ltc-icon"></div>绑定认证</div>
                     <div className="ltc-content">
                         {
-                            baseData.bingCar ?
+                            baseData.bindCar ?
                                 bindData.map((e, index) => {
                                     return <div className="ltc-item ltc-item-bind">
                                         <div className="new-item">所属车辆-{index + 1}</div><div className="new-value"><a>{e.plate_color}:{e.plate_number}</a></div>
@@ -1151,7 +1153,7 @@ function UserInfo() {
             >
                 <div>
                     <div className="eae-modal-item">
-                        <img src={bigPic} width={1550} />
+                        <img src={bigPic} width={1500} />
                     </div>
                 </div>
             </Modal>