@fle-ui/plus-choose-mall-goods 1.1.2 → 1.1.3

package/es/index.js

@@ -52,10 +52,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } } return target; }
 import React, { useEffect, useState, useRef } from 'react';
+import PlusConfigProvider from '@fle-ui/plus-config-provider';
 import AddressSelection from '@fle-ui/plus-address-selection';
 import ProImage from '@fle-ui/plus-image';
 import { QuestionCircleOutlined, LoadingOutlined } from '@ant-design/icons';
-import PlusConfigProvider from '@fle-ui/plus-config-provider';
 import Icon from './components/icon';
 import ChangePrice from './components/changePrice';
 import { tabs, tabsSearchParamsMap, priceRangeForOnce, priceRangeForPurchase, profitRangeForOnce, profitRangeForPurchase, sortOptions } from './utils/options';
@@ -202,7 +202,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
     setLoading = _useState14[1];
   var getGoodsList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _searchParams$flagCat, _searchParams$saleabl, params, text, apiKey, res, _res$data, _res$data2, list, jdGoods;
+      var _searchParams$flagCat, _searchParams$priceTy, _searchParams$priceTy2, _searchParams$saleabl, params, text, apiKey, res, _res$data, _res$data2, list, jdGoods;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -222,7 +222,14 @@ var ChooseMallGoods = function ChooseMallGoods(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);
             }
@@ -258,9 +265,9 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
             apiKey = '';
             if (mode === 1) apiKey = 'getGoodsList';
             if (mode === 2) apiKey = 'getGoodsListForTemplate';
-            _context.next = 14;
+            _context.next = 16;
             return $http.post(api[apiKey], params);
-          case 14:
+          case 16:
             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) || [];
@@ -276,15 +283,15 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
                 getJdStock(list, jdGoods);
               }
             }
-          case 16:
-            _context.prev = 16;
+          case 18:
+            _context.prev = 18;
             setLoading(false);
-            return _context.finish(16);
-          case 19:
+            return _context.finish(18);
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0,, 16, 19]]);
+      }, _callee, null, [[0,, 18, 21]]);
     }));
     return function getGoodsList() {
       return _ref.apply(this, arguments);

package/lib/index.js

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
+var _plusConfigProvider = _interopRequireDefault(require("@fle-ui/plus-config-provider"));
 var _plusAddressSelection = _interopRequireDefault(require("@fle-ui/plus-address-selection"));
 var _plusImage = _interopRequireDefault(require("@fle-ui/plus-image"));
 var _icons = require("@ant-design/icons");
-var _plusConfigProvider = _interopRequireDefault(require("@fle-ui/plus-config-provider"));
 var _icon = _interopRequireDefault(require("./components/icon"));
 var _changePrice = _interopRequireDefault(require("./components/changePrice"));
 var _options = require("./utils/options");
@@ -182,7 +182,7 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
     setLoading = _useState14[1];
   var getGoodsList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _searchParams$flagCat, _searchParams$saleabl, params, text, apiKey, res, _res$data, _res$data2, list, jdGoods;
+      var _searchParams$flagCat, _searchParams$priceTy, _searchParams$priceTy2, _searchParams$saleabl, params, text, apiKey, res, _res$data, _res$data2, list, jdGoods;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -202,7 +202,14 @@ var ChooseMallGoods = function ChooseMallGoods(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);
             }
@@ -238,9 +245,9 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
             apiKey = '';
             if (mode === 1) apiKey = 'getGoodsList';
             if (mode === 2) apiKey = 'getGoodsListForTemplate';
-            _context.next = 14;
+            _context.next = 16;
             return $http.post(_api.default[apiKey], params);
-          case 14:
+          case 16:
             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) || [];
@@ -256,15 +263,15 @@ var ChooseMallGoods = function ChooseMallGoods(props) {
                 getJdStock(list, jdGoods);
               }
             }
-          case 16:
-            _context.prev = 16;
+          case 18:
+            _context.prev = 18;
             setLoading(false);
-            return _context.finish(16);
-          case 19:
+            return _context.finish(18);
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0,, 16, 19]]);
+      }, _callee, null, [[0,, 18, 21]]);
     }));
     return function getGoodsList() {
       return _ref.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-choose-mall-goods",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "@fle-ui/plus-choose-mall-goods",
   "keywords": [
     "fle-ui",
@@ -44,5 +44,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e56b10c76831c3d57c62576452c07ae1cee01a8a"
+  "gitHead": "961fbbdd6c0cbc39663350a77a01bd9b7131f246"
 }