kmkf-work-order-service-component 0.1.5 → 0.1.7

package/dist/esm/WorkOrder/index.js

@@ -28,7 +28,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-16 11:19:43
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-25 14:00:49
+ * @LastEditTime: 2022-10-25 15:27:24
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *
@@ -76,11 +76,6 @@ var WorkOrder = function WorkOrder(props) {
       buyerId = props.buyerId,
       orderNo = props.orderNo;
   var dispatch = useAppDispatch();
-  var platformInfo = useAppSelector(function (state) {
-    var _state$global;
-
-    return (_state$global = state.global) === null || _state$global === void 0 ? void 0 : _state$global.platformInfo;
-  });
   var loading = useAppSelector(function (state) {
     var _state$workOrder;
 
@@ -132,7 +127,7 @@ var WorkOrder = function WorkOrder(props) {
   return /*#__PURE__*/_jsx(Spin, {
     spinning: loading,
     children: /*#__PURE__*/_jsxs("div", {
-      className: "order_container",
+      className: "order_container ".concat(platform === PlatForm.FXG ? '' : 'order_container_padding_bottom'),
       children: [/*#__PURE__*/_jsx("header", {
         className: "order_header",
         children: /*#__PURE__*/_jsxs("div", {
@@ -183,7 +178,8 @@ var OrderList = function OrderList(_ref) {
     return state.global.platformInfo;
   });
   var buyerNick = platformInfo.buyerNick,
-      buyerId = platformInfo.buyerId;
+      buyerId = platformInfo.buyerId,
+      platform = platformInfo.platform;
   var recordLogRef = useRef();
   var transferRef = useRef();
   var customizeFormRef = useRef();
@@ -462,9 +458,9 @@ var OrderList = function OrderList(_ref) {
           alt: ""
         })
       })]
-    }), /*#__PURE__*/_jsxs("main", {
-      className: "custom_box_main",
-      children: [orderList.length ? orderList.map(function (item) {
+    }), /*#__PURE__*/_jsx("main", {
+      className: "custom_box_main ".concat(platform === PlatForm.FXG ? 'custom_box_main_feige' : 'custom_box_main_other'),
+      children: orderList.length ? orderList.map(function (item) {
         return /*#__PURE__*/_jsx(ListOrderItem, {
           item: item,
           onEdit: onEdit,
@@ -483,20 +479,20 @@ var OrderList = function OrderList(_ref) {
             children: "\u6682\u65E0\u6570\u636E"
           })]
         })
-      }), total > 0 && /*#__PURE__*/_jsx("div", {
-        className: "custom_box_page",
-        children: /*#__PURE__*/_jsx(Pagination, {
-          showSizeChanger: false,
-          showQuickJumper: true,
-          showTotal: function showTotal(total) {
-            return "\u5171".concat(total, "\u6761");
-          },
-          current: customSearch.pageNo,
-          pageSize: customSearch.pageSize,
-          total: total,
-          onChange: onChangePage
-        })
-      })]
+      })
+    }), total > 0 && /*#__PURE__*/_jsx("div", {
+      className: "custom_box_page",
+      children: /*#__PURE__*/_jsx(Pagination, {
+        showSizeChanger: false,
+        showQuickJumper: true,
+        showTotal: function showTotal(total) {
+          return "\u5171".concat(total, "\u6761");
+        },
+        current: customSearch.pageNo,
+        pageSize: customSearch.pageSize,
+        total: total,
+        onChange: onChangePage
+      })
     }), /*#__PURE__*/_jsx(RecordLog, {
       ref: recordLogRef
     }), /*#__PURE__*/_jsx(TransferOrderModal, {
@@ -540,15 +536,16 @@ var PayOrderList = function PayOrderList(_ref5) {
     return state.workOrder.paySearch;
   });
   var platformInfo = useAppSelector(function (state) {
-    var _state$global2;
+    var _state$global;
 
-    return (_state$global2 = state.global) === null || _state$global2 === void 0 ? void 0 : _state$global2.platformInfo;
+    return (_state$global = state.global) === null || _state$global === void 0 ? void 0 : _state$global.platformInfo;
   });
   var shopList = useAppSelector(function (state) {
     return state.workOrder.userInfo.shopList;
   });
   var buyerNick = platformInfo.buyerNick,
-      buyerId = platformInfo.buyerId;
+      buyerId = platformInfo.buyerId,
+      platform = platformInfo.platform;
   var logRef = useRef();
   var payOrderRef = useRef();
   var PAY_STATUS = [{
@@ -718,9 +715,9 @@ var PayOrderList = function PayOrderList(_ref5) {
           alt: ""
         })
       })]
-    }), /*#__PURE__*/_jsxs("div", {
-      className: "payment_box_main",
-      children: [payOrderList.length ? payOrderList.map(function (item) {
+    }), /*#__PURE__*/_jsx("div", {
+      className: "payment_box_main ".concat(platform === PlatForm.FXG ? 'payment_box_main_feige' : 'payment_box_main_other'),
+      children: payOrderList.length ? payOrderList.map(function (item) {
         return /*#__PURE__*/_jsx(PayListOrderItem, {
           record: item,
           onRefresh: onSearch,
@@ -741,20 +738,20 @@ var PayOrderList = function PayOrderList(_ref5) {
             children: "\u6682\u65E0\u6570\u636E"
           })]
         })
-      }), /*#__PURE__*/_jsx("div", {
-        className: "custom_box_page",
-        children: /*#__PURE__*/_jsx(Pagination, {
-          showQuickJumper: true,
-          showSizeChanger: false,
-          showTotal: function showTotal(total) {
-            return "\u5171".concat(total, "\u6761");
-          },
-          current: paySearch.pageNo,
-          pageSize: paySearch.pageSize,
-          total: total,
-          onChange: onChangePage
-        })
-      })]
+      })
+    }), /*#__PURE__*/_jsx("div", {
+      className: "custom_box_page",
+      children: /*#__PURE__*/_jsx(Pagination, {
+        showQuickJumper: true,
+        showSizeChanger: false,
+        showTotal: function showTotal(total) {
+          return "\u5171".concat(total, "\u6761");
+        },
+        current: paySearch.pageNo,
+        pageSize: paySearch.pageSize,
+        total: total,
+        onChange: onChangePage
+      })
     }), /*#__PURE__*/_jsx(RecordModal, {
       ref: logRef
     }), /*#__PURE__*/_jsx(PayOrderModal, {

package/dist/esm/WorkOrder/index.less

@@ -31,7 +31,7 @@
 }
 
 .custom_box {
-  height: calc(100% - 58px);
+  // height: calc(100% - 58px);
 
   .custom_box_header {
     padding: 0 16px 16px 16px;
@@ -138,11 +138,18 @@
   }
 
   .custom_box_main {
-    height: calc(100vh - 273px);
     overflow: auto;
     background-color: #fafafa;
   }
 
+  .custom_box_main_other {
+    height: calc(100vh - 338px);
+  }
+
+  .custom_box_main_feige {
+    height: calc(100vh - 446px);
+  }
+
   .custom_box_main_empty {
     display: flex;
     align-items: center;
@@ -154,11 +161,18 @@
   }
 
   .payment_box_main {
-    height: calc(100% - 173px);
     overflow: auto;
     background-color: #fafafa;
   }
 
+  .payment_box_main_feige {
+    height: calc(100vh - 340px);
+  }
+
+  .payment_box_main_other {
+    height: calc(100vh - 236px);
+  }
+
   .custom_box_page {
     display: flex;
     justify-content: flex-end;

package/dist/esm/WorkOrder/model/servers/request.js

@@ -9,7 +9,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-09-06 09:29:34
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-19 19:17:36
+ * @LastEditTime: 2022-10-25 14:36:13
  */
 import { extend } from 'umi-request';
 import { message } from 'antd';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",