@fle-ui/plus-choose-site-goods 1.1.2 → 1.1.4

package/es/index.js

@@ -61,9 +61,9 @@ import { QuestionCircleOutlined, LoadingOutlined } from '@ant-design/icons';
 import PlusConfigProvider from '@fle-ui/plus-config-provider';
 import Icon from './components/icon';
 import { tabs, tabsSearchParamsMap, priceRangeForOnce, priceRangeForPurchase, profitRangeForOnce, profitRangeForPurchase, sortOptions } from './utils/options';
+import api from './utils/api';
 import request from './utils/request';
 import { getApiHost } from './utils/serviceEnv';
-import api from './utils/api';
 import { showMoney } from './utils/common';
 import './index.less';
 var ChooseSiteGoods = function ChooseSiteGoods(props) {
@@ -199,7 +199,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     setLoading = _useState14[1];
   var getGoodsList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _searchParams$flagCat, _searchParams$saleabl, params, text, res, _res$data, _res$data2, list, jdGoods;
+      var _searchParams$flagCat, _searchParams$priceTy, _searchParams$priceTy2, _searchParams$saleabl, params, text, res, _res$data, _res$data2, list, jdGoods;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -218,7 +218,14 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
               flagTags: searchParams.flagTags,
               flagIndustry: searchParams.flagIndustry,
               flagCategory: ((_searchParams$flagCat = searchParams.flagCategory) === null || _searchParams$flagCat === void 0 ? void 0 : _searchParams$flagCat.length) ? searchParams.flagCategory[searchParams.flagCategory.length - 1] : undefined
-            }); // 价格区间
+            });
+            if ((_searchParams$priceTy = searchParams.priceType) === null || _searchParams$priceTy === void 0 ? void 0 : _searchParams$priceTy.includes('once')) {
+              params['isOnce'] = 1;
+            }
+            if ((_searchParams$priceTy2 = searchParams.priceType) === null || _searchParams$priceTy2 === void 0 ? void 0 : _searchParams$priceTy2.includes('purchase')) {
+              params['isPurchase'] = 1;
+            }
+            // 价格区间
             if (searchParams.priceRangeMin !== undefined) {
               params[searchParams.priceType + 'Min'] = Number(searchParams.priceRangeMin * 100);
             }
@@ -250,9 +257,9 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
             }
             // return;
             setLoading(true);
-            _context.next = 11;
+            _context.next = 13;
             return $http.post(api['getGoodsList'], params);
-          case 11:
+          case 13:
             res = _context.sent;
             if (res === null || res === void 0 ? void 0 : res.success) {
               list = (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [];
@@ -268,15 +275,15 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
                 getJdStock(list, jdGoods);
               }
             }
-          case 13:
-            _context.prev = 13;
+          case 15:
+            _context.prev = 15;
             setLoading(false);
-            return _context.finish(13);
-          case 16:
+            return _context.finish(15);
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0,, 13, 16]]);
+      }, _callee, null, [[0,, 15, 18]]);
     }));
     return function getGoodsList() {
       return _ref.apply(this, arguments);
@@ -975,7 +982,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     dataIndex: 'salePriceMin',
     key: 'salePriceMin',
     align: 'center',
-    width: 150,
     render: function render(text, record) {
       if ((record === null || record === void 0 ? void 0 : record.isPurchase) === 1) {
         var _record$purchaseInfo6, _record$purchaseInfo12;
@@ -1286,7 +1292,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     onCancel: onClose,
     styles: {
       body: {
-        padding: '0 16px'
+        padding: '16px 16px 0'
       }
     },
     className: "choose-site-goods-modal",

package/lib/index.js

@@ -14,9 +14,9 @@ var _icons = require("@ant-design/icons");
 var _plusConfigProvider = _interopRequireDefault(require("@fle-ui/plus-config-provider"));
 var _icon = _interopRequireDefault(require("./components/icon"));
 var _options = require("./utils/options");
+var _api = _interopRequireDefault(require("./utils/api"));
 var _request = _interopRequireDefault(require("./utils/request"));
 var _serviceEnv = require("./utils/serviceEnv");
-var _api = _interopRequireDefault(require("./utils/api"));
 var _common = require("./utils/common");
 require("./index.less");
 var _excluded = ["env", "token", "loginErrFn", "onClose", "siteId", "app", "multiple", "defaultSelectedGoodsIds", "onSelectOk", "showMore", "showMoreText", "tabsConfig", "hiddenColumns", "hiddenSearchProps"];
@@ -177,7 +177,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     setLoading = _useState14[1];
   var getGoodsList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _searchParams$flagCat, _searchParams$saleabl, params, text, res, _res$data, _res$data2, list, jdGoods;
+      var _searchParams$flagCat, _searchParams$priceTy, _searchParams$priceTy2, _searchParams$saleabl, params, text, res, _res$data, _res$data2, list, jdGoods;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -196,7 +196,14 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
               flagTags: searchParams.flagTags,
               flagIndustry: searchParams.flagIndustry,
               flagCategory: ((_searchParams$flagCat = searchParams.flagCategory) === null || _searchParams$flagCat === void 0 ? void 0 : _searchParams$flagCat.length) ? searchParams.flagCategory[searchParams.flagCategory.length - 1] : undefined
-            }); // 价格区间
+            });
+            if ((_searchParams$priceTy = searchParams.priceType) === null || _searchParams$priceTy === void 0 ? void 0 : _searchParams$priceTy.includes('once')) {
+              params['isOnce'] = 1;
+            }
+            if ((_searchParams$priceTy2 = searchParams.priceType) === null || _searchParams$priceTy2 === void 0 ? void 0 : _searchParams$priceTy2.includes('purchase')) {
+              params['isPurchase'] = 1;
+            }
+            // 价格区间
             if (searchParams.priceRangeMin !== undefined) {
               params[searchParams.priceType + 'Min'] = Number(searchParams.priceRangeMin * 100);
             }
@@ -228,9 +235,9 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
             }
             // return;
             setLoading(true);
-            _context.next = 11;
+            _context.next = 13;
             return $http.post(_api.default['getGoodsList'], params);
-          case 11:
+          case 13:
             res = _context.sent;
             if (res === null || res === void 0 ? void 0 : res.success) {
               list = (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [];
@@ -246,15 +253,15 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
                 getJdStock(list, jdGoods);
               }
             }
-          case 13:
-            _context.prev = 13;
+          case 15:
+            _context.prev = 15;
             setLoading(false);
-            return _context.finish(13);
-          case 16:
+            return _context.finish(15);
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0,, 13, 16]]);
+      }, _callee, null, [[0,, 15, 18]]);
     }));
     return function getGoodsList() {
       return _ref.apply(this, arguments);
@@ -953,7 +960,6 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     dataIndex: 'salePriceMin',
     key: 'salePriceMin',
     align: 'center',
-    width: 150,
     render: function render(text, record) {
       if ((record === null || record === void 0 ? void 0 : record.isPurchase) === 1) {
         var _record$purchaseInfo6, _record$purchaseInfo12;
@@ -1264,7 +1270,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     onCancel: onClose,
     styles: {
       body: {
-        padding: '0 16px'
+        padding: '16px 16px 0'
       }
     },
     className: "choose-site-goods-modal",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-choose-site-goods",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "@fle-ui/plus-choose-site-goods",
   "keywords": [
     "fle-ui",
@@ -28,7 +28,7 @@
     "@ant-design/icons": "^5.3.0",
     "@fle-tools/env": "^1.0.3",
     "@fle-ui/plus-address-selection": "^1.0.12",
-    "@fle-ui/plus-choose-mall-goods": "^1.1.2"
+    "@fle-ui/plus-choose-mall-goods": "^1.1.4"
   },
   "peerDependencies": {
     "antd": ">=4.23.0 || >=5.0.0",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e56b10c76831c3d57c62576452c07ae1cee01a8a"
+  "gitHead": "6900a3b541e1a24a85cc767a8b9b8247915f454c"
 }