tplus-components-touch 3.22.6 → 3.22.10

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 (8) hide show
  1. package/dist/components/cloudPrint/index.js +77 -93
  2. package/dist/components/cloudPrint/index.js.map +1 -1
  3. package/dist/components/settlement/settlement.js +90 -56
  4. package/dist/components/settlement/settlement.js.map +1 -1
  5. package/dist/components/settlement/settlement.less +4 -4
  6. package/dist/components/settlement/settlementStore.js +99 -86
  7. package/dist/components/settlement/settlementStore.js.map +1 -1
  8. package/package.json +1 -1
package/dist/components/settlement/settlement.less CHANGED
@@ -224,7 +224,7 @@
224
224
  }
225
225
  span:last-child{
226
226
  font-size: 18px;
227
- color: #333333;
227
+ color: white;
228
228
  text-align: right;
229
229
  line-height: 14px;
230
230
  }
@@ -424,7 +424,7 @@
424
424
  .amount{
425
425
  padding-top:27px;
426
426
  span:first-child{
427
- font-size: 30px;
427
+ font-size: 20px;
428
428
  color: #FFFFFF;
429
429
  line-height: 36px;
430
430
  }
@@ -504,8 +504,8 @@
504
504
  }
505
505
  .noxuanzhong1 {
506
506
  position: absolute;
507
- top: 6px;
508
- right: 6px;
507
+ top: 12px;
508
+ right: 12px;
509
509
  border: 1px solid #979797;
510
510
  border-radius: 0.83px;
511
511
  width: 18px;
package/dist/components/settlement/settlementStore.js CHANGED
@@ -965,12 +965,10 @@ var SettlementStore = (_class = function () {
965
965
  }, {
966
966
  key: 'delPay',
967
967
  value: function delPay(index) {
968
- var _this10 = this;
968
+ var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
969
+ PayStyle = _enumController$getEn12.PayStyle;
969
970
 
970
971
  (0, _remove3.default)(this.paymode.thePaymodes, function (mode) {
971
- if (mode.paymethodId === index) {
972
- _this10.paymode.amount = _this10.paymode.amount + mode.value;
973
- }
974
972
  return mode.paymethodId === index;
975
973
  });
976
974
  this.paymode.currentFocus = -1;
@@ -1066,26 +1064,26 @@ var SettlementStore = (_class = function () {
1066
1064
  }, {
1067
1065
  key: 'saveMember',
1068
1066
  value: function saveMember() {
1069
- var _this11 = this;
1067
+ var _this10 = this;
1070
1068
 
1071
- var _enumController$getEn12 = _mutantsUtil.enumController.getEnumOj(),
1072
- PayStyle = _enumController$getEn12.PayStyle;
1069
+ var _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(),
1070
+ PayStyle = _enumController$getEn13.PayStyle;
1073
1071
 
1074
1072
  (0, _mobx.runInAction)(function () {
1075
- _this11.dto.StorageMutiSettleDetails = [];
1076
- var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
1073
+ _this10.dto.StorageMutiSettleDetails = [];
1074
+ var thePaymodes = _this10.newStyle ? (0, _filter3.default)(_this10.paymode.thePaymodes, function (mode) {
1077
1075
  return parseFloat(mode.value) != 0;
1078
- }) : _this11.paymode.thePaymodes;
1076
+ }) : _this10.paymode.thePaymodes;
1079
1077
  (0, _each3.default)(thePaymodes, function (mode) {
1080
- var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
1078
+ var themode = (0, _find3.default)(_this10.paymode.paymodes, { 'paymentType': mode.paymentType });
1081
1079
 
1082
1080
  var value = parseFloat(mode.value);
1083
1081
  var giveChange = null;
1084
- if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
1085
- value = Math.Add(value, _this11.paymode.receivable);
1086
- giveChange = Math.abs(_this11.paymode.receivable);
1082
+ if (mode.paymentType == PayStyle.xianjin && _this10.paymode.receivable < 0 && value > Math.abs(_this10.paymode.receivable)) {
1083
+ value = Math.Add(value, _this10.paymode.receivable);
1084
+ giveChange = Math.abs(_this10.paymode.receivable);
1087
1085
  }
1088
- _this11.dto.StorageMutiSettleDetails.push({
1086
+ _this10.dto.StorageMutiSettleDetails.push({
1089
1087
  Code: mode.paymethodId,
1090
1088
  StorageAmount: value,
1091
1089
  GiveChange: giveChange,
@@ -1094,7 +1092,7 @@ var SettlementStore = (_class = function () {
1094
1092
  PaymentCode: mode.authCode,
1095
1093
  DynamicPropertyKeys: [],
1096
1094
  DynamicPropertyValues: [],
1097
- DataSource: { Id: _this11.dataSource }
1095
+ DataSource: { Id: _this10.dataSource }
1098
1096
  });
1099
1097
  });
1100
1098
  });
@@ -1104,42 +1102,42 @@ var SettlementStore = (_class = function () {
1104
1102
  IPMSG = JSON.parse(window.localStorage.IPMSG);
1105
1103
  }
1106
1104
  return (0, _tplusApi.tApi)({ dto: this.dto }, 'chanjet.ME.INewRetailMemberStorage.Save', false, false).then(function (resp) {
1107
- _this11.handlePrint(resp);
1105
+ _this10.handlePrint(resp);
1108
1106
  });
1109
1107
  }
1110
1108
  }, {
1111
1109
  key: 'save',
1112
1110
  value: function () {
1113
1111
  var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3() {
1114
- var _this12 = this;
1112
+ var _this11 = this;
1115
1113
 
1116
- var _enumController$getEn13, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1114
+ var _enumController$getEn14, PayStyle, _ref15, isNewRetailBCPos, IPMSG, RetailTypeEnum;
1117
1115
 
1118
1116
  return _regenerator2.default.wrap(function _callee3$(_context3) {
1119
1117
  while (1) {
1120
1118
  switch (_context3.prev = _context3.next) {
1121
1119
  case 0:
1122
- _enumController$getEn13 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn13.PayStyle;
1120
+ _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(), PayStyle = _enumController$getEn14.PayStyle;
1123
1121
 
1124
1122
  (0, _mobx.runInAction)(function () {
1125
- _this12.dto.RetailPaymentDetails = [];
1126
- _this12.dto.RetailStorageDetails = [];
1127
- _this12.dto.RetailCouponDetails = [];
1123
+ _this11.dto.RetailPaymentDetails = [];
1124
+ _this11.dto.RetailStorageDetails = [];
1125
+ _this11.dto.RetailCouponDetails = [];
1128
1126
  var czkSum = 0;
1129
- var Idmember = _this12.dto.Idmember;
1127
+ var Idmember = _this11.dto.Idmember;
1130
1128
  var count = 0;
1131
- var thePaymodes = _this12.newStyle ? (0, _filter3.default)(_this12.paymode.thePaymodes, function (mode) {
1129
+ var thePaymodes = _this11.newStyle ? (0, _filter3.default)(_this11.paymode.thePaymodes, function (mode) {
1132
1130
  return parseFloat(mode.value) != 0;
1133
- }) : _this12.paymode.thePaymodes;
1131
+ }) : _this11.paymode.thePaymodes;
1134
1132
  (0, _each3.default)(thePaymodes, function (mode, index) {
1135
- var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': mode.paymentType });
1133
+ var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': mode.paymentType });
1136
1134
  if (mode.paymentType == PayStyle.hyczk) {
1137
1135
  if (!Idmember) {
1138
1136
  Idmember = mode.member.id;
1139
1137
  }
1140
1138
  czkSum = Math.Add(czkSum, mode.value);
1141
- var MeStorageCardId = mode.member.MeStorageCardId ? mode.member.MeStorageCardId : _this12.member.MeStorageCardId;
1142
- _this12.dto.RetailStorageDetails.push({
1139
+ var MeStorageCardId = mode.member.MeStorageCardId ? mode.member.MeStorageCardId : _this11.member.MeStorageCardId;
1140
+ _this11.dto.RetailStorageDetails.push({
1143
1141
  Code: mode.paymethodId,
1144
1142
  MeStorageCardId: MeStorageCardId,
1145
1143
  StoragePaymentAmount: mode.value,
@@ -1148,17 +1146,17 @@ var SettlementStore = (_class = function () {
1148
1146
  Idmember: mode.member.id,
1149
1147
  DynamicPropertyKeys: [],
1150
1148
  DynamicPropertyValues: [],
1151
- DataSource: { Id: _this12.dataSource },
1149
+ DataSource: { Id: _this11.dataSource },
1152
1150
  Password: mode.authCode
1153
1151
  });
1154
1152
  } else {
1155
1153
  var value = parseFloat(mode.value);
1156
1154
  var giveChange = null;
1157
- if (mode.paymentType == PayStyle.xianjin && _this12.paymode.receivable < 0 && value > Math.abs(_this12.paymode.receivable)) {
1158
- value = Math.Add(value, _this12.paymode.receivable);
1159
- giveChange = Math.abs(_this12.paymode.receivable);
1155
+ if (mode.paymentType == PayStyle.xianjin && _this11.paymode.receivable < 0 && value > Math.abs(_this11.paymode.receivable)) {
1156
+ value = Math.Add(value, _this11.paymode.receivable);
1157
+ giveChange = Math.abs(_this11.paymode.receivable);
1160
1158
  }
1161
- _this12.dto.RetailPaymentDetails.push({
1159
+ _this11.dto.RetailPaymentDetails.push({
1162
1160
  Code: mode.paymethodId,
1163
1161
  OrigAmount: mode.exchangeRate != 1 ? mode.value2 : value,
1164
1162
  Amount: value,
@@ -1172,12 +1170,12 @@ var SettlementStore = (_class = function () {
1172
1170
  OverchargesAmount: mode.overchargesAmount,
1173
1171
  DynamicPropertyKeys: [],
1174
1172
  DynamicPropertyValues: [],
1175
- DataSource: { Id: _this12.dataSource }
1173
+ DataSource: { Id: _this11.dataSource }
1176
1174
  });
1177
1175
  if (mode.paymentType == PayStyle.djq) {
1178
1176
  (0, _each3.default)(mode.djqs, function (djq) {
1179
1177
  if (djq.checked) {
1180
- _this12.dto.RetailCouponDetails.push({
1178
+ _this11.dto.RetailCouponDetails.push({
1181
1179
  CouponCode: djq.code,
1182
1180
  ReductionAmount: djq.amount,
1183
1181
  EnableAmount: djq.doorsill,
@@ -1187,7 +1185,7 @@ var SettlementStore = (_class = function () {
1187
1185
  PromotionId: djq.promoId,
1188
1186
  PromotionRuleId: djq.promoRuleId,
1189
1187
  PromoCouponAllocatedId: djq.id,
1190
- DataSource: { Id: _this12.dataSource }
1188
+ DataSource: { Id: _this11.dataSource }
1191
1189
  });
1192
1190
  }
1193
1191
  });
@@ -1198,36 +1196,36 @@ var SettlementStore = (_class = function () {
1198
1196
  var _ref14 = _mutantsUtil.platform || {},
1199
1197
  isNewRetailBCPos = _ref14.isNewRetailBCPos;
1200
1198
 
1201
- if (_this12.dto.RetailStorageDetails.length > 0) {
1202
- var themode = (0, _find3.default)(_this12.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
1199
+ if (_this11.dto.RetailStorageDetails.length > 0) {
1200
+ var themode = (0, _find3.default)(_this11.paymode.paymodes, { 'paymentType': PayStyle.hyczk });
1203
1201
  if (isNewRetailBCPos) {
1204
1202
  // this.dto.RetailStorageDetails && this.dto.RetailStorageDetails.forEach((value, index) => {
1205
1203
  // value.MeStorageCardId = (mode.MeStorageCardId ? mode.MeStorageCardId : this.member.MeStorageCardId);
1206
1204
  // })
1207
- _this12.dto.RetailPaymentDetails.push({
1208
- Code: _this12.paymode.counter,
1205
+ _this11.dto.RetailPaymentDetails.push({
1206
+ Code: _this11.paymode.counter,
1209
1207
  OrigAmount: czkSum,
1210
1208
  Amount: czkSum,
1211
1209
  IdsettleStyle: themode.idSettleStyle,
1212
1210
  IdbankAccount: themode.idBankAccount,
1213
1211
  DynamicPropertyKeys: [],
1214
1212
  DynamicPropertyValues: [],
1215
- DataSource: { Id: _this12.dataSource },
1216
- RetailStorageDetails: _this12.dto.RetailStorageDetails
1213
+ DataSource: { Id: _this11.dataSource },
1214
+ RetailStorageDetails: _this11.dto.RetailStorageDetails
1217
1215
  });
1218
1216
  } else {
1219
- _this12.dto.RetailPaymentDetails.push({
1220
- Code: _this12.paymode.counter,
1217
+ _this11.dto.RetailPaymentDetails.push({
1218
+ Code: _this11.paymode.counter,
1221
1219
  OrigAmount: czkSum,
1222
1220
  Amount: czkSum,
1223
1221
  IdsettleStyle: themode.idSettleStyle,
1224
1222
  IdbankAccount: themode.idBankAccount,
1225
1223
  DynamicPropertyKeys: [],
1226
1224
  DynamicPropertyValues: [],
1227
- DataSource: { Id: _this12.dataSource }
1225
+ DataSource: { Id: _this11.dataSource }
1228
1226
  });
1229
1227
  }
1230
- _this12.dto.Idmember = Idmember;
1228
+ _this11.dto.Idmember = Idmember;
1231
1229
  }
1232
1230
  });
1233
1231
  _ref15 = _mutantsUtil.platform || {}, isNewRetailBCPos = _ref15.isNewRetailBCPos;
@@ -1276,8 +1274,8 @@ var SettlementStore = (_class = function () {
1276
1274
  }
1277
1275
 
1278
1276
  return _context3.abrupt('return', (0, _tplusApi.ccApi)({ dto: (0, _extends3.default)({}, this.dto.cut(), { RetailOms: { RetailTypeEnum: RetailTypeEnum } }), cip: IPMSG.query || "" }, '/retail/RetailPos/settle', false, false, { method: 'post', timeout_skip: true }).then(function (resp) {
1279
- _this12.setDtoID(resp.ID);
1280
- _this12.billID = resp.ID;
1277
+ _this11.setDtoID(resp.ID);
1278
+ _this11.billID = resp.ID;
1281
1279
  }));
1282
1280
 
1283
1281
  case 18:
@@ -1286,8 +1284,8 @@ var SettlementStore = (_class = function () {
1286
1284
 
1287
1285
  case 20:
1288
1286
  return _context3.abrupt('return', (0, _tplusApi.tApi)({ dto: this.dto.cut() }, 'chanjet.RE.newRetail.Settle', false, false, { timeout_skip: true }).then(function (resp) {
1289
- _this12.setDtoID(resp.ID);
1290
- _this12.billID = resp.ID;
1287
+ _this11.setDtoID(resp.ID);
1288
+ _this11.billID = resp.ID;
1291
1289
  }));
1292
1290
 
1293
1291
  case 21:
@@ -1467,7 +1465,7 @@ var SettlementStore = (_class = function () {
1467
1465
  }(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, 'queryPwd', [_mobx.action], {
1468
1466
  enumerable: true,
1469
1467
  initializer: function initializer() {
1470
- var _this13 = this;
1468
+ var _this12 = this;
1471
1469
 
1472
1470
  return function (newPass, newPassConfirm) {
1473
1471
  if (!newPass || !newPassConfirm) {
@@ -1479,7 +1477,7 @@ var SettlementStore = (_class = function () {
1479
1477
  var idstore = (0, _tplusPoslogin.PosInitData)('storeID');
1480
1478
  return (0, _tplusApi.ccApi)({
1481
1479
  Idstore: idstore,
1482
- meMemberId: _this13.member.ID,
1480
+ meMemberId: _this12.member.ID,
1483
1481
  oldPassword: null,
1484
1482
  newPassword: _tplusApi.User.pwdEncrypt(newPassConfirm),
1485
1483
  dataSource: "POS"
@@ -1493,7 +1491,7 @@ var SettlementStore = (_class = function () {
1493
1491
  }), _applyDecoratedDescriptor(_class.prototype, 'initByOriginReturn', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'initByOriginReturn'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'quickSettle', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'quickSettle'), _class.prototype), _applyDecoratedDescriptor(_class.prototype, 'changeFocusAndAddPay', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class.prototype, 'changeFocusAndAddPay'), _class.prototype), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, 'updateMemberInfo', [_mobx.action], {
1494
1492
  enumerable: true,
1495
1493
  initializer: function initializer() {
1496
- var _this14 = this;
1494
+ var _this13 = this;
1497
1495
 
1498
1496
  return function () {
1499
1497
  var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(_this) {
@@ -1503,9 +1501,9 @@ var SettlementStore = (_class = function () {
1503
1501
  while (1) {
1504
1502
  switch (_context6.prev = _context6.next) {
1505
1503
  case 0:
1506
- _getLoginInfo = _this14.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
1504
+ _getLoginInfo = _this13.getLoginInfo(), IdStore = _getLoginInfo.IdStore, StoreCode = _getLoginInfo.StoreCode;
1507
1505
  _context6.next = 3;
1508
- return (0, _tplusApi.tApi)({ Idmember: _this14.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
1506
+ return (0, _tplusApi.tApi)({ Idmember: _this13.member.ID, IdStore: IdStore, StoreCode: StoreCode }, 'chanjet.AA.DR.INewRetailMember.GetUmemberDTO', false, false);
1509
1507
 
1510
1508
  case 3:
1511
1509
  resp = _context6.sent;
@@ -1519,7 +1517,7 @@ var SettlementStore = (_class = function () {
1519
1517
  return _context6.stop();
1520
1518
  }
1521
1519
  }
1522
- }, _callee6, _this14);
1520
+ }, _callee6, _this13);
1523
1521
  }));
1524
1522
 
1525
1523
  return function (_x4) {
@@ -1601,7 +1599,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1601
1599
  }, {
1602
1600
  key: 'calcDjqCheckValue',
1603
1601
  value: function calcDjqCheckValue(q1, dto, params) {
1604
- var _this15 = this;
1602
+ var _this14 = this;
1605
1603
 
1606
1604
  var useLimitPerOrder = (0, _tplusPoslogin.PosInitData)('UseLimitPerOrder');
1607
1605
  var qList = (0, _filter3.default)(this.currentMode.djqs, function (djq) {
@@ -1618,9 +1616,9 @@ var PayMode = exports.PayMode = (_class3 = function () {
1618
1616
  var _ref20 = _mutantsUtil.platform || {},
1619
1617
  isNewRetailBCPos = _ref20.isNewRetailBCPos;
1620
1618
 
1621
- var _enumController$getEn14 = _mutantsUtil.enumController.getEnumOj(),
1622
- PayStyle = _enumController$getEn14.PayStyle,
1623
- Differentiate = _enumController$getEn14.Differentiate;
1619
+ var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
1620
+ PayStyle = _enumController$getEn15.PayStyle,
1621
+ Differentiate = _enumController$getEn15.Differentiate;
1624
1622
 
1625
1623
  if (q1) {
1626
1624
  if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -1648,7 +1646,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
1648
1646
  if (!q1.checked) {
1649
1647
  this.checkList.forEach(function (ele, i) {
1650
1648
  if (ele.id === q1.id) {
1651
- _this15.checkList.splice(i, 1);
1649
+ // this.checkList.forEach((ele1) => {
1650
+ // if(ele.discountPct > 0) {
1651
+ // this.currentMode.receivable = this.currentMode.receivable + ele.amount / (1 - discountPct);
1652
+ // } else {
1653
+ // this.currentMode.receivable = this.currentMode.receivable + ele.amount;
1654
+ // }
1655
+ // })
1656
+ // if(ele.discountPct > 0) {
1657
+ // this.currentMode.receivable = 100;
1658
+ // } else {
1659
+ // this.currentMode.receivable = this.currentMode.receivable + ele.amount;
1660
+ // }
1661
+ _this14.checkList.splice(i, 1);
1652
1662
  }
1653
1663
  });
1654
1664
  } else {
@@ -1657,11 +1667,14 @@ var PayMode = exports.PayMode = (_class3 = function () {
1657
1667
  }
1658
1668
  this.checkList.push(q1);
1659
1669
  }
1670
+
1671
+ var copy1 = (0, _cloneDeep2.default)(this.receivable);
1660
1672
  this.checkList.forEach(function (ele, i) {
1661
1673
  if (ele.discountPct > 0) {
1662
- if (ele.amount === 0) {
1663
- ele.amount = (1 - ele.discountPct) * _this15.currentMode.receivable;
1664
- }
1674
+ ele.amount = (1 - ele.discountPct) * copy1;
1675
+ copy1 -= ele.amount;
1676
+ } else {
1677
+ copy1 -= ele.amount;
1665
1678
  }
1666
1679
  sum = Math.Add(sum, ele.amount);
1667
1680
  });
@@ -1722,7 +1735,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1722
1735
  return (0, _tplusApi.ccApi)((0, _extends3.default)({}, promoVoucher), 'promotion/PromoCalculate/findUsefulCouponPromoList', false, false, { method: 'post', timeout_skip: true }).then(function (result) {
1723
1736
  if (result && result.length != 0) {
1724
1737
  result.forEach(function (element) {
1725
- var djq1 = (0, _filter3.default)(_this15.currentMode.djqs, function (djq) {
1738
+ var djq1 = (0, _filter3.default)(_this14.currentMode.djqs, function (djq) {
1726
1739
  return djq.id === element.id;
1727
1740
  });
1728
1741
 
@@ -1765,9 +1778,9 @@ var PayMode = exports.PayMode = (_class3 = function () {
1765
1778
  // couponCategoryEnum: tieredAmountResult.couponCategoryEnum,
1766
1779
  // id
1767
1780
  // })
1768
- _this15.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
1781
+ _this14.addDjqs(couponCode, name, true, nominalAmount, doorsill, element.LastTS, false, true, dto.Idmember, dateMount, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, tieredAmountResult.couponCategoryEnum, id);
1769
1782
  } else {
1770
- _this15.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum);
1783
+ _this14.setCouponNum(element.id, tieredAmountResult.couponCategoryEnum);
1771
1784
  // this.currentMode.djqs[0].couponCategoryEnum = 'couponCategoryEnum';
1772
1785
  // djq1.couponCategoryEnum = element.tieredAmountResult.couponCategoryEnum
1773
1786
  }
@@ -1782,8 +1795,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
1782
1795
  var _ref22 = _mutantsUtil.platform || {},
1783
1796
  isNewRetailBCPos = _ref22.isNewRetailBCPos;
1784
1797
 
1785
- var _enumController$getEn15 = _mutantsUtil.enumController.getEnumOj(),
1786
- Differentiate = _enumController$getEn15.Differentiate;
1798
+ var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
1799
+ Differentiate = _enumController$getEn16.Differentiate;
1787
1800
 
1788
1801
  if (q1) {
1789
1802
  if (!this.currentMode.boriginReturn && parseFloat(this.currentMode.maxamount) <= 0) {
@@ -1845,8 +1858,8 @@ var PayMode = exports.PayMode = (_class3 = function () {
1845
1858
  this.currentMode.errinfo = '';
1846
1859
  var sum = this.amount;
1847
1860
 
1848
- var _enumController$getEn16 = _mutantsUtil.enumController.getEnumOj(),
1849
- PayStyle = _enumController$getEn16.PayStyle;
1861
+ var _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(),
1862
+ PayStyle = _enumController$getEn17.PayStyle;
1850
1863
 
1851
1864
  this.paymodes.thePaymodes && this.paymodes.thePaymodes.forEach(function (mode) {
1852
1865
  if (mode.paymentType === PayStyle.hyczk) {
@@ -1871,15 +1884,15 @@ var PayMode = exports.PayMode = (_class3 = function () {
1871
1884
  key: 'setPaymodes',
1872
1885
  value: function () {
1873
1886
  var _ref23 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(type, isIntegralExchange) {
1874
- var _this16 = this;
1887
+ var _this15 = this;
1875
1888
 
1876
- var _enumController$getEn17, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
1889
+ var _enumController$getEn18, settleStyleType, PayStyle, memberStoreCode, settlementCode, param, modes;
1877
1890
 
1878
1891
  return _regenerator2.default.wrap(function _callee7$(_context7) {
1879
1892
  while (1) {
1880
1893
  switch (_context7.prev = _context7.next) {
1881
1894
  case 0:
1882
- _enumController$getEn17 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn17.settleStyleType, PayStyle = _enumController$getEn17.PayStyle;
1895
+ _enumController$getEn18 = _mutantsUtil.enumController.getEnumOj(), settleStyleType = _enumController$getEn18.settleStyleType, PayStyle = _enumController$getEn18.PayStyle;
1883
1896
  memberStoreCode = settleStyleType.memberStoreCode, settlementCode = settleStyleType.settlementCode;
1884
1897
  param = { 'settleStyleType': type == 1 ? memberStoreCode : settlementCode, isIntegralExchange: isIntegralExchange };
1885
1898
  _context7.next = 5;
@@ -1911,7 +1924,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1911
1924
  calDirection: mode.Currency ? mode.Currency.CalDirection.Id : "88"
1912
1925
  });
1913
1926
  });
1914
- _this16.paymodes = paymodes;
1927
+ _this15.paymodes = paymodes;
1915
1928
  //modes.QuickSettleStyles
1916
1929
  });
1917
1930
  }
@@ -1970,19 +1983,19 @@ var PayMode = exports.PayMode = (_class3 = function () {
1970
1983
  }), _applyDecoratedDescriptor(_class3.prototype, 'clean', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clean'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clear', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clear'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcReserved', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcReserved'), _class3.prototype), _descriptor8 = _applyDecoratedDescriptor(_class3.prototype, 'calcCheckList', [_mobx.action], {
1971
1984
  enumerable: true,
1972
1985
  initializer: function initializer() {
1973
- var _this17 = this;
1986
+ var _this16 = this;
1974
1987
 
1975
1988
  return function () {
1976
- _this17.checkList = [];
1989
+ _this16.checkList = [];
1977
1990
  };
1978
1991
  }
1979
1992
  }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqCheckValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqCheckValue'), _class3.prototype), _descriptor9 = _applyDecoratedDescriptor(_class3.prototype, 'setCouponNum', [_mobx.action], {
1980
1993
  enumerable: true,
1981
1994
  initializer: function initializer() {
1982
- var _this18 = this;
1995
+ var _this17 = this;
1983
1996
 
1984
1997
  return function (id, couponNum, code) {
1985
- _this18.currentMode.djqs.forEach(function (ele) {
1998
+ _this17.currentMode.djqs.forEach(function (ele) {
1986
1999
  if (ele.id === id) {
1987
2000
  ele.couponCategoryEnum = couponNum;
1988
2001
  var IsEnable = ele.couponCategoryEnum === 'RIGUP' || ele.couponCategoryEnum === 'UN_MATCH' || ele.couponCategoryEnum === "PREPARING" || ele.couponCategoryEnum === 'PROMO_LIMITED' || ele.couponCategoryEnum === 'COUPON_CONFLICT' ? false : true;
@@ -1994,7 +2007,7 @@ var PayMode = exports.PayMode = (_class3 = function () {
1994
2007
  }), _descriptor10 = _applyDecoratedDescriptor(_class3.prototype, 'addDjqs', [_mobx.action], {
1995
2008
  enumerable: true,
1996
2009
  initializer: function initializer() {
1997
- var _this19 = this;
2010
+ var _this18 = this;
1998
2011
 
1999
2012
  return function (promoCouponCode, name, IsEnable, amount, doorsill, LastTS, checked, IsRepelWithPoints, UMemberID, expired, displayText, promoMethodEnum, discountPct, promoId, promoRuleId, couponCategoryEnum, id) {
2000
2013
  var djq = {
@@ -2016,13 +2029,13 @@ var PayMode = exports.PayMode = (_class3 = function () {
2016
2029
  couponCategoryEnum: couponCategoryEnum,
2017
2030
  id: id
2018
2031
  };
2019
- _this19.currentMode.djqs.push(djq);
2032
+ _this18.currentMode.djqs.push(djq);
2020
2033
  };
2021
2034
  }
2022
2035
  }), _applyDecoratedDescriptor(_class3.prototype, 'calcDjqValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcDjqValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'reCalculationDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'reCalculationDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'clearDjqs', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'clearDjqs'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'setCurrentModeValue', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'setCurrentModeValue'), _class3.prototype), _applyDecoratedDescriptor(_class3.prototype, 'calcMemberBalance', [_mobx.action], (0, _getOwnPropertyDescriptor2.default)(_class3.prototype, 'calcMemberBalance'), _class3.prototype)), _class3);
2023
2036
  var Member = exports.Member = (_class5 = function () {
2024
2037
  function Member(m) {
2025
- var _this20 = this;
2038
+ var _this19 = this;
2026
2039
 
2027
2040
  (0, _classCallCheck3.default)(this, Member);
2028
2041
 
@@ -2051,11 +2064,11 @@ var Member = exports.Member = (_class5 = function () {
2051
2064
  m.StorageCardNo && (this.StorageCardNo = m.StorageCardNo);
2052
2065
  m.MeStorageCardId && (this.MeStorageCardId = m.MeStorageCardId);
2053
2066
  (0, _mobx.runInAction)(function () {
2054
- _this20.cardNo = m.CardCode;
2067
+ _this19.cardNo = m.CardCode;
2055
2068
  if (index >= 0) {
2056
- _this20.balance = parseFloat(m.DynamicPropertyValues[index]);
2069
+ _this19.balance = parseFloat(m.DynamicPropertyValues[index]);
2057
2070
  } else {
2058
- _this20.balance = _this20.rawbalance;
2071
+ _this19.balance = _this19.rawbalance;
2059
2072
  }
2060
2073
  });
2061
2074
  this.needPwd = m.MemberType ? m.MemberType.IsNeedPwd : false;