优化组件文件目录

Musicminion · Musicminion · commit 5b5a6a150af7 · 2022-07-07T15:09:43.000+08:00
优雅，给我狠狠的优雅
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/src/App.js b/src/App.js
@@ -3,7 +3,6 @@ import LoginPage from "./view/login/LoginPage";
 import MainPage from "./view/MainPage";
 
 import LoginPageAbout from "./view/login/LoginPageAbout";
-import LoginShopRegisterPage from "./view/login/LoginPageRules";
 import LoginPageFeedBack from "./view/login/LoginPageFeedBack";
 import BookDetailPage from "./view/BookDetailPage";
 import SearchResultPage from "./view/SearchResultPage";
@@ -14,7 +13,6 @@ import SingleOrderComfirm from "./view/Order/singleOrderComfirm";
 import PrivateRoute from "./route/PrivateRoute";
 import OrderPay from "./view/Order/OrderPay";
 import myCart from "./view/iEbook/myCart";
-import ShopCartOrderComfirm from "./view/Order/shopCartOrderComfirm";
 import shopCartOrderComfirm from "./view/Order/shopCartOrderComfirm";
 import purchaseSuccess from "./view/Result/purchaseSuccess";
 import errorPage from "./view/Result/errorPage";
diff --git a/src/components/Modal/UserLocation.js b/src/components/Modal/UserLocation.js
@@ -1,7 +1,7 @@
 import React from "react";
 import {Button, Form, Input, Modal} from "antd";
 
-
+//  [对话框]
 //  [组件用途介绍]：用户支付订单前的，如果修改地址将会打开的对话框，对话框需要与父组件交互
 //  [组件使用场景]：用户支付订单的页面
 //  [功能详细介绍]：对话框常态是隐藏的，单机按钮打开对话框
diff --git a/src/components/Modal/UserOrderComfirm.js b/src/components/Modal/UserOrderComfirm.js
@@ -2,6 +2,11 @@ import React from "react";
 import {Button, Modal} from "antd";
 import {orderMakeFromShopCart} from "../../service/orderService";
 
+//  [对话框]
+//  [组件用途介绍]：用户订单确认的对话框
+//  [组件使用场景]：用户支付的对接
+//  [功能详细介绍]：对话框常态是隐藏的，单机按钮打开对话框
+
 
 class UserOrderComfirm extends React.Component{
     constructor(props) {
@@ -25,15 +30,14 @@ class UserOrderComfirm extends React.Component{
             this.setState({ loading: false, visible: false });
         }, 0);
 
-
         let orderInfo = {
             receivename :this.props.parentNode.state.receivename,
             phonenumber: this.props.parentNode.state.phonenumber,
             postcode: this.props.parentNode.state.postcode,
             receiveaddress : this.props.parentNode.state.receiveaddress,
         };
 
-        orderMakeFromShopCart(this.props.bookIDGroup,this.props.bookNumGroup,orderInfo,
+        orderMakeFromShopCart(this.props.bookIDGroup,this.props.bookNumGroup, orderInfo,
             (data) =>{
                 console.log(data);
                 if(data.status>=0)
diff --git a/src/components/Modal/UserRegister.js b/src/components/Modal/UserRegister.js
@@ -2,6 +2,8 @@ import React from 'react';
 import {Modal, Button, Form, Input, Checkbox, message} from 'antd';
 import {checkUserExit, userRegister} from "../../service/userService";
 
+
+//  [对话框]
 //  [组件用途介绍]：用户注册的对话框，里面内嵌一个表格，用户填写完成注册的信息，然后确认后可以向后端注册
 //  [组件使用场景]：登录页面的注册按钮，对接本组件
 //  [功能详细介绍]：对话框常态是隐藏的，单机按钮打开对话框
diff --git a/src/components/Table/orderItemTable.js b/src/components/Table/orderItemTable.js
@@ -2,8 +2,10 @@ import React from "react";
 import {Button, Image, Input, Space, Table, Tag} from "antd";
 import {SearchOutlined} from "@ant-design/icons";
 import Highlighter from "react-highlight-words";
-import {getAllOrderItem, getUserOrderItem} from "../../service/orderService";
 import { DatePicker} from 'antd';
+import {getAllOrderItem, getUserOrderItem} from "../../service/admin/adminService_order";
+
+
 const { RangePicker } = DatePicker;
 
 class OrderItemTable extends React.Component{
@@ -18,12 +20,11 @@ class OrderItemTable extends React.Component{
         };
 
         if(this.props.idAdmin){
-            getAllOrderItem((data)=>{
+            getAllOrderItem((data) => {
                 // console.log(data);
                 this.setState({
                     orderData:data.concat([])
                 });
-
             });
         }
         else {
diff --git a/src/components/Table/orderTable.js b/src/components/Table/orderTable.js
@@ -1,7 +1,8 @@
 import React from "react";
 import {Button, DatePicker, Image, Space, Table, Tag} from "antd";
-import {getAllOrder, getUserOrder} from "../../service/orderService";
+
 import {SearchOutlined} from "@ant-design/icons";
+import {getAllOrder, getUserOrder} from "../../service/admin/adminService_order";
 const { RangePicker } = DatePicker;
 
 //return <Table columns={columns} dataSource={data} pagination={false} />;
diff --git a/src/service/admin/adminService_order.js b/src/service/admin/adminService_order.js
@@ -0,0 +1,28 @@
+
+// 管理员
+import {apiURL} from "../../config/BaseConfig";
+import {postRequest} from "../../utils/ajax";
+
+// 管理员，获取所有订单项目数据
+export const getAllOrderItem =(callback) =>{
+
+    let url = apiURL + "/order/getAllOrderItem"
+    postRequest(url,{},callback);
+};
+
+export const getAllOrder =(callback) =>{
+
+    let url = apiURL + "/order/getAllOrder";
+    postRequest(url,{},callback);
+};
+
+export const getUserOrder = (callback) =>{
+    let url = apiURL + "/order/getUserOrder";
+    postRequest(url,{},callback);
+}
+
+
+export const getUserOrderItem = (callback) =>{
+    let url = apiURL + "/order/getUserOrderItem";
+    postRequest(url,{},callback);
+}
diff --git a/src/service/orderService.js b/src/service/orderService.js
@@ -69,27 +69,27 @@ export const orderMakeFromShopCart = (bookIDGroup, bookNumGroup,orderInfo,callBa
 
 
 
-// 管理员，获取所有订单项目数据
-export const getAllOrderItem =(callback) =>{
-
-    let url = apiURL + "/order/getAllOrderItem"
-    postRequest(url,{},callback);
-};
+// // 管理员，获取所有订单项目数据
+// export const getAllOrderItem =(callback) =>{
+//
+//     let url = apiURL + "/order/getAllOrderItem"
+//     postRequest(url,{},callback);
+// };
 
 // 管理员
-export const getAllOrder =(callback) =>{
-
-    let url = apiURL + "/order/getAllOrder";
-    postRequest(url,{},callback);
-};
-
-export const getUserOrder = (callback) =>{
-    let url = apiURL + "/order/getUserOrder";
-    postRequest(url,{},callback);
-}
-
-
-export const getUserOrderItem = (callback) =>{
-    let url = apiURL + "/order/getUserOrderItem";
-    postRequest(url,{},callback);
-}
+// export const getAllOrder =(callback) =>{
+//
+//     let url = apiURL + "/order/getAllOrder";
+//     postRequest(url,{},callback);
+// };
+
+// export const getUserOrder = (callback) =>{
+//     let url = apiURL + "/order/getUserOrder";
+//     postRequest(url,{},callback);
+// }
+//
+//
+// export const getUserOrderItem = (callback) =>{
+//     let url = apiURL + "/order/getUserOrderItem";
+//     postRequest(url,{},callback);
+// }
diff --git a/src/view/Order/shopCartOrderComfirm.js b/src/view/Order/shopCartOrderComfirm.js
@@ -12,6 +12,7 @@ import {getBookByID} from "../../service/bookservice";
 import UserOrderComfirm from "../../components/Modal/UserOrderComfirm";
 import BookShopCartRow from "../../components/Book/BookShopCartRow";
 import BookShopCartHead from "../../components/Book/BookShopCartHead";
+import OrderPayTable from "../../components/Table/orderPayTable";
 
 const { Step } = Steps;
 const { TabPane } = Tabs;
@@ -26,9 +27,27 @@ const reminderInfoCheck = type => {
 
 //
 class ShopCartOrderComfirm extends React.Component{
+    refOrderPayTable = null;
+
     constructor() {
         super();
+        reminderInfoCheck('warning');
+        this.state = {
+            receivename: LoginPassport.getNickName(),
+            phonenumber: LoginPassport.getUserTelephone(),
+            postcode : "400000",
+            receiveaddress: LoginPassport.getUserAddress(),
+        }
+    }
 
+    // ！这个函数下发给子组件，子组件操作父亲组件的页面的 用户订单信息！
+    infoChange = (receivename, phonenumber, postcode, receiveaddress) => {
+        this.setState({
+            receivename: receivename,
+            phonenumber: phonenumber,
+            postcode: postcode,
+            receiveaddress: receiveaddress,
+        });
     }
 
     render() {
@@ -38,14 +57,12 @@ class ShopCartOrderComfirm extends React.Component{
                 <div className="MainContentsCard_compact">
                     <div className="PayComfirm_TopArea">
                         <div className="PayComfirm_logoArea">
-                            <img src={LogoEBook} className="PayComfirm_logo"/>
+                            <img src={LogoEBook} className="PayComfirm_logo" alt={"logo"}/>
                         </div>
                         <div className="PayComfirm_StepArea">
                             <Steps current={0} className="PayComfirm_Step">
-                                <Step title="确认订单"/>
-                                <Step title="付款"/>
-                                <Step title="确认收货"/>
-                                <Step title="评价"/>
+                                <Step title="确认订单"/><Step title="付款"/>
+                                <Step title="确认收货"/><Step title="评价"/>
                             </Steps>
                         </div>
                     </div>
@@ -61,9 +78,7 @@ class ShopCartOrderComfirm extends React.Component{
                                 </Card>
 
                                 <Row>
-                                    <Col span={20}>
-
-                                    </Col>
+                                    <Col span={20}></Col>
                                     <Col span={2}>
                                         <UserLocation
                                             confirmChange = {this.infoChange}
@@ -79,19 +94,15 @@ class ShopCartOrderComfirm extends React.Component{
 
                         <Tabs defaultActiveKey="1">
                             <TabPane tab={<><AppstoreOutlined/>确认订单信息</>} key="1">
-                                <BookShopCartHead/>
+                                <OrderPayTable fromType={"shopCartBuy"} ref={this.refOrderPayTable}/>
+
 
-                                <>{this.orderItem}</>
                             </TabPane>
                         </Tabs>
 
                         <Row>
-                            <Col span={18}>
-
-                            </Col>
-                            <Col span={2}>
-                                <p className="payComfirmPriceTotalLabel">总价格：</p>
-                            </Col>
+                            <Col span={18}></Col>
+                            <Col span={2}><p className="payComfirmPriceTotalLabel">总价格：</p></Col>
                             <Col span={4}>
                                 <p className="payComfirmPriceTotalNum">
                                     ￥{this.state.allBookPrice.toFixed(2)}
@@ -100,22 +111,17 @@ class ShopCartOrderComfirm extends React.Component{
                         </Row>
 
                         <Row>
-                            <Col span={20}>
-
-                            </Col>
+                            <Col span={20}></Col>
                             <Col span={3}>
                                 <UserOrderComfirm
-                                    bookIDGroup={this.bookID}
-                                    bookNumGroup={this.bookNum}
-                                    parentNode={this}
+                                    bookIDGroup={this.bookID} bookNumGroup={this.bookNum} parentNode={this}
                                 />
                             </Col>
                         </Row>
 
                     </div>
                 </div>
-                <div className="clearOnly_compact">
-                </div>
+                <div className="clearOnly_compact"></div>
                 <div className="Pagefooter">
                     <p>CopyRight ©2022 All Rights Reserved.Developed By Zhang Ziqian.</p>
                 </div>
diff --git a/src/view/Order/singleOrderComfirm.js b/src/view/Order/singleOrderComfirm.js
