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

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 14:58:08
  * @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();
@@ -463,7 +459,7 @@ var OrderList = function OrderList(_ref) {
         })
       })]
     }), /*#__PURE__*/_jsxs("main", {
-      className: "custom_box_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,
@@ -484,7 +480,7 @@ var OrderList = function OrderList(_ref) {
           })]
         })
       }), total > 0 && /*#__PURE__*/_jsx("div", {
-        className: "custom_box_page",
+        className: "custom_box_page ".concat(platform === PlatForm.FXG ? '' : 'custom_box_page_layout'),
         children: /*#__PURE__*/_jsx(Pagination, {
           showSizeChanger: false,
           showQuickJumper: true,
@@ -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 = [{
@@ -719,7 +716,7 @@ var PayOrderList = function PayOrderList(_ref5) {
         })
       })]
     }), /*#__PURE__*/_jsxs("div", {
-      className: "payment_box_main",
+      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,
@@ -742,7 +739,7 @@ var PayOrderList = function PayOrderList(_ref5) {
           })]
         })
       }), /*#__PURE__*/_jsx("div", {
-        className: "custom_box_page",
+        className: "custom_box_page ".concat(platform === PlatForm.FXG ? '' : 'custom_box_page_layout'),
         children: /*#__PURE__*/_jsx(Pagination, {
           showQuickJumper: true,
           showSizeChanger: false,

package/dist/esm/WorkOrder/index.less

@@ -1,3 +1,6 @@
+.order_container_padding_bottom {
+  padding-bottom: 40px;
+}
 .order_header {
   padding: 16px 16px 0 16px;
 
@@ -138,10 +141,15 @@
   }
 
   .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 - 298px);
+  }
 
   .custom_box_main_empty {
     display: flex;
@@ -154,10 +162,15 @@
   }
 
   .payment_box_main {
-    height: calc(100% - 173px);
     overflow: auto;
     background-color: #fafafa;
   }
+  .payment_box_main_feige {
+    height: calc(100vh - 196px);
+  }
+  .payment_box_main_other {
+    height: calc(100vh - 236px);
+  }
 
   .custom_box_page {
     display: flex;
@@ -167,6 +180,11 @@
     padding: 0 16px;
     background-color: #fff;
   }
+  .custom_box_page_layout {
+    position: fixed;
+    right: 0px;
+    bottom: 0px;
+  }
 }
 
 .footer {

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.6",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",