tplus-portaltouch 3.25.4 → 3.25.8

package/dist/pages/Portalbc/index.js

@@ -49,12 +49,12 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
-var _class, _class2, _temp; /*
-                             * @Description:
-                             * @Date: 2019-08-13 08:42:18
-                             * @LastEditTime: 2021-11-22 18:41:40
-                             * @LastEditors: chenlongad
-                             * @modify:修改跳转到T+的查询方案方式
+var _class, _class2, _temp; /*
+                             * @Description:
+                             * @Date: 2019-08-13 08:42:18
+                             * @LastEditTime: 2021-12-01 19:38:56
+                             * @LastEditors: chenlongad
+                             * @modify:修改跳转到T+的查询方案方式
                              */
 
 
@@ -135,44 +135,59 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
               currentDay = Math.ceil(new Date() / 1000 / 60 / 60 / 24);
 
               if (!(isLoginAfter == 1)) {
-                _context.next = 14;
+                _context.next = 24;
                 break;
               }
 
               if (!(!downloadCatcherDay || currentDay > downloadCatcherDay)) {
-                _context.next = 13;
+                _context.next = 23;
                 break;
               }
 
+              _context.prev = 6;
+
               downProgress = function downProgress(params) {
                 _tplusComponentsTouch.Loading.transfer(params);
               };
 
               _tplusComponentsTouch.Loading.show({
-                text: '离线数据下载中',
+                text: '离线数据下载中，请稍等...',
                 delay: 0,
                 showProgress: true
               });
-              _context.next = 10;
+              _context.next = 11;
               return offlineSys.downloadCatcherData(downProgress);
 
-            case 10:
+            case 11:
               result = _context.sent;
 
+              if (result) _mutantsMicrofx.localStore.set("downloadCatcherDay", currentDay);
               _tplusComponentsTouch.Loading.hide();
-              if (result) {
-                _mutantsMicrofx.localStore.set("downloadCatcherDay", currentDay);
-              }
+              _context.next = 20;
+              break;
 
-            case 13:
+            case 16:
+              _context.prev = 16;
+              _context.t0 = _context['catch'](6);
+
+              console.log('downloadCatcherData下载离线数据', _context.t0);
+              _tplusComponentsTouch.Loading.hide();
+
+            case 20:
+              _context.prev = 20;
+
+              _tplusComponentsTouch.Loading.hide();
+              return _context.finish(20);
+
+            case 23:
               _mutantsMicrofx.localStore.set("isLoginAfter", 0);
 
-            case 14:
+            case 24:
             case 'end':
               return _context.stop();
           }
         }
-      }, _callee, _this2);
+      }, _callee, _this2, [[6, 16, 20, 23]]);
     }));
 
     _this.getOperation = function () {
@@ -217,7 +232,7 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
 
             case 7:
               _tplusComponentsTouch.Loading.show({
-                text: '权限加载中...',
+                text: '权限加载中，请稍等...',
                 delay: 2500
               });
               //权限加载
@@ -232,10 +247,16 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
             case 13:
               _context2.prev = 13;
               _context2.t0 = _context2['catch'](8);
+
               _tplusComponentsTouch.Loading.hide();
 
             case 16:
+              _context2.prev = 16;
+
               _tplusComponentsTouch.Loading.hide();
+              return _context2.finish(16);
+
+            case 19:
               addClass && addClass(_this.state.id, 'portalHead');
               // 初始化参数设置。
               stores.setStore.initSetParams().then(function (ret) {
@@ -254,12 +275,12 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
               });
               _this.hsyBasicInfoInit();
 
-            case 20:
+            case 22:
             case 'end':
               return _context2.stop();
           }
         }
-      }, _callee2, _this2, [[8, 13]]);
+      }, _callee2, _this2, [[8, 13, 16, 19]]);
     }));
 
     _this.initHsyPage = function () {
@@ -908,6 +929,15 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
 
     _this.createLeftNode = function () {
       var menu = _this.leftMenu;
+      var width = menu.length == 0 ? _this.isMobileEnvironment & !_this.isNewRetailBCPosTC ? 5 : 4 : 7;
+      if (menu.length == 0) {
+        return _react2.default.createElement(
+          _antd.Col,
+          { xl: width, md: width, className: 'portal-left-col', key: 'left' },
+          _react2.default.createElement('div', { className: 'portal-left-content' })
+        );
+        // return null;
+      }
       var menuNode = menu.map(function (v) {
         return v.container ? _react2.default.createElement(
           'div',
@@ -958,7 +988,15 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
           v.icon && _react2.default.createElement(_tplusComponentsTouch.Ticon, { icon: v.icon })
         );
       });
-      return menuNode;
+      return _react2.default.createElement(
+        _antd.Col,
+        { xl: 7, md: 7, className: 'portal-left-col', key: 'left' },
+        _react2.default.createElement(
+          'div',
+          { className: 'portal-left-content' },
+          menuNode
+        )
+      );
     };
 
     _this.createCenterNode = function () {
@@ -1047,6 +1085,7 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
     };
 
     _this.createRightNode = function () {
+      var width = _this.leftMenu.length == 0 ? _this.isMobileEnvironment & !_this.isNewRetailBCPosTC ? 9 : 10 : 7;
       var node = _this.rightMenu.map(function (v) {
         return v.container ? _react2.default.createElement(
           'div',
@@ -1088,16 +1127,20 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
           !!v.icon && _react2.default.createElement(_tplusComponentsTouch.Ticon, { icon: v.icon })
         );
       });
-      return node;
+      return _react2.default.createElement(
+        _antd.Col,
+        { xl: width, md: width, className: 'portal-right-col', key: 'right' },
+        _react2.default.createElement(
+          'div',
+          { className: 'portal-right-content' },
+          node
+        )
+      );
     };
 
     _this.createMoreNode = function () {
-      var arrs = _this.centerRightMenu.find(function (v) {
-        return v.sub && v.sub.find(function (vv) {
-          return vv.key == 'more';
-        });
-      }).sub[1];
-      var items = _this.new_retail_app == 'cc' ? arrs.sub_cc : _this.new_retail_app == 'tc' || _this.new_retail_app == 'tczsy' || _this.new_retail_app == 'tcyzj' ? arrs.sub_tc : [];
+      var arrs = _this.getMoreNodeInfo();
+      var items = _this.isNewRetailBCPosTC ? arrs.sub_tc : arrs.sub_cc || [];
       var node = items.length > 0 && items.map(function (v) {
         return _react2.default.createElement(
           'div',
@@ -1122,6 +1165,34 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
       return node;
     };
 
+    _this.getMoreNodeInfo = function () {
+      if (_this.isNewRetailBCPosTC) {
+        if (_this.isMobileEnvironment) {
+          return _this.centerRightMenu.find(function (vv) {
+            return vv.key == 'more';
+          }) || {};
+        } else {
+          return _this.centerRightMenu.find(function (v) {
+            return v.sub && v.sub.find(function (vv) {
+              return vv.key == 'more';
+            });
+          }).sub[1] || {};
+        }
+      } else {
+        if (_this.isMobileEnvironment) {
+          return _this.centerRightMenu.find(function (vv) {
+            return vv.key == 'more';
+          }) || {};
+        } else {
+          return _this.centerRightMenu.find(function (v) {
+            return v.sub && v.sub.find(function (vv) {
+              return vv.key == 'more';
+            });
+          }).sub[1] || {};
+        }
+      }
+    };
+
     _this.hasElectron = hasElectron;
     _this.state = {
       id: Date.now(),
@@ -1153,17 +1224,10 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
     _this.new_retail_app = _mutantsMicrofx.localStore && _mutantsMicrofx.localStore.get('newRetailAppType');
 
     //首页布局
-    var leftMenu = _data2.default.leftMenu,
-        centerLeftMenu = _data2.default.centerLeftMenu,
-        centerRightMenu = _data2.default.centerRightMenu,
-        rightMenu = _data2.default.rightMenu,
-        leftMenuTC = _data2.default.leftMenuTC,
-        rightMenuTC = _data2.default.rightMenuTC;
-
-    _this.leftMenu = isNewRetailBCPosTC ? leftMenuTC : leftMenu;
-    _this.centerLeftMenu = centerLeftMenu;
-    _this.centerRightMenu = centerRightMenu;
-    _this.rightMenu = isNewRetailBCPosTC ? rightMenuTC : rightMenu;
+    _this.leftMenu = _this.getMenuByPosition('left');
+    _this.centerLeftMenu = _this.getMenuByPosition('centerLeft');
+    _this.centerRightMenu = _this.getMenuByPosition('centerRight');
+    _this.rightMenu = _this.getMenuByPosition('right');
     _this.hsy_domain = _tplusApi.User && _tplusApi.User.getWebEntry();
     _this.randomWord = _this.randomWord.bind(_this);
     (0, _mobx.autorun)(function () {
@@ -1173,6 +1237,58 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
   }
 
   (0, _createClass3.default)(_default, [{
+    key: 'getMenuByPosition',
+    value: function getMenuByPosition(position) {
+      var leftMenu = _data2.default.leftMenu,
+          centerLeftMenu = _data2.default.centerLeftMenu,
+          centerRightMenu = _data2.default.centerRightMenu,
+          rightMenu = _data2.default.rightMenu,
+          leftMenuTC = _data2.default.leftMenuTC,
+          rightMenuTC = _data2.default.rightMenuTC,
+          centerLeftMenuMobileCC = _data2.default.centerLeftMenuMobileCC,
+          centerLeftMenuMobileTC = _data2.default.centerLeftMenuMobileTC,
+          centerRightMenuMobileCC = _data2.default.centerRightMenuMobileCC,
+          centerRightMenuMobileTC = _data2.default.centerRightMenuMobileTC,
+          rightMenuMobileTC = _data2.default.rightMenuMobileTC,
+          rightMenuMobileCC = _data2.default.rightMenuMobileCC;
+
+      switch (position) {
+        case "left":
+          {
+            return this.getMenuByEnvironment(leftMenu, leftMenuTC, [], []);
+          }
+        case "centerLeft":
+          {
+            return this.getMenuByEnvironment(centerLeftMenu, centerLeftMenu, centerLeftMenuMobileTC, centerLeftMenuMobileCC);
+          }
+        case "centerRight":
+          {
+            return this.getMenuByEnvironment(centerRightMenu, centerRightMenu, centerRightMenuMobileTC, centerRightMenuMobileCC);
+          }
+        case "right":
+          {
+            return this.getMenuByEnvironment(rightMenu, rightMenuTC, rightMenuMobileTC, rightMenuMobileCC);
+          }
+      }
+    }
+  }, {
+    key: 'getMenuByEnvironment',
+    value: function getMenuByEnvironment(ccMenu, tcMenu, tcMobilMenu, ccMobilMenu) {
+      if (this.isNewRetailBCPosTC) {
+        if (this.isMobileEnvironment) {
+          return tcMobilMenu;
+        } else {
+          return tcMenu;
+        }
+      } else {
+        if (this.isMobileEnvironment) {
+          return ccMobilMenu;
+        } else {
+          return ccMenu;
+        }
+      }
+    }
+  }, {
     key: 'componentDidMount',
     value: function componentDidMount() {
       this.initPageData();
@@ -1270,88 +1386,73 @@ var _default = (0, _mobxReact.observer)(_class = (_temp = _class2 = function (_C
 
       var screenHeight = window.screen.availHeight - 100;
       var htmlContent = null;
-      if (this.isVerticalTouch) {
-        htmlContent = _react2.default.createElement(_verticalPortal2.default, { handelClick: this.handelClick });
-      } else if (this.isHorizontalPad) {
-        htmlContent = _react2.default.createElement(_horizontalPadPortal2.default, { handelClick: this.handelClick });
-      } else {
-        htmlContent = _react2.default.createElement(
-          _tplusComponentsTouch.Layout,
-          { style: { height: '100%' }, className: 'portal-content' },
+      // if (this.isVerticalTouch) {
+      //   htmlContent = <VerticalPortal handelClick={this.handelClick} />
+      // } else if (this.isHorizontalPad) {
+      //   htmlContent = <HorizontalPadPortal handelClick={this.handelClick} />
+      // }
+      // else {
+      htmlContent = _react2.default.createElement(
+        _tplusComponentsTouch.Layout,
+        { style: { height: '100%' }, className: 'portal-content' },
+        _react2.default.createElement(
+          Content,
+          { style: { paddingLeft: '50px', paddingRight: '50px' }, className: 'portal-container' },
           _react2.default.createElement(
-            Content,
-            { style: { paddingLeft: '50px', paddingRight: '50px' }, className: 'portal-container' },
+            _antd.Row,
+            { className: 'portal-content-row' },
+            this.createLeftNode(),
             _react2.default.createElement(
-              _antd.Row,
-              null,
+              _antd.Col,
+              { xl: 10, md: 10, className: 'portal-center-col', key: 'center' },
               _react2.default.createElement(
-                _antd.Col,
-                { xl: 7, md: 7, className: 'portal-left-col', key: 'left' },
-                _react2.default.createElement(
-                  'div',
-                  { className: 'portal-left-content' },
-                  this.createLeftNode()
-                )
-              ),
-              _react2.default.createElement(
-                _antd.Col,
-                { xl: 10, md: 10, className: 'portal-center-col', key: 'center' },
-                _react2.default.createElement(
-                  'div',
-                  { className: 'portal-center-content' },
-                  this.createCenterNode()
-                )
-              ),
-              _react2.default.createElement(
-                _antd.Col,
-                { xl: 7, md: 7, className: 'portal-right-col', key: 'right' },
-                _react2.default.createElement(
-                  'div',
-                  { className: 'portal-right-content' },
-                  this.createRightNode()
-                )
+                'div',
+                { className: 'portal-center-content' },
+                this.createCenterNode()
               )
-            )
-          ),
-          _react2.default.createElement(
-            'div',
-            { className: loadHsyPage ? 'portal-hsy-tc-container' : 'portal-hsy-tc-container portal-hsy-tc-container-hide' },
-            _react2.default.createElement('iframe', { src: loadHsyURL, width: '100%', height: '93%', frameborder: 'no', border: '0', marginwidth: '0', marginheight: '0', scrolling: 'yes', allowtransparency: 'true', id: 'external-frame-cc' })
-          ),
-          _react2.default.createElement(
-            'div',
-            { className: loadTcPage ? 'portal-hsy-tc-container' : 'portal-hsy-tc-container portal-hsy-tc-container-hide' },
-            _react2.default.createElement('iframe', { src: loadTcURL, width: '100%', height: '93%', frameborder: 'no', border: '0', marginwidth: '0', marginheight: '0', scrolling: 'yes', allowtransparency: 'true', id: 'external-frame-tc' })
-          ),
-          this.isMobileEnvironment && _react2.default.createElement(
-            _antd.Modal,
-            {
-              visible: showModal,
-              onCancel: this.closeFrameModal,
-              width: '99%',
-              height: '99%',
-              footer: null
-            },
-            _react2.default.createElement('iframe', { src: modalURL, width: '100%', height: screenHeight, frameborder: 'no', border: '0', marginwidth: '0', marginheight: '0', scrolling: 'yes', allowtransparency: 'true' })
-          ),
-          _react2.default.createElement(
-            _antd.Modal,
-            {
-              title: '更多',
-              className: 'portal-container-modal-more',
-              visible: showMoreModal,
-              onCancel: this.closeMoreModal,
-              width: 800,
-              height: 375,
-              footer: null,
-              centered: true,
-              maskClosable: false,
-              keyboard: false
-            },
-            this.createMoreNode()
+            ),
+            this.createRightNode()
           )
-        );
-      }
+        ),
+        _react2.default.createElement(
+          'div',
+          { className: loadHsyPage ? 'portal-hsy-tc-container' : 'portal-hsy-tc-container portal-hsy-tc-container-hide' },
+          _react2.default.createElement('iframe', { src: loadHsyURL, width: '100%', height: '93%', frameborder: 'no', border: '0', marginwidth: '0', marginheight: '0', scrolling: 'yes', allowtransparency: 'true', id: 'external-frame-cc' })
+        ),
+        _react2.default.createElement(
+          'div',
+          { className: loadTcPage ? 'portal-hsy-tc-container' : 'portal-hsy-tc-container portal-hsy-tc-container-hide' },
+          _react2.default.createElement('iframe', { src: loadTcURL, width: '100%', height: '93%', frameborder: 'no', border: '0', marginwidth: '0', marginheight: '0', scrolling: 'yes', allowtransparency: 'true', id: 'external-frame-tc' })
+        ),
+        this.isMobileEnvironment && _react2.default.createElement(
+          _antd.Modal,
+          {
+            visible: showModal,
+            onCancel: this.closeFrameModal,
+            width: '99%',
+            height: '99%',
+            footer: null
+          },
+          _react2.default.createElement('iframe', { src: modalURL, width: '100%', height: screenHeight, frameborder: 'no', border: '0', marginwidth: '0', marginheight: '0', scrolling: 'yes', allowtransparency: 'true' })
+        ),
+        _react2.default.createElement(
+          _antd.Modal,
+          {
+            title: '更多',
+            className: 'portal-container-modal-more',
+            visible: showMoreModal,
+            onCancel: this.closeMoreModal,
+            width: 800,
+            height: 375,
+            footer: null,
+            centered: true,
+            maskClosable: false,
+            keyboard: false
+          },
+          this.createMoreNode()
+        )
+      );
+      // }
       return htmlContent;
     }
   }]);