tplus-components-touch 3.41.7 → 3.41.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (201) hide show
  1. package/README.md +16 -16
  2. package/dist/components/acCitySelect/CitySelect.js +18 -18
  3. package/dist/components/acCitySelect/CitySelect.js.map +1 -1
  4. package/dist/components/acCitySelect/CitySelect.less +9 -9
  5. package/dist/components/acCitySelect/citys.js.map +1 -1
  6. package/dist/components/acCitySelect/index.js.map +1 -1
  7. package/dist/components/acCitySelect/provinceData.js +7 -7
  8. package/dist/components/acCitySelect/provinceData.js.map +1 -1
  9. package/dist/components/addLog/AddLogProcessor.js +6 -6
  10. package/dist/components/addLog/AddLogProcessor.js.map +1 -1
  11. package/dist/components/addLog/OperationLogApi.js +3 -3
  12. package/dist/components/addLog/OperationLogApi.js.map +1 -1
  13. package/dist/components/autoComplete/index.js +14 -14
  14. package/dist/components/autoComplete/index.js.map +1 -1
  15. package/dist/components/autoComplete/index.less +89 -89
  16. package/dist/components/autoComplete/option.js.map +1 -1
  17. package/dist/components/autoCompleteWithKeyboard/index.js +14 -14
  18. package/dist/components/autoCompleteWithKeyboard/index.js.map +1 -1
  19. package/dist/components/autoCompleteWithKeyboard/index.less +18 -18
  20. package/dist/components/billSearch/api.js +29 -29
  21. package/dist/components/billSearch/api.js.map +1 -1
  22. package/dist/components/billSearch/index.js +6 -6
  23. package/dist/components/billSearch/index.js.map +1 -1
  24. package/dist/components/billSearch/index.less +384 -384
  25. package/dist/components/cloudPrint/BTPrintFormatUtil.js +17 -17
  26. package/dist/components/cloudPrint/BTPrintFormatUtil.js.map +1 -1
  27. package/dist/components/cloudPrint/api.js.map +1 -1
  28. package/dist/components/cloudPrint/index.js.map +1 -1
  29. package/dist/components/cloudPrint/printDispatch.js +7 -7
  30. package/dist/components/cloudPrint/printDispatch.js.map +1 -1
  31. package/dist/components/cloudPrint/printTemplate/dialy_one.json +238 -238
  32. package/dist/components/cloudPrint/printTemplate/duty_one.json +238 -238
  33. package/dist/components/cloudPrint/printTemplate/retail_one.json +207 -207
  34. package/dist/components/cloudPrint/printTemplate/retail_two.json +219 -219
  35. package/dist/components/cloudPrint/printTemplate/storage_one.json +128 -128
  36. package/dist/components/cloudPrint/printTemplate/template.js +7 -7
  37. package/dist/components/cloudPrint/printTemplate/template.js.map +1 -1
  38. package/dist/components/commonForm/addressPicker/index.js +7 -7
  39. package/dist/components/commonForm/addressPicker/index.js.map +1 -1
  40. package/dist/components/commonForm/addressPicker/style.less +10 -10
  41. package/dist/components/commonForm/autoComplete/index.js.map +1 -1
  42. package/dist/components/commonForm/autoComplete/style.less +2 -2
  43. package/dist/components/commonForm/datePicker/index.js.map +1 -1
  44. package/dist/components/commonForm/datePicker/style.less +4 -4
  45. package/dist/components/commonForm/formControl/index.js.map +1 -1
  46. package/dist/components/commonForm/index.js +4 -4
  47. package/dist/components/commonForm/index.js.map +1 -1
  48. package/dist/components/commonForm/inputNumber/index.js.map +1 -1
  49. package/dist/components/commonForm/inputNumber/style.less +10 -10
  50. package/dist/components/commonForm/radio/index.js.map +1 -1
  51. package/dist/components/commonForm/style.less +1 -1
  52. package/dist/components/deliverySearch/api.js +21 -21
  53. package/dist/components/deliverySearch/api.js.map +1 -1
  54. package/dist/components/deliverySearch/index.js +6 -6
  55. package/dist/components/deliverySearch/index.js.map +1 -1
  56. package/dist/components/deliverySearch/index.less +553 -553
  57. package/dist/components/form/index.js.map +1 -1
  58. package/dist/components/hardwareAPI/index.js +7 -7
  59. package/dist/components/hardwareAPI/index.js.map +1 -1
  60. package/dist/components/hotKey/config.js +23 -23
  61. package/dist/components/hotKey/config.js.map +1 -1
  62. package/dist/components/hotKey/hotKeyModal.js.map +1 -1
  63. package/dist/components/hotKey/index.js +26 -26
  64. package/dist/components/hotKey/index.js.map +1 -1
  65. package/dist/components/hotKey/localConfig.js +13 -0
  66. package/dist/components/hotKey/localConfig.js.map +1 -1
  67. package/dist/components/hotKey/style.less +96 -96
  68. package/dist/components/hotKey/utils.js.map +1 -1
  69. package/dist/components/input/index.js +6 -6
  70. package/dist/components/input/index.js.map +1 -1
  71. package/dist/components/input/scanInput.js.map +1 -1
  72. package/dist/components/input/scanInput.less +30 -30
  73. package/dist/components/input/style.less +106 -106
  74. package/dist/components/input/tplusInput/index.js +30 -30
  75. package/dist/components/input/tplusInput/index.js.map +1 -1
  76. package/dist/components/input/tplusInput/inputContent.js.map +1 -1
  77. package/dist/components/input/tplusInput/inputs.js.map +1 -1
  78. package/dist/components/input/tplusInput/style.less +132 -132
  79. package/dist/components/input/utils/index.js.map +1 -1
  80. package/dist/components/inventorySearch/api.js +58 -58
  81. package/dist/components/inventorySearch/api.js.map +1 -1
  82. package/dist/components/inventorySearch/index.js +3 -3
  83. package/dist/components/inventorySearch/index.js.map +1 -1
  84. package/dist/components/inventorySearch/index.less +119 -119
  85. package/dist/components/inventorySearch/store.js.map +1 -1
  86. package/dist/components/inventorySearch/tab.js.map +1 -1
  87. package/dist/components/keyboard/index.js.map +1 -1
  88. package/dist/components/keyboard/index.less +485 -485
  89. package/dist/components/keyboard/letterKeyboard.js +2 -2
  90. package/dist/components/keyboard/letterKeyboard.js.map +1 -1
  91. package/dist/components/keyboard/numKeyboard.js +4 -4
  92. package/dist/components/keyboard/numKeyboard.js.map +1 -1
  93. package/dist/components/keyboard/numKeyboardScan.js.map +1 -1
  94. package/dist/components/keyboard/numberButton_input.js +5 -5
  95. package/dist/components/keyboard/numberButton_input.js.map +1 -1
  96. package/dist/components/keyboard/numkeyboardPassword.js +4 -4
  97. package/dist/components/keyboard/numkeyboardPassword.js.map +1 -1
  98. package/dist/components/keyboard/onlyKeyboard.js +7 -7
  99. package/dist/components/keyboard/onlyKeyboard.js.map +1 -1
  100. package/dist/components/keyboard/onlyLetterButton.js +2 -2
  101. package/dist/components/keyboard/onlyLetterButton.js.map +1 -1
  102. package/dist/components/keyboard/onlyLetterButton2.js +2 -2
  103. package/dist/components/keyboard/onlyLetterButton2.js.map +1 -1
  104. package/dist/components/keyboard/onlyLetterButton2.less +156 -156
  105. package/dist/components/keyboard/onlyNumberButton.js +2 -2
  106. package/dist/components/keyboard/onlyNumberButton.js.map +1 -1
  107. package/dist/components/keyboard/onlyNumberButton2.js +3 -3
  108. package/dist/components/keyboard/onlyNumberButton2.js.map +1 -1
  109. package/dist/components/keyboard/textKeyboard.js.map +1 -1
  110. package/dist/components/layout/hamburger.js.map +1 -1
  111. package/dist/components/layout/index.js +10 -10
  112. package/dist/components/layout/index.js.map +1 -1
  113. package/dist/components/layout/layout.js.map +1 -1
  114. package/dist/components/layout/sider.js +12 -12
  115. package/dist/components/layout/sider.js.map +1 -1
  116. package/dist/components/layout/style.less +82 -82
  117. package/dist/components/loading/index.js +15 -15
  118. package/dist/components/loading/index.js.map +1 -1
  119. package/dist/components/loading/loadingContent.js.map +1 -1
  120. package/dist/components/loading/style.less +72 -72
  121. package/dist/components/loading/utils.js.map +1 -1
  122. package/dist/components/message/index.js +8 -8
  123. package/dist/components/message/index.js.map +1 -1
  124. package/dist/components/message/index.less +101 -101
  125. package/dist/components/modal/index.js.map +1 -1
  126. package/dist/components/modal/index.less +19 -19
  127. package/dist/components/modalVertical/index.js +7 -7
  128. package/dist/components/modalVertical/index.js.map +1 -1
  129. package/dist/components/modalVertical/style.less +60 -60
  130. package/dist/components/modalWraper/index.js +15 -15
  131. package/dist/components/modalWraper/index.js.map +1 -1
  132. package/dist/components/modalWraper/style.less +257 -257
  133. package/dist/components/modalWraper/utils.js.map +1 -1
  134. package/dist/components/notification/index.js +4 -4
  135. package/dist/components/notification/index.js.map +1 -1
  136. package/dist/components/notification/index.less +51 -51
  137. package/dist/components/overflowTip/index.js +15 -15
  138. package/dist/components/overflowTip/index.js.map +1 -1
  139. package/dist/components/overflowTip/style.less +66 -66
  140. package/dist/components/page/index.js.map +1 -1
  141. package/dist/components/page/index.less +21 -21
  142. package/dist/components/presale/pickup.js.map +1 -1
  143. package/dist/components/presale/style.less +58 -58
  144. package/dist/components/product/detail.js +7 -7
  145. package/dist/components/product/detail.js.map +1 -1
  146. package/dist/components/product/getCard.js +5 -5
  147. package/dist/components/product/getCard.js.map +1 -1
  148. package/dist/components/product/index.less +128 -128
  149. package/dist/components/progressState/EmptyAndErrorView.js.map +1 -1
  150. package/dist/components/progressState/ProgressState.js +10 -10
  151. package/dist/components/progressState/ProgressState.js.map +1 -1
  152. package/dist/components/progressState/index.js.map +1 -1
  153. package/dist/components/progressState/style.less +65 -65
  154. package/dist/components/scan/index.js.map +1 -1
  155. package/dist/components/scan/index.less +33 -33
  156. package/dist/components/select/index.js.map +1 -1
  157. package/dist/components/select/index.less +11 -11
  158. package/dist/components/settlement/asyncModal.js.map +1 -1
  159. package/dist/components/settlement/index.js.map +1 -1
  160. package/dist/components/settlement/moreCzkTable/index.js.map +1 -1
  161. package/dist/components/settlement/moreCzkTable/style.less +6 -6
  162. package/dist/components/settlement/prototypeTable/index.js +1 -1
  163. package/dist/components/settlement/prototypeTable/index.js.map +1 -1
  164. package/dist/components/settlement/prototypeTable/style.less +58 -58
  165. package/dist/components/settlement/prototypeTable/utils.js.map +1 -1
  166. package/dist/components/settlement/settlement.js +70 -44
  167. package/dist/components/settlement/settlement.js.map +1 -1
  168. package/dist/components/settlement/settlement.less +1705 -1705
  169. package/dist/components/settlement/settlementStore.js +155 -198
  170. package/dist/components/settlement/settlementStore.js.map +1 -1
  171. package/dist/components/settlement/utils.js.map +1 -1
  172. package/dist/components/socket/index.js +11 -11
  173. package/dist/components/socket/index.js.map +1 -1
  174. package/dist/components/spin/index.js +6 -6
  175. package/dist/components/spin/index.js.map +1 -1
  176. package/dist/components/spin/spin-style.less +436 -436
  177. package/dist/components/test/index.js +3 -3
  178. package/dist/components/test/index.js.map +1 -1
  179. package/dist/components/ticon/iconfont/demo.css +539 -539
  180. package/dist/components/ticon/iconfont/demo_index.html +5248 -5248
  181. package/dist/components/ticon/iconfont/iconfont.css +895 -895
  182. package/dist/components/ticon/iconfont/iconfont.json +1549 -1549
  183. package/dist/components/ticon/iconfont/iconfont.svg +593 -593
  184. package/dist/components/ticon/index.js.map +1 -1
  185. package/dist/components/touchScroll/index.js +9 -9
  186. package/dist/components/touchScroll/index.js.map +1 -1
  187. package/dist/components/touchTable/AuthProcess.js.map +1 -1
  188. package/dist/components/touchTable/generateWater.js.map +1 -1
  189. package/dist/components/touchTable/index.js +9 -9
  190. package/dist/components/touchTable/index.js.map +1 -1
  191. package/dist/components/touchTable/index.less +376 -376
  192. package/dist/components/touchTable/utils.js.map +1 -1
  193. package/dist/demo/PopOverDemo.js.map +1 -1
  194. package/dist/index.js +7 -7
  195. package/dist/index.js.map +1 -1
  196. package/dist/util/tools.js.map +1 -1
  197. package/locales/zh/tplus-components-touch.json +1 -1
  198. package/locales/zh-CN/tplus-components-touch.json +1 -1
  199. package/mocks/memberInfo.json +79 -79
  200. package/package.json +35 -35
  201. package/tsconfig.json +26 -26
@@ -761,6 +761,9 @@ var SettlementStore = (_class = function () {
761
761
 
762
762
  // 设置密码后更新会员信息
763
763
 
764
+
765
+ // 查看会员卡信息
766
+
764
767
  }, {
765
768
  key: 'getLoginInfo',
766
769
  value: function getLoginInfo() {
@@ -768,7 +771,7 @@ var SettlementStore = (_class = function () {
768
771
  }
769
772
  }, {
770
773
  key: 'loadCzk',
771
- value: function loadCzk(v) {
774
+ value: function loadCzk(v, returnType) {
772
775
  var _this7 = this;
773
776
 
774
777
  if ((0, _trim3.default)(v) === "") {
@@ -777,136 +780,87 @@ var SettlementStore = (_class = function () {
777
780
  });
778
781
  return;
779
782
  }
780
- var IdStore = this.storeInfo.storeID;
781
- var StoreCode = this.storeInfo.storeCode; //_find(this.storeInfo.storeInfos,(store)=>{return store.ID==IdStore;}).Code;
782
-
783
- var _ref8 = _mutantsUtil.platform || {},
784
- isNewRetailBCPos = _ref8.isNewRetailBCPos;
785
-
786
- var address = '';
787
- if (isNewRetailBCPos) {
788
- // address = '/member/memberProfile/FindByStorageCode/'+v;
789
- address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + true;
790
- return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function () {
791
- var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(result) {
792
- var data, m;
793
- return _regenerator2.default.wrap(function _callee3$(_context3) {
794
- while (1) {
795
- switch (_context3.prev = _context3.next) {
796
- case 0:
797
- data = result.data;
798
- m = data && data.length && data[0];
799
-
800
- if (!(result && result.data.length)) {
801
- _context3.next = 25;
802
- break;
803
- }
783
+ var isOnlyEnabled = returnType ? false : true; //非原单退货为false,其他true
784
+ var address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + v + '/' + isOnlyEnabled;
785
+ return (0, _tplusApi.ccApi)({ code: v }, address, false, false, { method: 'get', timeout_skip: true }).then(function () {
786
+ var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(result) {
787
+ var data, m;
788
+ return _regenerator2.default.wrap(function _callee3$(_context3) {
789
+ while (1) {
790
+ switch (_context3.prev = _context3.next) {
791
+ case 0:
792
+ data = result.data;
793
+ m = data && data.length && data[0];
794
+
795
+ if (!(result && result.data.length)) {
796
+ _context3.next = 25;
797
+ break;
798
+ }
804
799
 
805
- if (!(result.data.length === 1)) {
806
- _context3.next = 14;
807
- break;
808
- }
800
+ if (!(result.data.length === 1)) {
801
+ _context3.next = 14;
802
+ break;
803
+ }
804
+
805
+ if (!(m.CardTypeEnum === 'BALANCE_CARD')) {
806
+ _context3.next = 10;
807
+ break;
808
+ }
809
809
 
810
- if (!(m.CardTypeEnum === 'BALANCE_CARD')) {
811
- _context3.next = 10;
812
- break;
810
+ _this7.paymode.updateCardInfo(m);
811
+ _this7.handleCzkData(m);
812
+ return _context3.abrupt('return', result.data);
813
+
814
+ case 10:
815
+ _context3.next = 12;
816
+ return (0, _tplusApi.ccApi)({ dto: _this7.dto, meStorageCardId: m.MeStorageCardId }, '/retail/RetailPos/validateRetailStorageCard', false, false).then(function (result1) {
817
+ var data1 = result1.data ? JSON.parse(result1.data)[0] : {};
818
+ if (data1.enable) {
819
+ _this7.paymode.updateCardInfo(m);
820
+ _this7.handleCzkData(m);
821
+ return result1.data;
822
+ } else {
823
+ _message2.default.warn(data1.disableReason);
813
824
  }
825
+ });
814
826
 
815
- _this7.paymode.updateCardInfo(m);
816
- _this7.handleCzkData(m);
817
- return _context3.abrupt('return', result.data);
818
-
819
- case 10:
820
- _context3.next = 12;
821
- return (0, _tplusApi.ccApi)({ dto: _this7.dto, meStorageCardId: m.MeStorageCardId }, '/retail/RetailPos/validateRetailStorageCard', false, false).then(function (result1) {
822
- var data1 = result1.data ? JSON.parse(result1.data)[0] : {};
823
- if (data1.enable) {
824
- _this7.paymode.updateCardInfo(m);
825
- _this7.handleCzkData(m);
826
- return result1.data;
827
- } else {
828
- _message2.default.warn(data1.disableReason);
829
- }
830
- });
827
+ case 12:
828
+ _context3.next = 25;
829
+ break;
831
830
 
832
- case 12:
833
- _context3.next = 25;
831
+ case 14:
832
+ if (!(result.data && result.data.length === 1)) {
833
+ _context3.next = 19;
834
834
  break;
835
+ }
835
836
 
836
- case 14:
837
- if (!(result.data && result.data.length === 1)) {
838
- _context3.next = 19;
839
- break;
840
- }
841
-
842
- _this7.paymode.updateCardInfo(result.data[0]);
843
- return _context3.abrupt('return', result.data);
837
+ _this7.paymode.updateCardInfo(result.data[0]);
838
+ return _context3.abrupt('return', result.data);
844
839
 
845
- case 19:
846
- if (!(result.data && result.data.length > 1)) {
847
- _context3.next = 23;
848
- break;
849
- }
840
+ case 19:
841
+ if (!(result.data && result.data.length > 1)) {
842
+ _context3.next = 23;
843
+ break;
844
+ }
850
845
 
851
- return _context3.abrupt('return', result.data);
846
+ return _context3.abrupt('return', result.data);
852
847
 
853
- case 23:
854
- _message2.default.warn('没有可用储值卡!');
855
- return _context3.abrupt('return', false);
848
+ case 23:
849
+ _message2.default.warn('没有可用储值卡!');
850
+ return _context3.abrupt('return', false);
856
851
 
857
- case 25:
858
- case 'end':
859
- return _context3.stop();
860
- }
861
- }
862
- }, _callee3, _this7);
863
- }));
864
-
865
- return function (_x2) {
866
- return _ref9.apply(this, arguments);
867
- };
868
- }()
869
- // result.data.forEach((m) => {
870
- // if (m.CardTypeEnum === 'BALANCE_CARD') {
871
- // // 会员概念改为卡,把这些字段都放开
872
- // this.paymode.updateCardInfo(m);
873
- // }
874
- // })
875
- );
876
- } else {
877
- address = 'AA.DR.newRetailMember.SearchMember';
878
- return (0, _tplusApi.tApi)({ SearchParams: { Key: v, IsSingleMember: true, IdStore: IdStore, StoreCode: StoreCode } }, address, false, false).then(function (result) {
879
- var data = JSON.parse(result.Data);
880
- var m = data && data.length > 0 && data[0];
881
- if (!m || !m.ID) {
882
- (0, _mobx.runInAction)(function () {
883
- _this7.paymode.currentMode.errinfo = "无效的会员卡号";
884
- });
885
- } else {
886
- (0, _mobx.runInAction)(function () {
887
- _this7.paymode.currentMode.errinfo = "";
888
- _this7.paymode.currentMode.member = new Member(m);
889
- _this7.paymode.currentMode.value = (0, _utils.getFixedNumber)(_this7.brefund ? _this7.paymode.receivable : Math.max(_this7.paymode.receivable, 0));
890
- _this7.updateEvent();
891
- var message = '';
892
- if (global.CheckMemberStorageProcessorBlock) {
893
- message = CheckMemberStorageProcessorBlock.execute(data[0]);
852
+ case 25:
853
+ case 'end':
854
+ return _context3.stop();
894
855
  }
895
- if (!String.isNullOrEmpty(message)) {
896
- _this7.paymode.currentMode.errinfo = message;
897
- } else if (_this7.checkReceived(_this7.paymode.currentMode, "balance")) {
898
- _this7.paymode.currentMode.errinfo = "余额不足";
899
- } else if (_this7.paymode.amount > 0 && _this7.paymode.currentMode.value == 0) {
900
- _this7.paymode.currentMode.errinfo = "实收金额必须录入";
901
- } else {
902
- // 查询成功后将焦点移入下一个输入框
903
- var nextInput = document.querySelector('.czk .received .input');
904
- nextInput && nextInput.focus();
905
- }
906
- });
907
- }
908
- });
909
- }
856
+ }
857
+ }, _callee3, _this7);
858
+ }));
859
+
860
+ return function (_x2) {
861
+ return _ref8.apply(this, arguments);
862
+ };
863
+ }());
910
864
  }
911
865
  }, {
912
866
  key: 'addDjq',
@@ -1235,8 +1189,8 @@ var SettlementStore = (_class = function () {
1235
1189
  }, {
1236
1190
  key: 'commit',
1237
1191
  value: function () {
1238
- var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(bTest) {
1239
- var status, paylist, ret, _ref11, _ref11$data, code, returnMsg, state, ret1, ret2;
1192
+ var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(bTest) {
1193
+ var status, paylist, ret, _ref10, _ref10$data, code, returnMsg, state, ret1, ret2;
1240
1194
 
1241
1195
  return _regenerator2.default.wrap(function _callee4$(_context4) {
1242
1196
  while (1) {
@@ -1277,9 +1231,9 @@ var SettlementStore = (_class = function () {
1277
1231
 
1278
1232
  case 12:
1279
1233
  ret = _context4.sent;
1280
- _ref11 = ret || {}, _ref11$data = _ref11.data;
1281
- _ref11$data = _ref11$data === undefined ? {} : _ref11$data;
1282
- code = _ref11$data.code, returnMsg = _ref11$data.returnMsg;
1234
+ _ref10 = ret || {}, _ref10$data = _ref10.data;
1235
+ _ref10$data = _ref10$data === undefined ? {} : _ref10$data;
1236
+ code = _ref10$data.code, returnMsg = _ref10$data.returnMsg;
1283
1237
 
1284
1238
  if (!(code && code == 10001)) {
1285
1239
  _context4.next = 24;
@@ -1361,7 +1315,7 @@ var SettlementStore = (_class = function () {
1361
1315
  }));
1362
1316
 
1363
1317
  function commit(_x3) {
1364
- return _ref10.apply(this, arguments);
1318
+ return _ref9.apply(this, arguments);
1365
1319
  }
1366
1320
 
1367
1321
  return commit;
@@ -1375,10 +1329,10 @@ var SettlementStore = (_class = function () {
1375
1329
  }, {
1376
1330
  key: 'saveMember',
1377
1331
  value: function () {
1378
- var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
1332
+ var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5() {
1379
1333
  var _this11 = this;
1380
1334
 
1381
- var _enumController$getEn15, PayStyle, TradeType, IPMSG, dtoParams, payList, payment, tradeType, ret, _ref13, type, data, msg, code;
1335
+ var _enumController$getEn15, PayStyle, TradeType, IPMSG, dtoParams, payList, payment, tradeType, ret, _ref12, type, data, msg, code;
1382
1336
 
1383
1337
  return _regenerator2.default.wrap(function _callee5$(_context5) {
1384
1338
  while (1) {
@@ -1440,7 +1394,7 @@ var SettlementStore = (_class = function () {
1440
1394
 
1441
1395
  case 11:
1442
1396
  ret = _context5.sent;
1443
- _ref13 = ret || {}, type = _ref13.type, data = _ref13.data, msg = _ref13.msg, code = _ref13.code;
1397
+ _ref12 = ret || {}, type = _ref12.type, data = _ref12.data, msg = _ref12.msg, code = _ref12.code;
1444
1398
 
1445
1399
  if (!(type === true)) {
1446
1400
  _context5.next = 17;
@@ -1471,7 +1425,7 @@ var SettlementStore = (_class = function () {
1471
1425
  }));
1472
1426
 
1473
1427
  function saveMember() {
1474
- return _ref12.apply(this, arguments);
1428
+ return _ref11.apply(this, arguments);
1475
1429
  }
1476
1430
 
1477
1431
  return saveMember;
@@ -1479,10 +1433,10 @@ var SettlementStore = (_class = function () {
1479
1433
  }, {
1480
1434
  key: 'save',
1481
1435
  value: function () {
1482
- var _ref14 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
1436
+ var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6() {
1483
1437
  var _this12 = this;
1484
1438
 
1485
- var _enumController$getEn16, PayStyle, TradeType, IPMSG, RetailTypeEnum, _getLoginInfo3, PreSellOrBook, PercentageWhenBook, _ref15, IdbusiType, DistributionMode, prepaidAmount, fullPayment, dtoParams, payList, payment, tradeType, ret, _ref16, type, data, msg, code;
1439
+ var _enumController$getEn16, PayStyle, TradeType, IPMSG, RetailTypeEnum, _getLoginInfo3, PreSellOrBook, PercentageWhenBook, _ref14, IdbusiType, DistributionMode, prepaidAmount, fullPayment, dtoParams, payList, payment, tradeType, ret, _ref15, type, data, msg, code;
1486
1440
 
1487
1441
  return _regenerator2.default.wrap(function _callee6$(_context6) {
1488
1442
  while (1) {
@@ -1582,7 +1536,7 @@ var SettlementStore = (_class = function () {
1582
1536
  }
1583
1537
  RetailTypeEnum = this.dto.IdbusiType == 36 ? "INTEGRAL_EXCHANGE" : "NORMAL";
1584
1538
  _getLoginInfo3 = this.getLoginInfo(), PreSellOrBook = _getLoginInfo3.PreSellOrBook, PercentageWhenBook = _getLoginInfo3.PercentageWhenBook;
1585
- _ref15 = this.dto || {}, IdbusiType = _ref15.IdbusiType, DistributionMode = _ref15.DistributionMode;
1539
+ _ref14 = this.dto || {}, IdbusiType = _ref14.IdbusiType, DistributionMode = _ref14.DistributionMode;
1586
1540
 
1587
1541
  if (IdbusiType == 38 && PreSellOrBook == 'BOOK' && PercentageWhenBook < 100 && (!DistributionMode.Id || DistributionMode.Id == 'ON_SITE_PICKUP')) {
1588
1542
  prepaidAmount = (0, _utils.getFixedNumber)(this.dto.RetailPaymentDetails.reduce(function (c, item) {
@@ -1645,7 +1599,7 @@ var SettlementStore = (_class = function () {
1645
1599
 
1646
1600
  case 25:
1647
1601
  ret = _context6.sent;
1648
- _ref16 = ret || {}, type = _ref16.type, data = _ref16.data, msg = _ref16.msg, code = _ref16.code;
1602
+ _ref15 = ret || {}, type = _ref15.type, data = _ref15.data, msg = _ref15.msg, code = _ref15.code;
1649
1603
 
1650
1604
  if (!(type === true)) {
1651
1605
  _context6.next = 31;
@@ -1664,8 +1618,8 @@ var SettlementStore = (_class = function () {
1664
1618
  this.dtoParams = dtoParams;
1665
1619
  console.log('结算信息:', dtoParams);
1666
1620
  return _context6.abrupt('return', (0, _tplusApi.ccApi)({ dto: dtoParams, cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
1667
- var _ref17 = resp || {},
1668
- ID = _ref17.ID;
1621
+ var _ref16 = resp || {},
1622
+ ID = _ref16.ID;
1669
1623
 
1670
1624
  _this12.setDtoID(ID);
1671
1625
  _this12.billID = ID;
@@ -1681,7 +1635,7 @@ var SettlementStore = (_class = function () {
1681
1635
  }));
1682
1636
 
1683
1637
  function save() {
1684
- return _ref14.apply(this, arguments);
1638
+ return _ref13.apply(this, arguments);
1685
1639
  }
1686
1640
 
1687
1641
  return save;
@@ -1698,19 +1652,19 @@ var SettlementStore = (_class = function () {
1698
1652
  return data;
1699
1653
  }
1700
1654
 
1701
- /**
1702
- * 二开支付
1703
- * vType:1零售单、2储值单
1704
- * payment:结算方式
1705
- * trade:00表示结算、02表示退款
1706
- * dto:结算数据集合
1655
+ /**
1656
+ * 二开支付
1657
+ * vType:1零售单、2储值单
1658
+ * payment:结算方式
1659
+ * trade:00表示结算、02表示退款
1660
+ * dto:结算数据集合
1707
1661
  */
1708
1662
 
1709
1663
  }, {
1710
1664
  key: 'thirdPay',
1711
1665
  value: function () {
1712
- var _ref18 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(vType, payment, trade, dto) {
1713
- var cto, params, ret, _ref19, Code, _Message, Result, _ref20, ThirdPaymentReturnInfo;
1666
+ var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(vType, payment, trade, dto) {
1667
+ var cto, params, ret, _ref18, Code, _Message, Result, _ref19, ThirdPaymentReturnInfo;
1714
1668
 
1715
1669
  return _regenerator2.default.wrap(function _callee7$(_context7) {
1716
1670
  while (1) {
@@ -1733,7 +1687,7 @@ var SettlementStore = (_class = function () {
1733
1687
 
1734
1688
  console.log('刷卡返回信息:', ret);
1735
1689
  ret = JSON.parse(ret);
1736
- _ref19 = ret || {}, Code = _ref19.Code, _Message = _ref19.Message, Result = _ref19.Result;
1690
+ _ref18 = ret || {}, Code = _ref18.Code, _Message = _ref18.Message, Result = _ref18.Result;
1737
1691
 
1738
1692
  if (!(Code > 0)) {
1739
1693
  _context7.next = 14;
@@ -1748,7 +1702,7 @@ var SettlementStore = (_class = function () {
1748
1702
  break;
1749
1703
  }
1750
1704
 
1751
- _ref20 = Result || {}, ThirdPaymentReturnInfo = _ref20.ThirdPaymentReturnInfo;
1705
+ _ref19 = Result || {}, ThirdPaymentReturnInfo = _ref19.ThirdPaymentReturnInfo;
1752
1706
 
1753
1707
  if (vType == 1) {
1754
1708
  dto.RetailPaymentDetails.forEach(function (v) {
@@ -1791,7 +1745,7 @@ var SettlementStore = (_class = function () {
1791
1745
  }));
1792
1746
 
1793
1747
  function thirdPay(_x4, _x5, _x6, _x7) {
1794
- return _ref18.apply(this, arguments);
1748
+ return _ref17.apply(this, arguments);
1795
1749
  }
1796
1750
 
1797
1751
  return thirdPay;
@@ -1802,7 +1756,7 @@ var SettlementStore = (_class = function () {
1802
1756
  }, {
1803
1757
  key: 'thirdPayRefund',
1804
1758
  value: function () {
1805
- var _ref21 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(type) {
1759
+ var _ref20 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(type) {
1806
1760
  var _this13 = this;
1807
1761
 
1808
1762
  var dto, pay, payment, _enumController$getEn17, TradeType;
@@ -1824,7 +1778,7 @@ var SettlementStore = (_class = function () {
1824
1778
  _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(), TradeType = _enumController$getEn17.TradeType;
1825
1779
 
1826
1780
  setTimeout((0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8() {
1827
- var ret, _ref23, msg;
1781
+ var ret, _ref22, msg;
1828
1782
 
1829
1783
  return _regenerator2.default.wrap(function _callee8$(_context8) {
1830
1784
  while (1) {
@@ -1835,7 +1789,7 @@ var SettlementStore = (_class = function () {
1835
1789
 
1836
1790
  case 2:
1837
1791
  ret = _context8.sent;
1838
- _ref23 = ret || {}, msg = _ref23.msg;
1792
+ _ref22 = ret || {}, msg = _ref22.msg;
1839
1793
 
1840
1794
  console.log('\u5237\u5361\u652F\u4ED8\u9000\u6B3E:' + msg);
1841
1795
 
@@ -1857,7 +1811,7 @@ var SettlementStore = (_class = function () {
1857
1811
  }));
1858
1812
 
1859
1813
  function thirdPayRefund(_x8) {
1860
- return _ref21.apply(this, arguments);
1814
+ return _ref20.apply(this, arguments);
1861
1815
  }
1862
1816
 
1863
1817
  return thirdPayRefund;
@@ -1870,7 +1824,7 @@ var SettlementStore = (_class = function () {
1870
1824
  }, {
1871
1825
  key: 'querySettleResult',
1872
1826
  value: function () {
1873
- var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
1827
+ var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10() {
1874
1828
  return _regenerator2.default.wrap(function _callee10$(_context10) {
1875
1829
  while (1) {
1876
1830
  switch (_context10.prev = _context10.next) {
@@ -1898,7 +1852,7 @@ var SettlementStore = (_class = function () {
1898
1852
  }));
1899
1853
 
1900
1854
  function querySettleResult() {
1901
- return _ref24.apply(this, arguments);
1855
+ return _ref23.apply(this, arguments);
1902
1856
  }
1903
1857
 
1904
1858
  return querySettleResult;
@@ -1924,14 +1878,14 @@ var SettlementStore = (_class = function () {
1924
1878
  }, {
1925
1879
  key: 'validePwd',
1926
1880
  value: function () {
1927
- var _ref25 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(value) {
1928
- var _ref26, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
1881
+ var _ref24 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(value) {
1882
+ var _ref25, isNewRetailBCPos, cook1, cook2, message, memberStorageId, _paymode$currentMode, cardTypeEnum, memberId, meStorageCardId, cardStatusEnum, result, count, _result;
1929
1883
 
1930
1884
  return _regenerator2.default.wrap(function _callee11$(_context11) {
1931
1885
  while (1) {
1932
1886
  switch (_context11.prev = _context11.next) {
1933
1887
  case 0:
1934
- _ref26 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref26.isNewRetailBCPos;
1888
+ _ref25 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref25.isNewRetailBCPos;
1935
1889
  _context11.prev = 1;
1936
1890
 
1937
1891
  if (!isNewRetailBCPos) {
@@ -2048,7 +2002,7 @@ var SettlementStore = (_class = function () {
2048
2002
  }));
2049
2003
 
2050
2004
  function validePwd(_x9) {
2051
- return _ref25.apply(this, arguments);
2005
+ return _ref24.apply(this, arguments);
2052
2006
  }
2053
2007
 
2054
2008
  return validePwd;
@@ -2101,7 +2055,7 @@ var SettlementStore = (_class = function () {
2101
2055
  var _this16 = this;
2102
2056
 
2103
2057
  return function () {
2104
- var _ref27 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(_this) {
2058
+ var _ref26 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(_this) {
2105
2059
  var _getLoginInfo4, IdStore, StoreCode, resp;
2106
2060
 
2107
2061
  return _regenerator2.default.wrap(function _callee12$(_context12) {
@@ -2128,7 +2082,7 @@ var SettlementStore = (_class = function () {
2128
2082
  }));
2129
2083
 
2130
2084
  return function (_x10) {
2131
- return _ref27.apply(this, arguments);
2085
+ return _ref26.apply(this, arguments);
2132
2086
  };
2133
2087
  }();
2134
2088
  }
@@ -2138,53 +2092,55 @@ var SettlementStore = (_class = function () {
2138
2092
  var _this17 = this;
2139
2093
 
2140
2094
  return function () {
2141
- var _ref28 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(memberId) {
2142
- var result;
2095
+ var _ref27 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee13(memberId, returnType) {
2096
+ var isOnlyEnabled, result;
2143
2097
  return _regenerator2.default.wrap(function _callee13$(_context13) {
2144
2098
  while (1) {
2145
2099
  switch (_context13.prev = _context13.next) {
2146
2100
  case 0:
2147
- _context13.next = 2;
2148
- return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId + '/' + true, false, false, { method: 'get' });
2101
+ isOnlyEnabled = returnType ? false : true; //非原单退货为false,其他true
2102
+
2103
+ _context13.next = 3;
2104
+ return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByMemberId/' + memberId + '/' + isOnlyEnabled, false, false, { method: 'get' });
2149
2105
 
2150
- case 2:
2106
+ case 3:
2151
2107
  result = _context13.sent;
2152
2108
 
2153
2109
  if (!(result && result.data.length)) {
2154
- _context13.next = 20;
2110
+ _context13.next = 21;
2155
2111
  break;
2156
2112
  }
2157
2113
 
2158
2114
  if (!(result.data.length === 1)) {
2159
- _context13.next = 9;
2115
+ _context13.next = 10;
2160
2116
  break;
2161
2117
  }
2162
2118
 
2163
2119
  _this17.paymode.updateCardInfo(result.data[0]);
2164
2120
  return _context13.abrupt('return', result.data);
2165
2121
 
2166
- case 9:
2122
+ case 10:
2167
2123
  if (!(result.data && result.data.length === 1)) {
2168
- _context13.next = 14;
2124
+ _context13.next = 15;
2169
2125
  break;
2170
2126
  }
2171
2127
 
2172
2128
  _this17.paymode.updateCardInfo(result.data[0]);
2173
2129
  return _context13.abrupt('return', result.data);
2174
2130
 
2175
- case 14:
2131
+ case 15:
2176
2132
  if (!(result.data && result.data.length > 1)) {
2177
- _context13.next = 18;
2133
+ _context13.next = 19;
2178
2134
  break;
2179
2135
  }
2180
2136
 
2181
2137
  return _context13.abrupt('return', result.data);
2182
2138
 
2183
- case 18:
2139
+ case 19:
2184
2140
  _message2.default.warn('没有可用储值卡!');
2185
2141
  return _context13.abrupt('return', false);
2186
2142
 
2187
- case 20:
2143
+ case 21:
2188
2144
  case 'end':
2189
2145
  return _context13.stop();
2190
2146
  }
@@ -2192,8 +2148,8 @@ var SettlementStore = (_class = function () {
2192
2148
  }, _callee13, _this17);
2193
2149
  }));
2194
2150
 
2195
- return function (_x11) {
2196
- return _ref28.apply(this, arguments);
2151
+ return function (_x11, _x12) {
2152
+ return _ref27.apply(this, arguments);
2197
2153
  };
2198
2154
  }();
2199
2155
  }
@@ -2203,21 +2159,22 @@ var SettlementStore = (_class = function () {
2203
2159
  var _this18 = this;
2204
2160
 
2205
2161
  return (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee14() {
2206
- var address, result;
2162
+ var ctMode, cardNo, result;
2207
2163
  return _regenerator2.default.wrap(function _callee14$(_context14) {
2208
2164
  while (1) {
2209
2165
  switch (_context14.prev = _context14.next) {
2210
2166
  case 0:
2211
- address = '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + _this18.paymode.currentMode.storageCardNo;
2212
- _context14.next = 3;
2213
- return (0, _tplusApi.ccApi)({}, address, false, false, { method: 'get', timeout_skip: true });
2167
+ ctMode = _this18.paymode && _this18.paymode.currentMode;
2168
+ cardNo = ctMode && ctMode.storageCardNo;
2169
+ _context14.next = 4;
2170
+ return (0, _tplusApi.ccApi)({}, '/marketingtool/MeStorageCard/getCardInfoByCardNo/' + cardNo, false, false, { method: 'get', timeout_skip: true });
2214
2171
 
2215
- case 3:
2172
+ case 4:
2216
2173
  result = _context14.sent;
2217
2174
 
2218
- _this18.paymode.updateCardInfo(result.data);
2175
+ _this18.paymode.updateCardInfo(result && result.data);
2219
2176
 
2220
- case 5:
2177
+ case 6:
2221
2178
  case 'end':
2222
2179
  return _context14.stop();
2223
2180
  }
@@ -2463,18 +2420,18 @@ var PayMode = exports.PayMode = (_class3 = function () {
2463
2420
  }
2464
2421
  });
2465
2422
 
2466
- var _ref30 = element || {},
2467
- couponCode = _ref30.couponCode,
2468
- name = _ref30.name,
2469
- tieredAmountResult = _ref30.tieredAmountResult,
2470
- fromDate = _ref30.fromDate,
2471
- dateMount = _ref30.dateMount,
2472
- promoMethodEnum = _ref30.promoMethodEnum,
2473
- discountPct = _ref30.discountPct,
2474
- nominalAmount = _ref30.nominalAmount,
2475
- promoId = _ref30.promoId,
2476
- id = _ref30.id,
2477
- doorsill = _ref30.doorsill;
2423
+ var _ref29 = element || {},
2424
+ couponCode = _ref29.couponCode,
2425
+ name = _ref29.name,
2426
+ tieredAmountResult = _ref29.tieredAmountResult,
2427
+ fromDate = _ref29.fromDate,
2428
+ dateMount = _ref29.dateMount,
2429
+ promoMethodEnum = _ref29.promoMethodEnum,
2430
+ discountPct = _ref29.discountPct,
2431
+ nominalAmount = _ref29.nominalAmount,
2432
+ promoId = _ref29.promoId,
2433
+ id = _ref29.id,
2434
+ doorsill = _ref29.doorsill;
2478
2435
 
2479
2436
  var condValue = tieredAmountResult.condValue,
2480
2437
  promoDiscount = tieredAmountResult.promoDiscount,
@@ -2619,17 +2576,17 @@ var PayMode = exports.PayMode = (_class3 = function () {
2619
2576
  }, {
2620
2577
  key: 'setPaymodes',
2621
2578
  value: function () {
2622
- var _ref31 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(type, isIntegralExchange) {
2579
+ var _ref30 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee15(type, isIntegralExchange) {
2623
2580
  var _this20 = this;
2624
2581
 
2625
- var _ref32, isHorizontalPad, isHorizontalSunMi, isMobileEnvironment, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
2582
+ var _ref31, isHorizontalPad, isHorizontalSunMi, isMobileEnvironment, _enumController$getEn21, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
2626
2583
 
2627
2584
  return _regenerator2.default.wrap(function _callee15$(_context15) {
2628
2585
  while (1) {
2629
2586
  switch (_context15.prev = _context15.next) {
2630
2587
  case 0:
2631
2588
  // 是否移动端判断
2632
- _ref32 = _mutantsUtil.platform || {}, isHorizontalPad = _ref32.isHorizontalPad, isHorizontalSunMi = _ref32.isHorizontalSunMi;
2589
+ _ref31 = _mutantsUtil.platform || {}, isHorizontalPad = _ref31.isHorizontalPad, isHorizontalSunMi = _ref31.isHorizontalSunMi;
2633
2590
  isMobileEnvironment = !!isHorizontalPad || !!isHorizontalSunMi;
2634
2591
  _enumController$getEn21 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn21.settleStyleType, PayStyle = _enumController$getEn21.PayStyle;
2635
2592
  memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
@@ -2680,8 +2637,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
2680
2637
  }, _callee15, this);
2681
2638
  }));
2682
2639
 
2683
- function setPaymodes(_x12, _x13) {
2684
- return _ref31.apply(this, arguments);
2640
+ function setPaymodes(_x13, _x14) {
2641
+ return _ref30.apply(this, arguments);
2685
2642
  }
2686
2643
 
2687
2644
  return setPaymodes;