tplus-member 3.56.6 → 3.57.1

package/dist/api.js

@@ -183,38 +183,6 @@ var API = function () {
 
             return getPosStorageRule;
         }()
-        // 获取可用额度
-
-    }, {
-        key: 'getStorageLimitAmount',
-        value: function () {
-            var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
-                var res;
-                return _regenerator2.default.wrap(function _callee5$(_context5) {
-                    while (1) {
-                        switch (_context5.prev = _context5.next) {
-                            case 0:
-                                _context5.next = 2;
-                                return (0, _tplusApi.ccApi)({}, '/marketingtool/storageLimit/statistics/', false, false, { method: 'get' });
-
-                            case 2:
-                                res = _context5.sent;
-                                return _context5.abrupt('return', res);
-
-                            case 4:
-                            case 'end':
-                                return _context5.stop();
-                        }
-                    }
-                }, _callee5, this);
-            }));
-
-            function getStorageLimitAmount() {
-                return _ref5.apply(this, arguments);
-            }
-
-            return getStorageLimitAmount;
-        }()
     }]);
     return API;
 }();

package/dist/api.js.map

@@ -1 +1 @@
-{"version":3,"sources":["tplus-member/api.js"],"names":["API","props","param","voucherViewInfo","storeID","dto","parameter","StorageDetails","ThisStorageAmount","Member","Code","result","memberId","resp","method","res"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;;;IACMA,G;AACF,iBAAYC,KAAZ,EAAmB;AAAA;AAAG;;;;;;;;;;;AAGZC,qC,GAAQ;AACV,mDAAe;AADL,iC;;uCAGgB,oBAAKA,KAAL,EAAY,wDAAZ,EAAsE,KAAtE,EAA6E,KAA7E,C;;;AAAxBC,+C;iEACCA,e;;;;;;;;;;;;;;;;;AAGX;;;;;;;;mHAI6BC,O;;;;;;uCACZ,oBAAK,EAAEA,gBAAF,EAAL,EAAkB,uDAAlB,EAA2E,KAA3E,EAAkF,KAAlF,C;;;;;;;;;;;;;;;;;;;;AAGjB;;;;;;;mHAG2BC,G;;;;;;oCAElBA,G;;;;;;;;;uCAIc,oBACf;AACIC,+CAAW,yBAAe,EAAE,qBAAqBD,IAAIE,cAAJ,CAAmB,CAAnB,EAAsBC,iBAA7C,EAAgE,cAAcH,IAAII,MAAJ,CAAWC,IAAzF,EAAf;AADf,iCADe,EAIf,yDAJe,EAKf,KALe,EAMf,KANe,C;;;AAAfC,sC;kEASGA,M;;;;;;;;;;;;;;;;AAEX;;;;;mHACwBC,Q;;;;;;;uCAOH,qBAAMA,QAAN,EACb,gDADa,EAEb,KAFa,EAGb,KAHa,C;;;AAAbC,oC;kEAKGA,I;;;;;;;;;;;;;;;;AAEX;;;;;;;;;;;;uCAEsB,qBAAM,EAAN,EAAU,yCAAV,EAAqD,KAArD,EAA4D,KAA5D,EAAmE,EAAEC,QAAQ,KAAV,EAAnE,C;;;AAAZC,mC;kEACCA,G;;;;;;;;;;;;;;;;;;;;kBAKA,IAAIf,GAAJ,E","file":"api.js","sourcesContent":["import { tApi, ccApi } from 'tplus-api';\nimport { platform } from 'mutants-util';\nimport memberStore from './member/api';\nclass API {\n    constructor(props) { }\n\n    async getMemberVoucherDataInfo() {\n        const param = {\n            \"vouchername\": \"MemberStorage\"\n        }\n        const voucherViewInfo = await tApi(param, 'chanjet.RE.INewRetailVoucherService.GetVoucherDataInfo', false, false);\n        return voucherViewInfo;\n    }\n\n    /**\n     * 获取储值业务员\n     * @param {*} storeID \n     */\n    async getPersonDTOsByStoreID(storeID) {\n        return await tApi({ storeID }, 'chanjet.AA.DR.INewRetailMember.GetPersonDTOsByStoreID', false, false);\n    }\n\n    /**\n    * 获取本次赠送金额\n    */\n    async GetThisPresentAmount(dto) {\n\n        if (!dto) {\n            return;\n        }\n\n        let result = await tApi(\n            {\n                parameter: JSON.stringify({ 'ThisStorageAmount': dto.StorageDetails[0].ThisStorageAmount, \"memberCode\": dto.Member.Code })\n            },\n            \"chanjet.ME.INewRetailMemberStorage.GetThisPresentAmount\",\n            false,\n            false\n        );\n\n        return result;\n    }\n    /** 获取会员储值相关信息 */\n    async getPosStorageRule(memberId) {\n        // let resp = await ccApi(memberId,\n        //     \"/marketingtool/MeStorageCard/getPosStorageRule\",\n        //     false,\n        //     false,\n        // );\n        // return resp;\n        let resp = await ccApi(memberId,\n            \"/marketingtool/MeStorageCard/getPosStorageRule\",\n            false,\n            false,\n        );\n        return resp;\n    }\n    // 获取可用额度\n    async getStorageLimitAmount() {\n        const res = await ccApi({}, '/marketingtool/storageLimit/statistics/', false, false, { method: 'get' });\n        return res;\n    }\n\n}\n\nexport default new API;"]}
+{"version":3,"sources":["tplus-member/api.js"],"names":["API","props","param","voucherViewInfo","storeID","dto","parameter","StorageDetails","ThisStorageAmount","Member","Code","result","memberId","resp"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;;;;;IACMA,G;AACF,iBAAYC,KAAZ,EAAmB;AAAA;AAAG;;;;;;;;;;;AAGZC,qC,GAAQ;AACV,mDAAe;AADL,iC;;uCAGgB,oBAAKA,KAAL,EAAY,wDAAZ,EAAsE,KAAtE,EAA6E,KAA7E,C;;;AAAxBC,+C;iEACCA,e;;;;;;;;;;;;;;;;;AAGX;;;;;;;;mHAI6BC,O;;;;;;uCACZ,oBAAK,EAAEA,gBAAF,EAAL,EAAkB,uDAAlB,EAA2E,KAA3E,EAAkF,KAAlF,C;;;;;;;;;;;;;;;;;;;;AAGjB;;;;;;;mHAG2BC,G;;;;;;oCAElBA,G;;;;;;;;;uCAIc,oBACf;AACIC,+CAAW,yBAAe,EAAE,qBAAqBD,IAAIE,cAAJ,CAAmB,CAAnB,EAAsBC,iBAA7C,EAAgE,cAAcH,IAAII,MAAJ,CAAWC,IAAzF,EAAf;AADf,iCADe,EAIf,yDAJe,EAKf,KALe,EAMf,KANe,C;;;AAAfC,sC;kEASGA,M;;;;;;;;;;;;;;;;AAEX;;;;;mHACwBC,Q;;;;;;;uCAOH,qBAAMA,QAAN,EACb,gDADa,EAEb,KAFa,EAGb,KAHa,C;;;AAAbC,oC;kEAKGA,I;;;;;;;;;;;;;;;;;;;;kBAIA,IAAIb,GAAJ,E","file":"api.js","sourcesContent":["import { tApi, ccApi } from 'tplus-api';\nimport { platform } from 'mutants-util';\nimport memberStore from './member/api';\nclass API {\n    constructor(props) { }\n\n    async getMemberVoucherDataInfo() {\n        const param = {\n            \"vouchername\": \"MemberStorage\"\n        }\n        const voucherViewInfo = await tApi(param, 'chanjet.RE.INewRetailVoucherService.GetVoucherDataInfo', false, false);\n        return voucherViewInfo;\n    }\n\n    /**\n     * 获取储值业务员\n     * @param {*} storeID \n     */\n    async getPersonDTOsByStoreID(storeID) {\n        return await tApi({ storeID }, 'chanjet.AA.DR.INewRetailMember.GetPersonDTOsByStoreID', false, false);\n    }\n\n    /**\n    * 获取本次赠送金额\n    */\n    async GetThisPresentAmount(dto) {\n\n        if (!dto) {\n            return;\n        }\n\n        let result = await tApi(\n            {\n                parameter: JSON.stringify({ 'ThisStorageAmount': dto.StorageDetails[0].ThisStorageAmount, \"memberCode\": dto.Member.Code })\n            },\n            \"chanjet.ME.INewRetailMemberStorage.GetThisPresentAmount\",\n            false,\n            false\n        );\n\n        return result;\n    }\n    /** 获取会员储值相关信息 */\n    async getPosStorageRule(memberId) {\n        // let resp = await ccApi(memberId,\n        //     \"/marketingtool/MeStorageCard/getPosStorageRule\",\n        //     false,\n        //     false,\n        // );\n        // return resp;\n        let resp = await ccApi(memberId,\n            \"/marketingtool/MeStorageCard/getPosStorageRule\",\n            false,\n            false,\n        );\n        return resp;\n    }\n}\n\nexport default new API;"]}

package/dist/member/ShopMember.js

@@ -101,8 +101,6 @@ var _MemberCardList2 = _interopRequireDefault(_MemberCardList);
 
 var _mutantsAppfx = require('mutants-appfx');
 
-var _tplusHardware = require('tplus-hardware');
-
 var _mobx = require('mobx');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -858,7 +856,9 @@ var ShopMember = (_temp = _class = function (_Component) {
       lastRetailList: [], // 最近购买列表
       lastRetailTotal: 0, // 最近购买的总数量
       lastRetailPageNo: 0, // 最近购买的当前页，默认0开始
-      lastRetailLoading: false // 是否正在加载购买记录
+      lastRetailLoading: false, // 是否正在加载购买记录
+      connectCardStatus: false, //连接IC卡状态
+      connectCardError: '' //连接IC卡错误后记录错误信息
     };
     _this2.ms = _api2.default;
     _this2.handleReadICard = _this2.handleReadICard.bind(_this2);
@@ -882,7 +882,7 @@ var ShopMember = (_temp = _class = function (_Component) {
       //     }
       //   }
       // });
-      _tplusHardware.rfCard.connectRfCard();
+      this.connectRfCard();
       window.addEventListener('resize', this.windowOnresize);
       var _props = this.props,
           viewMemberInfo = _props.viewMemberInfo,
@@ -935,40 +935,56 @@ var ShopMember = (_temp = _class = function (_Component) {
 
 
     //IC卡读取
-    value: function () {
-      var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4() {
-        var result;
-        return _regenerator2.default.wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _context4.next = 2;
-                return _tplusHardware.rfCard.readRfCard();
-
-              case 2:
-                result = _context4.sent;
+    value: function readRfCard() {
+      var _this4 = this;
 
-                if (result) {
-                  this.setState({
-                    searchValue: result
-                  });
-                  this.handleSearchClick(result);
-                }
+      //客户端环境下，并开启了启用IC卡。
+      if (this.hasElectron === true && this.iCCardServer === 1) {
+        var _state2 = this.state,
+            connectCardStatus = _state2.connectCardStatus,
+            connectCardError = _state2.connectCardError;
 
-              case 4:
-              case 'end':
-                return _context4.stop();
-            }
+        if (connectCardStatus === false) {
+          _tplusComponentsTouch.Message.error(connectCardError ? connectCardError : '读取IC卡失败');
+          this.connectRfCard(); //读取失败后，重新连接一下。
+          return;
+        }
+        var params = { cardPsw: this.iCCardPassword, cardSec: 13, cardKm: 0 };
+        _mutantsMicrofx.nativeMs.setIpcRendererMethod('ReadRfCard', (0, _extends3.default)({}, params), function (ret) {
+          if (ret.status === 0) {
+            _tplusComponentsTouch.Message.error(ret.value);
+            _this4.connectRfCard(); //读取失败后，重新连接一下。
+            return;
+          } else if (ret.status === 1) {
+            _this4.setState({
+              searchValue: ret.value
+            });
+            _this4.handleSearchClick(ret.value);
           }
-        }, _callee4, this);
-      }));
-
-      function readRfCard() {
-        return _ref12.apply(this, arguments);
+        });
       }
+    }
 
-      return readRfCard;
-    }()
+    //IC卡连接
+
+  }, {
+    key: 'connectRfCard',
+    value: function connectRfCard() {
+      var _this5 = this;
+
+      //客户端环境下，并开启了启用IC卡。
+      if (this.hasElectron === true && this.iCCardServer === 1) {
+        _mutantsMicrofx.nativeMs.setIpcRendererMethod('ConnectRfCard', null, function (ret) {
+          var result = {};
+          if (ret.status === 0) {
+            result = { connectCardStatus: false, connectCardError: ret.value };
+          } else {
+            result = { connectCardStatus: true, connectCardError: '' };
+          }
+          _this5.setState(result);
+        });
+      }
+    }
 
     //移动端：扫描商品
 
@@ -978,28 +994,28 @@ var ShopMember = (_temp = _class = function (_Component) {
 
     // 获取会员的卡信息
     value: function () {
-      var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(memberId) {
+      var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(memberId) {
         var cardInfo, _cardInfo$data, data;
 
-        return _regenerator2.default.wrap(function _callee5$(_context5) {
+        return _regenerator2.default.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context5.prev = _context5.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
-                _context5.next = 2;
+                _context4.next = 2;
                 return this.ms.getCardInfoByMemberId(memberId);
 
               case 2:
-                _context5.t0 = _context5.sent;
+                _context4.t0 = _context4.sent;
 
-                if (_context5.t0) {
-                  _context5.next = 5;
+                if (_context4.t0) {
+                  _context4.next = 5;
                   break;
                 }
 
-                _context5.t0 = {};
+                _context4.t0 = {};
 
               case 5:
-                cardInfo = _context5.t0;
+                cardInfo = _context4.t0;
                 _cardInfo$data = cardInfo.data, data = _cardInfo$data === undefined ? [] : _cardInfo$data;
 
                 this.setState({
@@ -1008,14 +1024,14 @@ var ShopMember = (_temp = _class = function (_Component) {
 
               case 8:
               case 'end':
-                return _context5.stop();
+                return _context4.stop();
             }
           }
-        }, _callee5, this);
+        }, _callee4, this);
       }));
 
       function getCardInfoByMemberId(_x9) {
-        return _ref13.apply(this, arguments);
+        return _ref12.apply(this, arguments);
       }
 
       return getCardInfoByMemberId;
@@ -1039,7 +1055,7 @@ var ShopMember = (_temp = _class = function (_Component) {
   }, {
     key: 'render',
     value: function render() {
-      var _this4 = this;
+      var _this6 = this;
 
       var isUserAndroidKey = !!window.android_setKeyBoard;
 
@@ -1047,33 +1063,33 @@ var ShopMember = (_temp = _class = function (_Component) {
       var _user$loginInfo = user.loginInfo;
       _user$loginInfo = _user$loginInfo === undefined ? {} : _user$loginInfo;
       var IsEnableUMember = _user$loginInfo.IsEnableUMember;
-      var _state2 = this.state,
-          searchValue = _state2.searchValue,
-          _state2$memberList = _state2.memberList,
-          memberList = _state2$memberList === undefined ? [] : _state2$memberList,
-          _state2$memberInfo = _state2.memberInfo,
-          memberInfo = _state2$memberInfo === undefined ? {} : _state2$memberInfo,
-          _state2$member = _state2.member,
-          member = _state2$member === undefined ? {} : _state2$member,
-          _state2$recommend = _state2.recommend,
-          recommend = _state2$recommend === undefined ? [] : _state2$recommend,
-          _state2$memberTabHeig = _state2.memberTabHeight,
-          memberTabHeight = _state2$memberTabHeig === undefined ? 0 : _state2$memberTabHeig,
-          loadmoreLoading = _state2.loadmoreLoading,
-          nomoreData = _state2.nomoreData,
-          initEmpty = _state2.initEmpty,
-          _state2$columnInfo = _state2.columnInfo,
-          columnInfo = _state2$columnInfo === undefined ? [] : _state2$columnInfo,
-          loadingUser = _state2.loadingUser,
-          loadingBtn = _state2.loadingBtn,
-          selected = _state2.selected,
-          isAllAuthority = _state2.isAllAuthority,
-          lastRetailTotal = _state2.lastRetailTotal,
-          lastRetailList = _state2.lastRetailList,
-          lastRetailLoading = _state2.lastRetailLoading,
-          isCC = _state2.isCC,
-          cardInfo = _state2.cardInfo,
-          cardList = _state2.cardList;
+      var _state3 = this.state,
+          searchValue = _state3.searchValue,
+          _state3$memberList = _state3.memberList,
+          memberList = _state3$memberList === undefined ? [] : _state3$memberList,
+          _state3$memberInfo = _state3.memberInfo,
+          memberInfo = _state3$memberInfo === undefined ? {} : _state3$memberInfo,
+          _state3$member = _state3.member,
+          member = _state3$member === undefined ? {} : _state3$member,
+          _state3$recommend = _state3.recommend,
+          recommend = _state3$recommend === undefined ? [] : _state3$recommend,
+          _state3$memberTabHeig = _state3.memberTabHeight,
+          memberTabHeight = _state3$memberTabHeig === undefined ? 0 : _state3$memberTabHeig,
+          loadmoreLoading = _state3.loadmoreLoading,
+          nomoreData = _state3.nomoreData,
+          initEmpty = _state3.initEmpty,
+          _state3$columnInfo = _state3.columnInfo,
+          columnInfo = _state3$columnInfo === undefined ? [] : _state3$columnInfo,
+          loadingUser = _state3.loadingUser,
+          loadingBtn = _state3.loadingBtn,
+          selected = _state3.selected,
+          isAllAuthority = _state3.isAllAuthority,
+          lastRetailTotal = _state3.lastRetailTotal,
+          lastRetailList = _state3.lastRetailList,
+          lastRetailLoading = _state3.lastRetailLoading,
+          isCC = _state3.isCC,
+          cardInfo = _state3.cardInfo,
+          cardList = _state3.cardList;
       var _props2 = this.props,
           status = _props2.status,
           showModal = _props2.showModal,
@@ -1111,27 +1127,27 @@ var ShopMember = (_temp = _class = function (_Component) {
             className: _tplusComponentsTouch.hotKey.hotKeyNotFilter('search-input') + ' android_focus_keyboard ' + (this.hasElectron === true && this.iCCardServer === 1 || this.isHorizontalPad === true ? 'temp' : ''),
             value: searchValue,
             type: 'native',
-            onChange: function onChange(_ref14) {
-              var searchValue = _ref14.target.value;
-              return _this4.setState({ searchValue: searchValue });
+            onChange: function onChange(_ref13) {
+              var searchValue = _ref13.target.value;
+              return _this6.setState({ searchValue: searchValue });
             },
             inputRef: function inputRef(ref) {
-              return _this4.searchRef = ref;
+              return _this6.searchRef = ref;
             },
             onClear: function onClear() {
-              return _this4.onClear('searchValue', _this4.searchRef);
+              return _this6.onClear('searchValue', _this6.searchRef);
             },
-            onFocus: function onFocus(_ref15) {
-              var target = _ref15.target;
+            onFocus: function onFocus(_ref14) {
+              var target = _ref14.target;
 
               if (!isUserAndroidKey) {
-                _this4.focusInputName = 'searchValue';
-                _this4.inputTarget = target;
+                _this6.focusInputName = 'searchValue';
+                _this6.inputTarget = target;
                 _tplusComponentsTouch.Keyboard.open(function (v) {
-                  var key = _this4.focusInputName;
-                  var value = _tplusComponentsTouch.Keyboard.getNewValue(_this4.inputTarget, _this4.inputTarget.value, v);
-                  _this4.setState((0, _defineProperty3.default)({}, key, value));
-                }, _this4.keyboardOnOk, _this4.keyboardOnClose)();
+                  var key = _this6.focusInputName;
+                  var value = _tplusComponentsTouch.Keyboard.getNewValue(_this6.inputTarget, _this6.inputTarget.value, v);
+                  _this6.setState((0, _defineProperty3.default)({}, key, value));
+                }, _this6.keyboardOnOk, _this6.keyboardOnClose)();
               }
             },
             onBlur: _tplusComponentsTouch.Keyboard.close,
@@ -1142,7 +1158,7 @@ var ShopMember = (_temp = _class = function (_Component) {
 
           /* 扫描组件 */
           this.isHorizontalPad && _react2.default.createElement(Scan, { ref: function ref(scan) {
-              return _this4.scanObj = scan;
+              return _this6.scanObj = scan;
             }, onChange: this.onScanCzkResult }),
           _react2.default.createElement(
             _button2.default,
@@ -1152,8 +1168,8 @@ var ShopMember = (_temp = _class = function (_Component) {
         ),
         _react2.default.createElement(
           'div',
-          { ref: function ref(_ref16) {
-              return _this4.memberTab = _ref16;
+          { ref: function ref(_ref15) {
+              return _this6.memberTab = _ref15;
             }, className: '' + _tplusComponentsTouch.hotKey.hotKeyBindClass('4', 'member-shop-content') },
           this.dataLoaded && noList && _react2.default.createElement(
             'div',
@@ -1166,7 +1182,7 @@ var ShopMember = (_temp = _class = function (_Component) {
           ),
           _react2.default.createElement(_MemberCardList2.default, {
             ref: function ref(list) {
-              return _this4.memberCardList = list;
+              return _this6.memberCardList = list;
             },
             title: title,
             storeKey: storeKey,
@@ -1201,7 +1217,7 @@ var ShopMember = (_temp = _class = function (_Component) {
                   cardList: cardList,
                   getCardList: this.getCardList,
                   loadUserInfo: function loadUserInfo(key, Idmember, item, type, syncUpdateMember) {
-                    return _this4.loadUserInfo(key, Idmember, item, type, syncUpdateMember);
+                    return _this6.loadUserInfo(key, Idmember, item, type, syncUpdateMember);
                   },
                   handleChange: this.MemberMenuChange })
               ),
@@ -1243,7 +1259,7 @@ var ShopMember = (_temp = _class = function (_Component) {
             _button2.default,
             {
               onClick: function onClick() {
-                return _this4.handleOk(noList);
+                return _this6.handleOk(noList);
               },
               type: 'primary',
               style: { marginRight: 5 },