@fle-ui/plus-choose-site-goods 1.1.11 → 1.1.15-alpha.0

package/es/index.js

@@ -55,12 +55,12 @@ 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 _ from 'lodash';
 import ProImage from '@fle-ui/plus-image';
 import ChooseMallGoods from '@fle-ui/plus-choose-mall-goods';
 import AddressSelection from '@fle-ui/plus-address-selection';
 import { QuestionCircleOutlined, LoadingOutlined } from '@ant-design/icons';
 import PlusConfigProvider from '@fle-ui/plus-config-provider';
-import _ from 'lodash';
 import Icon from './components/icon';
 import { tabs, tabsSearchParamsMap, priceRangeForOnce, priceRangeForPurchase, profitRangeForOnce, profitRangeForPurchase, sortOptions } from './utils/options';
 import api from './utils/api';
@@ -121,13 +121,11 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     flagCategory: undefined,
     saleableCity: undefined // dgss可售卖城市
   };
-  // http ------------ begin
   var $http = request({
     baseUrl: getApiHost(env),
     token: token,
     loginErrFn: loginErrFn
   });
-  // http ------------ end
   useEffect(function () {
     if (env) {
       window.localStorage.setItem('env', env);
@@ -601,7 +599,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
   // 获取全局控制状态
   var getGoodControlInfo = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-      var res, _res$data3;
+      var res, _res$data3, _res$data4;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -611,8 +609,8 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
             res = _context7.sent;
             if (res === null || res === void 0 ? void 0 : res.success) {
               setShow({
-                priceShow: ((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.customer_mall_cost_price_show) == '1' ? true : false,
-                supplierShow: true
+                priceShow: ((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.internal_mall_cost_price_show) == '1' ? true : false,
+                supplierShow: ((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.internal_mall_supplier_name_show) == '1' ? true : false
               });
             }
           case 4:

package/lib/index.js

@@ -7,12 +7,12 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
+var _lodash = _interopRequireDefault(require("lodash"));
 var _plusImage = _interopRequireDefault(require("@fle-ui/plus-image"));
 var _plusChooseMallGoods = _interopRequireDefault(require("@fle-ui/plus-choose-mall-goods"));
 var _plusAddressSelection = _interopRequireDefault(require("@fle-ui/plus-address-selection"));
 var _icons = require("@ant-design/icons");
 var _plusConfigProvider = _interopRequireDefault(require("@fle-ui/plus-config-provider"));
-var _lodash = _interopRequireDefault(require("lodash"));
 var _icon = _interopRequireDefault(require("./components/icon"));
 var _options = require("./utils/options");
 var _api = _interopRequireDefault(require("./utils/api"));
@@ -99,13 +99,11 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
     flagCategory: undefined,
     saleableCity: undefined // dgss可售卖城市
   };
-  // http ------------ begin
   var $http = (0, _request.default)({
     baseUrl: (0, _serviceEnv.getApiHost)(env),
     token: token,
     loginErrFn: loginErrFn
   });
-  // http ------------ end
   (0, _react.useEffect)(function () {
     if (env) {
       window.localStorage.setItem('env', env);
@@ -579,7 +577,7 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
   // 获取全局控制状态
   var getGoodControlInfo = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
-      var res, _res$data3;
+      var res, _res$data3, _res$data4;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -589,8 +587,8 @@ var ChooseSiteGoods = function ChooseSiteGoods(props) {
             res = _context7.sent;
             if (res === null || res === void 0 ? void 0 : res.success) {
               setShow({
-                priceShow: ((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.customer_mall_cost_price_show) == '1' ? true : false,
-                supplierShow: true
+                priceShow: ((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.internal_mall_cost_price_show) == '1' ? true : false,
+                supplierShow: ((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.internal_mall_supplier_name_show) == '1' ? true : false
               });
             }
           case 4:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fle-ui/plus-choose-site-goods",
-  "version": "1.1.11",
+  "version": "1.1.15-alpha.0",
   "description": "@fle-ui/plus-choose-site-goods",
   "keywords": [
     "fle-ui",
@@ -27,8 +27,8 @@
   "dependencies": {
     "@ant-design/icons": "^5.3.0",
     "@fle-tools/env": "^1.0.3",
-    "@fle-ui/plus-address-selection": "^1.0.14",
-    "@fle-ui/plus-choose-mall-goods": "^1.1.11"
+    "@fle-ui/plus-address-selection": "^1.0.15",
+    "@fle-ui/plus-choose-mall-goods": "^1.1.15-alpha.0"
   },
   "peerDependencies": {
     "antd": ">=4.23.0 || >=5.0.0",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f5a34365f0ab189629c08301c00018edb7243bc2"
+  "gitHead": "7a7bd43ac08bdf95ee9040639078b87d121df077"
 }