tplus-portaltouch 3.25.1 → 3.25.5

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.
@@ -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: 2021-11-22 10:06:12
55
+ * @LastEditTime: 2021-11-22 18:41:40
56
56
  * @LastEditors: chenlongad
57
57
  * @modify:修改跳转到T+的查询方案方式
58
58
  */
@@ -135,44 +135,59 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
135
135
  currentDay = Math.ceil(new Date() / 1000 / 60 / 60 / 24);
136
136
 
137
137
  if (!(isLoginAfter == 1)) {
138
- _context.next = 14;
138
+ _context.next = 24;
139
139
  break;
140
140
  }
141
141
 
142
142
  if (!(!downloadCatcherDay || currentDay > downloadCatcherDay)) {
143
- _context.next = 13;
143
+ _context.next = 23;
144
144
  break;
145
145
  }
146
146
 
147
+ _context.prev = 6;
148
+
147
149
  downProgress = function downProgress(params) {
148
150
  _tplusComponentsTouch.Loading.transfer(params);
149
151
  };
150
152
 
151
153
  _tplusComponentsTouch.Loading.show({
152
- text: '离线数据下载中',
154
+ text: '离线数据下载中,请稍等...',
153
155
  delay: 0,
154
156
  showProgress: true
155
157
  });
156
- _context.next = 10;
158
+ _context.next = 11;
157
159
  return offlineSys.downloadCatcherData(downProgress);
158
160
 
159
- case 10:
161
+ case 11:
160
162
  result = _context.sent;
161
163
 
164
+ if (result) _mutantsMicrofx.localStore.set("downloadCatcherDay", currentDay);
162
165
  _tplusComponentsTouch.Loading.hide();
163
- if (result) {
164
- _mutantsMicrofx.localStore.set("downloadCatcherDay", currentDay);
165
- }
166
+ _context.next = 20;
167
+ break;
166
168
 
167
- case 13:
169
+ case 16:
170
+ _context.prev = 16;
171
+ _context.t0 = _context['catch'](6);
172
+
173
+ console.log('downloadCatcherData下载离线数据', _context.t0);
174
+ _tplusComponentsTouch.Loading.hide();
175
+
176
+ case 20:
177
+ _context.prev = 20;
178
+
179
+ _tplusComponentsTouch.Loading.hide();
180
+ return _context.finish(20);
181
+
182
+ case 23:
168
183
  _mutantsMicrofx.localStore.set("isLoginAfter", 0);
169
184
 
170
- case 14:
185
+ case 24:
171
186
  case 'end':
172
187
  return _context.stop();
173
188
  }
174
189
  }
175
- }, _callee, _this2);
190
+ }, _callee, _this2, [[6, 16, 20, 23]]);
176
191
  }));
177
192
 
178
193
  _this.getOperation = function () {
@@ -217,7 +232,7 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
217
232
 
218
233
  case 7:
219
234
  _tplusComponentsTouch.Loading.show({
220
- text: '权限加载中...',
235
+ text: '权限加载中,请稍等...',
221
236
  delay: 2500
222
237
  });
223
238
  //权限加载
@@ -232,10 +247,16 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
232
247
  case 13:
233
248
  _context2.prev = 13;
234
249
  _context2.t0 = _context2['catch'](8);
250
+
235
251
  _tplusComponentsTouch.Loading.hide();
236
252
 
237
253
  case 16:
254
+ _context2.prev = 16;
255
+
238
256
  _tplusComponentsTouch.Loading.hide();
257
+ return _context2.finish(16);
258
+
259
+ case 19:
239
260
  addClass && addClass(_this.state.id, 'portalHead');
240
261
  // 初始化参数设置。
241
262
  stores.setStore.initSetParams().then(function (ret) {
@@ -245,17 +266,21 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
245
266
  _this.sunMiPresentationInit(ret);
246
267
  return;
247
268
  }
269
+ console.log('副屏页面打开之前,user信息', (0, _stringify2.default)(stores.user));
248
270
  window.open('vicescreen?ts=' + new Date().getTime(), 'screen');
271
+ setTimeout(function () {
272
+ console.log('副屏页面打开之后,user信息', (0, _stringify2.default)(stores.user));
273
+ }, 3000);
249
274
  }
250
275
  });
251
276
  _this.hsyBasicInfoInit();
252
277
 
253
- case 20:
278
+ case 22:
254
279
  case 'end':
255
280
  return _context2.stop();
256
281
  }
257
282
  }
258
- }, _callee2, _this2, [[8, 13]]);
283
+ }, _callee2, _this2, [[8, 13, 16, 19]]);
259
284
  }));
260
285
 
261
286
  _this.initHsyPage = function () {
@@ -275,15 +300,12 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
275
300
  //SunMi初始化参数设置。
276
301
  //副屏幕交互。硬件改动20200428 需要在商米页面加载成功后才能发送 初始化命令
277
302
  // 进行主副屏数据交互 初始化
278
- var _ref3 = _mutantsMicrofx.localStore.get('user') || {},
279
- _ref3$store = _ref3.store;
280
-
281
- _ref3$store = _ref3$store === undefined ? {} : _ref3$store;
282
- var _ref3$store$storeName = _ref3$store.storeName,
283
- storeName = _ref3$store$storeName === undefined ? '' : _ref3$store$storeName;
284
-
285
303
  console.log(result);
286
304
 
305
+ var _ref3 = _mutantsMicrofx.stores.user.options.get('store') || {},
306
+ _ref3$storeName = _ref3.storeName,
307
+ storeName = _ref3$storeName === undefined ? '' : _ref3$storeName;
308
+
287
309
  var _enumController$getEn = _mutantsUtil.enumController.getEnumOj(),
288
310
  RE_POSParamType = _enumController$getEn.RE_POSParamType;
289
311
 
@@ -484,7 +506,7 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
484
506
  // if (this.isMobileEnvironment) { //暂时不支持android系统跳转
485
507
  // return Message.warn('新功能正在研发中,敬请期待。');
486
508
  // }
487
- if (!isHsyLoadFinish) {
509
+ if (!isHsyLoadFinish && !_this.isMobileEnvironment) {
488
510
  return _tplusComponentsTouch.Message.warn('正在加载资源中,请稍后。');
489
511
  }
490
512
  if (!search) {
@@ -630,7 +652,7 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
630
652
 
631
653
  _this.toHsyPage = function () {
632
654
  var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(params) {
633
- 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$loginInfo, _ref10$loginInfo$IdSt, IdStore, _ref10$loginInfo$PosI, PosId, _ref10$store, _ref10$store$storeNam, storeName, commonArgs, actionUrl, cc_url, CC_WEB_URL, external_frame, win;
655
+ 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, external_frame, win;
634
656
 
635
657
  return _regenerator2.default.wrap(function _callee4$(_context4) {
636
658
  while (1) {
@@ -643,14 +665,13 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
643
665
  IdWarehouse = (0, _tplusPoslogin.PosInitData)('IdWarehouse') || '';
644
666
  WarehouseName = (0, _tplusPoslogin.PosInitData)('WarehouseName') || '';
645
667
  IsPerformanceDistribution = (0, _tplusPoslogin.PosInitData)('PerformanceDistribution') === 'SHIPPER_STORE' || false;
646
- _ref10 = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('user') || {}, _ref10$loginInfo = _ref10.loginInfo, _ref10$loginInfo$IdSt = _ref10$loginInfo.IdStore, IdStore = _ref10$loginInfo$IdSt === undefined ? '' : _ref10$loginInfo$IdSt, _ref10$loginInfo$PosI = _ref10$loginInfo.PosId, PosId = _ref10$loginInfo$PosI === undefined ? '' : _ref10$loginInfo$PosI, _ref10$store = _ref10.store;
647
- _ref10$store = _ref10$store === undefined ? {} : _ref10$store;
648
- _ref10$store$storeNam = _ref10$store.storeName, storeName = _ref10$store$storeNam === undefined ? '' : _ref10$store$storeNam;
668
+ _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;
669
+ _ref11 = _mutantsMicrofx.stores.user.options.get('store') || {}, _ref11$storeName = _ref11.storeName, storeName = _ref11$storeName === undefined ? '' : _ref11$storeName;
649
670
  _context4.t0 = pageType;
650
- _context4.next = _context4.t0 === 'voucher' ? 11 : _context4.t0 === 'report' ? 14 : 18;
671
+ _context4.next = _context4.t0 === 'voucher' ? 10 : _context4.t0 === 'report' ? 13 : 17;
651
672
  break;
652
673
 
653
- case 11:
674
+ case 10:
654
675
  filter = {
655
676
  defaultValue: {
656
677
  storeId: {
@@ -677,9 +698,9 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
677
698
  }
678
699
  };
679
700
  }
680
- return _context4.abrupt('break', 18);
701
+ return _context4.abrupt('break', 17);
681
702
 
682
- case 14:
703
+ case 13:
683
704
  filter = {
684
705
  filterValue: {
685
706
  storeId: {
@@ -733,9 +754,9 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
733
754
  }
734
755
  };
735
756
  }
736
- return _context4.abrupt('break', 18);
757
+ return _context4.abrupt('break', 17);
737
758
 
738
- case 18:
759
+ case 17:
739
760
  bar_bg = encodeURIComponent(bar_bg);
740
761
  bar_active_bg = encodeURIComponent(bar_active_bg);
741
762
  menu = secondRouter ? menu + '/' + _this.randomWord(true, 13) : menu;
@@ -751,22 +772,22 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
751
772
  console.log('web_hsy_url:', cc_url);
752
773
 
753
774
  if (!_this.isHorizontalSunMi) {
754
- _context4.next = 37;
775
+ _context4.next = 36;
755
776
  break;
756
777
  }
757
778
 
758
- _context4.next = 32;
779
+ _context4.next = 31;
759
780
  return _tplusApi.User.getLoginCCMidWebUrl(cc_url);
760
781
 
761
- case 32:
782
+ case 31:
762
783
  CC_WEB_URL = _context4.sent;
763
784
 
764
785
  console.log('CC_WEB_URL:', CC_WEB_URL);
765
786
  window.android_CommonFun.openWebUrlByOutBrowser(CC_WEB_URL);
766
- _context4.next = 42;
787
+ _context4.next = 41;
767
788
  break;
768
789
 
769
- case 37:
790
+ case 36:
770
791
  external_frame = document.getElementById('external-frame-cc');
771
792
  win = external_frame.contentWindow;
772
793
 
@@ -787,7 +808,7 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
787
808
  }
788
809
  });
789
810
 
790
- case 42:
811
+ case 41:
791
812
  case 'end':
792
813
  return _context4.stop();
793
814
  }
@@ -890,10 +911,10 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
890
911
  return vv.Name === v.Name;
891
912
  });
892
913
 
893
- var _ref11 = controllable || {},
894
- Visibility = _ref11.Visibility,
895
- HoldFunctionAuth = _ref11.HoldFunctionAuth,
896
- Title = _ref11.Title;
914
+ var _ref12 = controllable || {},
915
+ Visibility = _ref12.Visibility,
916
+ HoldFunctionAuth = _ref12.HoldFunctionAuth,
917
+ Title = _ref12.Title;
897
918
 
898
919
  var errorTip = void 0;
899
920
  if (!Visibility) {
@@ -1136,12 +1157,12 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
1136
1157
  modalURL: ''
1137
1158
  };
1138
1159
 
1139
- var _ref12 = _mutantsUtil.platform || {},
1140
- isVerticalTouch = _ref12.isVerticalTouch,
1141
- isHorizontalPad = _ref12.isHorizontalPad,
1142
- isHorizontalSunMi = _ref12.isHorizontalSunMi,
1143
- isNewRetailBCPos = _ref12.isNewRetailBCPos,
1144
- isNewRetailBCPosTC = _ref12.isNewRetailBCPosTC;
1160
+ var _ref13 = _mutantsUtil.platform || {},
1161
+ isVerticalTouch = _ref13.isVerticalTouch,
1162
+ isHorizontalPad = _ref13.isHorizontalPad,
1163
+ isHorizontalSunMi = _ref13.isHorizontalSunMi,
1164
+ isNewRetailBCPos = _ref13.isNewRetailBCPos,
1165
+ isNewRetailBCPosTC = _ref13.isNewRetailBCPosTC;
1145
1166
 
1146
1167
  _this.isVerticalTouch = !!isVerticalTouch;
1147
1168
  _this.isHorizontalPad = !!isHorizontalPad;
@@ -1209,9 +1230,9 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
1209
1230
  break;
1210
1231
  }
1211
1232
 
1212
- var _ref13 = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('StoreKey') || {},
1213
- _ref13$PosId = _ref13.PosId,
1214
- PosId = _ref13$PosId === undefined ? '' : _ref13$PosId;
1233
+ var _ref14 = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('StoreKey') || {},
1234
+ _ref14$PosId = _ref14.PosId,
1235
+ PosId = _ref14$PosId === undefined ? '' : _ref14$PosId;
1215
1236
 
1216
1237
  var cc_url = this.hsy_domain.replace('#/', '') + '?fromApp=nretail&posid=' + PosId + '&content_only=true&bar_bg=' + encodeURIComponent('#FFFFFF') + '&bar_active_bg=' + encodeURIComponent(color);
1217
1238
  this.setState({ loadHsyURL: cc_url });