tplus-portaltouch 3.54.2 → 3.55.3

Sign up to get free protection for your applications and to get access to all the features.
@@ -52,7 +52,7 @@ var _inherits3 = _interopRequireDefault(_inherits2);
52
52
  var _class, _class2, _temp; /*
53
53
  * @Description:
54
54
  * @Date: 2019-08-13 08:42:18
55
- * @LastEditTime: 2022-04-21 15:16:36
55
+ * @LastEditTime: 2022-05-17 20:45:11
56
56
  * @LastEditors: chenlongad
57
57
  * @modify:修改跳转到T+的查询方案方式
58
58
  */
@@ -124,7 +124,7 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
124
124
 
125
125
  _this2.ccFrameStore = {};
126
126
  _this2.catchOfflineData = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
127
- var offlineSys, isLoginAfter, downloadCatcherDay, currentDay, downProgress, result;
127
+ var offlineSys, isLoginAfter, downloadCatcherDay, dataIsOffline, currentDay, downProgress, result;
128
128
  return _regenerator2.default.wrap(function _callee$(_context) {
129
129
  while (1) {
130
130
  switch (_context.prev = _context.next) {
@@ -132,19 +132,20 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
132
132
  offlineSys = _this2.context.stores.offlineSys;
133
133
  isLoginAfter = _mutantsMicrofx.localStore.get("isLoginAfter");
134
134
  downloadCatcherDay = _mutantsMicrofx.localStore.get("downloadCatcherDay");
135
+ dataIsOffline = _mutantsMicrofx.localStore.get("dataIsOffline");
135
136
  currentDay = Math.ceil(new Date() / 1000 / 60 / 60 / 24);
136
137
 
137
138
  if (!(isLoginAfter == 1)) {
138
- _context.next = 24;
139
+ _context.next = 25;
139
140
  break;
140
141
  }
141
142
 
142
143
  if (!(!downloadCatcherDay || currentDay > downloadCatcherDay)) {
143
- _context.next = 23;
144
+ _context.next = 24;
144
145
  break;
145
146
  }
146
147
 
147
- _context.prev = 6;
148
+ _context.prev = 7;
148
149
 
149
150
  downProgress = function downProgress(params) {
150
151
  _tplusComponentsTouch.Loading.transfer(params);
@@ -155,39 +156,39 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
155
156
  delay: 0,
156
157
  showProgress: true
157
158
  });
158
- _context.next = 11;
159
- return offlineSys.downloadCatcherData(downProgress);
159
+ _context.next = 12;
160
+ return offlineSys.downloadCatcherData(downProgress, !dataIsOffline);
160
161
 
161
- case 11:
162
+ case 12:
162
163
  result = _context.sent;
163
164
 
164
165
  if (result) _mutantsMicrofx.localStore.set("downloadCatcherDay", currentDay);
165
166
  _tplusComponentsTouch.Loading.hide();
166
- _context.next = 20;
167
+ _context.next = 21;
167
168
  break;
168
169
 
169
- case 16:
170
- _context.prev = 16;
171
- _context.t0 = _context['catch'](6);
170
+ case 17:
171
+ _context.prev = 17;
172
+ _context.t0 = _context['catch'](7);
172
173
 
173
174
  console.log('downloadCatcherData下载离线数据', _context.t0);
174
175
  _tplusComponentsTouch.Loading.hide();
175
176
 
176
- case 20:
177
- _context.prev = 20;
177
+ case 21:
178
+ _context.prev = 21;
178
179
 
179
180
  _tplusComponentsTouch.Loading.hide();
180
- return _context.finish(20);
181
+ return _context.finish(21);
181
182
 
182
- case 23:
183
+ case 24:
183
184
  _mutantsMicrofx.localStore.set("isLoginAfter", 0);
184
185
 
185
- case 24:
186
+ case 25:
186
187
  case 'end':
187
188
  return _context.stop();
188
189
  }
189
190
  }
190
- }, _callee, _this3, [[6, 16, 20, 23]]);
191
+ }, _callee, _this3, [[7, 17, 21, 24]]);
191
192
  }));
192
193
 
193
194
  _this2.getOperation = function () {
@@ -284,6 +285,42 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
284
285
  }, _callee2, _this3, [[9, 14, 17, 20]]);
285
286
  }));
286
287
 
288
+ _this2.loadARMSConfig = function () {
289
+ var nrsp = window.newRetailStaticParams;
290
+ if (nrsp && nrsp.arms) {
291
+ var _ref3 = nrsp.arms || {},
292
+ bl = _ref3.bl,
293
+ appName = _ref3.appName,
294
+ userType = _ref3.userType,
295
+ orgType = _ref3.orgType;
296
+
297
+ if (bl && appName) {
298
+ var user = _tplusApi.User.restore();
299
+
300
+ var _ref4 = user || {},
301
+ _ref4$domainName = _ref4.domainName,
302
+ domainName = _ref4$domainName === undefined ? '' : _ref4$domainName,
303
+ _ref4$bookCode = _ref4.bookCode,
304
+ bookCode = _ref4$bookCode === undefined ? '' : _ref4$bookCode,
305
+ _ref4$userId = _ref4.userId,
306
+ userId = _ref4$userId === undefined ? '' : _ref4$userId,
307
+ _ref4$username = _ref4.username,
308
+ username = _ref4$username === undefined ? '' : _ref4$username;
309
+
310
+ if (orgType === false) {
311
+ bl.setConfig({ uid: 'pos-' + appName + '-' + domainName + '-' + bookCode });
312
+ nrsp.arms.orgType = true;
313
+ }
314
+ if (userType === false) {
315
+ bl.setConfig({ setUsername: function setUsername() {
316
+ return (username || 's') + '-' + (userId || '00000000000');
317
+ } });
318
+ nrsp.arms.userType = true;
319
+ }
320
+ }
321
+ }
322
+ };
323
+
287
324
  _this2.loadHsyPage = function () {
288
325
  if (_this2.isHsyIframeInclude) {
289
326
  _this2.initHsyBasicPageInfo();
@@ -297,9 +334,9 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
297
334
  // 进行主副屏数据交互 初始化
298
335
  console.log(result);
299
336
 
300
- var _ref3 = _mutantsMicrofx.stores.user.options.get('store') || {},
301
- _ref3$storeName = _ref3.storeName,
302
- storeName = _ref3$storeName === undefined ? '' : _ref3$storeName;
337
+ var _ref5 = _mutantsMicrofx.stores.user.options.get('store') || {},
338
+ _ref5$storeName = _ref5.storeName,
339
+ storeName = _ref5$storeName === undefined ? '' : _ref5$storeName;
303
340
 
304
341
  var _enumController$getEn = _mutantsUtil.enumController.getEnumOj(),
305
342
  RE_POSParamType = _enumController$getEn.RE_POSParamType;
@@ -341,11 +378,11 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
341
378
 
342
379
  var loginInfo = user.options.get('loginInfo');
343
380
 
344
- var _ref4 = loginInfo || {},
345
- UserCode = _ref4.UserCode,
346
- AccountNum = _ref4.AccountNum,
347
- posCode = _ref4.posCode,
348
- TplusStoreId = _ref4.TplusStoreId;
381
+ var _ref6 = loginInfo || {},
382
+ UserCode = _ref6.UserCode,
383
+ AccountNum = _ref6.AccountNum,
384
+ posCode = _ref6.posCode,
385
+ TplusStoreId = _ref6.TplusStoreId;
349
386
 
350
387
  var uid = _this2.tplusEncode(UserCode);
351
388
  var pwd = _this2.tplusEncode(user.options.get("password"));
@@ -388,8 +425,7 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
388
425
  Name = values.Name,
389
426
  style = values.style,
390
427
  search = values.search,
391
- tmenuCode = values.tmenuCode,
392
- planName = values.planName;
428
+ tmenuCode = values.tmenuCode;
393
429
  var _this2$state = _this2.state,
394
430
  operations = _this2$state.operations,
395
431
  isHsyLoadFinish = _this2$state.isHsyLoadFinish;
@@ -398,11 +434,11 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
398
434
  return vv.Name === Name;
399
435
  });
400
436
 
401
- var _ref5 = controllable || {},
402
- Visibility = _ref5.Visibility,
403
- HoldFunctionAuth = _ref5.HoldFunctionAuth,
404
- Title = _ref5.Title,
405
- MenuCode = _ref5.MenuCode;
437
+ var _ref7 = controllable || {},
438
+ Visibility = _ref7.Visibility,
439
+ HoldFunctionAuth = _ref7.HoldFunctionAuth,
440
+ Title = _ref7.Title,
441
+ MenuCode = _ref7.MenuCode;
406
442
 
407
443
  var errorTip = void 0;
408
444
 
@@ -455,7 +491,7 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
455
491
  return _mutantsMicrofx.stores.modalRouter.show({ url: '/' + type, width: 800, title: title });
456
492
  }
457
493
  // 支持页面内打开,减少再次加载页面的时间。
458
- if (iframe === true) return _this2.toFramePage({ type: type, app: app, title: title, style: style, search: search, MenuCode: MenuCode, tmenuCode: tmenuCode, isHsyLoadFinish: isHsyLoadFinish, planName: planName });
494
+ if (iframe === true) return _this2.toFramePage({ type: type, app: app, title: title, style: style, search: search, MenuCode: MenuCode, tmenuCode: tmenuCode, isHsyLoadFinish: isHsyLoadFinish });
459
495
  switch (type) {
460
496
  case 'cashier':
461
497
  portalStore.checkDuty().then(function (onDutyMessage) {
@@ -499,14 +535,14 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
499
535
  };
500
536
 
501
537
  _this2.toFramePage = function (params) {
502
- var _ref6 = params || {},
503
- app = _ref6.app,
504
- title = _ref6.title,
505
- style = _ref6.style,
506
- search = _ref6.search,
507
- tmenuCode = _ref6.tmenuCode,
508
- MenuCode = _ref6.MenuCode,
509
- isHsyLoadFinish = _ref6.isHsyLoadFinish;
538
+ var _ref8 = params || {},
539
+ app = _ref8.app,
540
+ title = _ref8.title,
541
+ style = _ref8.style,
542
+ search = _ref8.search,
543
+ tmenuCode = _ref8.tmenuCode,
544
+ MenuCode = _ref8.MenuCode,
545
+ isHsyLoadFinish = _ref8.isHsyLoadFinish;
510
546
 
511
547
  switch (app) {
512
548
  case 'cc':
@@ -531,9 +567,9 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
531
567
  if (tmenuCode || MenuCode) {
532
568
  _this2.saveLog(title);
533
569
  if (MenuCode) {
534
- _this2.toTplusPage(MenuCode, search, params);
570
+ _this2.toTplusPage(MenuCode, search);
535
571
  } else {
536
- _this2.toTplusPage(tmenuCode, search, params);
572
+ _this2.toTplusPage(tmenuCode, search);
537
573
  }
538
574
  }
539
575
  break;
@@ -565,8 +601,8 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
565
601
  };
566
602
 
567
603
  _this2.toTplusPage = function () {
568
- var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(tmenuCode, search, params) {
569
- var ret, _ref8, ossjumpUrl, postMessageUrl, dsearchPlanID, portalStore, _portalStore, result, menu, ciaToken, external_frame_tc, win, loadTcURL;
604
+ var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(tmenuCode, search) {
605
+ var ret, _ref10, ossjumpUrl, postMessageUrl, dsearchPlanID, portalStore, menu, ciaToken, external_frame_tc, win, loadTcURL;
570
606
 
571
607
  return _regenerator2.default.wrap(function _callee3$(_context3) {
572
608
  while (1) {
@@ -582,7 +618,7 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
582
618
  return _context3.abrupt('return');
583
619
 
584
620
  case 3:
585
- _ref8 = ret || {}, ossjumpUrl = _ref8.ossjumpUrl, postMessageUrl = _ref8.postMessageUrl;
621
+ _ref10 = ret || {}, ossjumpUrl = _ref10.ossjumpUrl, postMessageUrl = _ref10.postMessageUrl;
586
622
  dsearchPlanID = '';
587
623
 
588
624
  if (!(search && search.id)) {
@@ -598,67 +634,52 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
598
634
  dsearchPlanID = _context3.sent;
599
635
 
600
636
  case 10:
601
- if (!params) {
602
- _context3.next = 16;
603
- break;
604
- }
605
-
606
- _portalStore = _this2.context.stores.portalStore;
607
- _context3.next = 14;
608
- return _portalStore.getSearchPlanId(params);
609
-
610
- case 14:
611
- result = _context3.sent;
612
-
613
- dsearchPlanID = result.data && result.data.planId;
614
-
615
- case 16:
616
637
  menu = _this2.tplusEncode(tmenuCode);
617
638
 
618
639
  ossjumpUrl += '&menu=' + menu + '&fromUrl=' + _this2.tplusEncode(location.origin);
619
640
  if (dsearchPlanID) {
620
- ossjumpUrl += '&searchPlanID=' + _this2.tplusEncode(dsearchPlanID + "");
641
+ ossjumpUrl += '&searchPlanID=' + _this2.tplusEncode(dsearchPlanID);
621
642
  }
622
643
 
623
644
  // 添加CiaToken
624
- _context3.prev = 19;
625
- _context3.next = 22;
645
+ _context3.prev = 13;
646
+ _context3.next = 16;
626
647
  return (0, _tplusApi.getCIACode)();
627
648
 
628
- case 22:
649
+ case 16:
629
650
  ciaToken = _context3.sent;
630
651
 
631
652
  ciaToken = _this2.tplusEncode(ciaToken);
632
653
  ossjumpUrl += '&ciaToken=' + ciaToken;
633
- _context3.next = 30;
654
+ _context3.next = 24;
634
655
  break;
635
656
 
636
- case 27:
637
- _context3.prev = 27;
638
- _context3.t0 = _context3['catch'](19);
657
+ case 21:
658
+ _context3.prev = 21;
659
+ _context3.t0 = _context3['catch'](13);
639
660
 
640
661
  console.log("获取CiaToken失败", _context3.t0);
641
662
 
642
- case 30:
663
+ case 24:
643
664
  if (!_this2.isHorizontalSunMi) {
644
- _context3.next = 34;
665
+ _context3.next = 28;
645
666
  break;
646
667
  }
647
668
 
648
669
  window.android_CommonFun.openWebUrlByOutBrowser(ossjumpUrl);
649
- _context3.next = 42;
670
+ _context3.next = 36;
650
671
  break;
651
672
 
652
- case 34:
673
+ case 28:
653
674
  if (!(_this2.new_retail_app == 'tc' || _this2.new_retail_app == 'tczsy' || _this2.new_retail_app == 'tcyzj')) {
654
- _context3.next = 37;
675
+ _context3.next = 31;
655
676
  break;
656
677
  }
657
678
 
658
679
  _mutantsMicrofx.nativeMs.useDefaultBrowser(ossjumpUrl);
659
680
  return _context3.abrupt('return');
660
681
 
661
- case 37:
682
+ case 31:
662
683
  external_frame_tc = document.getElementById('external-frame-tc');
663
684
  win = external_frame_tc.contentWindow;
664
685
  loadTcURL = _this2.state.loadTcURL;
@@ -677,22 +698,22 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
677
698
  }
678
699
  });
679
700
 
680
- case 42:
701
+ case 36:
681
702
  case 'end':
682
703
  return _context3.stop();
683
704
  }
684
705
  }
685
- }, _callee3, _this3, [[19, 27]]);
706
+ }, _callee3, _this3, [[13, 21]]);
686
707
  }));
687
708
 
688
- return function (_x2, _x3, _x4) {
689
- return _ref7.apply(this, arguments);
709
+ return function (_x2, _x3) {
710
+ return _ref9.apply(this, arguments);
690
711
  };
691
712
  }();
692
713
 
693
714
  _this2.toHsyPage = function () {
694
- var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(params) {
695
- var content_only, bar_bg, bar_active_bg, menu, secondRouter, activePrompt, closePrompt, closeable, leavePrompt, lock, pageId, pageParams, path, tabId, tabLabel, pageType, _k, filter, IdWarehouse, WarehouseName, IsPerformanceDistribution, _ref10, _ref10$IdStore, IdStore, _ref10$PosId, PosId, _ref11, _ref11$storeName, storeName, commonArgs, actionUrl, cc_url, CC_WEB_URL, _hsyPage;
715
+ var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(params) {
716
+ var content_only, bar_bg, bar_active_bg, menu, secondRouter, activePrompt, closePrompt, closeable, leavePrompt, lock, pageId, pageParams, path, tabId, tabLabel, pageType, _k, filter, IdWarehouse, WarehouseName, IsPerformanceDistribution, _ref12, _ref12$IdStore, IdStore, _ref12$PosId, PosId, _ref13, _ref13$storeName, storeName, commonArgs, actionUrl, cc_url, CC_WEB_URL, _hsyPage;
696
717
 
697
718
  return _regenerator2.default.wrap(function _callee4$(_context4) {
698
719
  while (1) {
@@ -705,8 +726,8 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
705
726
  IdWarehouse = _this2.idWarehouse;
706
727
  WarehouseName = _this2.warehouseName;
707
728
  IsPerformanceDistribution = _this2.performanceDistribution === 'SHIPPER_STORE' || false;
708
- _ref10 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {}, _ref10$IdStore = _ref10.IdStore, IdStore = _ref10$IdStore === undefined ? '' : _ref10$IdStore, _ref10$PosId = _ref10.PosId, PosId = _ref10$PosId === undefined ? '' : _ref10$PosId;
709
- _ref11 = _mutantsMicrofx.stores.user.options.get('store') || {}, _ref11$storeName = _ref11.storeName, storeName = _ref11$storeName === undefined ? '' : _ref11$storeName;
729
+ _ref12 = _mutantsMicrofx.stores.user.options.get('loginInfo') || {}, _ref12$IdStore = _ref12.IdStore, IdStore = _ref12$IdStore === undefined ? '' : _ref12$IdStore, _ref12$PosId = _ref12.PosId, PosId = _ref12$PosId === undefined ? '' : _ref12$PosId;
730
+ _ref13 = _mutantsMicrofx.stores.user.options.get('store') || {}, _ref13$storeName = _ref13.storeName, storeName = _ref13$storeName === undefined ? '' : _ref13$storeName;
710
731
  _context4.t0 = pageType;
711
732
  _context4.next = _context4.t0 === 'voucher' ? 10 : _context4.t0 === 'report' ? 14 : 18;
712
733
  break;
@@ -858,8 +879,8 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
858
879
  }, _callee4, _this3);
859
880
  }));
860
881
 
861
- return function (_x5) {
862
- return _ref9.apply(this, arguments);
882
+ return function (_x4) {
883
+ return _ref11.apply(this, arguments);
863
884
  };
864
885
  }();
865
886
 
@@ -953,10 +974,10 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
953
974
  return vv.Name === v.Name;
954
975
  });
955
976
 
956
- var _ref12 = controllable || {},
957
- Visibility = _ref12.Visibility,
958
- HoldFunctionAuth = _ref12.HoldFunctionAuth,
959
- Title = _ref12.Title;
977
+ var _ref14 = controllable || {},
978
+ Visibility = _ref14.Visibility,
979
+ HoldFunctionAuth = _ref14.HoldFunctionAuth,
980
+ Title = _ref14.Title;
960
981
 
961
982
  var errorTip = void 0;
962
983
  if (!Visibility) {
@@ -1235,11 +1256,11 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
1235
1256
  modalURL: ''
1236
1257
  };
1237
1258
 
1238
- var _ref13 = _mutantsUtil.platform || {},
1239
- isVerticalTouch = _ref13.isVerticalTouch,
1240
- isHorizontalPad = _ref13.isHorizontalPad,
1241
- isHorizontalSunMi = _ref13.isHorizontalSunMi,
1242
- isNewRetailBCPosTC = _ref13.isNewRetailBCPosTC;
1259
+ var _ref15 = _mutantsUtil.platform || {},
1260
+ isVerticalTouch = _ref15.isVerticalTouch,
1261
+ isHorizontalPad = _ref15.isHorizontalPad,
1262
+ isHorizontalSunMi = _ref15.isHorizontalSunMi,
1263
+ isNewRetailBCPosTC = _ref15.isNewRetailBCPosTC;
1243
1264
 
1244
1265
  _this2.isVerticalTouch = !!isVerticalTouch;
1245
1266
  _this2.isHorizontalPad = !!isHorizontalPad;
@@ -1329,8 +1350,12 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
1329
1350
  _this4.loadHsyPage();
1330
1351
  }, 1000);
1331
1352
  }
1353
+ this.loadARMSConfig();
1332
1354
  }
1333
1355
 
1356
+ //加载arms系统相关企业参数
1357
+
1358
+
1334
1359
  // 初始化加载hsy
1335
1360
 
1336
1361
  }, {
@@ -1361,7 +1386,7 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
1361
1386
  key: 'initHsyBasicPageInfo',
1362
1387
 
1363
1388
 
1364
- // 初始化智+模块信息
1389
+ // 初始化模块信息
1365
1390
  value: function initHsyBasicPageInfo() {
1366
1391
  console.log('start create iframe-hsyPage');
1367
1392
  var hsyPageLoadIsFinish = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('hsyPageLoadIsFinish');
@@ -1385,9 +1410,9 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
1385
1410
  }
1386
1411
  var _height = document.body.clientHeight;
1387
1412
 
1388
- var _ref14 = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('StoreKey') || {},
1389
- _ref14$PosId = _ref14.PosId,
1390
- PosId = _ref14$PosId === undefined ? '' : _ref14$PosId;
1413
+ var _ref16 = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('StoreKey') || {},
1414
+ _ref16$PosId = _ref16.PosId,
1415
+ PosId = _ref16$PosId === undefined ? '' : _ref16$PosId;
1391
1416
 
1392
1417
  var cc_url = this.hsy_domain.replace('#/', '') + '?fromApp=nretail&posid=' + PosId + '&content_only=true&bar_bg=' + encodeURIComponent('#FFFFFF') + '&bar_active_bg=' + encodeURIComponent(color);
1393
1418
  var iframe = document.createElement('iframe');